From 9bbcf8dbd6d0687af849d3bca932c6c7a2dacc99 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Thu, 15 Jun 2017 13:14:04 -0700
Subject: [PATCH 01/14] Add support for night mode (#749)

---
 app/src/main/AndroidManifest.xml                         | 2 +-
 .../auth/{LeakCatcher.java => FirebaseUIDemo.java}       | 9 +++++++--
 app/src/main/res/values/styles.xml                       | 2 +-
 auth/src/main/res/values/styles.xml                      | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)
 rename app/src/main/java/com/firebase/uidemo/auth/{LeakCatcher.java => FirebaseUIDemo.java} (69%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ce2b85437..68a391ea9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
     <application
-        android:name=".auth.LeakCatcher"
+        android:name=".auth.FirebaseUIDemo"
         android:allowBackup="true"
         android:fullBackupContent="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/com/firebase/uidemo/auth/LeakCatcher.java b/app/src/main/java/com/firebase/uidemo/auth/FirebaseUIDemo.java
similarity index 69%
rename from app/src/main/java/com/firebase/uidemo/auth/LeakCatcher.java
rename to app/src/main/java/com/firebase/uidemo/auth/FirebaseUIDemo.java
index e0a3f3b06..f9d7bbe1d 100644
--- a/app/src/main/java/com/firebase/uidemo/auth/LeakCatcher.java
+++ b/app/src/main/java/com/firebase/uidemo/auth/FirebaseUIDemo.java
@@ -2,15 +2,20 @@
 
 import android.app.Application;
 import android.content.Context;
+import android.support.v7.app.AppCompatDelegate;
 
 import com.squareup.leakcanary.LeakCanary;
 import com.squareup.leakcanary.RefWatcher;
 
-public class LeakCatcher extends Application {
+public class FirebaseUIDemo extends Application {
     private RefWatcher mRefWatcher;
 
+    static {
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO);
+    }
+
     public static RefWatcher getRefWatcher(Context context) {
-        return ((LeakCatcher) context.getApplicationContext()).mRefWatcher;
+        return ((FirebaseUIDemo) context.getApplicationContext()).mRefWatcher;
     }
 
     @Override
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f5b6c16fc..849919918 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
diff --git a/auth/src/main/res/values/styles.xml b/auth/src/main/res/values/styles.xml
index 9e60f3731..bea2ffb1a 100644
--- a/auth/src/main/res/values/styles.xml
+++ b/auth/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="FirebaseUI" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="FirebaseUI" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>

From 6d2c1ae09b2027aca6bf56c39411be7bf07b8d84 Mon Sep 17 00:00:00 2001
From: Willie Chalmers III <willieechalmers@gmail.com>
Date: Thu, 22 Jun 2017 15:08:03 -0500
Subject: [PATCH 02/14] Update FirebaseListAdapter to use Context in
 constructor and layout inflation (#774)

---
 .../ui/database/FirebaseListAdapter.java      | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/database/src/main/java/com/firebase/ui/database/FirebaseListAdapter.java b/database/src/main/java/com/firebase/ui/database/FirebaseListAdapter.java
index 07f5a76bf..08b90c8bb 100644
--- a/database/src/main/java/com/firebase/ui/database/FirebaseListAdapter.java
+++ b/database/src/main/java/com/firebase/ui/database/FirebaseListAdapter.java
@@ -1,8 +1,10 @@
 package com.firebase.ui.database;
 
 import android.app.Activity;
+import android.content.Context;
 import android.support.annotation.LayoutRes;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
@@ -27,21 +29,21 @@
 public abstract class FirebaseListAdapter<T> extends BaseAdapter implements FirebaseAdapter<T> {
     private static final String TAG = "FirebaseListAdapter";
 
-    protected final Activity mActivity;
+    protected final Context mContext;
     protected final ObservableSnapshotArray<T> mSnapshots;
     protected final int mLayout;
 
     /**
-     * @param activity    The {@link Activity} containing the {@link ListView}
-     * @param modelLayout This is the layout used to represent a single list item. You will be
-     *                    responsible for populating an instance of the corresponding view with the
-     *                    data from an instance of modelClass.
+     * @param context    The {@link Activity} containing the {@link ListView}
      * @param snapshots   The data used to populate the adapter
+     * @param modelLayout This is the layout used to represent a single list item. You will be
+ *                    responsible for populating an instance of the corresponding view with the
+ *                    data from an instance of modelClass.
      */
-    public FirebaseListAdapter(Activity activity,
+    public FirebaseListAdapter(Context context,
                                ObservableSnapshotArray<T> snapshots,
                                @LayoutRes int modelLayout) {
-        mActivity = activity;
+        mContext = context;
         mSnapshots = snapshots;
         mLayout = modelLayout;
 
@@ -54,23 +56,23 @@ public FirebaseListAdapter(Activity activity,
      * @param query  The Firebase location to watch for data changes. Can also be a slice of a
      *               location, using some combination of {@code limit()}, {@code startAt()}, and
      *               {@code endAt()}. <b>Note, this can also be a {@link DatabaseReference}.</b>
-     * @see #FirebaseListAdapter(Activity, ObservableSnapshotArray, int)
+     * @see #FirebaseListAdapter(Context, ObservableSnapshotArray, int)
      */
-    public FirebaseListAdapter(Activity activity,
+    public FirebaseListAdapter(Context context,
                                SnapshotParser<T> parser,
                                @LayoutRes int modelLayout,
                                Query query) {
-        this(activity, new FirebaseArray<>(query, parser), modelLayout);
+        this(context, new FirebaseArray<>(query, parser), modelLayout);
     }
 
     /**
-     * @see #FirebaseListAdapter(Activity, SnapshotParser, int, Query)
+     * @see #FirebaseListAdapter(Context, SnapshotParser, int, Query)
      */
-    public FirebaseListAdapter(Activity activity,
+    public FirebaseListAdapter(Context context,
                                Class<T> modelClass,
                                @LayoutRes int modelLayout,
                                Query query) {
-        this(activity, new ClassSnapshotParser<>(modelClass), modelLayout, query);
+        this(context, new ClassSnapshotParser<>(modelClass), modelLayout, query);
     }
 
     @Override
@@ -126,7 +128,7 @@ public long getItemId(int i) {
     @Override
     public View getView(int position, View view, ViewGroup viewGroup) {
         if (view == null) {
-            view = mActivity.getLayoutInflater().inflate(mLayout, viewGroup, false);
+            view = LayoutInflater.from(mContext).inflate(mLayout, viewGroup, false);
         }
 
         T model = getItem(position);

From baa2d5141ba77e7e7f3cf07aac378e29914a8946 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Tue, 27 Jun 2017 07:47:42 -0700
Subject: [PATCH 03/14] When linking two accounts, use the provider the user
 last added to their account instead of the first one (#701)

---
 .../main/java/com/firebase/ui/auth/provider/ProviderUtils.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/ProviderUtils.java b/auth/src/main/java/com/firebase/ui/auth/provider/ProviderUtils.java
index 28eccea7e..f9b25b0a0 100644
--- a/auth/src/main/java/com/firebase/ui/auth/provider/ProviderUtils.java
+++ b/auth/src/main/java/com/firebase/ui/auth/provider/ProviderUtils.java
@@ -68,7 +68,7 @@ public String then(@NonNull Task<ProviderQueryResult> task) throws Exception {
 
                         List<String> providers = task.getResult().getProviders();
                         return providers == null || providers.isEmpty()
-                                ? null : providers.get(0);
+                                ? null : providers.get(providers.size() - 1);
                     }
                 });
     }

From b9a2fa4650082188d9335773f01ec7d3e2c2ea8f Mon Sep 17 00:00:00 2001
From: Sam Stern <samstern@google.com>
Date: Tue, 27 Jun 2017 13:09:40 -0400
Subject: [PATCH 04/14] Kill BaseHelper and friends (#777)

---
 .../com/firebase/ui/auth/KickoffActivity.java |   5 +-
 .../ui/auth/provider/EmailProvider.java       |  13 +-
 .../ui/auth/provider/PhoneProvider.java       |  13 +-
 .../firebase/ui/auth/ui/ActivityHelper.java   |  67 ----------
 .../firebase/ui/auth/ui/AppCompatBase.java    |   9 +-
 .../com/firebase/ui/auth/ui/BaseHelper.java   | 119 ------------------
 .../com/firebase/ui/auth/ui/DialogBase.java   |  28 -----
 .../firebase/ui/auth/ui/FlowParameters.java   |  26 ++++
 .../com/firebase/ui/auth/ui/FragmentBase.java |  33 ++++-
 .../firebase/ui/auth/ui/FragmentHelper.java   |  43 -------
 .../ui/auth/ui/HelperActivityBase.java        |  65 +++++++++-
 .../ui/auth/ui/ProgressDialogHolder.java      |  47 +++++++
 .../ui/accountlink/WelcomeBackIdpPrompt.java  |  15 +--
 .../WelcomeBackPasswordPrompt.java            |  22 ++--
 .../ui/auth/ui/email/CheckEmailFragment.java  |  14 ++-
 .../ui/email/RecoverPasswordActivity.java     |  16 +--
 .../ui/email/RecoveryEmailSentDialog.java     |   9 +-
 .../auth/ui/email/RegisterEmailActivity.java  |  17 ++-
 .../auth/ui/email/RegisterEmailFragment.java  |  39 +++---
 .../auth/ui/idp/AuthMethodPickerActivity.java |  25 ++--
 .../auth/ui/idp/CredentialSignInHandler.java  |  38 +++---
 .../ui/phone/PhoneVerificationActivity.java   |  20 +--
 .../phone/SubmitConfirmationCodeFragment.java |   2 +-
 .../ui/phone/VerifyPhoneNumberFragment.java   |   5 +-
 .../firebase/ui/auth/util/AuthInstances.java  |  44 +++++++
 .../signincontainer/IdpSignInContainer.java   |  30 +++--
 .../util/signincontainer/SaveSmartLock.java   |  16 +--
 .../util/signincontainer/SignInDelegate.java  |  29 ++---
 .../util/signincontainer/SmartLockBase.java   |   8 +-
 .../testhelpers/ActivityHelperShadow.java     |  34 -----
 .../auth/testhelpers/AuthInstancesShadow.java |  77 ++++++++++++
 .../ui/auth/testhelpers/BaseHelperShadow.java |  67 ----------
 .../CustomRobolectricGradleTestRunner.java    |   6 +-
 .../ui/auth/testhelpers/FakeAuthResult.java   |   2 +-
 .../ui/auth/testhelpers/TestHelper.java       |   2 +-
 .../ui/email/RecoverPasswordActivityTest.java |  10 +-
 .../ui/email/RegisterEmailActivityTest.java   |  12 +-
 .../email/WelcomeBackPasswordPromptTest.java  |  12 +-
 .../ui/idp/AuthMethodPickerActivityTest.java  |  27 ++--
 .../ui/idp/CredentialSignInHandlerTest.java   |  47 +++----
 .../phone/PhoneVerificationActivityTest.java  |  77 ++++++------
 41 files changed, 561 insertions(+), 629 deletions(-)
 delete mode 100644 auth/src/main/java/com/firebase/ui/auth/ui/ActivityHelper.java
 delete mode 100644 auth/src/main/java/com/firebase/ui/auth/ui/BaseHelper.java
 delete mode 100644 auth/src/main/java/com/firebase/ui/auth/ui/DialogBase.java
 delete mode 100644 auth/src/main/java/com/firebase/ui/auth/ui/FragmentHelper.java
 create mode 100644 auth/src/main/java/com/firebase/ui/auth/ui/ProgressDialogHolder.java
 create mode 100644 auth/src/main/java/com/firebase/ui/auth/util/AuthInstances.java
 delete mode 100644 auth/src/test/java/com/firebase/ui/auth/testhelpers/ActivityHelperShadow.java
 create mode 100644 auth/src/test/java/com/firebase/ui/auth/testhelpers/AuthInstancesShadow.java
 delete mode 100644 auth/src/test/java/com/firebase/ui/auth/testhelpers/BaseHelperShadow.java

diff --git a/auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java b/auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java
index ff33ea219..1739d31a0 100644
--- a/auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java
@@ -8,7 +8,6 @@
 import android.support.annotation.RestrictTo;
 import android.util.Log;
 
-import com.firebase.ui.auth.ui.ActivityHelper;
 import com.firebase.ui.auth.ui.ExtraConstants;
 import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.HelperActivityBase;
@@ -24,7 +23,7 @@ public class KickoffActivity extends HelperActivityBase {
     private boolean mIsWaitingForPlayServices = false;
 
     public static Intent createIntent(Context context, FlowParameters flowParams) {
-        return ActivityHelper.createBaseIntent(context, KickoffActivity.class, flowParams);
+        return HelperActivityBase.createBaseIntent(context, KickoffActivity.class, flowParams);
     }
 
     @Override
@@ -84,7 +83,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
 
     private void start() {
-        FlowParameters flowParams = mActivityHelper.getFlowParams();
+        FlowParameters flowParams = getFlowParams();
         SignInDelegate.delegate(this, flowParams);
     }
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/EmailProvider.java b/auth/src/main/java/com/firebase/ui/auth/provider/EmailProvider.java
index fd22120cf..be04312d8 100644
--- a/auth/src/main/java/com/firebase/ui/auth/provider/EmailProvider.java
+++ b/auth/src/main/java/com/firebase/ui/auth/provider/EmailProvider.java
@@ -8,7 +8,7 @@
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.ResultCodes;
-import com.firebase.ui.auth.ui.BaseHelper;
+import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.email.RegisterEmailActivity;
 import com.google.firebase.auth.EmailAuthProvider;
 
@@ -16,11 +16,11 @@ public class EmailProvider implements Provider {
     private static final int RC_EMAIL_FLOW = 2;
 
     private Activity mActivity;
-    private BaseHelper mHelper;
+    private FlowParameters mFlowParameters;
 
-    public EmailProvider(Activity activity, BaseHelper helper) {
+    public EmailProvider(Activity activity, FlowParameters flowParameters) {
         mActivity = activity;
-        mHelper = helper;
+        mFlowParameters = flowParameters;
     }
 
     @Override
@@ -43,14 +43,15 @@ public int getButtonLayout() {
     @Override
     public void startLogin(Activity activity) {
         activity.startActivityForResult(
-                RegisterEmailActivity.createIntent(activity, mHelper.getFlowParams()),
+                RegisterEmailActivity.createIntent(activity, mFlowParameters),
                 RC_EMAIL_FLOW);
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == RC_EMAIL_FLOW && resultCode == ResultCodes.OK) {
-            mHelper.finishActivity(mActivity, ResultCodes.OK, data);
+            mActivity.setResult(ResultCodes.OK, data);
+            mActivity.finish();
         }
     }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/PhoneProvider.java b/auth/src/main/java/com/firebase/ui/auth/provider/PhoneProvider.java
index 741d47cd7..7c9b8db64 100644
--- a/auth/src/main/java/com/firebase/ui/auth/provider/PhoneProvider.java
+++ b/auth/src/main/java/com/firebase/ui/auth/provider/PhoneProvider.java
@@ -8,7 +8,7 @@
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.ResultCodes;
-import com.firebase.ui.auth.ui.BaseHelper;
+import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.phone.PhoneVerificationActivity;
 import com.google.firebase.auth.PhoneAuthProvider;
 
@@ -17,11 +17,11 @@ public class PhoneProvider implements Provider {
     private static final int RC_PHONE_FLOW = 4;
 
     private Activity mActivity;
-    private BaseHelper mHelper;
+    private FlowParameters mFlowParameters;
 
-    public PhoneProvider(Activity activity, BaseHelper helper) {
+    public PhoneProvider(Activity activity, FlowParameters parameters) {
         mActivity = activity;
-        mHelper = helper;
+        mFlowParameters = parameters;
     }
 
     @Override
@@ -44,14 +44,15 @@ public int getButtonLayout() {
     @Override
     public void startLogin(Activity activity) {
         activity.startActivityForResult(
-                PhoneVerificationActivity.createIntent(activity, mHelper.getFlowParams(), null),
+                PhoneVerificationActivity.createIntent(activity, mFlowParameters, null),
                 RC_PHONE_FLOW);
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == RC_PHONE_FLOW && resultCode == ResultCodes.OK) {
-            mHelper.finishActivity(mActivity, ResultCodes.OK, data);
+            mActivity.setResult(ResultCodes.OK, data);
+            mActivity.finish();
         }
     }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/ActivityHelper.java b/auth/src/main/java/com/firebase/ui/auth/ui/ActivityHelper.java
deleted file mode 100644
index 9a87e58b3..000000000
--- a/auth/src/main/java/com/firebase/ui/auth/ui/ActivityHelper.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.firebase.ui.auth.ui;
-
-import android.content.Intent;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
-
-import com.firebase.ui.auth.IdpResponse;
-import com.firebase.ui.auth.R;
-import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
-import com.google.firebase.auth.FirebaseUser;
-
-@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class ActivityHelper extends BaseHelper {
-    private HelperActivityBase mActivity;
-
-    public ActivityHelper(HelperActivityBase activity, Intent intent) {
-        super(activity, (FlowParameters) intent.getParcelableExtra(ExtraConstants.EXTRA_FLOW_PARAMS));
-        mActivity = activity;
-    }
-
-    public void configureTheme() {
-        mActivity.setTheme(R.style.FirebaseUI); // Provides default values
-        mActivity.setTheme(getFlowParams().themeId);
-    }
-
-    public void startActivityForResult(Intent intent, int requestCode) {
-        mActivity.startActivityForResult(intent, requestCode);
-    }
-
-    public void finish(int resultCode, Intent intent) {
-        finishActivity(mActivity, resultCode, intent);
-    }
-
-    public SaveSmartLock getSaveSmartLockInstance() {
-        return getSaveSmartLockInstance(mActivity);
-    }
-
-    public void saveCredentialsOrFinish(
-            @Nullable SaveSmartLock saveSmartLock,
-            FirebaseUser firebaseUser,
-            @NonNull String password,
-            IdpResponse response) {
-        saveCredentialsOrFinish(saveSmartLock, mActivity, firebaseUser, password, response);
-    }
-
-    public void saveCredentialsOrFinish(
-            @Nullable SaveSmartLock saveSmartLock,
-            FirebaseUser firebaseUser,
-            IdpResponse response) {
-        saveCredentialsOrFinish(saveSmartLock, mActivity, firebaseUser, null, response);
-    }
-}
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/AppCompatBase.java b/auth/src/main/java/com/firebase/ui/auth/ui/AppCompatBase.java
index 975d1db1d..ec62c3152 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/AppCompatBase.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/AppCompatBase.java
@@ -17,6 +17,8 @@
 import android.os.Bundle;
 import android.support.annotation.RestrictTo;
 
+import com.firebase.ui.auth.R;
+
 @SuppressWarnings("Registered")
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class AppCompatBase extends HelperActivityBase {
@@ -24,7 +26,12 @@ public class AppCompatBase extends HelperActivityBase {
     @Override
     protected void onCreate(Bundle savedInstance) {
         super.onCreate(savedInstance);
-        mActivityHelper.configureTheme();
+        configureTheme();
+    }
+
+    private void configureTheme() {
+        setTheme(R.style.FirebaseUI); // Provides default values
+        setTheme(getFlowParams().themeId);
     }
 
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/BaseHelper.java b/auth/src/main/java/com/firebase/ui/auth/ui/BaseHelper.java
deleted file mode 100644
index 27df410fe..000000000
--- a/auth/src/main/java/com/firebase/ui/auth/ui/BaseHelper.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.firebase.ui.auth.ui;
-
-import android.app.Activity;
-import android.app.ProgressDialog;
-import android.content.Context;
-import android.content.Intent;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
-import android.support.annotation.StringRes;
-import android.support.v4.app.FragmentActivity;
-
-import com.firebase.ui.auth.IdpResponse;
-import com.firebase.ui.auth.ResultCodes;
-import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
-import com.google.android.gms.auth.api.Auth;
-import com.google.android.gms.auth.api.credentials.CredentialsApi;
-import com.google.firebase.FirebaseApp;
-import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.auth.FirebaseUser;
-import com.google.firebase.auth.PhoneAuthProvider;
-
-import static com.firebase.ui.auth.util.Preconditions.checkNotNull;
-
-@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class BaseHelper {
-    private final FlowParameters mFlowParams;
-    protected Context mContext;
-    protected ProgressDialog mProgressDialog;
-
-    public BaseHelper(Context context, FlowParameters parameters) {
-        mContext = context;
-        mFlowParams = parameters;
-    }
-
-    public static Intent createBaseIntent(
-            @NonNull Context context,
-            @NonNull Class<? extends Activity> target,
-            @NonNull FlowParameters flowParams) {
-        return new Intent(
-                checkNotNull(context, "context cannot be null"),
-                checkNotNull(target, "target activity cannot be null"))
-                .putExtra(ExtraConstants.EXTRA_FLOW_PARAMS,
-                          checkNotNull(flowParams, "flowParams cannot be null"));
-    }
-
-    public FlowParameters getFlowParams() {
-        return mFlowParams;
-    }
-
-    public void finishActivity(Activity activity, int resultCode, Intent intent) {
-        activity.setResult(resultCode, intent);
-        activity.finish();
-    }
-
-    public void showLoadingDialog(String message) {
-        dismissDialog();
-
-        if (mProgressDialog == null) {
-            mProgressDialog = new ProgressDialog(mContext);
-            mProgressDialog.setIndeterminate(true);
-            mProgressDialog.setTitle("");
-        }
-
-        mProgressDialog.setMessage(message);
-        mProgressDialog.show();
-    }
-
-    public void showLoadingDialog(@StringRes int stringResource) {
-        showLoadingDialog(mContext.getString(stringResource));
-    }
-
-    public void dismissDialog() {
-        if (mProgressDialog != null) {
-            mProgressDialog.dismiss();
-            mProgressDialog = null;
-        }
-    }
-
-    public boolean isProgressDialogShowing() {
-        return mProgressDialog != null && mProgressDialog.isShowing();
-    }
-
-    public FirebaseAuth getFirebaseAuth() {
-        return FirebaseAuth.getInstance(FirebaseApp.getInstance(mFlowParams.appName));
-    }
-
-    public CredentialsApi getCredentialsApi() {
-        return Auth.CredentialsApi;
-    }
-
-    public FirebaseUser getCurrentUser() {
-        return getFirebaseAuth().getCurrentUser();
-    }
-
-    public SaveSmartLock getSaveSmartLockInstance(FragmentActivity activity) {
-        return SaveSmartLock.getInstance(activity, getFlowParams());
-    }
-
-    public PhoneAuthProvider getPhoneAuthProviderInstance() {
-        return PhoneAuthProvider.getInstance();
-    }
-
-    public void saveCredentialsOrFinish(
-            @Nullable SaveSmartLock saveSmartLock,
-            Activity activity,
-            FirebaseUser firebaseUser,
-            @Nullable String password,
-            IdpResponse response) {
-        if (saveSmartLock == null) {
-            finishActivity(activity, ResultCodes.OK, response.toIntent());
-        } else {
-            saveSmartLock.saveCredentialsOrFinish(
-                    firebaseUser,
-                    password,
-                    response);
-        }
-    }
-}
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/DialogBase.java b/auth/src/main/java/com/firebase/ui/auth/ui/DialogBase.java
deleted file mode 100644
index b02009c9d..000000000
--- a/auth/src/main/java/com/firebase/ui/auth/ui/DialogBase.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.firebase.ui.auth.ui;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.RestrictTo;
-import android.support.v4.app.DialogFragment;
-
-@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class DialogBase extends DialogFragment {
-    protected FragmentHelper mHelper;
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mHelper = new FragmentHelper(this);
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        mHelper.dismissDialog();
-    }
-
-    public void finish(int resultCode, Intent resultIntent) {
-        mHelper.finish(resultCode, resultIntent);
-    }
-}
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/FlowParameters.java b/auth/src/main/java/com/firebase/ui/auth/ui/FlowParameters.java
index 7f3bd5e08..c4e15bb88 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/FlowParameters.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/FlowParameters.java
@@ -13,6 +13,8 @@
  */
 package com.firebase.ui.auth.ui;
 
+import android.content.Intent;
+import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.annotation.DrawableRes;
@@ -78,6 +80,30 @@ public FlowParameters(
         this.allowNewEmailAccounts = allowNewEmailAccounts;
     }
 
+    /**
+     * Extract FlowParameters from an Intent.
+     */
+    public static FlowParameters fromIntent(Intent intent) {
+        return intent.getParcelableExtra(ExtraConstants.EXTRA_FLOW_PARAMS);
+    }
+
+    /**
+     * Extract FlowParameters from a Bundle.
+     */
+    public static FlowParameters fromBundle(Bundle bundle) {
+        return bundle.getParcelable(ExtraConstants.EXTRA_FLOW_PARAMS);
+    }
+
+    /**
+     * Create a bundle containing this FlowParameters object as
+     * {@link ExtraConstants#EXTRA_FLOW_PARAMS}.
+     */
+    public Bundle toBundle() {
+        Bundle bundle = new Bundle();
+        bundle.putParcelable(ExtraConstants.EXTRA_FLOW_PARAMS, this);
+        return bundle;
+    }
+
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(appName);
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/FragmentBase.java b/auth/src/main/java/com/firebase/ui/auth/ui/FragmentBase.java
index 019f9d213..8532a92cb 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/FragmentBase.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/FragmentBase.java
@@ -1,28 +1,53 @@
 package com.firebase.ui.auth.ui;
 
 import android.content.Intent;
+import android.content.IntentSender;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
 import android.support.v4.app.Fragment;
+import android.view.ContextThemeWrapper;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class FragmentBase extends Fragment {
-    protected FragmentHelper mHelper;
+
+    private FlowParameters mFlowParameters;
+    private ProgressDialogHolder mProgressDialogHolder;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mHelper = new FragmentHelper(this);
+
+        ContextThemeWrapper context = new ContextThemeWrapper(
+                getContext(), getFlowParams().themeId);
+        mProgressDialogHolder = new ProgressDialogHolder(context);
     }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
-        mHelper.dismissDialog();
+        mProgressDialogHolder.dismissDialog();
+    }
+
+    public FlowParameters getFlowParams() {
+        if (mFlowParameters == null) {
+            mFlowParameters = FlowParameters.fromBundle(getArguments());
+        }
+
+        return mFlowParameters;
+    }
+
+    public ProgressDialogHolder getDialogHolder() {
+        return mProgressDialogHolder;
     }
 
     public void finish(int resultCode, Intent resultIntent) {
-        mHelper.finish(resultCode, resultIntent);
+        getActivity().setResult(resultCode, resultIntent);
+        getActivity().finish();
+    }
+
+    public void startIntentSenderForResult(IntentSender sender, int requestCode)
+            throws IntentSender.SendIntentException {
+        startIntentSenderForResult(sender, requestCode, null, 0, 0, 0, null);
     }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/FragmentHelper.java b/auth/src/main/java/com/firebase/ui/auth/ui/FragmentHelper.java
deleted file mode 100644
index 0cc545146..000000000
--- a/auth/src/main/java/com/firebase/ui/auth/ui/FragmentHelper.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.firebase.ui.auth.ui;
-
-import android.app.ProgressDialog;
-import android.content.Intent;
-import android.content.IntentSender;
-import android.os.Bundle;
-import android.support.annotation.RestrictTo;
-import android.support.v4.app.Fragment;
-import android.view.ContextThemeWrapper;
-
-@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class FragmentHelper extends BaseHelper {
-    private Fragment mFragment;
-
-    public FragmentHelper(Fragment fragment) {
-        super(fragment.getContext().getApplicationContext(),
-              (FlowParameters) fragment.getArguments().getParcelable(ExtraConstants.EXTRA_FLOW_PARAMS));
-        mFragment = fragment;
-    }
-
-    public static Bundle getFlowParamsBundle(FlowParameters params) {
-        Bundle bundle = new Bundle();
-        bundle.putParcelable(ExtraConstants.EXTRA_FLOW_PARAMS, params);
-        return bundle;
-    }
-
-    public void finish(int resultCode, Intent intent) {
-        finishActivity(mFragment.getActivity(), resultCode, intent);
-    }
-
-    @Override
-    public void showLoadingDialog(String message) {
-        dismissDialog();
-        ContextThemeWrapper context =
-                new ContextThemeWrapper(mFragment.getContext(), getFlowParams().themeId);
-        mProgressDialog = ProgressDialog.show(context, "", message, true);
-    }
-
-    public void startIntentSenderForResult(IntentSender sender, int requestCode)
-            throws IntentSender.SendIntentException {
-        mFragment.startIntentSenderForResult(sender, requestCode, null, 0, 0, 0, null);
-    }
-}
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java b/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java
index d13fb60ad..f167213d2 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java
@@ -1,30 +1,87 @@
 package com.firebase.ui.auth.ui;
 
+import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
 import android.support.v7.app.AppCompatActivity;
 
+import com.firebase.ui.auth.IdpResponse;
+import com.firebase.ui.auth.ResultCodes;
+import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
+import com.google.firebase.auth.FirebaseUser;
+
+import static com.firebase.ui.auth.util.Preconditions.checkNotNull;
+
 @SuppressWarnings("Registered")
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class HelperActivityBase extends AppCompatActivity {
 
-    protected ActivityHelper mActivityHelper;
+    private FlowParameters mFlowParameters;
+    private ProgressDialogHolder mProgressDialogHolder;
+
+    public static Intent createBaseIntent(
+            @NonNull Context context,
+            @NonNull Class<? extends Activity> target,
+            @NonNull FlowParameters flowParams) {
+        return new Intent(
+                checkNotNull(context, "context cannot be null"),
+                checkNotNull(target, "target activity cannot be null"))
+                .putExtra(ExtraConstants.EXTRA_FLOW_PARAMS,
+                          checkNotNull(flowParams, "flowParams cannot be null"));
+    }
 
     @Override
     protected void onCreate(Bundle savedInstance) {
         super.onCreate(savedInstance);
-        mActivityHelper = new ActivityHelper(this, getIntent());
+        mProgressDialogHolder = new ProgressDialogHolder(this);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        mActivityHelper.dismissDialog();
+        mProgressDialogHolder.dismissDialog();
+    }
+
+    public FlowParameters getFlowParams() {
+        if (mFlowParameters == null) {
+            mFlowParameters = FlowParameters.fromIntent(getIntent());
+        }
+
+        return mFlowParameters;
+    }
+
+    public ProgressDialogHolder getDialogHolder() {
+        return mProgressDialogHolder;
     }
 
     public void finish(int resultCode, Intent intent) {
-        mActivityHelper.finish(resultCode, intent);
+        setResult(resultCode, intent);
+        finish();
+    }
+
+    public void saveCredentialsOrFinish(
+            @Nullable SaveSmartLock saveSmartLock,
+            FirebaseUser firebaseUser,
+            IdpResponse response) {
+        saveCredentialsOrFinish(saveSmartLock, firebaseUser, null, response);
     }
+
+    public void saveCredentialsOrFinish(
+            @Nullable SaveSmartLock saveSmartLock,
+            FirebaseUser firebaseUser,
+            @Nullable String password,
+            IdpResponse response) {
+
+        if (saveSmartLock == null) {
+            finish(ResultCodes.OK, response.toIntent());
+        } else {
+            saveSmartLock.saveCredentialsOrFinish(firebaseUser, password, response);
+        }
+    }
+
 }
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/ProgressDialogHolder.java b/auth/src/main/java/com/firebase/ui/auth/ui/ProgressDialogHolder.java
new file mode 100644
index 000000000..c86780417
--- /dev/null
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/ProgressDialogHolder.java
@@ -0,0 +1,47 @@
+package com.firebase.ui.auth.ui;
+
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.support.annotation.StringRes;
+
+/**
+ * Helper class to manage a ProgressDialog.
+ */
+public class ProgressDialogHolder {
+
+    private Context mContext;
+    private ProgressDialog mProgressDialog;
+
+    public ProgressDialogHolder(Context context) {
+        mContext = context;
+    }
+
+    public void showLoadingDialog(String message) {
+        dismissDialog();
+
+        if (mProgressDialog == null) {
+            mProgressDialog = new ProgressDialog(mContext);
+            mProgressDialog.setIndeterminate(true);
+            mProgressDialog.setTitle("");
+        }
+
+        mProgressDialog.setMessage(message);
+        mProgressDialog.show();
+    }
+
+    public void showLoadingDialog(@StringRes int stringResource) {
+        showLoadingDialog(mContext.getString(stringResource));
+    }
+
+    public void dismissDialog() {
+        if (mProgressDialog != null) {
+            mProgressDialog.dismiss();
+            mProgressDialog = null;
+        }
+    }
+
+    public boolean isProgressDialogShowing() {
+        return mProgressDialog != null && mProgressDialog.isShowing();
+    }
+
+}
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java
index c965cbb81..8328ca3e7 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java
@@ -37,11 +37,12 @@
 import com.firebase.ui.auth.provider.IdpProvider.IdpCallback;
 import com.firebase.ui.auth.provider.TwitterProvider;
 import com.firebase.ui.auth.ui.AppCompatBase;
-import com.firebase.ui.auth.ui.BaseHelper;
 import com.firebase.ui.auth.ui.ExtraConstants;
 import com.firebase.ui.auth.ui.FlowParameters;
+import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.User;
+import com.firebase.ui.auth.util.AuthInstances;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
@@ -65,7 +66,7 @@ public static Intent createIntent(
             FlowParameters flowParams,
             User existingUser,
             IdpResponse newUserResponse) {
-        return BaseHelper.createBaseIntent(context, WelcomeBackIdpPrompt.class, flowParams)
+        return HelperActivityBase.createBaseIntent(context, WelcomeBackIdpPrompt.class, flowParams)
                 .putExtra(ExtraConstants.EXTRA_USER, existingUser)
                 .putExtra(ExtraConstants.EXTRA_IDP_RESPONSE, newUserResponse);
     }
@@ -81,7 +82,7 @@ protected void onCreate(Bundle savedInstanceState) {
         User oldUser = User.getUser(getIntent());
 
         String providerId = oldUser.getProvider();
-        for (IdpConfig idpConfig : mActivityHelper.getFlowParams().providerInfo) {
+        for (IdpConfig idpConfig : getFlowParams().providerInfo) {
             if (providerId.equals(idpConfig.getProviderId())) {
                 switch (providerId) {
                     case GoogleAuthProvider.PROVIDER_ID:
@@ -89,7 +90,7 @@ protected void onCreate(Bundle savedInstanceState) {
                         break;
                     case FacebookAuthProvider.PROVIDER_ID:
                         mIdpProvider = new FacebookProvider(
-                                idpConfig, mActivityHelper.getFlowParams().themeId);
+                                idpConfig, getFlowParams().themeId);
                         break;
                     case TwitterAuthProvider.PROVIDER_ID:
                         mIdpProvider = new TwitterProvider(this);
@@ -118,7 +119,7 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.welcome_back_idp_button).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View view) {
-                mActivityHelper.showLoadingDialog(R.string.progress_dialog_signing_in);
+                getDialogHolder().showLoadingDialog(R.string.progress_dialog_signing_in);
                 mIdpProvider.startLogin(WelcomeBackIdpPrompt.this);
             }
         });
@@ -147,9 +148,9 @@ public void onSuccess(final IdpResponse idpResponse) {
             return;
         }
 
-        FirebaseUser currentUser = mActivityHelper.getCurrentUser();
+        FirebaseUser currentUser = AuthInstances.getCurrentUser(getFlowParams());
         if (currentUser == null) {
-            mActivityHelper.getFirebaseAuth()
+            AuthInstances.getFirebaseAuth(getFlowParams())
                     .signInWithCredential(newCredential)
                     .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
                         @Override
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
index 6ac33f2e3..0bef04fd8 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
@@ -37,12 +37,13 @@
 import com.firebase.ui.auth.ResultCodes;
 import com.firebase.ui.auth.provider.ProviderUtils;
 import com.firebase.ui.auth.ui.AppCompatBase;
-import com.firebase.ui.auth.ui.BaseHelper;
 import com.firebase.ui.auth.ui.ExtraConstants;
 import com.firebase.ui.auth.ui.FlowParameters;
+import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.ImeHelper;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.email.RecoverPasswordActivity;
+import com.firebase.ui.auth.util.AuthInstances;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
@@ -71,7 +72,7 @@ public static Intent createIntent(
             Context context,
             FlowParameters flowParams,
             IdpResponse response) {
-        return BaseHelper.createBaseIntent(context, WelcomeBackPasswordPrompt.class, flowParams)
+        return HelperActivityBase.createBaseIntent(context, WelcomeBackPasswordPrompt.class, flowParams)
                 .putExtra(ExtraConstants.EXTRA_IDP_RESPONSE, response);
     }
 
@@ -83,7 +84,8 @@ protected void onCreate(Bundle savedInstanceState) {
         // Show keyboard
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
 
-        mSaveSmartLock = mActivityHelper.getSaveSmartLockInstance();
+        mSaveSmartLock = AuthInstances.getSaveSmartLockInstance(
+                this, getFlowParams());
         mIdpResponse = IdpResponse.fromResultIntent(getIntent());
         mEmail = mIdpResponse.getEmail();
 
@@ -95,7 +97,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // Create welcome back text with email bolded.
         String bodyText = getString(R.string.welcome_back_password_prompt_body, mEmail);
-        FlowParameters flowParameters = mActivityHelper.getFlowParams();
 
         SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(bodyText);
         int emailStart = bodyText.indexOf(mEmail);
@@ -120,7 +121,7 @@ public void onClick(View view) {
         } else if (id == R.id.trouble_signing_in) {
             startActivity(RecoverPasswordActivity.createIntent(
                     this,
-                    mActivityHelper.getFlowParams(),
+                    getFlowParams(),
                     mEmail));
             finish(ResultCodes.CANCELED, IdpResponse.getErrorCodeIntent(ErrorCodes.UNKNOWN_ERROR));
         }
@@ -143,9 +144,10 @@ private void validateAndSignIn(final String email, final String password) {
         } else {
             mPasswordLayout.setError(null);
         }
-        mActivityHelper.showLoadingDialog(R.string.progress_dialog_signing_in);
+        getDialogHolder().showLoadingDialog(R.string.progress_dialog_signing_in);
+
+        final FirebaseAuth firebaseAuth = AuthInstances.getFirebaseAuth(getFlowParams());
 
-        final FirebaseAuth firebaseAuth = mActivityHelper.getFirebaseAuth();
         // Sign in with known email and the password provided
         firebaseAuth.signInWithEmailAndPassword(email, password)
                 .addOnFailureListener(
@@ -159,7 +161,7 @@ public void onSuccess(AuthResult authResult) {
                         // If authCredential is null, the user only has an email account.
                         // Otherwise, the user has an email account that we need to link to an idp.
                         if (authCredential == null) {
-                            mActivityHelper.saveCredentialsOrFinish(
+                            saveCredentialsOrFinish(
                                     mSaveSmartLock,
                                     authResult.getUser(),
                                     password,
@@ -174,7 +176,7 @@ public void onSuccess(AuthResult authResult) {
                                     .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
                                         @Override
                                         public void onSuccess(AuthResult authResult) {
-                                            mActivityHelper.saveCredentialsOrFinish(
+                                            saveCredentialsOrFinish(
                                                     mSaveSmartLock,
                                                     authResult.getUser(),
                                                     mIdpResponse);
@@ -186,7 +188,7 @@ public void onSuccess(AuthResult authResult) {
                 .addOnFailureListener(this, new OnFailureListener() {
                     @Override
                     public void onFailure(@NonNull Exception e) {
-                        mActivityHelper.dismissDialog();
+                        getDialogHolder().dismissDialog();
                         String error = e.getLocalizedMessage();
                         mPasswordLayout.setError(error);
                     }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java
index 82d1dd12f..e938eeb88 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java
@@ -24,6 +24,7 @@
 import com.firebase.ui.auth.ui.ImeHelper;
 import com.firebase.ui.auth.ui.User;
 import com.firebase.ui.auth.ui.email.fieldvalidators.EmailFieldValidator;
+import com.firebase.ui.auth.util.AuthInstances;
 import com.firebase.ui.auth.util.GoogleApiHelper;
 import com.google.android.gms.auth.api.Auth;
 import com.google.android.gms.auth.api.credentials.Credential;
@@ -35,6 +36,7 @@
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.EmailAuthProvider;
+import com.google.firebase.auth.FirebaseAuth;
 
 /**
  * Fragment that shows a form with an email field and checks for existing accounts with that
@@ -136,7 +138,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
             // Use email passed in
             mEmailEditText.setText(email);
             validateAndProceed();
-        } else if (mHelper.getFlowParams().enableHints) {
+        } else if (getFlowParams().enableHints) {
             // Try SmartLock email autocomplete hint
             showEmailAutoCompleteHint();
         }
@@ -179,7 +181,7 @@ private void validateAndProceed() {
     }
 
     private void checkAccountExists(@NonNull final String email) {
-        mHelper.showLoadingDialog(R.string.progress_dialog_checking_accounts);
+        getDialogHolder().showLoadingDialog(R.string.progress_dialog_checking_accounts);
 
         // Get name from SmartLock, if possible
         String name = null;
@@ -191,7 +193,9 @@ private void checkAccountExists(@NonNull final String email) {
 
         final String finalName = name;
         final Uri finalPhotoUri = photoUri;
-        ProviderUtils.fetchTopProvider(mHelper.getFirebaseAuth(), email)
+
+        FirebaseAuth auth = AuthInstances.getFirebaseAuth(getFlowParams());
+        ProviderUtils.fetchTopProvider(auth, email)
                 .addOnSuccessListener(getActivity(), new OnSuccessListener<String>() {
                     @Override
                     public void onSuccess(String provider) {
@@ -213,14 +217,14 @@ public void onSuccess(String provider) {
                         new OnCompleteListener<String>() {
                             @Override
                             public void onComplete(@NonNull Task<String> task) {
-                                mHelper.dismissDialog();
+                                getDialogHolder().dismissDialog();
                             }
                         });
     }
 
     private void showEmailAutoCompleteHint() {
         try {
-            mHelper.startIntentSenderForResult(getEmailHintIntent().getIntentSender(), RC_HINT);
+            startIntentSenderForResult(getEmailHintIntent().getIntentSender(), RC_HINT);
         } catch (IntentSender.SendIntentException e) {
             Log.e(TAG, "Unable to start hint intent", e);
         }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivity.java
index 084643caa..a49c7bf65 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivity.java
@@ -25,11 +25,12 @@
 
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.ui.AppCompatBase;
-import com.firebase.ui.auth.ui.BaseHelper;
 import com.firebase.ui.auth.ui.ExtraConstants;
 import com.firebase.ui.auth.ui.FlowParameters;
+import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.email.fieldvalidators.EmailFieldValidator;
+import com.firebase.ui.auth.util.AuthInstances;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.auth.FirebaseAuthInvalidUserException;
@@ -45,7 +46,7 @@ public class RecoverPasswordActivity extends AppCompatBase implements View.OnCli
     private EmailFieldValidator mEmailFieldValidator;
 
     public static Intent createIntent(Context context, FlowParameters flowParams, String email) {
-        return BaseHelper.createBaseIntent(context, RecoverPasswordActivity.class, flowParams)
+        return HelperActivityBase.createBaseIntent(context, RecoverPasswordActivity.class, flowParams)
                 .putExtra(ExtraConstants.EXTRA_EMAIL, email);
     }
 
@@ -67,21 +68,22 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void next(final String email) {
-        mActivityHelper.getFirebaseAuth()
+        AuthInstances.getFirebaseAuth(getFlowParams())
                 .sendPasswordResetEmail(email)
                 .addOnFailureListener(
                         new TaskFailureLogger(TAG, "Error sending password reset email"))
                 .addOnSuccessListener(new OnSuccessListener<Void>() {
                     @Override
                     public void onSuccess(Void aVoid) {
-                        mActivityHelper.dismissDialog();
-                        RecoveryEmailSentDialog.show(email, getSupportFragmentManager());
+                        getDialogHolder().dismissDialog();
+                        RecoveryEmailSentDialog.show(
+                                email, getSupportFragmentManager());
                     }
                 })
                 .addOnFailureListener(this, new OnFailureListener() {
                     @Override
                     public void onFailure(@NonNull Exception e) {
-                        mActivityHelper.dismissDialog();
+                        getDialogHolder().dismissDialog();
 
                         if (e instanceof FirebaseAuthInvalidUserException) {
                             // No FirebaseUser exists with this email address, show error.
@@ -95,7 +97,7 @@ public void onFailure(@NonNull Exception e) {
     public void onClick(View view) {
         if (view.getId() == R.id.button_done) {
             if (mEmailFieldValidator.validate(mEmailEditText.getText())) {
-                mActivityHelper.showLoadingDialog(R.string.progress_dialog_sending);
+                getDialogHolder().showLoadingDialog(R.string.progress_dialog_sending);
                 next(mEmailEditText.getText().toString());
             }
         }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java
index b56a8f92c..dd97546fe 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java
@@ -6,16 +6,16 @@
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.RestrictTo;
+import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v7.app.AlertDialog;
 
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.ResultCodes;
-import com.firebase.ui.auth.ui.DialogBase;
 import com.firebase.ui.auth.ui.ExtraConstants;
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class RecoveryEmailSentDialog extends DialogBase {
+public class RecoveryEmailSentDialog extends DialogFragment {
     private static final String TAG = "RecoveryEmailSentDialog";
 
     public static void show(String email, FragmentManager manager) {
@@ -42,4 +42,9 @@ public void onDismiss(DialogInterface anInterface) {
                 .setPositiveButton(android.R.string.ok, null)
                 .show();
     }
+
+    public void finish(int resultCode, Intent resultIntent) {
+        getActivity().setResult(resultCode, resultIntent);
+        getActivity().finish();
+    }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailActivity.java
index 97d720644..e2eacbf6c 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailActivity.java
@@ -24,9 +24,9 @@
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.ui.AppCompatBase;
-import com.firebase.ui.auth.ui.BaseHelper;
 import com.firebase.ui.auth.ui.ExtraConstants;
 import com.firebase.ui.auth.ui.FlowParameters;
+import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.User;
 import com.firebase.ui.auth.ui.accountlink.WelcomeBackIdpPrompt;
 import com.firebase.ui.auth.ui.accountlink.WelcomeBackPasswordPrompt;
@@ -49,7 +49,7 @@ public static Intent createIntent(Context context, FlowParameters flowParams) {
     }
 
     public static Intent createIntent(Context context, FlowParameters flowParams, String email) {
-        return BaseHelper.createBaseIntent(context, RegisterEmailActivity.class, flowParams)
+        return HelperActivityBase.createBaseIntent(context, RegisterEmailActivity.class, flowParams)
                 .putExtra(ExtraConstants.EXTRA_EMAIL, email);
     }
 
@@ -66,8 +66,7 @@ protected void onCreate(Bundle savedInstanceState) {
         String email = getIntent().getExtras().getString(ExtraConstants.EXTRA_EMAIL);
 
         // Start with check email
-        CheckEmailFragment fragment = CheckEmailFragment.newInstance(
-                mActivityHelper.getFlowParams(), email);
+        CheckEmailFragment fragment = CheckEmailFragment.newInstance(getFlowParams(), email);
         getSupportFragmentManager().beginTransaction()
                 .replace(R.id.fragment_register_email, fragment, CheckEmailFragment.TAG)
                 .disallowAddToBackStack()
@@ -96,7 +95,7 @@ public void onExistingEmailUser(User user) {
         startActivityForResult(
                 WelcomeBackPasswordPrompt.createIntent(
                         this,
-                        mActivityHelper.getFlowParams(),
+                        getFlowParams(),
                         new IdpResponse.Builder(EmailAuthProvider.PROVIDER_ID,
                                                 user.getEmail()).build()),
                 RC_SIGN_IN);
@@ -109,11 +108,11 @@ public void onExistingIdpUser(User user) {
         // Existing social user, direct them to sign in using their chosen provider.
         Intent intent = WelcomeBackIdpPrompt.createIntent(
                 this,
-                mActivityHelper.getFlowParams(),
+                getFlowParams(),
                 user,
                 new IdpResponse.Builder(EmailAuthProvider.PROVIDER_ID, user.getEmail()).build());
-        mActivityHelper.startActivityForResult(intent, RC_WELCOME_BACK_IDP);
 
+        startActivityForResult(intent, RC_WELCOME_BACK_IDP);
         setSlideAnimation();
     }
 
@@ -124,9 +123,9 @@ public void onNewUser(User user) {
 
         TextInputLayout emailLayout = (TextInputLayout) findViewById(R.id.email_layout);
 
-        if (mActivityHelper.getFlowParams().allowNewEmailAccounts) {
+        if (getFlowParams().allowNewEmailAccounts) {
             RegisterEmailFragment fragment = RegisterEmailFragment.newInstance(
-                    mActivityHelper.getFlowParams(),
+                    getFlowParams(),
                     user);
             FragmentTransaction ft = getSupportFragmentManager().beginTransaction()
                     .replace(R.id.fragment_register_email, fragment, RegisterEmailFragment.TAG);
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java
index 29f1e5dbd..ecc3a5604 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java
@@ -18,6 +18,7 @@
 import com.firebase.ui.auth.ui.ExtraConstants;
 import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.FragmentBase;
+import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.ImeHelper;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.TermsTextView;
@@ -27,6 +28,7 @@
 import com.firebase.ui.auth.ui.email.fieldvalidators.EmailFieldValidator;
 import com.firebase.ui.auth.ui.email.fieldvalidators.PasswordFieldValidator;
 import com.firebase.ui.auth.ui.email.fieldvalidators.RequiredFieldValidator;
+import com.firebase.ui.auth.util.AuthInstances;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnFailureListener;
@@ -34,6 +36,7 @@
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.EmailAuthProvider;
+import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException;
 import com.google.firebase.auth.FirebaseAuthUserCollisionException;
 import com.google.firebase.auth.FirebaseAuthWeakPasswordException;
@@ -49,6 +52,8 @@ public class RegisterEmailFragment extends FragmentBase implements
 
     public static final String TAG = "RegisterEmailFragment";
 
+    private HelperActivityBase mActivity;
+
     private EditText mEmailEditText;
     private EditText mNameEditText;
     private EditText mPasswordEditText;
@@ -156,8 +161,13 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         getActivity().setTitle(R.string.title_register_email);
 
-        mSaveSmartLock = mHelper.getSaveSmartLockInstance(getActivity());
-        mAgreementText.showTerms(mHelper.getFlowParams(), R.string.button_text_save);
+        if (!(getActivity() instanceof HelperActivityBase)) {
+            throw new RuntimeException("Must be attached to a HelperActivityBase.");
+        }
+
+        mActivity = (HelperActivityBase) getActivity();
+        mSaveSmartLock = AuthInstances.getSaveSmartLockInstance(getActivity(), getFlowParams());
+        mAgreementText.showTerms(getFlowParams(), R.string.button_text_save);
     }
 
     @Override
@@ -205,13 +215,13 @@ private void validateAndRegisterUser() {
         boolean passwordValid = mPasswordFieldValidator.validate(password);
         boolean nameValid = mNameValidator.validate(name);
         if (emailValid && passwordValid && nameValid) {
-            mHelper.showLoadingDialog(R.string.progress_dialog_signing_up);
+            getDialogHolder().showLoadingDialog(R.string.progress_dialog_signing_up);
             registerUser(email, name, password);
         }
     }
 
     private void registerUser(final String email, final String name, final String password) {
-        mHelper.getFirebaseAuth()
+        AuthInstances.getFirebaseAuth(getFlowParams())
                 .createUserWithEmailAndPassword(email, password)
                 .addOnFailureListener(new TaskFailureLogger(TAG, "Error creating user"))
                 .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
@@ -234,14 +244,10 @@ public void onComplete(@NonNull Task<Void> task) {
                                         // This executes even if the name change fails, since
                                         // the account creation succeeded and we want to save
                                         // the credential to SmartLock (if enabled).
-                                        mHelper.saveCredentialsOrFinish(
-                                                mSaveSmartLock,
-                                                getActivity(),
-                                                user,
-                                                password,
+                                        mActivity.saveCredentialsOrFinish(
+                                                mSaveSmartLock, user, password,
                                                 new IdpResponse.Builder(EmailAuthProvider.PROVIDER_ID,
-                                                                        email)
-                                                        .build());
+                                                                        email).build());
                                     }
                                 });
                     }
@@ -260,7 +266,8 @@ public void onFailure(@NonNull Exception e) {
                             // Collision with existing user email, it should be very hard for
                             // the user to even get to this error due to CheckEmailFragment.
 
-                            ProviderUtils.fetchTopProvider(mHelper.getFirebaseAuth(), email).addOnSuccessListener(
+                            FirebaseAuth auth = AuthInstances.getFirebaseAuth(getFlowParams());
+                            ProviderUtils.fetchTopProvider(auth, email).addOnSuccessListener(
                                     getActivity(),
                                     new OnSuccessListener<String>() {
                                         @Override
@@ -281,7 +288,7 @@ public void onSuccess(String provider) {
                                                 getActivity().startActivityForResult(
                                                         WelcomeBackPasswordPrompt.createIntent(
                                                                 getContext(),
-                                                                mHelper.getFlowParams(),
+                                                                getFlowParams(),
                                                                 new IdpResponse.Builder(
                                                                         EmailAuthProvider.PROVIDER_ID,
                                                                         email).build()),
@@ -290,7 +297,7 @@ public void onSuccess(String provider) {
                                                 getActivity().startActivityForResult(
                                                         WelcomeBackIdpPrompt.createIntent(
                                                                 getContext(),
-                                                                mHelper.getFlowParams(),
+                                                                getFlowParams(),
                                                                 new User.Builder(email)
                                                                         .setProvider(provider)
                                                                         .build(),
@@ -304,7 +311,7 @@ public void onSuccess(String provider) {
                                     .addOnCompleteListener(new OnCompleteListener<String>() {
                                         @Override
                                         public void onComplete(@NonNull Task<String> task) {
-                                            mHelper.dismissDialog();
+                                            getDialogHolder().dismissDialog();
                                         }
                                     });
                             return;
@@ -314,7 +321,7 @@ public void onComplete(@NonNull Task<String> task) {
                             mEmailInput.setError(getString(R.string.email_account_creation_error));
                         }
 
-                        mHelper.dismissDialog();
+                        getDialogHolder().dismissDialog();
                     }
                 });
     }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
index de617fd23..36abadcfe 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
@@ -38,11 +38,11 @@
 import com.firebase.ui.auth.provider.Provider;
 import com.firebase.ui.auth.provider.TwitterProvider;
 import com.firebase.ui.auth.ui.AppCompatBase;
-import com.firebase.ui.auth.ui.BaseHelper;
 import com.firebase.ui.auth.ui.FlowParameters;
+import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.email.RegisterEmailActivity;
-import com.firebase.ui.auth.ui.phone.PhoneVerificationActivity;
+import com.firebase.ui.auth.util.AuthInstances;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.firebase.auth.AuthCredential;
 
@@ -67,18 +67,18 @@ public class AuthMethodPickerActivity extends AppCompatBase implements IdpCallba
     private SaveSmartLock mSaveSmartLock;
 
     public static Intent createIntent(Context context, FlowParameters flowParams) {
-        return BaseHelper.createBaseIntent(context, AuthMethodPickerActivity.class, flowParams);
+        return HelperActivityBase.createBaseIntent(context, AuthMethodPickerActivity.class, flowParams);
     }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.auth_method_picker_layout);
-        mSaveSmartLock = mActivityHelper.getSaveSmartLockInstance();
+        mSaveSmartLock = AuthInstances.getSaveSmartLockInstance(this, getFlowParams());
 
-        populateIdpList(mActivityHelper.getFlowParams().providerInfo);
+        populateIdpList(getFlowParams().providerInfo);
 
-        int logoId = mActivityHelper.getFlowParams().logoId;
+        int logoId = getFlowParams().logoId;
         if (logoId == AuthUI.NO_LOGO) {
             findViewById(R.id.logo_layout).setVisibility(View.GONE);
         } else {
@@ -96,16 +96,16 @@ private void populateIdpList(List<IdpConfig> providers) {
                     break;
                 case AuthUI.FACEBOOK_PROVIDER:
                     mProviders.add(new FacebookProvider(
-                            idpConfig, mActivityHelper.getFlowParams().themeId));
+                            idpConfig, getFlowParams().themeId));
                     break;
                 case AuthUI.TWITTER_PROVIDER:
                     mProviders.add(new TwitterProvider(this));
                     break;
                 case AuthUI.EMAIL_PROVIDER:
-                    mProviders.add(new EmailProvider(this, mActivityHelper));
+                    mProviders.add(new EmailProvider(this, getFlowParams()));
                     break;
                 case AuthUI.PHONE_VERIFICATION_PROVIDER:
-                    mProviders.add(new PhoneProvider(this, mActivityHelper));
+                    mProviders.add(new PhoneProvider(this, getFlowParams()));
                     break;
                 default:
                     Log.e(TAG, "Encountered unknown provider parcel with type: "
@@ -122,7 +122,7 @@ private void populateIdpList(List<IdpConfig> providers) {
                 @Override
                 public void onClick(View view) {
                     if (provider instanceof IdpProvider) {
-                        mActivityHelper.showLoadingDialog(R.string.progress_dialog_loading);
+                        getDialogHolder().showLoadingDialog(R.string.progress_dialog_loading);
                     }
                     provider.startLogin(AuthMethodPickerActivity.this);
                 }
@@ -149,7 +149,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
     @Override
     public void onSuccess(final IdpResponse response) {
         AuthCredential credential = ProviderUtils.getAuthCredential(response);
-        mActivityHelper.getFirebaseAuth()
+        AuthInstances.getFirebaseAuth(getFlowParams())
                 .signInWithCredential(credential)
                 .addOnFailureListener(
                         new TaskFailureLogger(TAG, "Firebase sign in with credential "
@@ -157,7 +157,6 @@ public void onSuccess(final IdpResponse response) {
                                 "Visit https://console.firebase.google.com to enable it."))
                 .addOnCompleteListener(new CredentialSignInHandler(
                         this,
-                        mActivityHelper,
                         mSaveSmartLock,
                         RC_ACCOUNT_LINK,
                         response));
@@ -166,7 +165,7 @@ public void onSuccess(final IdpResponse response) {
     @Override
     public void onFailure(Bundle extra) {
         // stay on this screen
-        mActivityHelper.dismissDialog();
+        getDialogHolder().dismissDialog();
     }
 
     @Override
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
index 9f7cba4f3..57bcb127e 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
@@ -14,21 +14,21 @@
 
 package com.firebase.ui.auth.ui.idp;
 
-import android.app.Activity;
+import android.content.Intent;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
 import android.util.Log;
 
-import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.ErrorCodes;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.ResultCodes;
 import com.firebase.ui.auth.provider.ProviderUtils;
-import com.firebase.ui.auth.ui.BaseHelper;
+import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.User;
 import com.firebase.ui.auth.ui.accountlink.WelcomeBackIdpPrompt;
 import com.firebase.ui.auth.ui.accountlink.WelcomeBackPasswordPrompt;
+import com.firebase.ui.auth.util.AuthInstances;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnFailureListener;
@@ -36,6 +36,7 @@
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.EmailAuthProvider;
+import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseAuthUserCollisionException;
 import com.google.firebase.auth.FirebaseUser;
 
@@ -43,21 +44,18 @@
 public class CredentialSignInHandler implements OnCompleteListener<AuthResult> {
     private static final String TAG = "CredentialSignInHandler";
 
-    private Activity mActivity;
-    private BaseHelper mHelper;
+    private HelperActivityBase mActivity;
     @Nullable
     private SaveSmartLock mSmartLock;
     private IdpResponse mResponse;
     private int mAccountLinkRequestCode;
 
     public CredentialSignInHandler(
-            Activity activity,
-            BaseHelper helper,
+            HelperActivityBase activity,
             @Nullable SaveSmartLock smartLock,
             int accountLinkRequestCode,
             IdpResponse response) {
         mActivity = activity;
-        mHelper = helper;
         mSmartLock = smartLock;
         mResponse = response;
         mAccountLinkRequestCode = accountLinkRequestCode;
@@ -67,25 +65,19 @@ public CredentialSignInHandler(
     public void onComplete(@NonNull Task<AuthResult> task) {
         if (task.isSuccessful()) {
             FirebaseUser firebaseUser = task.getResult().getUser();
-            mHelper.saveCredentialsOrFinish(
-                    mSmartLock,
-                    mActivity,
-                    firebaseUser,
-                    null,
-                    mResponse);
+            mActivity.saveCredentialsOrFinish(mSmartLock, firebaseUser, mResponse);
         } else {
             if (task.getException() instanceof FirebaseAuthUserCollisionException) {
                 String email = mResponse.getEmail();
                 if (email != null) {
-                    ProviderUtils.fetchTopProvider(mHelper.getFirebaseAuth(), email)
+                    FirebaseAuth auth = AuthInstances.getFirebaseAuth(mActivity.getFlowParams());
+                    ProviderUtils.fetchTopProvider(auth, email)
                             .addOnSuccessListener(new StartWelcomeBackFlow())
                             .addOnFailureListener(new OnFailureListener() {
                                 @Override
                                 public void onFailure(@NonNull Exception e) {
-                                    mHelper.finishActivity(
-                                            mActivity,
-                                            ResultCodes.CANCELED,
-                                            IdpResponse.getErrorCodeIntent(ErrorCodes.UNKNOWN_ERROR));
+                                    Intent intent = IdpResponse.getErrorCodeIntent(ErrorCodes.UNKNOWN_ERROR);
+                                    mActivity.finish(ResultCodes.CANCELED, intent);
                                 }
                             });
                     return;
@@ -98,14 +90,14 @@ public void onFailure(@NonNull Exception e) {
                       task.getException());
             }
 
-            mHelper.dismissDialog();
+            mActivity.getDialogHolder().dismissDialog();
         }
     }
 
     private class StartWelcomeBackFlow implements OnSuccessListener<String> {
         @Override
         public void onSuccess(String provider) {
-            mHelper.dismissDialog();
+            mActivity.getDialogHolder().dismissDialog();
 
             if (provider == null) {
                 throw new IllegalStateException(
@@ -115,7 +107,7 @@ public void onSuccess(String provider) {
                 mActivity.startActivityForResult(
                         WelcomeBackPasswordPrompt.createIntent(
                                 mActivity,
-                                mHelper.getFlowParams(),
+                                mActivity.getFlowParams(),
                                 mResponse),
                         mAccountLinkRequestCode);
             } else {
@@ -123,7 +115,7 @@ public void onSuccess(String provider) {
                 mActivity.startActivityForResult(
                         WelcomeBackIdpPrompt.createIntent(
                                 mActivity,
-                                mHelper.getFlowParams(),
+                                mActivity.getFlowParams(),
                                 new User.Builder(mResponse.getEmail())
                                         .setProvider(provider)
                                         .build(),
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java
index a31cebac2..f4eb14451 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java
@@ -31,9 +31,10 @@
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.ResultCodes;
 import com.firebase.ui.auth.ui.AppCompatBase;
-import com.firebase.ui.auth.ui.BaseHelper;
 import com.firebase.ui.auth.ui.ExtraConstants;
 import com.firebase.ui.auth.ui.FlowParameters;
+import com.firebase.ui.auth.ui.HelperActivityBase;
+import com.firebase.ui.auth.util.AuthInstances;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
@@ -79,7 +80,7 @@ enum VerificationState {
     private VerificationState mVerificationState;
 
     public static Intent createIntent(Context context, FlowParameters flowParams, String phone) {
-        return BaseHelper.createBaseIntent(context, PhoneVerificationActivity.class, flowParams)
+        return HelperActivityBase.createBaseIntent(context, PhoneVerificationActivity.class, flowParams)
                 .putExtra(ExtraConstants.EXTRA_PHONE, phone);
     }
 
@@ -88,7 +89,7 @@ protected void onCreate(final Bundle savedInstance) {
         super.onCreate(savedInstance);
         setContentView(R.layout.activity_register_phone);
 
-        mSaveSmartLock = mActivityHelper.getSaveSmartLockInstance();
+        mSaveSmartLock = AuthInstances.getSaveSmartLockInstance(this, getFlowParams());
         mHandler = new Handler();
         mVerificationState = VerificationState.VERIFICATION_NOT_STARTED;
         if (savedInstance != null && !savedInstance.isEmpty()) {
@@ -101,7 +102,7 @@ protected void onCreate(final Bundle savedInstance) {
 
         String phone = getIntent().getExtras().getString(ExtraConstants.EXTRA_PHONE);
         VerifyPhoneNumberFragment fragment = VerifyPhoneNumberFragment.newInstance
-                (mActivityHelper.getFlowParams(), phone);
+                (getFlowParams(), phone);
         getSupportFragmentManager().beginTransaction().replace(R.id.fragment_verify_phone,
                 fragment, VerifyPhoneNumberFragment.TAG).disallowAddToBackStack().commit();
     }
@@ -121,7 +122,7 @@ protected void onStart() {
             sendCode(mPhoneNumber, false);
         } else if (mVerificationState == VerificationState.VERIFIED) {
             // activity was recreated when verified dialog was displayed
-            finish(mActivityHelper.getFirebaseAuth().getCurrentUser());
+            finish(AuthInstances.getCurrentUser(getFlowParams()));
         }
     }
 
@@ -233,7 +234,7 @@ private void sendCode(String phoneNumber, boolean forceResend) {
         mPhoneNumber = phoneNumber;
         mVerificationState = VerificationState.VERIFICATION_STARTED;
 
-        mActivityHelper.getPhoneAuthProviderInstance().verifyPhoneNumber(phoneNumber,
+        AuthInstances.getPhoneAuthProviderInstance().verifyPhoneNumber(phoneNumber,
                 AUTO_RETRIEVAL_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS, this, new PhoneAuthProvider
                         .OnVerificationStateChangedCallbacks() {
             @Override
@@ -274,8 +275,8 @@ protected AlertDialog getAlertDialog() {
     private void showSubmitCodeFragment() {
         // idempotent function
         if (getSubmitConfirmationCodeFragment() == null) {
-            SubmitConfirmationCodeFragment f = SubmitConfirmationCodeFragment.newInstance
-                    (mActivityHelper.getFlowParams(), mPhoneNumber);
+            SubmitConfirmationCodeFragment f = SubmitConfirmationCodeFragment.newInstance(
+                    getFlowParams(), mPhoneNumber);
             FragmentTransaction t = getSupportFragmentManager().beginTransaction().replace(R.id
                     .fragment_verify_phone, f, SubmitConfirmationCodeFragment.TAG).addToBackStack
                     (null);
@@ -303,7 +304,8 @@ private void showAlertDialog(@NonNull String s, DialogInterface.OnClickListener
     }
 
     private void signingWithCreds(@NonNull PhoneAuthCredential phoneAuthCredential) {
-        mActivityHelper.getFirebaseAuth().signInWithCredential(phoneAuthCredential)
+        AuthInstances.getFirebaseAuth(getFlowParams())
+                .signInWithCredential(phoneAuthCredential)
                 .addOnSuccessListener(this, new OnSuccessListener<AuthResult>() {
             @Override
             public void onSuccess(final AuthResult authResult) {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java
index dead802e1..1bf5efde1 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java
@@ -224,7 +224,7 @@ private void cancelTimer() {
     }
 
     private void setUpTermsOfService() {
-        mAgreementText.showTerms(mHelper.getFlowParams(), R.string.continue_phone_login);
+        mAgreementText.showTerms(getFlowParams(), R.string.continue_phone_login);
     }
 
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java
index e2a3b0253..7129626aa 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java
@@ -123,7 +123,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
             PhoneNumber phoneNumber = PhoneNumberUtils.getPhoneNumber(phone);
             setPhoneNumber(phoneNumber);
             setCountryCode(phoneNumber);
-        } else if (mHelper.getFlowParams().enableHints) {
+        } else if (getFlowParams().enableHints) {
             // Try SmartLock phone autocomplete hint
             showPhoneAutoCompleteHint();
         }
@@ -195,8 +195,7 @@ private void setupSendCodeButton() {
 
     private void showPhoneAutoCompleteHint() {
         try {
-            mHelper.startIntentSenderForResult(getPhoneHintIntent().getIntentSender(),
-                                               RC_PHONE_HINT);
+            startIntentSenderForResult(getPhoneHintIntent().getIntentSender(), RC_PHONE_HINT);
         } catch (IntentSender.SendIntentException e) {
             Log.e(TAG, "Unable to start hint intent", e);
         }
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/AuthInstances.java b/auth/src/main/java/com/firebase/ui/auth/util/AuthInstances.java
new file mode 100644
index 000000000..dbf9e7b7a
--- /dev/null
+++ b/auth/src/main/java/com/firebase/ui/auth/util/AuthInstances.java
@@ -0,0 +1,44 @@
+package com.firebase.ui.auth.util;
+
+import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentActivity;
+
+import com.firebase.ui.auth.ui.FlowParameters;
+import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
+import com.google.android.gms.auth.api.Auth;
+import com.google.android.gms.auth.api.credentials.CredentialsApi;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.auth.PhoneAuthProvider;
+
+/**
+ * Factory for instances of authentication classes. Should eventually be replaced by
+ * dependency injection.
+ */
+public class AuthInstances {
+
+    public static FirebaseAuth getFirebaseAuth(FlowParameters parameters) {
+        return FirebaseAuth.getInstance(FirebaseApp.getInstance(parameters.appName));
+    }
+
+    public static CredentialsApi getCredentialsApi() {
+        return Auth.CredentialsApi;
+    }
+
+    @Nullable
+    public static FirebaseUser getCurrentUser(FlowParameters parameters) {
+        return getFirebaseAuth(parameters).getCurrentUser();
+    }
+
+    public static SaveSmartLock getSaveSmartLockInstance(FragmentActivity activity,
+                                                         FlowParameters parameters) {
+        return SaveSmartLock.getInstance(activity, parameters);
+    }
+
+    public static PhoneAuthProvider getPhoneAuthProviderInstance() {
+        return PhoneAuthProvider.getInstance();
+    }
+
+
+}
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java
index b16e17451..023ce057e 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java
@@ -27,19 +27,20 @@
 import com.firebase.ui.auth.ErrorCodes;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.ResultCodes;
-import com.firebase.ui.auth.provider.ProviderUtils;
 import com.firebase.ui.auth.provider.FacebookProvider;
 import com.firebase.ui.auth.provider.GoogleProvider;
 import com.firebase.ui.auth.provider.IdpProvider;
 import com.firebase.ui.auth.provider.IdpProvider.IdpCallback;
+import com.firebase.ui.auth.provider.ProviderUtils;
 import com.firebase.ui.auth.provider.TwitterProvider;
 import com.firebase.ui.auth.ui.ExtraConstants;
 import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.FragmentBase;
-import com.firebase.ui.auth.ui.FragmentHelper;
+import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.User;
 import com.firebase.ui.auth.ui.idp.CredentialSignInHandler;
+import com.firebase.ui.auth.util.AuthInstances;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.GoogleAuthProvider;
@@ -50,6 +51,7 @@ public class IdpSignInContainer extends FragmentBase implements IdpCallback {
     private static final String TAG = "IDPSignInContainer";
     private static final int RC_WELCOME_BACK_IDP = 4;
 
+    private HelperActivityBase mActivity;
     private IdpProvider mIdpProvider;
     @Nullable
     private SaveSmartLock mSaveSmartLock;
@@ -60,7 +62,7 @@ public static void signIn(FragmentActivity activity, FlowParameters parameters,
         if (!(fragment instanceof IdpSignInContainer)) {
             IdpSignInContainer result = new IdpSignInContainer();
 
-            Bundle bundle = FragmentHelper.getFlowParamsBundle(parameters);
+            Bundle bundle = parameters.toBundle();
             bundle.putParcelable(ExtraConstants.EXTRA_USER, user);
             result.setArguments(bundle);
 
@@ -84,13 +86,13 @@ public static IdpSignInContainer getInstance(FragmentActivity activity) {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mSaveSmartLock = mHelper.getSaveSmartLockInstance(getActivity());
+        mSaveSmartLock = AuthInstances.getSaveSmartLockInstance(getActivity(), getFlowParams());
 
         User user = User.getUser(getArguments());
         String provider = user.getProvider();
 
         AuthUI.IdpConfig providerConfig = null;
-        for (AuthUI.IdpConfig config : mHelper.getFlowParams().providerInfo) {
+        for (AuthUI.IdpConfig config : getFlowParams().providerInfo) {
             if (config.getProviderId().equalsIgnoreCase(provider)) {
                 providerConfig = config;
                 break;
@@ -109,7 +111,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
                     providerConfig,
                     user.getEmail());
         } else if (provider.equalsIgnoreCase(FacebookAuthProvider.PROVIDER_ID)) {
-            mIdpProvider = new FacebookProvider(providerConfig, mHelper.getFlowParams().themeId);
+            mIdpProvider = new FacebookProvider(providerConfig, getFlowParams().themeId);
         } else if (provider.equalsIgnoreCase(TwitterAuthProvider.PROVIDER_ID)) {
             mIdpProvider = new TwitterProvider(getContext());
         }
@@ -121,6 +123,17 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         }
     }
 
+    @Override
+    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        if (!(getActivity() instanceof HelperActivityBase)) {
+            throw new RuntimeException("Can only attach IdpSignInContainer to HelperActivityBase.");
+        }
+
+        mActivity = (HelperActivityBase) getActivity();
+    }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
         outState.putBoolean(ExtraConstants.HAS_EXISTING_INSTANCE, true);
@@ -130,14 +143,13 @@ public void onSaveInstanceState(Bundle outState) {
     @Override
     public void onSuccess(final IdpResponse response) {
         AuthCredential credential = ProviderUtils.getAuthCredential(response);
-        mHelper.getFirebaseAuth()
+        AuthInstances.getFirebaseAuth(getFlowParams())
                 .signInWithCredential(credential)
                 .addOnFailureListener(
                         new TaskFailureLogger(TAG, "Failure authenticating with credential " +
                                 credential.getProvider()))
                 .addOnCompleteListener(new CredentialSignInHandler(
-                        getActivity(),
-                        mHelper,
+                        mActivity,
                         mSaveSmartLock,
                         RC_WELCOME_BACK_IDP,
                         response));
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SaveSmartLock.java b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SaveSmartLock.java
index 4a5a09539..d1d42d7d4 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SaveSmartLock.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SaveSmartLock.java
@@ -34,7 +34,7 @@
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.ResultCodes;
 import com.firebase.ui.auth.ui.FlowParameters;
-import com.firebase.ui.auth.ui.FragmentHelper;
+import com.firebase.ui.auth.util.AuthInstances;
 import com.firebase.ui.auth.util.GoogleApiHelper;
 import com.firebase.ui.auth.util.PlayServicesHelper;
 import com.google.android.gms.auth.api.Auth;
@@ -66,7 +66,7 @@ public static SaveSmartLock getInstance(FragmentActivity activity, FlowParameter
         Fragment fragment = fm.findFragmentByTag(TAG);
         if (!(fragment instanceof SaveSmartLock)) {
             result = new SaveSmartLock();
-            result.setArguments(FragmentHelper.getFlowParamsBundle(parameters));
+            result.setArguments(parameters.toBundle());
             try {
                 fm.beginTransaction().add(result, TAG).disallowAddToBackStack().commit();
             } catch (IllegalStateException e) {
@@ -115,7 +115,7 @@ public void onConnected(Bundle bundle) {
             builder.setProfilePictureUri(Uri.parse(mProfilePictureUri));
         }
 
-        mHelper.getCredentialsApi()
+        AuthInstances.getCredentialsApi()
                 .save(mGoogleApiClient, builder.build())
                 .setResultCallback(this);
     }
@@ -130,7 +130,7 @@ public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
                                                          connectionResult.getErrorCode(),
                                                          RC_UPDATE_SERVICE);
         try {
-            mHelper.startIntentSenderForResult(resolution.getIntentSender(), RC_UPDATE_SERVICE);
+            startIntentSenderForResult(resolution.getIntentSender(), RC_UPDATE_SERVICE);
         } catch (IntentSender.SendIntentException e) {
             Log.e(TAG, "STATUS: Failed to send resolution.", e);
             finish();
@@ -146,8 +146,7 @@ public void onResult(@NonNull Status status) {
                 // Try to resolve the save request. This will prompt the user if
                 // the credential is new.
                 try {
-                    mHelper.startIntentSenderForResult(status.getResolution().getIntentSender(),
-                                                       RC_SAVE);
+                    startIntentSenderForResult(status.getResolution().getIntentSender(), RC_SAVE);
                 } catch (IntentSender.SendIntentException e) {
                     // Could not resolve the request
                     Log.e(TAG, "STATUS: Failed to send resolution.", e);
@@ -173,7 +172,8 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
             if (resultCode == ResultCodes.OK) {
                 Credential credential = new Credential.Builder(mEmail).setPassword(mPassword)
                         .build();
-                mHelper.getCredentialsApi()
+
+                AuthInstances.getCredentialsApi()
                         .save(mGoogleApiClient, credential)
                         .setResultCallback(this);
             } else {
@@ -203,7 +203,7 @@ public void saveCredentialsOrFinish(FirebaseUser firebaseUser,
                                         @Nullable IdpResponse response) {
         mResponse = response;
 
-        if (!mHelper.getFlowParams().enableCredentials) {
+        if (!getFlowParams().enableCredentials) {
             finish();
             return;
         }
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
index ec0f9c296..d888f87df 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
@@ -19,12 +19,12 @@
 import com.firebase.ui.auth.ResultCodes;
 import com.firebase.ui.auth.ui.ExtraConstants;
 import com.firebase.ui.auth.ui.FlowParameters;
-import com.firebase.ui.auth.ui.FragmentHelper;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.User;
 import com.firebase.ui.auth.ui.email.RegisterEmailActivity;
 import com.firebase.ui.auth.ui.idp.AuthMethodPickerActivity;
 import com.firebase.ui.auth.ui.phone.PhoneVerificationActivity;
+import com.firebase.ui.auth.util.AuthInstances;
 import com.firebase.ui.auth.util.GoogleApiHelper;
 import com.firebase.ui.auth.util.GoogleSignInHelper;
 import com.google.android.gms.auth.api.Auth;
@@ -46,6 +46,7 @@
 import com.google.firebase.auth.GoogleAuthProvider;
 import com.google.firebase.auth.PhoneAuthProvider;
 import com.google.firebase.auth.TwitterAuthProvider;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -75,7 +76,7 @@ public static void delegate(FragmentActivity activity, FlowParameters params) {
         Fragment fragment = fm.findFragmentByTag(TAG);
         if (!(fragment instanceof SignInDelegate)) {
             SignInDelegate result = new SignInDelegate();
-            result.setArguments(FragmentHelper.getFlowParamsBundle(params));
+            result.setArguments(params.toBundle());
             fm.beginTransaction().add(result, TAG).disallowAddToBackStack().commit();
         }
     }
@@ -97,9 +98,9 @@ public void onCreate(Bundle savedInstance) {
             return;
         }
 
-        FlowParameters flowParams = mHelper.getFlowParams();
+        FlowParameters flowParams = getFlowParams();
         if (flowParams.enableCredentials) {
-            mHelper.showLoadingDialog(R.string.progress_dialog_loading);
+            getDialogHolder().showLoadingDialog(R.string.progress_dialog_loading);
 
             mGoogleApiClient = new GoogleApiClient.Builder(getContext().getApplicationContext())
                     .addConnectionCallbacks(this)
@@ -108,7 +109,7 @@ public void onCreate(Bundle savedInstance) {
                     .build();
             mGoogleApiClient.connect();
 
-            mHelper.getCredentialsApi()
+            AuthInstances.getCredentialsApi()
                     .request(mGoogleApiClient,
                              new CredentialRequest.Builder()
                                      .setPasswordLoginSupported(true)
@@ -139,7 +140,7 @@ public void onResult(@NonNull CredentialRequestResult result) {
             if (status.hasResolution()) {
                 try {
                     if (status.getStatusCode() == CommonStatusCodes.RESOLUTION_REQUIRED) {
-                        mHelper.startIntentSenderForResult(
+                        startIntentSenderForResult(
                                 status.getResolution().getIntentSender(),
                                 RC_CREDENTIALS_READ);
                         return;
@@ -189,7 +190,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
 
     private List<String> getSupportedAccountTypes() {
         List<String> accounts = new ArrayList<>();
-        for (AuthUI.IdpConfig idpConfig : mHelper.getFlowParams().providerInfo) {
+        for (AuthUI.IdpConfig idpConfig : getFlowParams().providerInfo) {
             @AuthUI.SupportedProvider String providerId = idpConfig.getProviderId();
             if (providerId.equals(GoogleAuthProvider.PROVIDER_ID)
                     || providerId.equals(FacebookAuthProvider.PROVIDER_ID)
@@ -237,7 +238,7 @@ private void handleCredential(Credential credential) {
     }
 
     private void startAuthMethodChoice() {
-        FlowParameters flowParams = mHelper.getFlowParams();
+        FlowParameters flowParams = getFlowParams();
         List<AuthUI.IdpConfig> idpConfigs = flowParams.providerInfo;
         Map<String, IdpConfig> providerIdToConfig = new HashMap<>();
         for (IdpConfig providerConfig : idpConfigs) {
@@ -270,7 +271,7 @@ private void startAuthMethodChoice() {
                             flowParams),
                     RC_AUTH_METHOD_PICKER);
         }
-        mHelper.dismissDialog();
+        getDialogHolder().dismissDialog();
     }
 
     /**
@@ -282,7 +283,7 @@ private void signInWithEmailAndPassword(String email, String password) {
         final IdpResponse response =
                 new IdpResponse.Builder(EmailAuthProvider.PROVIDER_ID, email).build();
 
-        mHelper.getFirebaseAuth()
+        AuthInstances.getFirebaseAuth(getFlowParams())
                 .signInWithEmailAndPassword(email, password)
                 .addOnFailureListener(new TaskFailureLogger(
                         TAG, "Error signing in with email and password"))
@@ -336,7 +337,7 @@ private void redirectToIdpSignIn(String email, String accountType) {
             startActivityForResult(
                     RegisterEmailActivity.createIntent(
                             getContext(),
-                            mHelper.getFlowParams(),
+                            getFlowParams(),
                             email),
                     RC_EMAIL_FLOW);
             return;
@@ -347,7 +348,7 @@ private void redirectToIdpSignIn(String email, String accountType) {
                 || accountType.equals(IdentityProviders.TWITTER)) {
             IdpSignInContainer.signIn(
                     getActivity(),
-                    mHelper.getFlowParams(),
+                    getFlowParams(),
                     new User.Builder(email)
                             .setProvider(accountTypeToProviderId(accountType))
                             .build());
@@ -356,9 +357,9 @@ private void redirectToIdpSignIn(String email, String accountType) {
             startActivityForResult(
                     AuthMethodPickerActivity.createIntent(
                             getContext(),
-                            mHelper.getFlowParams()),
+                            getFlowParams()),
                     RC_IDP_SIGNIN);
-            mHelper.dismissDialog();
+            getDialogHolder().dismissDialog();
         }
     }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SmartLockBase.java b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SmartLockBase.java
index 6c63a9f7e..b71bde2b4 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SmartLockBase.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SmartLockBase.java
@@ -121,9 +121,9 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
     public void onStart() {
         super.onStart();
         if (mActivityResultPair != null) {
-            mHelper.finish(mActivityResultPair.first, mActivityResultPair.second);
+            finish(mActivityResultPair.first, mActivityResultPair.second);
         } else if (mWasProgressDialogShowing) {
-            mHelper.showLoadingDialog(com.firebase.ui.auth.R.string.progress_dialog_loading);
+            getDialogHolder().showLoadingDialog(com.firebase.ui.auth.R.string.progress_dialog_loading);
             mWasProgressDialogShowing = false;
         }
     }
@@ -131,8 +131,8 @@ public void onStart() {
     @Override
     public void onStop() {
         super.onStop();
-        mWasProgressDialogShowing = mHelper.isProgressDialogShowing();
-        mHelper.dismissDialog();
+        mWasProgressDialogShowing = getDialogHolder().isProgressDialogShowing();
+        getDialogHolder().dismissDialog();
     }
 
     @Override
diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/ActivityHelperShadow.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/ActivityHelperShadow.java
deleted file mode 100644
index 6366be617..000000000
--- a/auth/src/test/java/com/firebase/ui/auth/testhelpers/ActivityHelperShadow.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.firebase.ui.auth.testhelpers;
-
-import com.firebase.ui.auth.ui.ActivityHelper;
-import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-@Implements(ActivityHelper.class)
-public class ActivityHelperShadow extends BaseHelperShadow {
-
-    public ActivityHelperShadow() {
-        super();
-    }
-
-    @Implementation
-    public SaveSmartLock getSaveSmartLockInstance() {
-        return sSaveSmartLock;
-    }
-}
diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/AuthInstancesShadow.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/AuthInstancesShadow.java
new file mode 100644
index 000000000..560e6fdab
--- /dev/null
+++ b/auth/src/test/java/com/firebase/ui/auth/testhelpers/AuthInstancesShadow.java
@@ -0,0 +1,77 @@
+package com.firebase.ui.auth.testhelpers;
+
+import android.support.v4.app.FragmentActivity;
+
+import com.firebase.ui.auth.ui.FlowParameters;
+import com.firebase.ui.auth.util.AuthInstances;
+import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
+import com.google.android.gms.auth.api.credentials.CredentialsApi;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.auth.PhoneAuthProvider;
+
+import org.mockito.Mockito;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import static org.mockito.Mockito.when;
+
+@Implements(AuthInstances.class)
+public class AuthInstancesShadow {
+
+    public static final FirebaseAuth sFirebaseAuth;
+    public static final FirebaseUser sFirebaseUser;
+    public static final CredentialsApi sCredentialsApi;
+    public static final SaveSmartLock sSaveSmartLock;
+    public static final PhoneAuthProvider sPhoneAuthProvider;
+
+    static {
+        // CredentialsApi
+        sCredentialsApi = Mockito.mock(CredentialsApi.class);
+
+        // FirebaseUser
+        sFirebaseUser = Mockito.mock(FirebaseUser.class);
+        when(sFirebaseUser.getEmail()).thenReturn(TestConstants.EMAIL);
+        when(sFirebaseUser.getDisplayName()).thenReturn(TestConstants.NAME);
+        when(sFirebaseUser.getPhotoUrl()).thenReturn(TestConstants.PHOTO_URI);
+
+        // FirebaseAuth
+        sFirebaseAuth = Mockito.mock(FirebaseAuth.class);
+        when(sFirebaseAuth.getCurrentUser()).thenReturn(sFirebaseUser);
+
+        // SaveSmartLock
+        sSaveSmartLock = Mockito.mock(SaveSmartLock.class);
+
+        // PhoneAuthProvider
+        sPhoneAuthProvider = Mockito.mock(PhoneAuthProvider.class);
+    }
+
+    private AuthInstancesShadow() {}
+
+    @Implementation
+    public static FirebaseAuth getFirebaseAuth(FlowParameters parameters) {
+        return sFirebaseAuth;
+    }
+
+    @Implementation
+    public static CredentialsApi getCredentialsApi() {
+        return sCredentialsApi;
+    }
+
+    @Implementation
+    public static FirebaseUser getCurrentUser(FlowParameters parameters) {
+        return sFirebaseUser;
+    }
+
+    @Implementation
+    public static SaveSmartLock getSaveSmartLockInstance(FragmentActivity activity,
+                                                         FlowParameters parameters) {
+        return sSaveSmartLock;
+    }
+
+    @Implementation
+    public static PhoneAuthProvider getPhoneAuthProviderInstance() {
+        return sPhoneAuthProvider;
+    }
+
+}
diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/BaseHelperShadow.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/BaseHelperShadow.java
deleted file mode 100644
index 47af92fb6..000000000
--- a/auth/src/test/java/com/firebase/ui/auth/testhelpers/BaseHelperShadow.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.firebase.ui.auth.testhelpers;
-
-import android.support.v4.app.FragmentActivity;
-
-import com.firebase.ui.auth.ui.BaseHelper;
-import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
-import com.google.android.gms.auth.api.credentials.CredentialsApi;
-import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.auth.PhoneAuthProvider;
-import com.google.firebase.auth.FirebaseUser;
-
-import org.mockito.Mockito;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-import static org.mockito.Mockito.when;
-
-@Implements(BaseHelper.class)
-public class BaseHelperShadow {
-    public static FirebaseAuth sFirebaseAuth;
-    public static FirebaseUser sFirebaseUser;
-    public static CredentialsApi sCredentialsApi;
-    public static SaveSmartLock sSaveSmartLock;
-    public static PhoneAuthProvider sPhoneAuthProvider;
-
-    public BaseHelperShadow() {
-        if (sFirebaseUser == null) {
-            sFirebaseUser = Mockito.mock(FirebaseUser.class);
-            when(sFirebaseUser.getEmail()).thenReturn(TestConstants.EMAIL);
-            when(sFirebaseUser.getDisplayName()).thenReturn(TestConstants.NAME);
-            when(sFirebaseUser.getPhotoUrl()).thenReturn(TestConstants.PHOTO_URI);
-        }
-        if (sFirebaseAuth == null) {
-            sFirebaseAuth = Mockito.mock(FirebaseAuth.class);
-            when(sFirebaseAuth.getCurrentUser()).thenReturn(sFirebaseUser);
-        }
-        if (sCredentialsApi == null) {
-            sCredentialsApi = Mockito.mock(CredentialsApi.class);
-        }
-        if (sSaveSmartLock == null) {
-            sSaveSmartLock = Mockito.mock(SaveSmartLock.class);
-        }
-        if (sPhoneAuthProvider == null) {
-            sPhoneAuthProvider = Mockito.mock(PhoneAuthProvider.class);
-        }
-    }
-
-    @Implementation
-    public FirebaseAuth getFirebaseAuth() {
-        return sFirebaseAuth;
-    }
-
-    @Implementation
-    public CredentialsApi getCredentialsApi() {
-        return sCredentialsApi;
-    }
-
-    @Implementation
-    public SaveSmartLock getSaveSmartLockInstance(FragmentActivity activity) {
-        return sSaveSmartLock;
-    }
-
-    @Implementation
-    public PhoneAuthProvider getPhoneAuthProviderInstance() {
-        return sPhoneAuthProvider;
-    }
-}
diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/CustomRobolectricGradleTestRunner.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/CustomRobolectricGradleTestRunner.java
index 12344596d..fa30fdc07 100644
--- a/auth/src/test/java/com/firebase/ui/auth/testhelpers/CustomRobolectricGradleTestRunner.java
+++ b/auth/src/test/java/com/firebase/ui/auth/testhelpers/CustomRobolectricGradleTestRunner.java
@@ -17,8 +17,7 @@
 import com.facebook.login.LoginManager;
 import com.firebase.ui.auth.provider.FacebookProvider;
 import com.firebase.ui.auth.provider.GoogleProvider;
-import com.firebase.ui.auth.ui.ActivityHelper;
-import com.firebase.ui.auth.ui.BaseHelper;
+import com.firebase.ui.auth.util.AuthInstances;
 
 import org.junit.runners.model.InitializationError;
 import org.robolectric.RobolectricTestRunner;
@@ -34,8 +33,7 @@ public CustomRobolectricGradleTestRunner(Class<?> klass) throws InitializationEr
     public InstrumentationConfiguration createClassLoaderConfig(Config config) {
         InstrumentationConfiguration.Builder builder = InstrumentationConfiguration.newBuilder();
 
-        builder.addInstrumentedClass(BaseHelper.class.getName());
-        builder.addInstrumentedClass(ActivityHelper.class.getName());
+        builder.addInstrumentedClass(AuthInstances.class.getName());
         builder.addInstrumentedClass(FacebookProvider.class.getName());
         builder.addInstrumentedClass(GoogleProvider.class.getName());
         builder.addInstrumentedClass(LoginManager.class.getName());
diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/FakeAuthResult.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/FakeAuthResult.java
index 7179b056e..f405277ba 100644
--- a/auth/src/test/java/com/firebase/ui/auth/testhelpers/FakeAuthResult.java
+++ b/auth/src/test/java/com/firebase/ui/auth/testhelpers/FakeAuthResult.java
@@ -27,7 +27,7 @@ private FakeAuthResult() {
 
     @Override
     public FirebaseUser getUser() {
-        return BaseHelperShadow.sFirebaseUser;
+        return AuthInstancesShadow.getCurrentUser(null);
     }
 
     @Override
diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java
index 97c0b5baa..8ec719385 100644
--- a/auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java
+++ b/auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java
@@ -80,7 +80,7 @@ public static void verifySmartLockSave(String providerId, String email,
         ArgumentCaptor<String> passwordCaptor = ArgumentCaptor.forClass(String.class);
         ArgumentCaptor<IdpResponse> idpResponseCaptor = ArgumentCaptor.forClass(IdpResponse.class);
 
-        verify(ActivityHelperShadow.sSaveSmartLock).saveCredentialsOrFinish(
+        verify(AuthInstancesShadow.sSaveSmartLock).saveCredentialsOrFinish(
                 userCaptor.capture(),
                 passwordCaptor.capture(),
                 idpResponseCaptor.capture());
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivityTest.java
index 91a92ac7a..df6a87795 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivityTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivityTest.java
@@ -19,9 +19,8 @@
 
 import com.firebase.ui.auth.BuildConfig;
 import com.firebase.ui.auth.R;
-import com.firebase.ui.auth.testhelpers.ActivityHelperShadow;
+import com.firebase.ui.auth.testhelpers.AuthInstancesShadow;
 import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
-import com.firebase.ui.auth.testhelpers.BaseHelperShadow;
 import com.firebase.ui.auth.testhelpers.CustomRobolectricGradleTestRunner;
 import com.firebase.ui.auth.testhelpers.TestConstants;
 import com.firebase.ui.auth.testhelpers.TestHelper;
@@ -57,13 +56,14 @@ private RecoverPasswordActivity createActivity() {
     }
 
     @Test
-    @Config(shadows = {BaseHelperShadow.class, ActivityHelperShadow.class})
+    @Config(shadows = {AuthInstancesShadow.class})
     public void testNextButton_sendsEmail() {
         RecoverPasswordActivity recoverPasswordActivity = createActivity();
+
         Button nextButton = (Button) recoverPasswordActivity.findViewById(R.id.button_done);
-        when(ActivityHelperShadow.sFirebaseAuth.sendPasswordResetEmail(TestConstants.EMAIL))
+        when(AuthInstancesShadow.sFirebaseAuth.sendPasswordResetEmail(TestConstants.EMAIL))
                 .thenReturn(new AutoCompleteTask<Void>(null, true, null));
         nextButton.performClick();
-        verify(ActivityHelperShadow.sFirebaseAuth).sendPasswordResetEmail(TestConstants.EMAIL);
+        verify(AuthInstancesShadow.sFirebaseAuth).sendPasswordResetEmail(TestConstants.EMAIL);
     }
 }
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java
index 560efa0d1..b002cb074 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java
@@ -23,9 +23,8 @@
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.BuildConfig;
 import com.firebase.ui.auth.R;
-import com.firebase.ui.auth.testhelpers.ActivityHelperShadow;
+import com.firebase.ui.auth.testhelpers.AuthInstancesShadow;
 import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
-import com.firebase.ui.auth.testhelpers.BaseHelperShadow;
 import com.firebase.ui.auth.testhelpers.CustomRobolectricGradleTestRunner;
 import com.firebase.ui.auth.testhelpers.FakeAuthResult;
 import com.firebase.ui.auth.testhelpers.TestConstants;
@@ -100,11 +99,10 @@ public void testSignUpButton_validatesFields() {
     }
 
     @Test
-    @Config(shadows = {BaseHelperShadow.class, ActivityHelperShadow.class})
+    @Config(shadows = {AuthInstancesShadow.class})
     public void testSignUpButton_successfulRegistrationShouldContinueToSaveCredentials() {
         // init mocks
-        new BaseHelperShadow();
-        reset(BaseHelperShadow.sSaveSmartLock);
+        reset(AuthInstancesShadow.sSaveSmartLock);
 
         TestHelper.initializeApp(RuntimeEnvironment.application);
         RegisterEmailActivity registerEmailActivity = createActivity();
@@ -120,10 +118,10 @@ public void testSignUpButton_successfulRegistrationShouldContinueToSaveCredentia
         name.setText(TestConstants.NAME);
         password.setText(TestConstants.PASSWORD);
 
-        when(BaseHelperShadow.sFirebaseUser.updateProfile(any(UserProfileChangeRequest.class)))
+        when(AuthInstancesShadow.sFirebaseUser.updateProfile(any(UserProfileChangeRequest.class)))
                 .thenReturn(new AutoCompleteTask<Void>(null, true, null));
 
-        when(BaseHelperShadow.sFirebaseAuth
+        when(AuthInstancesShadow.sFirebaseAuth
                      .createUserWithEmailAndPassword(
                              TestConstants.EMAIL,
                              TestConstants.PASSWORD))
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java
index 27df90f1d..3ef3be1ab 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java
@@ -22,9 +22,8 @@
 import com.firebase.ui.auth.BuildConfig;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
-import com.firebase.ui.auth.testhelpers.ActivityHelperShadow;
 import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
-import com.firebase.ui.auth.testhelpers.BaseHelperShadow;
+import com.firebase.ui.auth.testhelpers.AuthInstancesShadow;
 import com.firebase.ui.auth.testhelpers.CustomRobolectricGradleTestRunner;
 import com.firebase.ui.auth.testhelpers.FakeAuthResult;
 import com.firebase.ui.auth.testhelpers.TestConstants;
@@ -90,17 +89,16 @@ public void testSignInButton_validatesFields() {
     }
 
     @Test
-    @Config(shadows = {BaseHelperShadow.class, ActivityHelperShadow.class})
+    @Config(shadows = {AuthInstancesShadow.class})
     public void testSignInButton_signsInAndSavesCredentials() {
         // initialize mocks
-        new ActivityHelperShadow();
-        reset(ActivityHelperShadow.sSaveSmartLock);
+        reset(AuthInstancesShadow.sSaveSmartLock);
 
         WelcomeBackPasswordPrompt welcomeBackActivity = createActivity();
         EditText passwordField = (EditText) welcomeBackActivity.findViewById(R.id.password);
         passwordField.setText(TestConstants.PASSWORD);
 
-        when(ActivityHelperShadow.sFirebaseAuth.signInWithEmailAndPassword(
+        when(AuthInstancesShadow.sFirebaseAuth.signInWithEmailAndPassword(
                 TestConstants.EMAIL,
                 TestConstants.PASSWORD)).thenReturn(
                 new AutoCompleteTask<>(FakeAuthResult.INSTANCE, true, null));
@@ -108,7 +106,7 @@ public void testSignInButton_signsInAndSavesCredentials() {
         Button signIn = (Button) welcomeBackActivity.findViewById(R.id.button_done);
         signIn.performClick();
 
-        verify(ActivityHelperShadow.sFirebaseAuth).signInWithEmailAndPassword(
+        verify(AuthInstancesShadow.sFirebaseAuth).signInWithEmailAndPassword(
                 TestConstants.EMAIL,
                 TestConstants.PASSWORD);
 
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
index c56a44500..7ce691991 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
@@ -22,9 +22,8 @@
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.BuildConfig;
 import com.firebase.ui.auth.R;
-import com.firebase.ui.auth.testhelpers.ActivityHelperShadow;
 import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
-import com.firebase.ui.auth.testhelpers.BaseHelperShadow;
+import com.firebase.ui.auth.testhelpers.AuthInstancesShadow;
 import com.firebase.ui.auth.testhelpers.CustomRobolectricGradleTestRunner;
 import com.firebase.ui.auth.testhelpers.FacebookProviderShadow;
 import com.firebase.ui.auth.testhelpers.FakeAuthResult;
@@ -117,15 +116,14 @@ public void testPhoneLoginFlow() {
     }
 
     @Test
-    @Config(shadows = {BaseHelperShadow.class, ActivityHelperShadow.class})
+    @Config(shadows = {AuthInstancesShadow.class, AuthInstancesShadow.class})
     public void testFacebookLoginFlow() {
         // initialize mocks
-        new ActivityHelperShadow();
-        reset(ActivityHelperShadow.sSaveSmartLock);
+        reset(AuthInstancesShadow.sSaveSmartLock);
 
-        when(BaseHelperShadow.sFirebaseUser.getProviders())
+        when(AuthInstancesShadow.sFirebaseUser.getProviders())
                 .thenReturn(Arrays.asList(FacebookAuthProvider.PROVIDER_ID));
-        when(ActivityHelperShadow.sFirebaseAuth.signInWithCredential((AuthCredential) any()))
+        when(AuthInstancesShadow.sFirebaseAuth.signInWithCredential((AuthCredential) any()))
                 .thenReturn(new AutoCompleteTask<>(FakeAuthResult.INSTANCE, true, null));
 
         List<String> providers = Arrays.asList(AuthUI.FACEBOOK_PROVIDER);
@@ -140,20 +138,19 @@ public void testFacebookLoginFlow() {
     }
 
     @Test
-    @Config(shadows = {GoogleProviderShadow.class, BaseHelperShadow.class, ActivityHelperShadow.class})
+    @Config(shadows = {GoogleProviderShadow.class, AuthInstancesShadow.class, AuthInstancesShadow.class})
     public void testGoogleLoginFlow() {
         // initialize mocks
-        new ActivityHelperShadow();
-        reset(ActivityHelperShadow.sSaveSmartLock);
+        reset(AuthInstancesShadow.sSaveSmartLock);
 
         List<String> providers = Arrays.asList(AuthUI.GOOGLE_PROVIDER);
 
         AuthMethodPickerActivity authMethodPickerActivity = createActivity(providers);
 
-        when(BaseHelperShadow.sFirebaseUser.getProviders())
+        when(AuthInstancesShadow.sFirebaseUser.getProviders())
                 .thenReturn(Arrays.asList(GoogleAuthProvider.PROVIDER_ID));
 
-        when(ActivityHelperShadow.sFirebaseAuth.signInWithCredential((AuthCredential) any()))
+        when(AuthInstancesShadow.sFirebaseAuth.signInWithCredential((AuthCredential) any()))
                 .thenReturn(new AutoCompleteTask<>(FakeAuthResult.INSTANCE, true, null));
 
         Button googleButton = (Button) authMethodPickerActivity.findViewById(R.id.google_button);
@@ -165,16 +162,16 @@ public void testGoogleLoginFlow() {
     }
 
     @Test
-    @Config(shadows = {ActivityHelperShadow.class})
+    @Config(shadows = {AuthInstancesShadow.class})
     public void testTwitterLoginFlowStarts() {
         List<String> providers = Arrays.asList(AuthUI.TWITTER_PROVIDER);
 
         AuthMethodPickerActivity authMethodPickerActivity = createActivity(providers);
 
-        when(BaseHelperShadow.sFirebaseUser.getProviders())
+        when(AuthInstancesShadow.sFirebaseUser.getProviders())
                 .thenReturn(Arrays.asList(TwitterAuthProvider.PROVIDER_ID));
 
-        when(ActivityHelperShadow.sFirebaseAuth.signInWithCredential(any(AuthCredential.class)))
+        when(AuthInstancesShadow.sFirebaseAuth.signInWithCredential(any(AuthCredential.class)))
                 .thenReturn(new AutoCompleteTask<>(FakeAuthResult.INSTANCE, true, null));
         Button twitterButton =
                 (Button) authMethodPickerActivity.findViewById(R.id.twitter_button);
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandlerTest.java
index 3c2ab870a..6bb22abab 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandlerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandlerTest.java
@@ -14,22 +14,20 @@
 
 package com.firebase.ui.auth.ui.idp;
 
-import android.app.Activity;
 import android.content.Intent;
 
 import com.firebase.ui.auth.BuildConfig;
 import com.firebase.ui.auth.IdpResponse;
-import com.firebase.ui.auth.testhelpers.ActivityHelperShadow;
+import com.firebase.ui.auth.testhelpers.AuthInstancesShadow;
 import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
-import com.firebase.ui.auth.testhelpers.BaseHelperShadow;
 import com.firebase.ui.auth.testhelpers.CustomRobolectricGradleTestRunner;
 import com.firebase.ui.auth.testhelpers.FakeAuthResult;
 import com.firebase.ui.auth.testhelpers.FakeProviderQueryResult;
 import com.firebase.ui.auth.testhelpers.TestConstants;
 import com.firebase.ui.auth.testhelpers.TestHelper;
-import com.firebase.ui.auth.ui.ActivityHelper;
 import com.firebase.ui.auth.ui.AppCompatBase;
 import com.firebase.ui.auth.ui.FlowParameters;
+import com.firebase.ui.auth.ui.ProgressDialogHolder;
 import com.firebase.ui.auth.ui.User;
 import com.firebase.ui.auth.ui.accountlink.WelcomeBackIdpPrompt;
 import com.firebase.ui.auth.ui.accountlink.WelcomeBackPasswordPrompt;
@@ -61,7 +59,7 @@
 import static org.mockito.Mockito.when;
 
 @RunWith(CustomRobolectricGradleTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = 25, shadows = {ActivityHelperShadow.class})
+@Config(constants = BuildConfig.class, sdk = 25)
 public class CredentialSignInHandlerTest {
     private static final int RC_ACCOUNT_LINK = 3;
     private static final String LINKING_ERROR = "ERROR_TEST_LINKING";
@@ -74,10 +72,9 @@ public void setUp() {
     }
 
     @Test
-    @Config(shadows = {BaseHelperShadow.class})
+    @Config(shadows = {AuthInstancesShadow.class})
     public void testSignInSucceeded() {
         AppCompatBase mockActivity = mock(AppCompatBase.class);
-        ActivityHelper mockActivityHelper = mock(ActivityHelper.class);
         IdpResponse idpResponse =
                 new IdpResponse.Builder(GoogleAuthProvider.PROVIDER_ID, TestConstants.EMAIL)
                         .setToken(TestConstants.TOKEN)
@@ -85,31 +82,25 @@ public void testSignInSucceeded() {
         SaveSmartLock smartLock = mock(SaveSmartLock.class);
         CredentialSignInHandler credentialSignInHandler = new CredentialSignInHandler(
                 mockActivity,
-                mockActivityHelper,
                 smartLock,
                 RC_ACCOUNT_LINK,
                 idpResponse);
 
-        when(mockActivityHelper.getFlowParams()).thenReturn(
+        when(mockActivity.getFlowParams()).thenReturn(
                 TestHelper.getFlowParameters(Collections.<String>emptyList()));
         credentialSignInHandler.onComplete(Tasks.forResult(FakeAuthResult.INSTANCE));
 
         ArgumentCaptor<SaveSmartLock> smartLockCaptor = ArgumentCaptor.forClass(SaveSmartLock.class);
-        ArgumentCaptor<Activity> activityCaptor = ArgumentCaptor.forClass(Activity.class);
         ArgumentCaptor<FirebaseUser> firebaseUserCaptor = ArgumentCaptor.forClass(FirebaseUser.class);
         ArgumentCaptor<IdpResponse> idpResponseCaptor = ArgumentCaptor.forClass(IdpResponse.class);
-        ArgumentCaptor<String> passwordCaptor = ArgumentCaptor.forClass(String.class);
 
-        verify(mockActivityHelper).saveCredentialsOrFinish(
+        verify(mockActivity).saveCredentialsOrFinish(
                 smartLockCaptor.capture(),
-                activityCaptor.capture(),
                 firebaseUserCaptor.capture(),
-                passwordCaptor.capture(), // Needed to make Mockito happy
                 idpResponseCaptor.capture());
 
         assertEquals(smartLock, smartLockCaptor.getValue());
-        assertEquals(mockActivity, activityCaptor.getValue());
-        assertEquals(BaseHelperShadow.sFirebaseUser, firebaseUserCaptor.getValue());
+        assertEquals(AuthInstancesShadow.sFirebaseUser, firebaseUserCaptor.getValue());
 
         IdpResponse response = idpResponseCaptor.getValue();
         assertEquals(idpResponse.getProviderType(), response.getProviderType());
@@ -119,26 +110,27 @@ public void testSignInSucceeded() {
     }
 
     @Test
+    @Config(shadows = {AuthInstancesShadow.class})
     public void testSignInFailed_withFacebookAlreadyLinked() {
         AppCompatBase mockActivity = mock(AppCompatBase.class);
-        ActivityHelper mockActivityHelper = mock(ActivityHelper.class);
-        FirebaseAuth mockFirebaseAuth = mock(FirebaseAuth.class);
         IdpResponse idpResponse =
                 new IdpResponse.Builder(GoogleAuthProvider.PROVIDER_ID, TestConstants.EMAIL)
                         .setToken(TestConstants.TOKEN)
                         .build();
         CredentialSignInHandler credentialSignInHandler = new CredentialSignInHandler(
                 mockActivity,
-                mockActivityHelper,
                 null,
                 RC_ACCOUNT_LINK,
                 idpResponse);
 
         FlowParameters mockFlowParams = mock(FlowParameters.class);
-        when(mockActivityHelper.getFirebaseAuth()).thenReturn(mockFirebaseAuth);
-        when(mockActivityHelper.getFlowParams()).thenReturn(mockFlowParams);
+        when(mockActivity.getFlowParams()).thenReturn(mockFlowParams);
+
+        ProgressDialogHolder mockHolder = mock(ProgressDialogHolder.class);
+        when(mockActivity.getDialogHolder()).thenReturn(mockHolder);
 
         // pretend the account has Facebook linked already
+        FirebaseAuth mockFirebaseAuth = AuthInstancesShadow.sFirebaseAuth;
         when(mockFirebaseAuth.fetchProvidersForEmail(TestConstants.EMAIL)).thenReturn(
                 new AutoCompleteTask<ProviderQueryResult>(
                         new FakeProviderQueryResult(
@@ -167,31 +159,32 @@ public void testSignInFailed_withFacebookAlreadyLinked() {
     }
 
     @Test
+    @Config(shadows = {AuthInstancesShadow.class})
     public void testSignInFailed_withPasswordAccountAlreadyLinked() {
         AppCompatBase mockActivity = mock(AppCompatBase.class);
-        ActivityHelper mockActivityHelper = mock(ActivityHelper.class);
-        FirebaseAuth mockFirebaseAuth = mock(FirebaseAuth.class);
         IdpResponse idpResponse =
                 new IdpResponse.Builder(GoogleAuthProvider.PROVIDER_ID, TestConstants.EMAIL)
                         .setToken(TestConstants.TOKEN)
                         .build();
         CredentialSignInHandler credentialSignInHandler = new CredentialSignInHandler(
                 mockActivity,
-                mockActivityHelper,
                 null,
                 RC_ACCOUNT_LINK,
                 idpResponse);
 
-        Task mockTask = mock(Task.class);
         FlowParameters mockFlowParams = mock(FlowParameters.class);
+        when(mockActivity.getFlowParams()).thenReturn(mockFlowParams);
+
+        ProgressDialogHolder mockHolder = mock(ProgressDialogHolder.class);
+        when(mockActivity.getDialogHolder()).thenReturn(mockHolder);
 
         // pretend there was already an account with this email
+        Task mockTask = mock(Task.class);
         when(mockTask.getException()).thenReturn(
                 new FirebaseAuthUserCollisionException(LINKING_ERROR, LINKING_EXPLANATION));
-        when(mockActivityHelper.getFirebaseAuth()).thenReturn(mockFirebaseAuth);
-        when(mockActivityHelper.getFlowParams()).thenReturn(mockFlowParams);
 
         // pretend the account has a Password account linked already
+        FirebaseAuth mockFirebaseAuth = AuthInstancesShadow.sFirebaseAuth;
         when(mockFirebaseAuth.fetchProvidersForEmail(TestConstants.EMAIL)).thenReturn(
                 new AutoCompleteTask<ProviderQueryResult>(
                         new FakeProviderQueryResult(
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java
index b6bae9a35..a6d481dfd 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java
@@ -25,14 +25,11 @@
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.BuildConfig;
 import com.firebase.ui.auth.R;
-import com.firebase.ui.auth.testhelpers.ActivityHelperShadow;
 import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
-import com.firebase.ui.auth.testhelpers.BaseHelperShadow;
+import com.firebase.ui.auth.testhelpers.AuthInstancesShadow;
 import com.firebase.ui.auth.testhelpers.CustomRobolectricGradleTestRunner;
 import com.firebase.ui.auth.testhelpers.FakeAuthResult;
 import com.firebase.ui.auth.testhelpers.TestHelper;
-import com.firebase.ui.auth.ui.BaseHelper;
-import com.google.firebase.auth.AdditionalUserInfo;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuthException;
@@ -56,13 +53,13 @@
 import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 
+import static com.firebase.ui.auth.ui.phone.PhoneTestConstants.PHONE;
 import static com.firebase.ui.auth.ui.phone.PhoneTestConstants.PHONE_NO_COUNTRY_CODE;
 import static com.firebase.ui.auth.ui.phone.PhoneTestConstants.YE_COUNTRY_CODE;
 import static com.firebase.ui.auth.ui.phone.PhoneTestConstants.YE_RAW_PHONE;
 import static com.firebase.ui.auth.ui.phone.PhoneVerificationActivity.AUTO_RETRIEVAL_TIMEOUT_MILLIS;
 import static com.firebase.ui.auth.ui.phone.PhoneVerificationActivity.ERROR_INVALID_PHONE;
 import static com.firebase.ui.auth.ui.phone.PhoneVerificationActivity.ERROR_INVALID_VERIFICATION;
-import static com.firebase.ui.auth.ui.phone.PhoneTestConstants.PHONE;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertNull;
@@ -84,6 +81,7 @@ public class PhoneVerificationActivityTest {
     private Button mSendCodeButton;
     private EditText mPhoneEditText;
     private CountryListSpinner mCountryListSpinner;
+
     @Captor
     ArgumentCaptor<PhoneAuthProvider.OnVerificationStateChangedCallbacks> callbacksArgumentCaptor;
     @Mock
@@ -150,9 +148,9 @@ public void testBadPhoneNumber_showsInlineError() {
     }
 
     @Test
-    @Config(shadows = {BaseHelperShadow.class, ActivityHelperShadow.class})
+    @Config(shadows = {AuthInstancesShadow.class})
     public void testVerifyPhoneNumberInvalidPhoneException_showsInlineError() {
-        reset(BaseHelperShadow.sPhoneAuthProvider);
+        reset(AuthInstancesShadow.sPhoneAuthProvider);
 
         mActivity.verifyPhoneNumber(PHONE, false);
         AlertDialog alert = ShadowAlertDialog.getLatestAlertDialog();
@@ -161,7 +159,7 @@ public void testVerifyPhoneNumberInvalidPhoneException_showsInlineError() {
         assertEquals(mActivity.getString(R.string.verifying), sAlert.getMessage());
 
         //was upstream method invoked
-        verify(ActivityHelperShadow.sPhoneAuthProvider).verifyPhoneNumber(eq(PHONE), eq
+        verify(AuthInstancesShadow.sPhoneAuthProvider).verifyPhoneNumber(eq(PHONE), eq
                 (AUTO_RETRIEVAL_TIMEOUT_MILLIS), eq(TimeUnit.MILLISECONDS), eq(mActivity),
                 callbacksArgumentCaptor.capture(), isNull(PhoneAuthProvider.ForceResendingToken
                         .class));
@@ -176,12 +174,12 @@ public void testVerifyPhoneNumberInvalidPhoneException_showsInlineError() {
     }
 
     @Test
-    @Config(shadows = {BaseHelperShadow.class, ActivityHelperShadow.class})
+    @Config(shadows = {AuthInstancesShadow.class})
     public void testVerifyPhoneNumberNoMsgException_showsAlertDialog() {
-        reset(BaseHelperShadow.sPhoneAuthProvider);
+        reset(AuthInstancesShadow.sPhoneAuthProvider);
 
         mActivity.verifyPhoneNumber(PHONE, false);
-        verify(ActivityHelperShadow.sPhoneAuthProvider).verifyPhoneNumber(eq(PHONE), eq
+        verify(AuthInstancesShadow.sPhoneAuthProvider).verifyPhoneNumber(eq(PHONE), eq
                 (AUTO_RETRIEVAL_TIMEOUT_MILLIS), eq(TimeUnit.MILLISECONDS), eq(mActivity),
                 callbacksArgumentCaptor.capture(), isNull(PhoneAuthProvider.ForceResendingToken
                         .class));
@@ -196,17 +194,17 @@ public void testVerifyPhoneNumberNoMsgException_showsAlertDialog() {
     }
 
     @Test
-    @Config(shadows = {BaseHelperShadow.class, ActivityHelperShadow.class})
+    @Config(shadows = {AuthInstancesShadow.class})
     public void testVerifyPhoneNumber_success() {
-        reset(BaseHelperShadow.sPhoneAuthProvider);
+        reset(AuthInstancesShadow.sPhoneAuthProvider);
         testSendConfirmationCode();
     }
 
     @Test
-    @Config(shadows = {BaseHelperShadow.class, ActivityHelperShadow.class})
+    @Config(shadows = {AuthInstancesShadow.class})
     public void testSubmitCode_badCodeShowsAlertDialog() {
-        reset(BaseHelperShadow.sPhoneAuthProvider);
-        when(ActivityHelperShadow.sFirebaseAuth.signInWithCredential(any(AuthCredential.class)))
+        reset(AuthInstancesShadow.sPhoneAuthProvider);
+        when(AuthInstancesShadow.sFirebaseAuth.signInWithCredential(any(AuthCredential.class)))
                 .thenReturn(new AutoCompleteTask<AuthResult>(null, true, new
                         FirebaseAuthInvalidCredentialsException(ERROR_INVALID_VERIFICATION,
                         "any_msg")));
@@ -229,9 +227,9 @@ public void testSubmitCode_badCodeShowsAlertDialog() {
     }
 
     @Test
-    @Config(shadows = {BaseHelperShadow.class, ActivityHelperShadow.class})
+    @Config(shadows = {AuthInstancesShadow.class})
     public void testresendCode_invokesUpstream() {
-        reset(BaseHelperShadow.sPhoneAuthProvider);
+        reset(AuthInstancesShadow.sPhoneAuthProvider);
         testSendConfirmationCode();
 
         //test resend code invisible
@@ -249,25 +247,25 @@ public void testresendCode_invokesUpstream() {
         assertEquals(View.GONE, r.getVisibility());
 
         //verify resend code was called
-        verify(ActivityHelperShadow.sPhoneAuthProvider).verifyPhoneNumber(eq(PHONE), eq
+        verify(AuthInstancesShadow.sPhoneAuthProvider).verifyPhoneNumber(eq(PHONE), eq
                 (AUTO_RETRIEVAL_TIMEOUT_MILLIS), eq(TimeUnit.MILLISECONDS), eq(mActivity),
                 callbacksArgumentCaptor.capture(), eq(forceResendingToken));
     }
 
     @Test
-    @Config(shadows = {BaseHelperShadow.class, ActivityHelperShadow.class})
+    @Config(shadows = {AuthInstancesShadow.class})
     public void testAutoVerify() {
-        reset(BaseHelperShadow.sPhoneAuthProvider);
-        reset(BaseHelperShadow.sSaveSmartLock);
-        reset(BaseHelperShadow.sFirebaseAuth);
+        reset(AuthInstancesShadow.sPhoneAuthProvider);
+        reset(AuthInstancesShadow.sSaveSmartLock);
+        reset(AuthInstancesShadow.sFirebaseAuth);
 
-        when(BaseHelperShadow.sFirebaseUser.getPhoneNumber()).thenReturn(PHONE);
-        when(BaseHelperShadow.sFirebaseUser.getEmail()).thenReturn(null);
-        when(ActivityHelperShadow.sFirebaseAuth.signInWithCredential(any(AuthCredential.class)))
+        when(AuthInstancesShadow.sFirebaseUser.getPhoneNumber()).thenReturn(PHONE);
+        when(AuthInstancesShadow.sFirebaseUser.getEmail()).thenReturn(null);
+        when(AuthInstancesShadow.sFirebaseAuth.signInWithCredential(any(AuthCredential.class)))
                 .thenReturn(new AutoCompleteTask(FakeAuthResult.INSTANCE
                         , true, null));
         mActivity.verifyPhoneNumber(PHONE, false);
-        verify(ActivityHelperShadow.sPhoneAuthProvider).verifyPhoneNumber(eq(PHONE), eq
+        verify(AuthInstancesShadow.sPhoneAuthProvider).verifyPhoneNumber(eq(PHONE), eq
                 (AUTO_RETRIEVAL_TIMEOUT_MILLIS), eq(TimeUnit.MILLISECONDS), eq(mActivity),
                 callbacksArgumentCaptor.capture(), isNull(PhoneAuthProvider.ForceResendingToken
                         .class));
@@ -276,22 +274,21 @@ public void testAutoVerify() {
                 = callbacksArgumentCaptor.getValue();
 
         onVerificationStateChangedCallbacks.onVerificationCompleted(credential);
-        verify(ActivityHelperShadow.sFirebaseAuth).signInWithCredential(any(AuthCredential.class));
+        verify(AuthInstancesShadow.sFirebaseAuth).signInWithCredential(any(AuthCredential.class));
     }
 
     @Test
-    @Config(shadows = {BaseHelperShadow.class, ActivityHelperShadow.class})
+    @Config(shadows = {AuthInstancesShadow.class})
     public void testSMSAutoRetrieval() {
-        reset(BaseHelperShadow.sPhoneAuthProvider);
-        reset(BaseHelperShadow.sSaveSmartLock);
+        reset(AuthInstancesShadow.sPhoneAuthProvider);
+        reset(AuthInstancesShadow.sSaveSmartLock);
         when(credential.getSmsCode()).thenReturn("123456");
 
-        when(BaseHelperShadow.sFirebaseUser.getPhoneNumber()).thenReturn(PHONE);
-        when(BaseHelperShadow.sFirebaseUser.getEmail()).thenReturn(null);
+        when(AuthInstancesShadow.sFirebaseUser.getPhoneNumber()).thenReturn(PHONE);
+        when(AuthInstancesShadow.sFirebaseUser.getEmail()).thenReturn(null);
 
-        when(ActivityHelperShadow.sFirebaseAuth.signInWithCredential(any(AuthCredential.class)))
-                .thenReturn(new AutoCompleteTask(FakeAuthResult.INSTANCE
-                        , true, null));
+        when(AuthInstancesShadow.sFirebaseAuth.signInWithCredential(any(AuthCredential.class)))
+                .thenReturn(new AutoCompleteTask(FakeAuthResult.INSTANCE, true, null));
         PhoneAuthProvider.OnVerificationStateChangedCallbacks callbacks =
                 testSendConfirmationCode();
         callbacks.onVerificationCompleted(credential);
@@ -301,13 +298,13 @@ public void testSMSAutoRetrieval() {
         //verify confirmation code set
         assertEquals("1 2 3 4 5 6", mConfirmationCodeEditText.getText().toString());
         //verify credential saves
-        verify(ActivityHelperShadow.sFirebaseAuth).signInWithCredential(credential);
+        verify(AuthInstancesShadow.sFirebaseAuth).signInWithCredential(credential);
     }
 
     @Test
-    @Config(shadows = {BaseHelperShadow.class, ActivityHelperShadow.class})
+    @Config(shadows = {AuthInstancesShadow.class})
     public void testEditPhoneNumber_togglesFragments() {
-        reset(BaseHelperShadow.sPhoneAuthProvider);
+        reset(AuthInstancesShadow.sPhoneAuthProvider);
         testSendConfirmationCode();
         TextView mEditPhoneTextView = (TextView) mActivity.findViewById(R.id.edit_phone_number);
         mEditPhoneTextView.performClick();
@@ -326,7 +323,7 @@ public void testEditPhoneNumber_togglesFragments() {
 
     private PhoneAuthProvider.OnVerificationStateChangedCallbacks testSendConfirmationCode() {
         mActivity.verifyPhoneNumber(PHONE, false);
-        verify(ActivityHelperShadow.sPhoneAuthProvider).verifyPhoneNumber(eq(PHONE), eq
+        verify(AuthInstancesShadow.sPhoneAuthProvider).verifyPhoneNumber(eq(PHONE), eq
                 (AUTO_RETRIEVAL_TIMEOUT_MILLIS), eq(TimeUnit.MILLISECONDS), eq(mActivity),
                 callbacksArgumentCaptor.capture(), isNull(PhoneAuthProvider.ForceResendingToken
                         .class));

From 19132d099e5d693e24bca20f4db881de348cab9e Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Wed, 28 Jun 2017 17:08:57 -0700
Subject: [PATCH 05/14] Fix Fragment getContext NPE (#781)

---
 .../ui/auth/ui/phone/VerifyPhoneNumberFragment.java   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java
index 7129626aa..485f31ffb 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java
@@ -15,6 +15,7 @@
 package com.firebase.ui.auth.ui.phone;
 
 import android.app.PendingIntent;
+import android.content.Context;
 import android.content.Intent;
 import android.content.IntentSender;
 import android.os.Bundle;
@@ -52,6 +53,8 @@
 public class VerifyPhoneNumberFragment extends FragmentBase implements View.OnClickListener {
     public static final String TAG = "VerifyPhoneFragment";
 
+    private Context mAppContext;
+
     private CountryListSpinner countryListSpinner;
     private EditText mPhoneEditText;
     private TextView errorEditText;
@@ -73,6 +76,12 @@ public static VerifyPhoneNumberFragment newInstance(FlowParameters flowParameter
         return fragment;
     }
 
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mAppContext = context.getApplicationContext();
+    }
+
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable
@@ -142,7 +151,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                     final String formattedPhone =
                             PhoneNumberUtils
                                     .formatPhoneNumberUsingCurrentCountry(unformattedPhone,
-                                                                          getContext());
+                                                                          mAppContext);
                     if (formattedPhone == null) {
                         Log.e(TAG, "Unable to normalize phone number from hint selector:"
                                 + unformattedPhone);

From 41970bc1f625f2da00eee86dd173fdd0b40df70a Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Wed, 5 Jul 2017 08:15:00 -0700
Subject: [PATCH 06/14] Fix weird keyboard behavior (#787)

---
 auth/src/main/res/layout/phone_layout.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/auth/src/main/res/layout/phone_layout.xml b/auth/src/main/res/layout/phone_layout.xml
index 0cb14cd47..3d32885f1 100644
--- a/auth/src/main/res/layout/phone_layout.xml
+++ b/auth/src/main/res/layout/phone_layout.xml
@@ -48,6 +48,6 @@
             android:layout_marginTop="@dimen/field_padding_vert"
             android:layout_below="@id/send_code"
             android:textColor="?android:textColorTertiary"
-            android:textIsSelectable="true" />
+            android:textIsSelectable="false" />
     </RelativeLayout>
 </ScrollView>

From f34f5ab1e7f0fa2b728cbb313337fb2e912a5899 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Wed, 5 Jul 2017 12:03:45 -0700
Subject: [PATCH 07/14] Style refactor (#784)

---
 .idea/codeStyleSettings.xml                   |   1 -
 app/src/main/AndroidManifest.xml              |  24 +-
 .../firebase/uidemo/auth/AuthUiActivity.java  |  12 +-
 .../uidemo/auth/SignedInActivity.java         |  23 +-
 app/src/main/res/values/strings.xml           |   2 +-
 auth/src/main/AndroidManifest.xml             |  36 +--
 .../java/com/firebase/ui/auth/AuthUI.java     |  57 ++---
 .../com/firebase/ui/auth/IdpResponse.java     |   6 +-
 .../com/firebase/ui/auth/ResultCodes.java     |   4 +-
 .../com/firebase/ui/auth/package-info.java    |   4 +-
 .../ui/auth/provider/FacebookProvider.java    |   3 +-
 .../ui/auth/provider/IdpProvider.java         |   4 +-
 .../ui/auth/provider/TwitterProvider.java     |  10 +-
 .../ui/auth/provider/package-info.java        |   4 +-
 .../firebase/ui/auth/ui/FlowParameters.java   |   8 +-
 .../ui/auth/ui/HelperActivityBase.java        |   2 +-
 .../firebase/ui/auth/ui/TermsTextView.java    |  50 -----
 .../java/com/firebase/ui/auth/ui/User.java    |   9 +-
 .../ui/accountlink/WelcomeBackIdpPrompt.java  |   2 +-
 .../WelcomeBackPasswordPrompt.java            |  10 +-
 .../ui/auth/ui/email/CheckEmailFragment.java  |  26 +--
 .../ui/auth/ui/email/PreambleHandler.java     |   6 +-
 .../ui/email/RecoveryEmailSentDialog.java     |   2 +-
 .../auth/ui/email/RegisterEmailActivity.java  |  10 +-
 .../auth/ui/email/RegisterEmailFragment.java  |  30 +--
 .../email/fieldvalidators/package-info.java   |   6 +-
 .../auth/ui/idp/AuthMethodPickerActivity.java |  12 +-
 .../ui/phone/BucketedTextChangeListener.java  |  28 +--
 .../ui/auth/ui/phone/CountryInfo.java         |  28 +--
 .../ui/auth/ui/phone/CountryListLoadTask.java |   8 +-
 .../ui/auth/ui/phone/CountryListSpinner.java  |  17 +-
 .../ui/auth/ui/phone/PhoneNumber.java         |  27 ++-
 .../ui/auth/ui/phone/PhoneNumberUtils.java    |  34 ++-
 .../ui/phone/PhoneVerificationActivity.java   | 211 +++++++++---------
 .../ui/auth/ui/phone/SpacedEditText.java      |   6 +-
 .../phone/SubmitConfirmationCodeFragment.java |  11 +-
 .../ui/phone/VerifyPhoneNumberFragment.java   |  43 ++--
 .../AbstractActivityLifecycleCallbacks.java   |  49 ----
 .../firebase/ui/auth/util/AuthInstances.java  |   4 +-
 .../ui/auth/util/PlayServicesHelper.java      |   4 +-
 .../firebase/ui/auth/util/Preconditions.java  |  10 +-
 .../firebase/ui/auth/util/package-info.java   |   6 +-
 .../util/signincontainer/SaveSmartLock.java   |   8 +-
 .../util/signincontainer/SignInDelegate.java  |  18 +-
 .../util/signincontainer/SmartLockBase.java   |  12 +-
 .../drawable/ic_settings_phone_white_24dp.xml |   4 +-
 .../layout-land/auth_method_picker_layout.xml |   4 +-
 .../res/layout/confirmation_code_layout.xml   |   7 +-
 auth/src/main/res/layout/phone_layout.xml     |   8 +-
 .../main/res/layout/register_email_layout.xml |   2 +-
 .../CustomCountDownTimerShadow.java           |  58 -----
 .../auth/testhelpers/LoginManagerShadow.java  |   4 +-
 .../email/WelcomeBackPasswordPromptTest.java  |   5 +-
 .../ui/idp/AuthMethodPickerActivityTest.java  |   2 +-
 .../phone/BucketedTextChangeListenerTest.java |   2 +-
 .../ui/auth/ui/phone/CountryInfoTests.java    |   4 +-
 .../ui/auth/ui/phone/PhoneNumberTest.java     |  26 ++-
 .../auth/ui/phone/PhoneNumberUtilsTest.java   |  24 +-
 .../phone/PhoneVerificationActivityTest.java  | 119 +++++-----
 .../ui/auth/ui/phone/SpacedEditTextTest.java  |  14 +-
 .../java/com/firebase/ui/database/Bean.java   |  16 +-
 database/src/main/AndroidManifest.xml         |   4 +-
 .../ui/database/ChangeEventListener.java      |   4 +-
 .../ui/database/FirebaseListAdapter.java      |  14 +-
 .../ui/database/FirebaseRecyclerAdapter.java  |   8 +-
 library/src/main/AndroidManifest.xml          |   4 +-
 .../main/java/com/firebase/ui/FirebaseUI.java |   6 +-
 storage/src/main/AndroidManifest.xml          |   2 +-
 .../storage/images/FirebaseImageLoader.java   |   2 +-
 69 files changed, 549 insertions(+), 681 deletions(-)
 delete mode 100644 auth/src/main/java/com/firebase/ui/auth/ui/TermsTextView.java
 delete mode 100644 auth/src/main/java/com/firebase/ui/auth/util/AbstractActivityLifecycleCallbacks.java
 delete mode 100644 auth/src/test/java/com/firebase/ui/auth/testhelpers/CustomCountDownTimerShadow.java

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index d10f95651..2d2745308 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -68,7 +68,6 @@
           <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
         </XML>
         <codeStyleSettings language="JAVA">
-          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
           <option name="CALL_PARAMETERS_WRAP" value="5" />
           <option name="METHOD_PARAMETERS_WRAP" value="5" />
           <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 68a391ea9..cb2589255 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,48 +4,48 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.firebase.uidemo">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
         android:name=".auth.FirebaseUIDemo"
+        android:label="@string/app_name"
         android:allowBackup="true"
         android:fullBackupContent="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme"
         android:supportsRtl="false"
+        android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
         <activity android:name=".ChooserActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <meta-data
                 android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts"/>
+                android:resource="@xml/shortcuts" />
         </activity>
 
         <!-- Chat demo -->
         <activity
             android:name=".database.ChatActivity"
-            android:label="@string/name_chat"/>
+            android:label="@string/name_chat" />
         <activity
             android:name=".database.ChatIndexActivity"
-            android:label="@string/name_chat"/>
+            android:label="@string/name_chat" />
 
         <!-- Auth UI demo -->
         <activity
             android:name=".auth.AuthUiActivity"
-            android:label="@string/name_auth_ui"/>
+            android:label="@string/name_auth_ui" />
         <activity
             android:name=".auth.SignedInActivity"
-            android:label="@string/name_auth_ui"/>
+            android:label="@string/name_auth_ui" />
 
         <!-- Storage UI demo-->
         <activity
             android:name=".storage.ImageActivity"
-            android:label="@string/name_image"/>
+            android:label="@string/name_image" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
index 0c396a0e2..f05e78a85 100644
--- a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
+++ b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
@@ -137,6 +137,12 @@ public class AuthUiActivity extends AppCompatActivity {
     @BindView(R.id.google_scope_youtube_data)
     CheckBox mGoogleScopeYoutubeData;
 
+    public static Intent createIntent(Context context) {
+        Intent in = new Intent();
+        in.setClass(context, AuthUiActivity.class);
+        return in;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -408,10 +414,4 @@ private List<String> getGooglePermissions() {
         }
         return result;
     }
-
-    public static Intent createIntent(Context context) {
-        Intent in = new Intent();
-        in.setClass(context, AuthUiActivity.class);
-        return in;
-    }
 }
diff --git a/app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java b/app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java
index fedb61a13..f0d129bcf 100644
--- a/app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java
+++ b/app/src/main/java/com/firebase/uidemo/auth/SignedInActivity.java
@@ -79,6 +79,16 @@ public class SignedInActivity extends AppCompatActivity {
 
     private SignedInConfig mSignedInConfig;
 
+    public static Intent createIntent(
+            Context context,
+            IdpResponse idpResponse,
+            SignedInConfig signedInConfig) {
+        Intent startIntent = idpResponse == null ? new Intent() : idpResponse.toIntent();
+
+        return startIntent.setClass(context, SignedInActivity.class)
+                .putExtra(EXTRA_SIGNED_IN_CONFIG, signedInConfig);
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -220,8 +230,7 @@ private void populateIdpToken() {
 
     @MainThread
     private void showSnackbar(@StringRes int errorMessageRes) {
-        Snackbar.make(mRootView, errorMessageRes, Snackbar.LENGTH_LONG)
-                .show();
+        Snackbar.make(mRootView, errorMessageRes, Snackbar.LENGTH_LONG).show();
     }
 
     static final class SignedInConfig implements Parcelable {
@@ -283,14 +292,4 @@ public void writeToParcel(Parcel dest, int flags) {
             dest.writeInt(isHintSelectorEnabled ? 1 : 0);
         }
     }
-
-    public static Intent createIntent(
-            Context context,
-            IdpResponse idpResponse,
-            SignedInConfig signedInConfig) {
-        Intent startIntent = idpResponse == null ? new Intent() : idpResponse.toIntent();
-
-        return startIntent.setClass(context, SignedInActivity.class)
-                .putExtra(EXTRA_SIGNED_IN_CONFIG, signedInConfig);
-    }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4bb747c6a..8cfaef35a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,7 +10,7 @@
     <string name="desc_image">Demonstrates displaying an image from Cloud Storage using Glide.</string>
 
     <!-- strings for Auth UI demo activities -->
-    <eat-comment/>
+    <eat-comment />
     <string name="launch_title">FirebaseUI Auth Demo</string>
     <string name="sign_in">Start</string>
     <string name="green_theme">Green Theme</string>
diff --git a/auth/src/main/AndroidManifest.xml b/auth/src/main/AndroidManifest.xml
index d26d526c6..f3a1db420 100644
--- a/auth/src/main/AndroidManifest.xml
+++ b/auth/src/main/AndroidManifest.xml
@@ -3,63 +3,63 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.firebase.ui.auth">
 
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application>
 
         <meta-data
             android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version"/>
+            android:value="@integer/google_play_services_version" />
 
         <meta-data
             android:name="io.fabric.ApiKey"
-            android:value="@string/twitter_consumer_secret"/>
+            android:value="@string/twitter_consumer_secret" />
 
         <meta-data
             android:name="com.facebook.sdk.ApplicationId"
-            android:value="@string/facebook_application_id"/>
+            android:value="@string/facebook_application_id" />
 
         <meta-data
             android:name="com.facebook.sdk.AutoLogAppEventsEnabled"
-            android:value="${enableFbLogging}"/>
+            android:value="${enableFbLogging}" />
 
         <activity
             android:name=".KickoffActivity"
             android:label=""
             android:exported="false"
-            android:theme="@style/FirebaseUI.Transparent"/>
+            android:theme="@style/FirebaseUI.Transparent" />
 
         <activity
             android:name=".ui.email.RecoverPasswordActivity"
             android:label="@string/title_recover_password_activity"
-            android:exported="false"/>
+            android:exported="false" />
 
         <activity
             android:name=".ui.email.RegisterEmailActivity"
             android:label="@string/sign_in_default"
-            android:exported="false"/>
+            android:exported="false" />
 
         <activity
             android:name=".ui.phone.PhoneVerificationActivity"
             android:label="@string/sign_in_with_phone_number"
-            android:windowSoftInputMode="stateAlwaysVisible"
-            android:exported="false"/>
+            android:exported="false"
+            android:windowSoftInputMode="stateAlwaysVisible" />
 
         <activity
             android:name=".ui.accountlink.WelcomeBackIdpPrompt"
             android:label="@string/title_welcome_back_idp_prompt"
-            android:exported="false"/>
+            android:exported="false" />
 
         <activity
             android:name=".ui.accountlink.WelcomeBackPasswordPrompt"
             android:label="@string/title_welcome_back_password_prompt"
-            android:exported="false"/>
+            android:exported="false" />
 
         <activity
             android:name=".ui.idp.AuthMethodPickerActivity"
             android:label="@string/default_toolbar_title"
-            android:exported="false"/>
+            android:exported="false" />
 
         <activity
             android:name="com.facebook.FacebookActivity"
@@ -72,12 +72,12 @@
             android:exported="true"
             tools:ignore="MissingRegistered">
             <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.intent.action.VIEW" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="@string/facebook_login_protocol_scheme"/>
+                <data android:scheme="@string/facebook_login_protocol_scheme" />
             </intent-filter>
         </activity>
 
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 0001113d8..d786e7dde 100644
--- a/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
+++ b/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
@@ -76,8 +76,8 @@ public class AuthUI {
     public @interface SupportedProvider {}
 
     /**
-     * Provider identifier for email and password credentials, for use with
-     * {@link SignInIntentBuilder#setAvailableProviders(List)}.
+     * Provider identifier for email and password credentials, for use with {@link
+     * SignInIntentBuilder#setAvailableProviders(List)}.
      */
     public static final String EMAIL_PROVIDER = EmailAuthProvider.PROVIDER_ID;
 
@@ -129,8 +129,8 @@ private AuthUI(FirebaseApp app) {
     }
 
     /**
-     * Retrieves the {@link AuthUI} instance associated with the default app, as returned by
-     * {@code FirebaseApp.getInstance()}.
+     * Retrieves the {@link AuthUI} instance associated with the default app, as returned by {@code
+     * FirebaseApp.getInstance()}.
      *
      * @throws IllegalStateException if the default app is not initialized.
      */
@@ -250,8 +250,8 @@ public Task<Void> then(@NonNull Task<Void> task) throws Exception {
     }
 
     /**
-     * Starts the process of creating a sign in intent, with the mandatory application
-     * context parameter.
+     * Starts the process of creating a sign in intent, with the mandatory application context
+     * parameter.
      */
     public SignInIntentBuilder createSignInIntentBuilder() {
         return new SignInIntentBuilder();
@@ -260,8 +260,8 @@ public SignInIntentBuilder createSignInIntentBuilder() {
     /**
      * Configuration for an identity provider.
      * <p>
-     * In the simplest case, you can supply the provider ID and build the config like this:
-     * {@code new IdpConfig.Builder(AuthUI.GOOGLE_PROVIDER).build()}
+     * In the simplest case, you can supply the provider ID and build the config like this: {@code
+     * new IdpConfig.Builder(AuthUI.GOOGLE_PROVIDER).build()}
      */
     public static class IdpConfig implements Parcelable {
         private final String mProviderId;
@@ -391,8 +391,8 @@ private abstract class AuthIntentBuilder<T extends AuthIntentBuilder> {
         private AuthIntentBuilder() {}
 
         /**
-         * Specifies the theme to use for the application flow. If no theme is specified,
-         * a default theme will be used.
+         * Specifies the theme to use for the application flow. If no theme is specified, a default
+         * theme will be used.
          */
         public T setTheme(@StyleRes int theme) {
             Preconditions.checkValidStyle(
@@ -404,8 +404,8 @@ public T setTheme(@StyleRes int theme) {
         }
 
         /**
-         * Specifies the logo to use for the {@link AuthMethodPickerActivity}. If no logo
-         * is specified, none will be used.
+         * Specifies the logo to use for the {@link AuthMethodPickerActivity}. If no logo is
+         * specified, none will be used.
          */
         public T setLogo(@DrawableRes int logo) {
             mLogo = logo;
@@ -429,8 +429,8 @@ public T setPrivacyPolicyUrl(@Nullable String privacyPolicyUrl) {
         }
 
         /**
-         * Specified the set of supported authentication providers. At least one provider must
-         * be specified. There may only be one instance of each provider.
+         * Specified the set of supported authentication providers. At least one provider must be
+         * specified. There may only be one instance of each provider.
          * <p>
          * <p>If no providers are explicitly specified by calling this method, then the email
          * provider is the default supported provider.
@@ -455,9 +455,10 @@ public T setAvailableProviders(@NonNull List<IdpConfig> idpConfigs) {
                     try {
                         Class c = com.facebook.FacebookSdk.class;
                     } catch (NoClassDefFoundError e) {
-                        throw new RuntimeException("Facebook provider cannot be configured " +
-                               "without dependency. Did you forget to add " +
-                               "'com.facebook.android:facebook-android-sdk:VERSION' dependency?");
+                        throw new RuntimeException(
+                                "Facebook provider cannot be configured " +
+                                        "without dependency. Did you forget to add " +
+                                        "'com.facebook.android:facebook-android-sdk:VERSION' dependency?");
                     }
                 }
 
@@ -465,9 +466,10 @@ public T setAvailableProviders(@NonNull List<IdpConfig> idpConfigs) {
                     try {
                         Class c = com.twitter.sdk.android.core.TwitterCore.class;
                     } catch (NoClassDefFoundError e) {
-                        throw new RuntimeException("Twitter provider cannot be configured " +
-                               "without dependency. Did you forget to add " +
-                               "'com.twitter.sdk.android:twitter-core:VERSION' dependency?");
+                        throw new RuntimeException(
+                                "Twitter provider cannot be configured " +
+                                        "without dependency. Did you forget to add " +
+                                        "'com.twitter.sdk.android:twitter-core:VERSION' dependency?");
                     }
                 }
             }
@@ -476,8 +478,8 @@ public T setAvailableProviders(@NonNull List<IdpConfig> idpConfigs) {
         }
 
         /**
-         * Specified the set of supported authentication providers. At least one provider must
-         * be specified. There may only be one instance of each provider.
+         * Specified the set of supported authentication providers. At least one provider must be
+         * specified. There may only be one instance of each provider.
          * <p>
          * <p>If no providers are explicitly specified by calling this method, then the email
          * provider is the default supported provider.
@@ -504,9 +506,9 @@ public T setProviders(@NonNull List<IdpConfig> idpConfigs) {
         }
 
         /**
-         * Enables or disables the use of Smart Lock for Passwords in the sign in flow.
-         * To (en)disable hint selector and credential selector independently
-         * use {@link #setIsSmartLockEnabled(boolean, boolean)}
+         * Enables or disables the use of Smart Lock for Passwords in the sign in flow. To
+         * (en)disable hint selector and credential selector independently use {@link
+         * #setIsSmartLockEnabled(boolean, boolean)}
          * <p>
          * <p>SmartLock is enabled by default.
          *
@@ -522,10 +524,9 @@ public T setIsSmartLockEnabled(boolean enabled) {
          * selector.
          * <p>
          * <p>Both selectors are enabled by default.
-
+         *
          * @param enableCredentials enables credential selector before signup
-         * @param enableHints enable hint selector in respective signup screens
-         * @return
+         * @param enableHints       enable hint selector in respective signup screens
          */
         public T setIsSmartLockEnabled(boolean enableCredentials, boolean enableHints) {
             mEnableCredentials = enableCredentials;
diff --git a/auth/src/main/java/com/firebase/ui/auth/IdpResponse.java b/auth/src/main/java/com/firebase/ui/auth/IdpResponse.java
index 2c9797a0a..36a882334 100644
--- a/auth/src/main/java/com/firebase/ui/auth/IdpResponse.java
+++ b/auth/src/main/java/com/firebase/ui/auth/IdpResponse.java
@@ -173,7 +173,8 @@ public static class Builder {
         private String mToken;
         private String mSecret;
 
-        public Builder(@AuthUI.SupportedProvider @NonNull String providerId, @Nullable String email) {
+        public Builder(@AuthUI.SupportedProvider @NonNull String providerId,
+                       @Nullable String email) {
             mProviderId = providerId;
             mEmail = email;
         }
@@ -208,7 +209,8 @@ public IdpResponse build() {
                         "Secret cannot be null when using the Twitter provider.");
             }
 
-            return new IdpResponse(mProviderId, mEmail, mPhoneNumber, mToken, mSecret, ResultCodes.OK);
+            return new IdpResponse(
+                    mProviderId, mEmail, mPhoneNumber, mToken, mSecret, ResultCodes.OK);
         }
     }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ResultCodes.java b/auth/src/main/java/com/firebase/ui/auth/ResultCodes.java
index c8889b778..72f189fc6 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ResultCodes.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ResultCodes.java
@@ -3,8 +3,8 @@
 import android.app.Activity;
 
 /**
- * Result codes returned when using {@link AuthUI.SignInIntentBuilder#build()} with
- * {@code startActivityForResult}.
+ * Result codes returned when using {@link AuthUI.SignInIntentBuilder#build()} with {@code
+ * startActivityForResult}.
  */
 public final class ResultCodes {
     /**
diff --git a/auth/src/main/java/com/firebase/ui/auth/package-info.java b/auth/src/main/java/com/firebase/ui/auth/package-info.java
index 3a0cc3890..5c1ac6f75 100644
--- a/auth/src/main/java/com/firebase/ui/auth/package-info.java
+++ b/auth/src/main/java/com/firebase/ui/auth/package-info.java
@@ -13,7 +13,7 @@
  */
 
 /**
- * The Firebase AuthUI library. See the {@link com.firebase.ui.auth.AuthUI} entry class
- * for information on using the library to manage signed-in user state.
+ * The Firebase AuthUI library. See the {@link com.firebase.ui.auth.AuthUI} entry class for
+ * information on using the library to manage signed-in user state.
  */
 package com.firebase.ui.auth;
diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java b/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java
index c7c1dba91..45ec1cee8 100644
--- a/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java
+++ b/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java
@@ -133,8 +133,7 @@ public void onSuccess(final LoginResult loginResult) {
                     public void onCompleted(JSONObject object, GraphResponse response) {
                         FacebookRequestError requestError = response.getError();
                         if (requestError != null) {
-                            Log.e(TAG,
-                                  "Received Facebook error: " + requestError.getErrorMessage());
+                            Log.e(TAG, "Received Facebook error: " + requestError.getErrorMessage());
                             onFailure(new Bundle());
                             return;
                         }
diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/IdpProvider.java b/auth/src/main/java/com/firebase/ui/auth/provider/IdpProvider.java
index b04a37fa1..f9cac1f94 100644
--- a/auth/src/main/java/com/firebase/ui/auth/provider/IdpProvider.java
+++ b/auth/src/main/java/com/firebase/ui/auth/provider/IdpProvider.java
@@ -19,11 +19,11 @@
 import com.firebase.ui.auth.IdpResponse;
 
 public interface IdpProvider extends Provider {
-    void setAuthenticationCallback(IdpCallback callback);
-
     interface IdpCallback {
         void onSuccess(IdpResponse idpResponse);
 
         void onFailure(Bundle extra);
     }
+
+    void setAuthenticationCallback(IdpCallback callback);
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/TwitterProvider.java b/auth/src/main/java/com/firebase/ui/auth/provider/TwitterProvider.java
index dd64d077c..a3beb2b60 100644
--- a/auth/src/main/java/com/firebase/ui/auth/provider/TwitterProvider.java
+++ b/auth/src/main/java/com/firebase/ui/auth/provider/TwitterProvider.java
@@ -63,6 +63,10 @@ public static void signout(Context context) {
         signOut();
     }
 
+    private static void signOut() throws IllegalStateException {
+        TwitterCore.getInstance().getSessionManager().clearActiveSession();
+    }
+
     @Override
     public String getName(Context context) {
         return context.getString(R.string.idp_name_twitter);
@@ -98,7 +102,7 @@ public void startLogin(Activity activity) {
     @Override
     public void success(Result<TwitterSession> result) {
         mTwitterAuthClient.requestEmail(result.data,
-                                        new EmailCallback(result.data, mCallbackObject));
+                new EmailCallback(result.data, mCallbackObject));
     }
 
     @Override
@@ -142,8 +146,4 @@ private IdpResponse createIdpResponse(String email) {
                     .build();
         }
     }
-
-    private static void signOut() throws IllegalStateException {
-        TwitterCore.getInstance().getSessionManager().clearActiveSession();
-    }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/package-info.java b/auth/src/main/java/com/firebase/ui/auth/provider/package-info.java
index 8b5cae576..d2f4dd20a 100644
--- a/auth/src/main/java/com/firebase/ui/auth/provider/package-info.java
+++ b/auth/src/main/java/com/firebase/ui/auth/provider/package-info.java
@@ -13,7 +13,7 @@
  */
 
 /**
- * IDP-specific interactions for signing in users. The contents of this package should
- * be considered an implementation detail and not part of the main API.
+ * IDP-specific interactions for signing in users. The contents of this package should be considered
+ * an implementation detail and not part of the main API.
  */
 package com.firebase.ui.auth.provider;
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/FlowParameters.java b/auth/src/main/java/com/firebase/ui/auth/ui/FlowParameters.java
index c4e15bb88..dea8597c0 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/FlowParameters.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/FlowParameters.java
@@ -30,8 +30,8 @@
 import java.util.List;
 
 /**
- * Encapsulates the core parameters and data captured during the authentication flow, in
- * a serializable manner, in order to pass data between activities.
+ * Encapsulates the core parameters and data captured during the authentication flow, in a
+ * serializable manner, in order to pass data between activities.
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class FlowParameters implements Parcelable {
@@ -95,8 +95,8 @@ public static FlowParameters fromBundle(Bundle bundle) {
     }
 
     /**
-     * Create a bundle containing this FlowParameters object as
-     * {@link ExtraConstants#EXTRA_FLOW_PARAMS}.
+     * Create a bundle containing this FlowParameters object as {@link
+     * ExtraConstants#EXTRA_FLOW_PARAMS}.
      */
     public Bundle toBundle() {
         Bundle bundle = new Bundle();
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java b/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java
index f167213d2..25e7706cc 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java
@@ -31,7 +31,7 @@ public static Intent createBaseIntent(
                 checkNotNull(context, "context cannot be null"),
                 checkNotNull(target, "target activity cannot be null"))
                 .putExtra(ExtraConstants.EXTRA_FLOW_PARAMS,
-                          checkNotNull(flowParams, "flowParams cannot be null"));
+                        checkNotNull(flowParams, "flowParams cannot be null"));
     }
 
     @Override
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/TermsTextView.java b/auth/src/main/java/com/firebase/ui/auth/ui/TermsTextView.java
deleted file mode 100644
index 77058716a..000000000
--- a/auth/src/main/java/com/firebase/ui/auth/ui/TermsTextView.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2017 Google Inc. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.firebase.ui.auth.ui;
-
-import android.content.Context;
-import android.support.annotation.StringRes;
-import android.support.v7.widget.AppCompatTextView;
-import android.util.AttributeSet;
-
-import com.firebase.ui.auth.ui.email.PreambleHandler;
-
-/**
- * Text view to display terms of service before completing signup.
- * The view helps display TOS linking to the provided custom URI.
- * It handles the styling of the link and opens the uri in a CustomTabs on click.
- */
-public class TermsTextView extends AppCompatTextView {
-    public TermsTextView(Context context) {
-        super(context);
-    }
-
-    public TermsTextView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public TermsTextView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    /**
-     * @param params     FlowParameters containing terms URLs.
-     * @param buttonText for the button that represents the "action" described in the terms.
-     */
-    public void showTerms(FlowParameters params, @StringRes int buttonText) {
-        PreambleHandler handler = new PreambleHandler(getContext(), params, buttonText);
-        handler.setPreamble(this);
-    }
-}
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/User.java b/auth/src/main/java/com/firebase/ui/auth/ui/User.java
index 7fab9ace1..aa2634b50 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/User.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/User.java
@@ -16,10 +16,11 @@ public class User implements Parcelable {
     public static final Parcelable.Creator<User> CREATOR = new Parcelable.Creator<User>() {
         @Override
         public User createFromParcel(Parcel in) {
-            return new User(in.readString(),
-                            in.readString(),
-                            in.readString(),
-                            in.<Uri>readParcelable(Uri.class.getClassLoader()));
+            return new User(
+                    in.readString(),
+                    in.readString(),
+                    in.readString(),
+                    in.<Uri>readParcelable(Uri.class.getClassLoader()));
         }
 
         @Override
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java
index 8328ca3e7..34e1c7b1e 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java
@@ -30,11 +30,11 @@
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.ResultCodes;
-import com.firebase.ui.auth.provider.ProviderUtils;
 import com.firebase.ui.auth.provider.FacebookProvider;
 import com.firebase.ui.auth.provider.GoogleProvider;
 import com.firebase.ui.auth.provider.IdpProvider;
 import com.firebase.ui.auth.provider.IdpProvider.IdpCallback;
+import com.firebase.ui.auth.provider.ProviderUtils;
 import com.firebase.ui.auth.provider.TwitterProvider;
 import com.firebase.ui.auth.ui.AppCompatBase;
 import com.firebase.ui.auth.ui.ExtraConstants;
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
index 0bef04fd8..7ab82eedd 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
@@ -53,8 +53,8 @@
 import com.google.firebase.auth.FirebaseAuth;
 
 /**
- * Activity to link a pre-existing email/password account to a new IDP sign-in by confirming
- * the password before initiating a link.
+ * Activity to link a pre-existing email/password account to a new IDP sign-in by confirming the
+ * password before initiating a link.
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class WelcomeBackPasswordPrompt extends AppCompatBase
@@ -101,9 +101,9 @@ protected void onCreate(Bundle savedInstanceState) {
         SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(bodyText);
         int emailStart = bodyText.indexOf(mEmail);
         spannableStringBuilder.setSpan(new StyleSpan(Typeface.BOLD),
-                                       emailStart,
-                                       emailStart + mEmail.length(),
-                                       Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+                emailStart,
+                emailStart + mEmail.length(),
+                Spannable.SPAN_INCLUSIVE_INCLUSIVE);
 
         TextView bodyTextView = ((TextView) findViewById(R.id.welcome_back_password_body));
         bodyTextView.setText(spannableStringBuilder);
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java
index e938eeb88..f28e38f40 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java
@@ -39,8 +39,7 @@
 import com.google.firebase.auth.FirebaseAuth;
 
 /**
- * Fragment that shows a form with an email field and checks for existing accounts with that
- * email.
+ * Fragment that shows a form with an email field and checks for existing accounts with that email.
  * <p>
  * Host Activities should implement {@link CheckEmailListener}.
  */
@@ -201,9 +200,9 @@ private void checkAccountExists(@NonNull final String email) {
                     public void onSuccess(String provider) {
                         if (provider == null) {
                             mListener.onNewUser(new User.Builder(email)
-                                                        .setName(finalName)
-                                                        .setPhotoUri(finalPhotoUri)
-                                                        .build());
+                                    .setName(finalName)
+                                    .setPhotoUri(finalPhotoUri)
+                                    .build());
                         } else if (EmailAuthProvider.PROVIDER_ID.equalsIgnoreCase(provider)) {
                             mListener.onExistingEmailUser(new User.Builder(email).build());
                         } else {
@@ -234,19 +233,18 @@ private PendingIntent getEmailHintIntent() {
         GoogleApiClient client = new GoogleApiClient.Builder(getContext())
                 .addApi(Auth.CREDENTIALS_API)
                 .enableAutoManage(getActivity(), GoogleApiHelper.getSafeAutoManageId(),
-                                  new GoogleApiClient.OnConnectionFailedListener() {
-                                      @Override
-                                      public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
-                                          Log.e(TAG,
-                                                "Client connection failed: " + connectionResult.getErrorMessage());
-                                      }
-                                  })
+                        new GoogleApiClient.OnConnectionFailedListener() {
+                            @Override
+                            public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
+                                Log.e(TAG, "Client connection failed: " + connectionResult.getErrorMessage());
+                            }
+                        })
                 .build();
 
         HintRequest hintRequest = new HintRequest.Builder()
                 .setHintPickerConfig(new CredentialPickerConfig.Builder()
-                                             .setShowCancelButton(true)
-                                             .build())
+                        .setShowCancelButton(true)
+                        .build())
                 .setEmailAddressIdentifierSupported(true)
                 .build();
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/PreambleHandler.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/PreambleHandler.java
index 24c0ca26e..f66b53cf9 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/PreambleHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/PreambleHandler.java
@@ -80,10 +80,8 @@ private void replaceUrlTarget(String target, @StringRes int replacementRes, Stri
     }
 
     /**
-     * 0 means we have both a TOS and a PP
-     * <p>1 means we only have a TOS
-     * <p>2 means we only have a PP
-     * <p>-1 means we have neither
+     * 0 means we have both a TOS and a PP <p>1 means we only have a TOS <p>2 means we only have a
+     * PP <p>-1 means we have neither
      */
     private int getPreambleType() {
         int preambleType;
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java
index dd97546fe..25f5ee508 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoveryEmailSentDialog.java
@@ -32,7 +32,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
         return new AlertDialog.Builder(getContext())
                 .setTitle(R.string.title_confirm_recover_password)
                 .setMessage(getString(R.string.confirm_recovery_body,
-                                      getArguments().getString(ExtraConstants.EXTRA_EMAIL)))
+                        getArguments().getString(ExtraConstants.EXTRA_EMAIL)))
                 .setOnDismissListener(new DialogInterface.OnDismissListener() {
                     @Override
                     public void onDismiss(DialogInterface anInterface) {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailActivity.java
index e2eacbf6c..4f367d1e4 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailActivity.java
@@ -33,9 +33,9 @@
 import com.google.firebase.auth.EmailAuthProvider;
 
 /**
- * Activity to control the entire email sign up flow. Plays host to {@link CheckEmailFragment}
- * and {@link RegisterEmailFragment} and triggers {@link WelcomeBackPasswordPrompt}
- * and {@link WelcomeBackIdpPrompt}.
+ * Activity to control the entire email sign up flow. Plays host to {@link CheckEmailFragment} and
+ * {@link RegisterEmailFragment} and triggers {@link WelcomeBackPasswordPrompt} and {@link
+ * WelcomeBackIdpPrompt}.
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class RegisterEmailActivity extends AppCompatBase implements
@@ -96,8 +96,8 @@ public void onExistingEmailUser(User user) {
                 WelcomeBackPasswordPrompt.createIntent(
                         this,
                         getFlowParams(),
-                        new IdpResponse.Builder(EmailAuthProvider.PROVIDER_ID,
-                                                user.getEmail()).build()),
+                        new IdpResponse.Builder(
+                                EmailAuthProvider.PROVIDER_ID, user.getEmail()).build()),
                 RC_SIGN_IN);
 
         setSlideAnimation();
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java
index ecc3a5604..ae210769e 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java
@@ -10,6 +10,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.firebase.ui.auth.IdpResponse;
@@ -21,7 +22,6 @@
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.ImeHelper;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
-import com.firebase.ui.auth.ui.TermsTextView;
 import com.firebase.ui.auth.ui.User;
 import com.firebase.ui.auth.ui.accountlink.WelcomeBackIdpPrompt;
 import com.firebase.ui.auth.ui.accountlink.WelcomeBackPasswordPrompt;
@@ -57,7 +57,7 @@ public class RegisterEmailFragment extends FragmentBase implements
     private EditText mEmailEditText;
     private EditText mNameEditText;
     private EditText mPasswordEditText;
-    private TermsTextView mAgreementText;
+    private TextView mAgreementText;
     private TextInputLayout mEmailInput;
     private TextInputLayout mPasswordInput;
 
@@ -100,7 +100,7 @@ public View onCreateView(LayoutInflater inflater,
         mEmailEditText = (EditText) v.findViewById(R.id.email);
         mNameEditText = (EditText) v.findViewById(R.id.name);
         mPasswordEditText = (EditText) v.findViewById(R.id.password);
-        mAgreementText = (TermsTextView) v.findViewById(R.id.create_account_text);
+        mAgreementText = (TextView) v.findViewById(R.id.create_account_text);
         mEmailInput = (TextInputLayout) v.findViewById(R.id.email_layout);
         mPasswordInput = (TextInputLayout) v.findViewById(R.id.password_layout);
 
@@ -167,16 +167,17 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 
         mActivity = (HelperActivityBase) getActivity();
         mSaveSmartLock = AuthInstances.getSaveSmartLockInstance(getActivity(), getFlowParams());
-        mAgreementText.showTerms(getFlowParams(), R.string.button_text_save);
+        new PreambleHandler(getContext(), getFlowParams(), R.string.button_text_save)
+                .setPreamble(mAgreementText);
     }
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
         outState.putParcelable(ExtraConstants.EXTRA_USER,
-                               new User.Builder(mEmailEditText.getText().toString())
-                                       .setName(mNameEditText.getText().toString())
-                                       .setPhotoUri(mUser.getPhotoUri())
-                                       .build());
+                new User.Builder(mEmailEditText.getText().toString())
+                        .setName(mNameEditText.getText().toString())
+                        .setPhotoUri(mUser.getPhotoUri())
+                        .build());
         super.onSaveInstanceState(outState);
     }
 
@@ -247,7 +248,7 @@ public void onComplete(@NonNull Task<Void> task) {
                                         mActivity.saveCredentialsOrFinish(
                                                 mSaveSmartLock, user, password,
                                                 new IdpResponse.Builder(EmailAuthProvider.PROVIDER_ID,
-                                                                        email).build());
+                                                        email).build());
                                     }
                                 });
                     }
@@ -273,16 +274,15 @@ public void onFailure(@NonNull Exception e) {
                                         @Override
                                         public void onSuccess(String provider) {
                                             Toast.makeText(getContext(),
-                                                           R.string.error_user_collision,
-                                                           Toast.LENGTH_LONG)
+                                                    R.string.error_user_collision,
+                                                    Toast.LENGTH_LONG)
                                                     .show();
 
                                             if (provider == null) {
-                                                String msg =
+                                                throw new IllegalStateException(
                                                         "User has no providers even though " +
-                                                        "we got a " +
-                                                        "FirebaseAuthUserCollisionException";
-                                                throw new IllegalStateException(msg);
+                                                                "we got a " +
+                                                                "FirebaseAuthUserCollisionException");
                                             } else if (EmailAuthProvider.PROVIDER_ID.equalsIgnoreCase(
                                                     provider)) {
                                                 getActivity().startActivityForResult(
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/package-info.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/package-info.java
index dcb0d5dc4..a60dd128a 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/package-info.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/fieldvalidators/package-info.java
@@ -13,8 +13,8 @@
  */
 
 /**
- * Contains utility classes for validating {@link android.widget.EditText} field contents.
- * The contents of this package should be considered an implementation detail and not part of
- * the main API.
+ * Contains utility classes for validating {@link android.widget.EditText} field contents. The
+ * contents of this package should be considered an implementation detail and not part of the main
+ * API.
  */
 package com.firebase.ui.auth.ui.email.fieldvalidators;
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
index 36abadcfe..b1331f2ba 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
@@ -28,7 +28,6 @@
 import com.firebase.ui.auth.AuthUI.IdpConfig;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
-import com.firebase.ui.auth.provider.ProviderUtils;
 import com.firebase.ui.auth.provider.EmailProvider;
 import com.firebase.ui.auth.provider.FacebookProvider;
 import com.firebase.ui.auth.provider.GoogleProvider;
@@ -36,6 +35,7 @@
 import com.firebase.ui.auth.provider.IdpProvider.IdpCallback;
 import com.firebase.ui.auth.provider.PhoneProvider;
 import com.firebase.ui.auth.provider.Provider;
+import com.firebase.ui.auth.provider.ProviderUtils;
 import com.firebase.ui.auth.provider.TwitterProvider;
 import com.firebase.ui.auth.ui.AppCompatBase;
 import com.firebase.ui.auth.ui.FlowParameters;
@@ -50,11 +50,11 @@
 import java.util.List;
 
 /**
- * Presents the list of authentication options for this app to the user. If an
- * identity provider option is selected, a {@link CredentialSignInHandler}
- * is launched to manage the IDP-specific sign-in flow. If email authentication is chosen,
- * the {@link RegisterEmailActivity} is started. if phone authentication is chosen, the
- * {@link com.firebase.ui.auth.ui.phone.PhoneVerificationActivity} is started.
+ * Presents the list of authentication options for this app to the user. If an identity provider
+ * option is selected, a {@link CredentialSignInHandler} is launched to manage the IDP-specific
+ * sign-in flow. If email authentication is chosen, the {@link RegisterEmailActivity} is started. if
+ * phone authentication is chosen, the {@link com.firebase.ui.auth.ui.phone.PhoneVerificationActivity}
+ * is started.
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class AuthMethodPickerActivity extends AppCompatBase implements IdpCallback {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/BucketedTextChangeListener.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/BucketedTextChangeListener.java
index 0de8728c4..ee63b73a6 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/BucketedTextChangeListener.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/BucketedTextChangeListener.java
@@ -38,6 +38,20 @@
  * 764176
  */
 final class BucketedTextChangeListener implements TextWatcher {
+    interface ContentChangeCallback {
+        /**
+         * Idempotent function invoked by the listener when the edit text changes and is of expected
+         * length
+         */
+        void whileComplete();
+
+        /**
+         * Idempotent function invoked by the listener when the edit text changes and is not of
+         * expected length
+         */
+        void whileIncomplete();
+    }
+
     private final EditText editText;
     private final ContentChangeCallback callback;
     private final String[] postFixes;
@@ -108,18 +122,4 @@ private String[] generatePostfixArray(CharSequence repeatableChar, int length) {
 
         return ret;
     }
-
-    interface ContentChangeCallback {
-        /**
-         * Idempotent function invoked by the listener when the edit text changes and is of
-         * expected length
-         */
-        void whileComplete();
-
-        /**
-         * Idempotent function invoked by the listener when the edit text changes and is not of
-         * expected length
-         */
-        void whileIncomplete();
-    }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryInfo.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryInfo.java
index f514e1057..569cbcf66 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryInfo.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryInfo.java
@@ -34,6 +34,20 @@ public CountryInfo(Locale locale, int countryCode) {
         this.countryCode = countryCode;
     }
 
+    public static String localeToEmoji(Locale locale) {
+        String countryCode = locale.getCountry();
+        // 0x41 is Letter A
+        // 0x1F1E6 is Regional Indicator Symbol Letter A
+        // Example :
+        // firstLetter U => 20 + 0x1F1E6
+        // secondLetter S => 18 + 0x1F1E6
+        // See: https://en.wikipedia.org/wiki/Regional_Indicator_Symbol
+        int firstLetter = Character.codePointAt(countryCode, 0) - 0x41 + 0x1F1E6;
+        int secondLetter = Character.codePointAt(countryCode, 1) - 0x41 + 0x1F1E6;
+        return new String(Character.toChars(firstLetter)) + new String(Character.toChars
+                (secondLetter));
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -57,20 +71,6 @@ public String toString() {
         return localeToEmoji(locale) + " " + this.locale.getDisplayCountry() + " +" + countryCode;
     }
 
-    public static String localeToEmoji(Locale locale) {
-        String countryCode = locale.getCountry();
-        // 0x41 is Letter A
-        // 0x1F1E6 is Regional Indicator Symbol Letter A
-        // Example :
-        // firstLetter U => 20 + 0x1F1E6
-        // secondLetter S => 18 + 0x1F1E6
-        // See: https://en.wikipedia.org/wiki/Regional_Indicator_Symbol
-        int firstLetter = Character.codePointAt(countryCode, 0) - 0x41 + 0x1F1E6;
-        int secondLetter = Character.codePointAt(countryCode, 1) - 0x41 + 0x1F1E6;
-        return new String(Character.toChars(firstLetter)) + new String(Character.toChars
-                (secondLetter));
-    }
-
     @Override
     public int compareTo(CountryInfo info) {
         return collator.compare(this.locale.getDisplayCountry(), info.locale.getDisplayCountry());
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListLoadTask.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListLoadTask.java
index 3c3c3f603..30b1bb25a 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListLoadTask.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListLoadTask.java
@@ -28,6 +28,10 @@
 // We need to move away from ListView and AsyncTask in the future and use (say)
 // RecyclerView and Task/ThreadPoolExecutor .
 final class CountryListLoadTask extends AsyncTask<Void, Void, List<CountryInfo>> {
+    public interface Listener {
+        void onLoadComplete(List<CountryInfo> result);
+    }
+
     private static final int MAX_COUNTRIES = 291;
 
     private final Listener listener;
@@ -295,8 +299,4 @@ protected void onPostExecute(List<CountryInfo> result) {
             listener.onLoadComplete(result);
         }
     }
-
-    public interface Listener {
-        void onLoadComplete(List<CountryInfo> result);
-    }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListSpinner.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListSpinner.java
index dda0e7c16..b1f3c2c4d 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListSpinner.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListSpinner.java
@@ -21,7 +21,6 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
-import android.support.annotation.VisibleForTesting;
 import android.support.v7.widget.AppCompatEditText;
 import android.text.TextUtils;
 import android.util.AttributeSet;
@@ -54,9 +53,11 @@ public CountryListSpinner(Context context, AttributeSet attrs, int defStyle) {
         init();
     }
 
-    @VisibleForTesting
-    void setDialogPopup(DialogPopup dialog) {
-        this.dialogPopup = dialog;
+    public static void hideKeyboard(Context context, View view) {
+        final InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (imm != null) {
+            imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+        }
     }
 
     private void init() {
@@ -173,12 +174,4 @@ public void onClick(DialogInterface dialog, int which) {
             dismiss();
         }
     }
-
-    public static void hideKeyboard(Context context, View view) {
-        final InputMethodManager imm = (InputMethodManager) context.getSystemService(Context
-                .INPUT_METHOD_SERVICE);
-        if (imm != null) {
-            imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
-        }
-    }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumber.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumber.java
index 90eb9eb88..2bbf22526 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumber.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumber.java
@@ -39,6 +39,21 @@ public static PhoneNumber emptyPhone() {
         return EMPTY_PHONE_NUMBER;
     }
 
+    public static boolean isValid(PhoneNumber phoneNumber) {
+        return phoneNumber != null
+                && !EMPTY_PHONE_NUMBER.equals(phoneNumber)
+                && !TextUtils.isEmpty(phoneNumber.getPhoneNumber())
+                && !TextUtils.isEmpty(phoneNumber.getCountryCode())
+                && !TextUtils.isEmpty(phoneNumber.getCountryIso());
+    }
+
+    public static boolean isCountryValid(PhoneNumber phoneNumber) {
+        return phoneNumber != null
+                && !EMPTY_PHONE_NUMBER.equals(phoneNumber)
+                && !TextUtils.isEmpty(phoneNumber.getCountryCode())
+                && !TextUtils.isEmpty(phoneNumber.getCountryIso());
+    }
+
     /**
      * Returns country code
      */
@@ -59,16 +74,4 @@ public String getPhoneNumber() {
     public String getCountryIso() {
         return countryIso;
     }
-
-    public static boolean isValid(PhoneNumber phoneNumber) {
-        return phoneNumber != null && !EMPTY_PHONE_NUMBER.equals(phoneNumber) && !TextUtils
-                .isEmpty(phoneNumber.getPhoneNumber()) && !TextUtils.isEmpty(phoneNumber
-                .getCountryCode()) && !TextUtils.isEmpty(phoneNumber.getCountryIso());
-    }
-
-    public static boolean isCountryValid(PhoneNumber phoneNumber) {
-        return phoneNumber != null && !EMPTY_PHONE_NUMBER.equals(phoneNumber) && !TextUtils
-                .isEmpty(phoneNumber.getCountryCode()) && !TextUtils.isEmpty(phoneNumber
-                .getCountryIso());
-    }
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumberUtils.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumberUtils.java
index bd43ff9c8..b7b16b346 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumberUtils.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumberUtils.java
@@ -47,30 +47,26 @@ final class PhoneNumberUtils {
     private static final Map<String, Integer> CountryCodeByIsoMap;
 
     static {
-        CountryCodeToRegionCodeMap = Collections.unmodifiableMap(createCountryCodeToRegionCodeMap
-                ());
+        CountryCodeToRegionCodeMap = Collections.unmodifiableMap(createCountryCodeToRegionCodeMap());
         CountryCodeByIsoMap = Collections.unmodifiableMap(createCountryCodeByIsoMap());
     }
 
     /**
-     * This method may be used to force initialize the static members in the class.
-     * It is recommended to do this in the background since the HashMaps created above
-     * may be time consuming operations on some devices.
+     * This method may be used to force initialize the static members in the class. It is
+     * recommended to do this in the background since the HashMaps created above may be time
+     * consuming operations on some devices.
      */
     static void load() {
     }
 
     /**
-     * This method works as follow:
-     * <ol><li>When the android version is LOLLIPOP or greater, the reliable
-     * {{@link android.telephony.PhoneNumberUtils#formatNumberToE164}} is used to format.</li>
-     * <li>For lower versions, we construct a value with the input phone number stripped of
-     * non numeric characters and prefix it with a "+" and country code</li>
-     * </ol>
-
+     * This method works as follow: <ol><li>When the android version is LOLLIPOP or greater, the
+     * reliable {{@link android.telephony.PhoneNumberUtils#formatNumberToE164}} is used to
+     * format.</li> <li>For lower versions, we construct a value with the input phone number
+     * stripped of non numeric characters and prefix it with a "+" and country code</li> </ol>
+     *
      * @param phoneNumber that may or may not itself have country code
      * @param countryInfo must have locale with ISO 3166 2-letter code for country
-     * @return
      */
     @Nullable
     static String formatPhoneNumber(@NonNull String phoneNumber, @NonNull CountryInfo countryInfo) {
@@ -87,10 +83,10 @@ static String formatPhoneNumber(@NonNull String phoneNumber, @NonNull CountryInf
 
 
     /**
-     * This method uses the country returned by  {@link #getCurrentCountryInfo(Context)} to
-     * format the phone number. Internall invokes {@link #formatPhoneNumber(String, CountryInfo)}
+     * This method uses the country returned by  {@link #getCurrentCountryInfo(Context)} to format
+     * the phone number. Internall invokes {@link #formatPhoneNumber(String, CountryInfo)}
+     *
      * @param phoneNumber that may or may not itself have country code
-     * @return
      */
 
     @Nullable
@@ -118,10 +114,10 @@ static CountryInfo getCurrentCountryInfo(@NonNull Context context) {
     }
 
     /**
-     * This method should not be called on UI thread. Potentially creates a country code by iso
-     * map which can take long in some devices
-     * @param providedPhoneNumber works best when formatted as e164
+     * This method should not be called on UI thread. Potentially creates a country code by iso map
+     * which can take long in some devices
      *
+     * @param providedPhoneNumber works best when formatted as e164
      * @return an instance of the PhoneNumber using the SIM information
      */
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java
index f4eb14451..e3cd5aafa 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java
@@ -35,7 +35,6 @@
 import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.util.AuthInstances;
-import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.FirebaseException;
@@ -49,28 +48,28 @@
 import java.util.concurrent.TimeUnit;
 
 /**
- * Activity to control the entire phone verification flow. Plays host to
- * {@link VerifyPhoneNumberFragment} and {@link SubmitConfirmationCodeFragment}
+ * Activity to control the entire phone verification flow. Plays host to {@link
+ * VerifyPhoneNumberFragment} and {@link SubmitConfirmationCodeFragment}
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class PhoneVerificationActivity extends AppCompatBase {
-    private static final String PHONE_VERIFICATION_LOG_TAG = "PhoneVerification";
-    static final long SHORT_DELAY_MILLIS = 750;
-    static final long AUTO_RETRIEVAL_TIMEOUT_MILLIS = 120000;
-    static final String ERROR_INVALID_PHONE = "ERROR_INVALID_PHONE_NUMBER";
-    static final String ERROR_INVALID_VERIFICATION = "ERROR_INVALID_VERIFICATION_CODE";
-    static final String ERROR_TOO_MANY_REQUESTS = "ERROR_TOO_MANY_REQUESTS";
-    static final String ERROR_QUOTA_EXCEEDED = "ERROR_QUOTA_EXCEEDED";
-    static final String ERROR_SESSION_EXPIRED = "ERROR_SESSION_EXPIRED";
-    static final String KEY_VERIFICATION_PHONE = "KEY_VERIFICATION_PHONE";
-    static final String KEY_STATE = "KEY_STATE";
-
-    enum VerificationState {
+    private enum VerificationState {
         VERIFICATION_NOT_STARTED, VERIFICATION_STARTED, VERIFIED;
     }
 
+    private static final String PHONE_VERIFICATION_LOG_TAG = "PhoneVerification";
+
+    private static final long SHORT_DELAY_MILLIS = 750;
+    @VisibleForTesting static final long AUTO_RETRIEVAL_TIMEOUT_MILLIS = 120000;
+    @VisibleForTesting static final String ERROR_INVALID_PHONE = "ERROR_INVALID_PHONE_NUMBER";
+    @VisibleForTesting static final String ERROR_INVALID_VERIFICATION = "ERROR_INVALID_VERIFICATION_CODE";
+    private static final String ERROR_TOO_MANY_REQUESTS = "ERROR_TOO_MANY_REQUESTS";
+    private static final String ERROR_QUOTA_EXCEEDED = "ERROR_QUOTA_EXCEEDED";
+    private static final String ERROR_SESSION_EXPIRED = "ERROR_SESSION_EXPIRED";
+    private static final String KEY_VERIFICATION_PHONE = "KEY_VERIFICATION_PHONE";
+    private static final String KEY_STATE = "KEY_STATE";
+
     private AlertDialog mAlertDialog;
-    private SaveSmartLock mSaveSmartLock;
     private CompletableProgressDialog mProgressDialog;
     private Handler mHandler;
     private String mPhoneNumber;
@@ -89,7 +88,6 @@ protected void onCreate(final Bundle savedInstance) {
         super.onCreate(savedInstance);
         setContentView(R.layout.activity_register_phone);
 
-        mSaveSmartLock = AuthInstances.getSaveSmartLockInstance(this, getFlowParams());
         mHandler = new Handler();
         mVerificationState = VerificationState.VERIFICATION_NOT_STARTED;
         if (savedInstance != null && !savedInstance.isEmpty()) {
@@ -103,14 +101,16 @@ protected void onCreate(final Bundle savedInstance) {
         String phone = getIntent().getExtras().getString(ExtraConstants.EXTRA_PHONE);
         VerifyPhoneNumberFragment fragment = VerifyPhoneNumberFragment.newInstance
                 (getFlowParams(), phone);
-        getSupportFragmentManager().beginTransaction().replace(R.id.fragment_verify_phone,
-                fragment, VerifyPhoneNumberFragment.TAG).disallowAddToBackStack().commit();
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.fragment_verify_phone, fragment, VerifyPhoneNumberFragment.TAG)
+                .disallowAddToBackStack()
+                .commit();
     }
 
     @Override
     protected void onStart() {
         super.onStart();
-        //Actvitiy can be restarted in any of the following states
+        // Activity can be restarted in any of the following states
         // 1) VERIFICATION_STARTED
         // 2) SMS_RETRIEVED
         // 3) INSTANT_VERIFIED
@@ -165,7 +165,7 @@ public void submitConfirmationCode(String confirmationCode) {
         signingWithCreds(PhoneAuthProvider.getCredential(mVerificationId, confirmationCode));
     }
 
-    void onVerificationSuccess(@NonNull final PhoneAuthCredential phoneAuthCredential) {
+    private void onVerificationSuccess(@NonNull final PhoneAuthCredential phoneAuthCredential) {
         if (TextUtils.isEmpty(phoneAuthCredential.getSmsCode())) {
             signingWithCreds(phoneAuthCredential);
         } else {
@@ -184,7 +184,7 @@ void onVerificationSuccess(@NonNull final PhoneAuthCredential phoneAuthCredentia
         }
     }
 
-    void onCodeSent() {
+    private void onCodeSent() {
         completeLoadingDialog(getString(R.string.code_sent));
         mHandler.postDelayed(new Runnable() {
             @Override
@@ -195,7 +195,7 @@ public void run() {
         }, SHORT_DELAY_MILLIS);
     }
 
-    void onVerificationFailed(@NonNull FirebaseException ex) {
+    private void onVerificationFailed(@NonNull FirebaseException ex) {
         VerifyPhoneNumberFragment verifyPhoneNumberFragment = (VerifyPhoneNumberFragment)
                 getSupportFragmentManager().findFragmentByTag(VerifyPhoneNumberFragment.TAG);
 
@@ -229,41 +229,43 @@ void onVerificationFailed(@NonNull FirebaseException ex) {
         }
     }
 
-
     private void sendCode(String phoneNumber, boolean forceResend) {
         mPhoneNumber = phoneNumber;
         mVerificationState = VerificationState.VERIFICATION_STARTED;
 
-        AuthInstances.getPhoneAuthProviderInstance().verifyPhoneNumber(phoneNumber,
-                AUTO_RETRIEVAL_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS, this, new PhoneAuthProvider
-                        .OnVerificationStateChangedCallbacks() {
-            @Override
-            public void onVerificationCompleted(@NonNull PhoneAuthCredential phoneAuthCredential) {
-                if (!mIsDestroyed) {
-                    PhoneVerificationActivity.this.onVerificationSuccess(phoneAuthCredential);
-                }
-            }
+        AuthInstances.getPhoneAuthProviderInstance().verifyPhoneNumber(
+                phoneNumber,
+                AUTO_RETRIEVAL_TIMEOUT_MILLIS,
+                TimeUnit.MILLISECONDS,
+                this,
+                new PhoneAuthProvider.OnVerificationStateChangedCallbacks() {
+                    @Override
+                    public void onVerificationCompleted(@NonNull PhoneAuthCredential phoneAuthCredential) {
+                        if (!mIsDestroyed) {
+                            PhoneVerificationActivity.this.onVerificationSuccess(phoneAuthCredential);
+                        }
+                    }
 
-            @Override
-            public void onVerificationFailed(FirebaseException ex) {
-                if (!mIsDestroyed) {
-                    PhoneVerificationActivity.this.onVerificationFailed(ex);
-                }
-            }
+                    @Override
+                    public void onVerificationFailed(FirebaseException ex) {
+                        if (!mIsDestroyed) {
+                            PhoneVerificationActivity.this.onVerificationFailed(ex);
+                        }
+                    }
 
-            @Override
-            public void onCodeSent(@NonNull String verificationId, @NonNull PhoneAuthProvider
-                    .ForceResendingToken forceResendingToken) {
-                mVerificationId = verificationId;
-                mForceResendingToken = forceResendingToken;
-                if (!mIsDestroyed) {
-                    PhoneVerificationActivity.this.onCodeSent();
-                }
-            }
-        }, forceResend ? mForceResendingToken : null);
+                    @Override
+                    public void onCodeSent(@NonNull String verificationId,
+                                           @NonNull PhoneAuthProvider.ForceResendingToken forceResendingToken) {
+                        mVerificationId = verificationId;
+                        mForceResendingToken = forceResendingToken;
+                        if (!mIsDestroyed) {
+                            PhoneVerificationActivity.this.onCodeSent();
+                        }
+                    }
+                },
+                forceResend ? mForceResendingToken : null);
     }
 
-
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)
     protected AlertDialog getAlertDialog() {
         // It is hard to test AlertDialogs currently with robo electric. See:
@@ -277,9 +279,9 @@ private void showSubmitCodeFragment() {
         if (getSubmitConfirmationCodeFragment() == null) {
             SubmitConfirmationCodeFragment f = SubmitConfirmationCodeFragment.newInstance(
                     getFlowParams(), mPhoneNumber);
-            FragmentTransaction t = getSupportFragmentManager().beginTransaction().replace(R.id
-                    .fragment_verify_phone, f, SubmitConfirmationCodeFragment.TAG).addToBackStack
-                    (null);
+            FragmentTransaction t = getSupportFragmentManager().beginTransaction()
+                    .replace(R.id.fragment_verify_phone, f, SubmitConfirmationCodeFragment.TAG)
+                    .addToBackStack(null);
 
             if (!isFinishing() && !mIsDestroyed) {
                 t.commitAllowingStateLoss();
@@ -307,61 +309,62 @@ private void signingWithCreds(@NonNull PhoneAuthCredential phoneAuthCredential)
         AuthInstances.getFirebaseAuth(getFlowParams())
                 .signInWithCredential(phoneAuthCredential)
                 .addOnSuccessListener(this, new OnSuccessListener<AuthResult>() {
-            @Override
-            public void onSuccess(final AuthResult authResult) {
-                mVerificationState = VerificationState.VERIFIED;
-                completeLoadingDialog(getString(R.string.verified));
-
-                // Activity can be recreated before this message is handled
-                mHandler.postDelayed(new Runnable() {
                     @Override
-                    public void run() {
-                        if (!mIsDestroyed) {
-                            dismissLoadingDialog();
-                            finish(authResult.getUser());
-                        }
-                    }
-                }, SHORT_DELAY_MILLIS);
-            }
-        }).addOnFailureListener(this, new OnFailureListener() {
-            @Override
-            public void onFailure(@NonNull Exception e) {
-                dismissLoadingDialog();
-                //incorrect confirmation code
-                if (e instanceof  FirebaseAuthInvalidCredentialsException) {
-                    FirebaseAuthInvalidCredentialsException firebaseAuthInvalidCredentialsException
-                            = (FirebaseAuthInvalidCredentialsException) e;
-                    switch (firebaseAuthInvalidCredentialsException.getErrorCode()) {
-                        case ERROR_INVALID_VERIFICATION:
-                            showAlertDialog(getString(R.string.incorrect_code_dialog_body), new
-                                    DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    SubmitConfirmationCodeFragment f
-                                            = getSubmitConfirmationCodeFragment();
-                                    f.setConfirmationCode("");
-                                }
-                            });
-                            break;
-                        case ERROR_SESSION_EXPIRED:
-                            showAlertDialog(getString(R.string.error_session_expired), new
-                                    DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    SubmitConfirmationCodeFragment f
-                                            = getSubmitConfirmationCodeFragment();
-                                    f.setConfirmationCode("");
+                    public void onSuccess(final AuthResult authResult) {
+                        mVerificationState = VerificationState.VERIFIED;
+                        completeLoadingDialog(getString(R.string.verified));
+
+                        // Activity can be recreated before this message is handled
+                        mHandler.postDelayed(new Runnable() {
+                            @Override
+                            public void run() {
+                                if (!mIsDestroyed) {
+                                    dismissLoadingDialog();
+                                    finish(authResult.getUser());
                                 }
-                            });
-                            break;
-                        default:
+                            }
+                        }, SHORT_DELAY_MILLIS);
+                    }
+                })
+                .addOnFailureListener(this, new OnFailureListener() {
+                    @Override
+                    public void onFailure(@NonNull Exception e) {
+                        dismissLoadingDialog();
+                        //incorrect confirmation code
+                        if (e instanceof FirebaseAuthInvalidCredentialsException) {
+                            FirebaseAuthInvalidCredentialsException firebaseAuthInvalidCredentialsException
+                                    = (FirebaseAuthInvalidCredentialsException) e;
+                            switch (firebaseAuthInvalidCredentialsException.getErrorCode()) {
+                                case ERROR_INVALID_VERIFICATION:
+                                    showAlertDialog(
+                                            getString(R.string.incorrect_code_dialog_body),
+                                            new DialogInterface.OnClickListener() {
+                                                @Override
+                                                public void onClick(DialogInterface dialog, int which) {
+                                                    getSubmitConfirmationCodeFragment()
+                                                            .setConfirmationCode("");
+                                                }
+                                            });
+                                    break;
+                                case ERROR_SESSION_EXPIRED:
+                                    showAlertDialog(
+                                            getString(R.string.error_session_expired),
+                                            new DialogInterface.OnClickListener() {
+                                                @Override
+                                                public void onClick(DialogInterface dialog, int which) {
+                                                    getSubmitConfirmationCodeFragment()
+                                                            .setConfirmationCode("");
+                                                }
+                                            });
+                                    break;
+                                default:
+                                    showAlertDialog(e.getLocalizedMessage(), null);
+                            }
+                        } else {
                             showAlertDialog(e.getLocalizedMessage(), null);
+                        }
                     }
-                } else {
-                    showAlertDialog(e.getLocalizedMessage(), null);
-                }
-            }
-        });
+                });
     }
 
     private void completeLoadingDialog(String content) {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/SpacedEditText.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/SpacedEditText.java
index 998391141..411ce7f44 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/SpacedEditText.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/SpacedEditText.java
@@ -31,8 +31,8 @@
 
 /**
  * This element inserts spaces between characters in the edit text and expands the width of the
- * spaces using spannables.
- * This is required since Android's letter spacing is not available until API 21.
+ * spaces using spannables. This is required since Android's letter spacing is not available until
+ * API 21.
  */
 public final class SpacedEditText extends AppCompatEditText {
     private float proportion;
@@ -64,8 +64,6 @@ public void setText(CharSequence text, BufferType type) {
 
     /**
      * Set the selection after recalculating the index intended by the caller.
-     *
-     * @param index
      */
     @Override
     public void setSelection(int index) {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java
index 1bf5efde1..d3e3c31f2 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java
@@ -33,7 +33,7 @@
 import com.firebase.ui.auth.ui.ExtraConstants;
 import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.FragmentBase;
-import com.firebase.ui.auth.ui.TermsTextView;
+import com.firebase.ui.auth.ui.email.PreambleHandler;
 
 /**
  * Display confirmation code to verify phone numbers input in {{@link VerifyPhoneNumberFragment}}
@@ -53,7 +53,7 @@ public class SubmitConfirmationCodeFragment extends FragmentBase {
     private Button mSubmitConfirmationButton;
     private CustomCountDownTimer mCountdownTimer;
     private PhoneVerificationActivity mVerifier;
-    private TermsTextView mAgreementText;
+    private TextView mAgreementText;
     private long mMillisUntilFinished;
 
     public static SubmitConfirmationCodeFragment newInstance(FlowParameters flowParameters,
@@ -80,7 +80,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         mResendCodeTextView = (TextView) v.findViewById(R.id.resend_code);
         mConfirmationCodeEditText = (SpacedEditText) v.findViewById(R.id.confirmation_code);
         mSubmitConfirmationButton = (Button) v.findViewById(R.id.submit_confirmation_code);
-        mAgreementText = (TermsTextView) v.findViewById(R.id.create_account_tos);
+        mAgreementText = (TextView) v.findViewById(R.id.create_account_tos);
 
         final String phoneNumber = getArguments().getString(ExtraConstants.EXTRA_PHONE);
 
@@ -224,11 +224,12 @@ private void cancelTimer() {
     }
 
     private void setUpTermsOfService() {
-        mAgreementText.showTerms(getFlowParams(), R.string.continue_phone_login);
+        new PreambleHandler(getContext(), getFlowParams(), R.string.continue_phone_login)
+                .setPreamble(mAgreementText);
     }
 
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)
-    CustomCountDownTimer getmCountdownTimer() {
+    CustomCountDownTimer getCountdownTimer() {
         return mCountdownTimer;
     }
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java
index 485f31ffb..2dd7dc4e9 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java
@@ -52,6 +52,7 @@
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class VerifyPhoneNumberFragment extends FragmentBase implements View.OnClickListener {
     public static final String TAG = "VerifyPhoneFragment";
+    private static final int RC_PHONE_HINT = 22;
 
     private Context mAppContext;
 
@@ -62,8 +63,6 @@ public class VerifyPhoneNumberFragment extends FragmentBase implements View.OnCl
     private PhoneVerificationActivity mVerifier;
     private TextView mSmsTermsText;
 
-    private static final int RC_PHONE_HINT = 22;
-
     public static VerifyPhoneNumberFragment newInstance(FlowParameters flowParameters,
                                                         String phone) {
         VerifyPhoneNumberFragment fragment = new VerifyPhoneNumberFragment();
@@ -149,9 +148,8 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                     // To accommodate either case, we normalize to e164 with best effort
                     final String unformattedPhone = cred.getId();
                     final String formattedPhone =
-                            PhoneNumberUtils
-                                    .formatPhoneNumberUsingCurrentCountry(unformattedPhone,
-                                                                          mAppContext);
+                            PhoneNumberUtils.formatPhoneNumberUsingCurrentCountry(unformattedPhone,
+                                    mAppContext);
                     if (formattedPhone == null) {
                         Log.e(TAG, "Unable to normalize phone number from hint selector:"
                                 + unformattedPhone);
@@ -211,20 +209,27 @@ private void showPhoneAutoCompleteHint() {
     }
 
     private PendingIntent getPhoneHintIntent() {
-        GoogleApiClient client = new GoogleApiClient.Builder(getContext()).addApi(Auth
-                .CREDENTIALS_API).enableAutoManage(getActivity(), GoogleApiHelper
-                .getSafeAutoManageId(), new GoogleApiClient.OnConnectionFailedListener() {
-            @Override
-            public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
-                Log.e(TAG, "Client connection failed: " + connectionResult.getErrorMessage());
-            }
-        }).build();
-
-
-        HintRequest hintRequest = new HintRequest.Builder().setHintPickerConfig(new
-                CredentialPickerConfig.Builder().setShowCancelButton(true).build())
-                .setPhoneNumberIdentifierSupported(true).setEmailAddressIdentifierSupported
-                        (false).build();
+        GoogleApiClient client = new GoogleApiClient.Builder(getContext())
+                .addApi(Auth.CREDENTIALS_API)
+                .enableAutoManage(
+                        getActivity(),
+                        GoogleApiHelper.getSafeAutoManageId(),
+                        new GoogleApiClient.OnConnectionFailedListener() {
+                            @Override
+                            public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
+                                Log.e(TAG,
+                                      "Client connection failed: " + connectionResult.getErrorMessage());
+                            }
+                        })
+                .build();
+
+
+        HintRequest hintRequest = new HintRequest.Builder()
+                .setHintPickerConfig(
+                        new CredentialPickerConfig.Builder().setShowCancelButton(true).build())
+                .setPhoneNumberIdentifierSupported(true)
+                .setEmailAddressIdentifierSupported(false)
+                .build();
 
         return Auth.CredentialsApi.getHintPickerIntent(client, hintRequest);
     }
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/AbstractActivityLifecycleCallbacks.java b/auth/src/main/java/com/firebase/ui/auth/util/AbstractActivityLifecycleCallbacks.java
deleted file mode 100644
index a4e1a45a8..000000000
--- a/auth/src/main/java/com/firebase/ui/auth/util/AbstractActivityLifecycleCallbacks.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.firebase.ui.auth.util;
-
-import android.app.Activity;
-import android.app.Application;
-import android.os.Bundle;
-
-/**
- * Implementation of {@link android.app.Application.ActivityLifecycleCallbacks} which
- * does nothing in response to each callback; a useful base class for implementors that only
- * care about a subset of the callbacks.
- */
-public abstract class AbstractActivityLifecycleCallbacks
-        implements Application.ActivityLifecycleCallbacks {
-
-    @Override
-    public void onActivityCreated(Activity activity, Bundle bundle) {}
-
-    @Override
-    public void onActivityStarted(Activity activity) {}
-
-    @Override
-    public void onActivityResumed(Activity activity) {}
-
-    @Override
-    public void onActivityPaused(Activity activity) {}
-
-    @Override
-    public void onActivityStopped(Activity activity) {}
-
-    @Override
-    public void onActivitySaveInstanceState(Activity activity, Bundle bundle) {}
-
-    @Override
-    public void onActivityDestroyed(Activity activity) {}
-}
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/AuthInstances.java b/auth/src/main/java/com/firebase/ui/auth/util/AuthInstances.java
index dbf9e7b7a..68745e8b9 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/AuthInstances.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/AuthInstances.java
@@ -13,8 +13,8 @@
 import com.google.firebase.auth.PhoneAuthProvider;
 
 /**
- * Factory for instances of authentication classes. Should eventually be replaced by
- * dependency injection.
+ * Factory for instances of authentication classes. Should eventually be replaced by dependency
+ * injection.
  */
 public class AuthInstances {
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/PlayServicesHelper.java b/auth/src/main/java/com/firebase/ui/auth/util/PlayServicesHelper.java
index bdfb54ac2..c19dfa19b 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/PlayServicesHelper.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/PlayServicesHelper.java
@@ -7,8 +7,8 @@
 import com.google.android.gms.common.GoogleApiAvailability;
 
 /**
- * Helper class wrapping {@link GoogleApiAvailability}. Used internally but can also be used
- * by client application
+ * Helper class wrapping {@link GoogleApiAvailability}. Used internally but can also be used by
+ * client application
  */
 public class PlayServicesHelper {
     private static GoogleApiAvailability mApiAvailability;
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/Preconditions.java b/auth/src/main/java/com/firebase/ui/auth/util/Preconditions.java
index 62eac357b..9f66f7b2b 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/Preconditions.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/Preconditions.java
@@ -27,8 +27,8 @@ private Preconditions() {
     }
 
     /**
-     * Ensures that the provided value is not null, and throws a {@link NullPointerException}
-     * if it is null, with a message constructed from the provided error template and arguments.
+     * Ensures that the provided value is not null, and throws a {@link NullPointerException} if it
+     * is null, with a message constructed from the provided error template and arguments.
      */
     public static <T> T checkNotNull(
             T val,
@@ -41,9 +41,9 @@ public static <T> T checkNotNull(
     }
 
     /**
-     * Ensures that the provided identifier matches a known style resource, and throws
-     * an {@link IllegalArgumentException} if the resource cannot be found, or is not
-     * a style resource, with a message constructed from the provided error template and arguments.
+     * Ensures that the provided identifier matches a known style resource, and throws an {@link
+     * IllegalArgumentException} if the resource cannot be found, or is not a style resource, with a
+     * message constructed from the provided error template and arguments.
      */
     @StyleRes
     public static int checkValidStyle(
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/package-info.java b/auth/src/main/java/com/firebase/ui/auth/util/package-info.java
index 3a1fb19cc..fb47a43b3 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/package-info.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/package-info.java
@@ -13,8 +13,8 @@
  */
 
 /**
- * Utilities to simplify interactions with {@code GoogleApiClient} and the APIs it provides,
- * such as Google Sign-in and Smart Lock for Passwords. The contents of this package should
- * be considered an implementation detail and not part of the main API.
+ * Utilities to simplify interactions with {@code GoogleApiClient} and the APIs it provides, such as
+ * Google Sign-in and Smart Lock for Passwords. The contents of this package should be considered an
+ * implementation detail and not part of the main API.
  */
 package com.firebase.ui.auth.util;
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SaveSmartLock.java b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SaveSmartLock.java
index d1d42d7d4..fff8a34c5 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SaveSmartLock.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SaveSmartLock.java
@@ -127,8 +127,8 @@ public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
         PendingIntent resolution =
                 PlayServicesHelper.getGoogleApiAvailability()
                         .getErrorResolutionPendingIntent(getContext(),
-                                                         connectionResult.getErrorCode(),
-                                                         RC_UPDATE_SERVICE);
+                                connectionResult.getErrorCode(),
+                                RC_UPDATE_SERVICE);
         try {
             startIntentSenderForResult(resolution.getIntentSender(), RC_UPDATE_SERVICE);
         } catch (IntentSender.SendIntentException e) {
@@ -191,8 +191,8 @@ private void finish() {
      * If SmartLock is enabled and Google Play Services is available, save the credentials.
      * Otherwise, finish the calling Activity with {@link ResultCodes#OK RESULT_OK}.
      * <p>
-     * Note: saveCredentialsOrFinish cannot be called immediately after getInstance because
-     * onCreate has not yet been called.
+     * Note: saveCredentialsOrFinish cannot be called immediately after getInstance because onCreate
+     * has not yet been called.
      *
      * @param firebaseUser Firebase user to save in Credential.
      * @param password     (optional) password for email credential.
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
index d888f87df..48fc292a0 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
@@ -53,12 +53,10 @@
 import java.util.Map;
 
 /**
- * Attempts to acquire a credential from Smart Lock for Passwords to sign in
- * an existing account. If this succeeds, an attempt is made to sign the user in
- * with this credential. If it does not, the
- * {@link AuthMethodPickerActivity authentication method picker activity}
- * is started, unless only email is supported, in which case the
- * {@link RegisterEmailActivity} is started.
+ * Attempts to acquire a credential from Smart Lock for Passwords to sign in an existing account. If
+ * this succeeds, an attempt is made to sign the user in with this credential. If it does not, the
+ * {@link AuthMethodPickerActivity authentication method picker activity} is started, unless only
+ * email is supported, in which case the {@link RegisterEmailActivity} is started.
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class SignInDelegate extends SmartLockBase<CredentialRequestResult> {
@@ -111,10 +109,10 @@ public void onCreate(Bundle savedInstance) {
 
             AuthInstances.getCredentialsApi()
                     .request(mGoogleApiClient,
-                             new CredentialRequest.Builder()
-                                     .setPasswordLoginSupported(true)
-                                     .setAccountTypes(getSupportedAccountTypes().toArray(new String[0]))
-                                     .build())
+                            new CredentialRequest.Builder()
+                                    .setPasswordLoginSupported(true)
+                                    .setAccountTypes(getSupportedAccountTypes().toArray(new String[0]))
+                                    .build())
                     .setResultCallback(this);
         } else {
             startAuthMethodChoice();
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SmartLockBase.java b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SmartLockBase.java
index b71bde2b4..5e685d8b0 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SmartLockBase.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SmartLockBase.java
@@ -41,8 +41,8 @@ public abstract class SmartLockBase<R extends Result> extends FragmentBase imple
     private Pair<Integer, Intent> mActivityResultPair;
 
     /**
-     * Translate a Firebase Auth provider ID (such as {@link GoogleAuthProvider#PROVIDER_ID}) to
-     * a Credentials API account type (such as {@link IdentityProviders#GOOGLE}).
+     * Translate a Firebase Auth provider ID (such as {@link GoogleAuthProvider#PROVIDER_ID}) to a
+     * Credentials API account type (such as {@link IdentityProviders#GOOGLE}).
      */
     public static String providerIdToAccountType(@AuthUI.SupportedProvider @NonNull String providerId) {
         switch (providerId) {
@@ -78,8 +78,8 @@ public static String accountTypeToProviderId(@NonNull String accountType) {
     }
 
     /**
-     * Make a list of {@link Credential} from a FirebaseUser. Useful for deleting Credentials,
-     * not for saving since we don't have access to the password.
+     * Make a list of {@link Credential} from a FirebaseUser. Useful for deleting Credentials, not
+     * for saving since we don't have access to the password.
      */
     public static List<Credential> credentialsFromFirebaseUser(@NonNull FirebaseUser user) {
         if (TextUtils.isEmpty(user.getEmail())) {
@@ -158,8 +158,8 @@ public void finish(int resultCode, Intent resultIntent) {
     @Override
     public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
         Toast.makeText(getContext(),
-                       com.firebase.ui.auth.R.string.general_error,
-                       Toast.LENGTH_SHORT).show();
+                com.firebase.ui.auth.R.string.general_error,
+                Toast.LENGTH_SHORT).show();
     }
 
     @Override
diff --git a/auth/src/main/res/drawable/ic_settings_phone_white_24dp.xml b/auth/src/main/res/drawable/ic_settings_phone_white_24dp.xml
index 6d0ce05a2..f4f394622 100644
--- a/auth/src/main/res/drawable/ic_settings_phone_white_24dp.xml
+++ b/auth/src/main/res/drawable/ic_settings_phone_white_24dp.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36 1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1 -9.39,0 -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45 0.57,3.57 0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z"
-        android:fillColor="#FFFFFF" />
+        android:fillColor="#FFFFFF"
+        android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36 1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1 -9.39,0 -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45 0.57,3.57 0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z" />
 </vector>
diff --git a/auth/src/main/res/layout-land/auth_method_picker_layout.xml b/auth/src/main/res/layout-land/auth_method_picker_layout.xml
index 906facfe3..93d3b32f4 100644
--- a/auth/src/main/res/layout-land/auth_method_picker_layout.xml
+++ b/auth/src/main/res/layout-land/auth_method_picker_layout.xml
@@ -10,10 +10,10 @@
     android:orientation="horizontal">
 
     <include
-        layout="@layout/include_auth_method_picker_logo"
         android:layout_width="0dp"
         android:layout_height="match_parent"
-        android:layout_weight="1.0" />
+        android:layout_weight="1.0"
+        layout="@layout/include_auth_method_picker_logo" />
 
     <FrameLayout
         android:layout_width="0dp"
diff --git a/auth/src/main/res/layout/confirmation_code_layout.xml b/auth/src/main/res/layout/confirmation_code_layout.xml
index 0d5e4ccff..feebef937 100644
--- a/auth/src/main/res/layout/confirmation_code_layout.xml
+++ b/auth/src/main/res/layout/confirmation_code_layout.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -29,7 +30,6 @@
 
         <com.firebase.ui.auth.ui.phone.SpacedEditText
             android:id="@+id/confirmation_code"
-            spacingProportion="1.1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
@@ -44,7 +44,8 @@
             android:imeOptions="actionNext"
             android:inputType="number"
             android:textSize="32sp"
-            android:typeface="monospace" />
+            android:typeface="monospace"
+            app:spacingProportion="1.1" />
 
         <Button
             android:id="@+id/submit_confirmation_code"
@@ -89,7 +90,7 @@
 
         </LinearLayout>
 
-        <com.firebase.ui.auth.ui.TermsTextView
+        <TextView
             android:id="@+id/create_account_tos"
             style="@style/FirebaseUI.Text.BodyText"
             android:layout_width="match_parent"
diff --git a/auth/src/main/res/layout/phone_layout.xml b/auth/src/main/res/layout/phone_layout.xml
index 3d32885f1..a45b5ba4c 100644
--- a/auth/src/main/res/layout/phone_layout.xml
+++ b/auth/src/main/res/layout/phone_layout.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <RelativeLayout
         style="@style/FirebaseUI.WrapperStyle"
@@ -50,4 +51,5 @@
             android:textColor="?android:textColorTertiary"
             android:textIsSelectable="false" />
     </RelativeLayout>
+
 </ScrollView>
diff --git a/auth/src/main/res/layout/register_email_layout.xml b/auth/src/main/res/layout/register_email_layout.xml
index 000cb2859..c41287ea6 100644
--- a/auth/src/main/res/layout/register_email_layout.xml
+++ b/auth/src/main/res/layout/register_email_layout.xml
@@ -65,7 +65,7 @@
 
         </android.support.design.widget.TextInputLayout>
 
-        <com.firebase.ui.auth.ui.TermsTextView
+        <TextView
             android:id="@+id/create_account_text"
             style="@style/FirebaseUI.Text.BodyText"
             android:layout_width="match_parent"
diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/CustomCountDownTimerShadow.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/CustomCountDownTimerShadow.java
deleted file mode 100644
index a78247257..000000000
--- a/auth/src/test/java/com/firebase/ui/auth/testhelpers/CustomCountDownTimerShadow.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.firebase.ui.auth.testhelpers;
-
-import android.os.CountDownTimer;
-
-import org.mockito.Mock;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-@Implements(CountDownTimer.class)
-public class CustomCountDownTimerShadow {
-    private boolean started;
-    private long countDownInterval;
-    private long millisInFuture;
-
-    @Mock
-    public CountDownTimer countDownTimer;
-
-    public CustomCountDownTimerShadow() {
-    }
-
-    @SuppressWarnings("checkstyle:methodname")
-    public void __constructor__(long millisInFuture, long countDownInterval) {
-        this.countDownInterval = countDownInterval;
-        this.millisInFuture = millisInFuture;
-        this.started = false;
-    }
-
-    @Implementation
-    public final synchronized CountDownTimer start() {
-        this.started = true;
-        return this.countDownTimer;
-    }
-
-    @Implementation
-    public final void cancel() {
-        this.started = false;
-    }
-
-    public void invokeTick(long millisUntilFinished) {
-        this.countDownTimer.onTick(millisUntilFinished);
-    }
-
-    public void invokeFinish() {
-        this.countDownTimer.onFinish();
-    }
-
-    public boolean hasStarted() {
-        return this.started;
-    }
-
-    public long getCountDownInterval() {
-        return this.countDownInterval;
-    }
-
-    public long getMillisInFuture() {
-        return this.millisInFuture;
-    }
-}
diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/LoginManagerShadow.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/LoginManagerShadow.java
index cc3200606..b90e5b270 100644
--- a/auth/src/test/java/com/firebase/ui/auth/testhelpers/LoginManagerShadow.java
+++ b/auth/src/test/java/com/firebase/ui/auth/testhelpers/LoginManagerShadow.java
@@ -30,8 +30,8 @@ public void registerCallback(final CallbackManager callbackManager,
     public void logInWithReadPermissions(Activity activity, Collection<String> permissions) {
         // Check for minimum permission set
         if (!(permissions.contains("email") && permissions.contains("public_profile"))) {
-            throw new IllegalArgumentException("Facebook permissions must contain email and " +
-                    "public_profile.");
+            throw new IllegalArgumentException(
+                    "Facebook permissions must contain email and public_profile.");
         }
 
         // Call back with success
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java
index 3ef3be1ab..58d8efb7c 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java
@@ -22,8 +22,8 @@
 import com.firebase.ui.auth.BuildConfig;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
-import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
 import com.firebase.ui.auth.testhelpers.AuthInstancesShadow;
+import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
 import com.firebase.ui.auth.testhelpers.CustomRobolectricGradleTestRunner;
 import com.firebase.ui.auth.testhelpers.FakeAuthResult;
 import com.firebase.ui.auth.testhelpers.TestConstants;
@@ -61,7 +61,8 @@ private WelcomeBackPasswordPrompt createActivity() {
         Intent startIntent = WelcomeBackPasswordPrompt.createIntent(
                 RuntimeEnvironment.application,
                 TestHelper.getFlowParameters(Collections.<String>emptyList()),
-                new IdpResponse.Builder(EmailAuthProvider.PROVIDER_ID, TestConstants.EMAIL).build());
+                new IdpResponse.Builder(EmailAuthProvider.PROVIDER_ID,
+                                        TestConstants.EMAIL).build());
         return Robolectric
                 .buildActivity(WelcomeBackPasswordPrompt.class)
                 .withIntent(startIntent)
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
index 7ce691991..a4cd8d161 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
@@ -22,8 +22,8 @@
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.BuildConfig;
 import com.firebase.ui.auth.R;
-import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
 import com.firebase.ui.auth.testhelpers.AuthInstancesShadow;
+import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
 import com.firebase.ui.auth.testhelpers.CustomRobolectricGradleTestRunner;
 import com.firebase.ui.auth.testhelpers.FacebookProviderShadow;
 import com.firebase.ui.auth.testhelpers.FakeAuthResult;
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/phone/BucketedTextChangeListenerTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/phone/BucketedTextChangeListenerTest.java
index 79198cff1..cb4d5a254 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/phone/BucketedTextChangeListenerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/phone/BucketedTextChangeListenerTest.java
@@ -48,7 +48,7 @@ public void setUp() throws Exception {
         editText = mock(EditText.class);
         contentChangeCallback = mock(BucketedTextChangeListener.ContentChangeCallback.class);
         textChangeListener = new BucketedTextChangeListener(editText, expectedLength,
-                placeHolder, contentChangeCallback);
+                                                            placeHolder, contentChangeCallback);
     }
 
     @Test
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/phone/CountryInfoTests.java b/auth/src/test/java/com/firebase/ui/auth/ui/phone/CountryInfoTests.java
index 3fcdda05a..bd0e9884f 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/phone/CountryInfoTests.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/phone/CountryInfoTests.java
@@ -26,7 +26,9 @@
 
 import java.util.Locale;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
 
 @RunWith(CustomRobolectricGradleTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 25)
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneNumberTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneNumberTest.java
index ed5482cdc..9a8169b9e 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneNumberTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneNumberTest.java
@@ -42,20 +42,27 @@ public void testIsValid_nullPhone() throws Exception {
 
     @Test
     public void testIsValid_emptyMembers() throws Exception {
-        PhoneNumber invalidPhoneNumber = new PhoneNumber("", PhoneTestConstants.US_ISO2, PhoneTestConstants
-                .US_COUNTRY_CODE);
+        PhoneNumber invalidPhoneNumber = new PhoneNumber(
+                "",
+                PhoneTestConstants.US_ISO2,
+                PhoneTestConstants.US_COUNTRY_CODE);
         assertFalse(PhoneNumber.isValid(invalidPhoneNumber));
         invalidPhoneNumber = new PhoneNumber(PhoneTestConstants.PHONE, "", PhoneTestConstants
                 .US_COUNTRY_CODE);
         assertFalse(PhoneNumber.isValid(invalidPhoneNumber));
-        invalidPhoneNumber = new PhoneNumber(PhoneTestConstants.PHONE, PhoneTestConstants.US_ISO2, "");
+        invalidPhoneNumber = new PhoneNumber(
+                PhoneTestConstants.PHONE,
+                PhoneTestConstants.US_ISO2,
+                "");
         assertFalse(PhoneNumber.isValid(invalidPhoneNumber));
     }
 
     @Test
     public void testIsValid() throws Exception {
-        final PhoneNumber validPhoneNumber = new PhoneNumber(PhoneTestConstants.PHONE, PhoneTestConstants
-                .US_ISO2, PhoneTestConstants.US_COUNTRY_CODE);
+        final PhoneNumber validPhoneNumber = new PhoneNumber(
+                PhoneTestConstants.PHONE,
+                PhoneTestConstants.US_ISO2,
+                PhoneTestConstants.US_COUNTRY_CODE);
         assertTrue(PhoneNumber.isValid(validPhoneNumber));
     }
 
@@ -71,7 +78,10 @@ public void testIsCountryValid_nullPhone() throws Exception {
 
     @Test
     public void testIsCountryValid_emptyMembers() throws Exception {
-        PhoneNumber invalidPhoneNumber = new PhoneNumber("", "", PhoneTestConstants.US_COUNTRY_CODE);
+        PhoneNumber invalidPhoneNumber = new PhoneNumber(
+                "",
+                "",
+                PhoneTestConstants.US_COUNTRY_CODE);
         assertFalse(PhoneNumber.isCountryValid(invalidPhoneNumber));
         invalidPhoneNumber = new PhoneNumber("", PhoneTestConstants.US_ISO2, "");
         assertFalse(PhoneNumber.isCountryValid(invalidPhoneNumber));
@@ -79,7 +89,9 @@ public void testIsCountryValid_emptyMembers() throws Exception {
 
     @Test
     public void testIsCountryValid() throws Exception {
-        final PhoneNumber validPhoneNumber = new PhoneNumber("", PhoneTestConstants.US_ISO2,
+        final PhoneNumber validPhoneNumber = new PhoneNumber(
+                "",
+                PhoneTestConstants.US_ISO2,
                 PhoneTestConstants.US_COUNTRY_CODE);
         assertTrue(PhoneNumber.isCountryValid(validPhoneNumber));
     }
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneNumberUtilsTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneNumberUtilsTest.java
index 83d3edc99..853b918c3 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneNumberUtilsTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneNumberUtilsTest.java
@@ -26,19 +26,19 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 import java.util.Locale;
 
-import static com.firebase.ui.auth.ui.phone.PhoneNumberUtils.*;
+import static com.firebase.ui.auth.ui.phone.PhoneNumberUtils.formatPhoneNumber;
+import static com.firebase.ui.auth.ui.phone.PhoneNumberUtils.getCountryCode;
+import static com.firebase.ui.auth.ui.phone.PhoneNumberUtils.getCurrentCountryInfo;
+import static com.firebase.ui.auth.ui.phone.PhoneNumberUtils.getPhoneNumber;
 import static com.firebase.ui.auth.ui.phone.PhoneTestConstants.RAW_PHONE;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.robolectric.Shadows.shadowOf;
 
 @RunWith(CustomRobolectricGradleTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21)
@@ -53,8 +53,7 @@ public void testGetPhoneNumber() throws Exception {
 
     @Test
     public void testGetPhoneNumber_withLongestCountryCode() throws Exception {
-        final PhoneNumber phoneNumber = getPhoneNumber(PhoneTestConstants
-                .YE_RAW_PHONE);
+        final PhoneNumber phoneNumber = getPhoneNumber(PhoneTestConstants.YE_RAW_PHONE);
         assertEquals(PhoneTestConstants.PHONE_NO_COUNTRY_CODE, phoneNumber.getPhoneNumber());
         assertEquals(PhoneTestConstants.YE_COUNTRY_CODE, phoneNumber.getCountryCode());
         assertEquals(PhoneTestConstants.YE_ISO2, phoneNumber.getCountryIso());
@@ -79,7 +78,7 @@ public void testGetPhoneNumber_noCountryCode() throws Exception {
 
     @Test
     public void testGetCountryCode() throws Exception {
-        assertEquals(new Integer(86), getCountryCode(Locale.CHINA.getCountry()));
+        assertEquals(Integer.valueOf(86), getCountryCode(Locale.CHINA.getCountry()));
         assertEquals(null, getCountryCode(null));
         assertEquals(null, getCountryCode(new Locale("", "DJJZ").getCountry()));
     }
@@ -111,9 +110,8 @@ public void testFormatNumberToE164_aboveApi21() {
         assertNull(formatPhoneNumber("999474735", indiaCountryInfo));
 
         // incorrect country with unformattednumber
-        assertNull(validPhoneNumber, formatPhoneNumber("919994947354",
-                                                         new CountryInfo(
-                                                                 new Locale("", "US"), 1)));
+        assertNull(validPhoneNumber, formatPhoneNumber(
+                "919994947354", new CountryInfo(new Locale("", "US"), 1)));
         //incorrect country, incorrect phone number
         assertNull(formatPhoneNumber("+914349873457", new CountryInfo(
                 new Locale("", "US"), 1)));
@@ -165,8 +163,8 @@ public void testGetCurrentCountryInfo_fromSim() {
     public void testGetCurrentCountryInfo_noTelephonyReturnsDefaultLocale() {
         Context context = mock(Context.class);
         assertEquals(new CountryInfo(
-                Locale.getDefault(),
-                PhoneNumberUtils.getCountryCode(Locale.getDefault().getCountry())),
-                getCurrentCountryInfo(context));
+                             Locale.getDefault(),
+                             PhoneNumberUtils.getCountryCode(Locale.getDefault().getCountry())),
+                     getCurrentCountryInfo(context));
     }
 }
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java
index a6d481dfd..10e8c6b91 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java
@@ -25,8 +25,8 @@
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.BuildConfig;
 import com.firebase.ui.auth.R;
-import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
 import com.firebase.ui.auth.testhelpers.AuthInstancesShadow;
+import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
 import com.firebase.ui.auth.testhelpers.CustomRobolectricGradleTestRunner;
 import com.firebase.ui.auth.testhelpers.FakeAuthResult;
 import com.firebase.ui.auth.testhelpers.TestHelper;
@@ -94,9 +94,10 @@ public class PhoneVerificationActivityTest {
     private String verificationId = "hjksdf737hc";
 
     private PhoneVerificationActivity createActivity() {
-        Intent startIntent = PhoneVerificationActivity.createIntent(RuntimeEnvironment
-                .application, TestHelper.getFlowParameters(Collections.singletonList(AuthUI
-                .PHONE_VERIFICATION_PROVIDER)), null);
+        Intent startIntent = PhoneVerificationActivity.createIntent(
+                RuntimeEnvironment.application,
+                TestHelper.getFlowParameters(
+                        Collections.singletonList(AuthUI.PHONE_VERIFICATION_PROVIDER)), null);
         return Robolectric.buildActivity(PhoneVerificationActivity.class).withIntent(startIntent)
                 .create(new Bundle()).start().visible().get();
     }
@@ -114,30 +115,32 @@ public void setUp() {
 
     @Test
     public void testPhoneNumberFromSmartlock_prePopulatesPhoneNumberInBundle() {
-        Intent startIntent = PhoneVerificationActivity.createIntent(RuntimeEnvironment
-                .application, TestHelper.getFlowParameters(Collections.singletonList(AuthUI
-                .PHONE_VERIFICATION_PROVIDER)), YE_RAW_PHONE);
+        Intent startIntent = PhoneVerificationActivity.createIntent(
+                RuntimeEnvironment.application,
+                TestHelper.getFlowParameters(
+                        Collections.singletonList(AuthUI.PHONE_VERIFICATION_PROVIDER)),
+                YE_RAW_PHONE);
 
         mActivity = Robolectric.buildActivity(PhoneVerificationActivity.class).withIntent
                 (startIntent).create(new Bundle()).start().visible().get();
 
         VerifyPhoneNumberFragment verifyPhoneNumberFragment = (VerifyPhoneNumberFragment)
-                mActivity.getSupportFragmentManager().findFragmentByTag(VerifyPhoneNumberFragment
-                        .TAG);
+                mActivity.getSupportFragmentManager()
+                        .findFragmentByTag(VerifyPhoneNumberFragment.TAG);
         assertNotNull(verifyPhoneNumberFragment);
         mPhoneEditText = (EditText) mActivity.findViewById(R.id.phone_number);
         mCountryListSpinner = (CountryListSpinner) mActivity.findViewById(R.id.country_list);
 
         assertEquals(PHONE_NO_COUNTRY_CODE, mPhoneEditText.getText().toString());
-        assertEquals(YE_COUNTRY_CODE, String.valueOf(((CountryInfo) mCountryListSpinner.getTag())
-                .countryCode));
+        assertEquals(YE_COUNTRY_CODE,
+                     String.valueOf(((CountryInfo) mCountryListSpinner.getTag()).countryCode));
     }
 
     @Test
     public void testBadPhoneNumber_showsInlineError() {
         VerifyPhoneNumberFragment verifyPhoneNumberFragment = (VerifyPhoneNumberFragment)
-                mActivity.getSupportFragmentManager().findFragmentByTag(VerifyPhoneNumberFragment
-                        .TAG);
+                mActivity.getSupportFragmentManager()
+                        .findFragmentByTag(VerifyPhoneNumberFragment.TAG);
         assertNotNull(verifyPhoneNumberFragment);
 
         mSendCodeButton.performClick();
@@ -159,15 +162,18 @@ public void testVerifyPhoneNumberInvalidPhoneException_showsInlineError() {
         assertEquals(mActivity.getString(R.string.verifying), sAlert.getMessage());
 
         //was upstream method invoked
-        verify(AuthInstancesShadow.sPhoneAuthProvider).verifyPhoneNumber(eq(PHONE), eq
-                (AUTO_RETRIEVAL_TIMEOUT_MILLIS), eq(TimeUnit.MILLISECONDS), eq(mActivity),
-                callbacksArgumentCaptor.capture(), isNull(PhoneAuthProvider.ForceResendingToken
-                        .class));
+        verify(AuthInstancesShadow.sPhoneAuthProvider).verifyPhoneNumber(
+                eq(PHONE),
+                eq(AUTO_RETRIEVAL_TIMEOUT_MILLIS),
+                eq(TimeUnit.MILLISECONDS),
+                eq(mActivity),
+                callbacksArgumentCaptor.capture(),
+                (PhoneAuthProvider.ForceResendingToken) isNull());
 
         PhoneAuthProvider.OnVerificationStateChangedCallbacks onVerificationStateChangedCallbacks
                 = callbacksArgumentCaptor.getValue();
-        onVerificationStateChangedCallbacks.onVerificationFailed(new FirebaseAuthException
-                (ERROR_INVALID_PHONE, "any_message"));
+        onVerificationStateChangedCallbacks.onVerificationFailed(
+                new FirebaseAuthException(ERROR_INVALID_PHONE, "any_message"));
 
         //was error displayed
         assertEquals(mErrorEditText.getText(), mActivity.getString(R.string.invalid_phone_number));
@@ -179,16 +185,19 @@ public void testVerifyPhoneNumberNoMsgException_showsAlertDialog() {
         reset(AuthInstancesShadow.sPhoneAuthProvider);
 
         mActivity.verifyPhoneNumber(PHONE, false);
-        verify(AuthInstancesShadow.sPhoneAuthProvider).verifyPhoneNumber(eq(PHONE), eq
-                (AUTO_RETRIEVAL_TIMEOUT_MILLIS), eq(TimeUnit.MILLISECONDS), eq(mActivity),
-                callbacksArgumentCaptor.capture(), isNull(PhoneAuthProvider.ForceResendingToken
-                        .class));
+        verify(AuthInstancesShadow.sPhoneAuthProvider).verifyPhoneNumber(
+                eq(PHONE),
+                eq(AUTO_RETRIEVAL_TIMEOUT_MILLIS),
+                eq(TimeUnit.MILLISECONDS),
+                eq(mActivity),
+                callbacksArgumentCaptor.capture(),
+                (PhoneAuthProvider.ForceResendingToken) isNull());
 
         PhoneAuthProvider.OnVerificationStateChangedCallbacks onVerificationStateChangedCallbacks
                 = callbacksArgumentCaptor.getValue();
 
-        onVerificationStateChangedCallbacks.onVerificationFailed(new FirebaseAuthException
-                ("some_code", "custom_message"));
+        onVerificationStateChangedCallbacks.onVerificationFailed(
+                new FirebaseAuthException("some_code", "custom_message"));
         assertTrue(mActivity.getAlertDialog().isShowing());
         assertEquals("custom_message", getAlertDialogMessage());
     }
@@ -205,14 +214,14 @@ public void testVerifyPhoneNumber_success() {
     public void testSubmitCode_badCodeShowsAlertDialog() {
         reset(AuthInstancesShadow.sPhoneAuthProvider);
         when(AuthInstancesShadow.sFirebaseAuth.signInWithCredential(any(AuthCredential.class)))
-                .thenReturn(new AutoCompleteTask<AuthResult>(null, true, new
-                        FirebaseAuthInvalidCredentialsException(ERROR_INVALID_VERIFICATION,
-                        "any_msg")));
+                .thenReturn(new AutoCompleteTask<AuthResult>(
+                        null, true,
+                        new FirebaseAuthInvalidCredentialsException(
+                                ERROR_INVALID_VERIFICATION,
+                                "any_msg")));
         testSendConfirmationCode();
-        SpacedEditText mConfirmationCodeEditText = (SpacedEditText) mActivity.findViewById(R.id
-                .confirmation_code);
-        Button mSubmitConfirmationButton = (Button) mActivity.findViewById(R.id
-                .submit_confirmation_code);
+        SpacedEditText mConfirmationCodeEditText = (SpacedEditText) mActivity.findViewById(R.id.confirmation_code);
+        Button mSubmitConfirmationButton = (Button) mActivity.findViewById(R.id.submit_confirmation_code);
 
         mConfirmationCodeEditText.setText("123456");
         mSubmitConfirmationButton.performClick();
@@ -239,7 +248,7 @@ public void testresendCode_invokesUpstream() {
         //assert resend visible after timeout
         SubmitConfirmationCodeFragment fragment = (SubmitConfirmationCodeFragment) mActivity
                 .getSupportFragmentManager().findFragmentByTag(SubmitConfirmationCodeFragment.TAG);
-        fragment.getmCountdownTimer().onFinish();
+        fragment.getCountdownTimer().onFinish();
         assertEquals(View.VISIBLE, r.getVisibility());
         r.performClick();
 
@@ -247,9 +256,13 @@ public void testresendCode_invokesUpstream() {
         assertEquals(View.GONE, r.getVisibility());
 
         //verify resend code was called
-        verify(AuthInstancesShadow.sPhoneAuthProvider).verifyPhoneNumber(eq(PHONE), eq
-                (AUTO_RETRIEVAL_TIMEOUT_MILLIS), eq(TimeUnit.MILLISECONDS), eq(mActivity),
-                callbacksArgumentCaptor.capture(), eq(forceResendingToken));
+        verify(AuthInstancesShadow.sPhoneAuthProvider).verifyPhoneNumber(
+                eq(PHONE),
+                eq(AUTO_RETRIEVAL_TIMEOUT_MILLIS),
+                eq(TimeUnit.MILLISECONDS),
+                eq(mActivity),
+                callbacksArgumentCaptor.capture(),
+                eq(forceResendingToken));
     }
 
     @Test
@@ -262,13 +275,15 @@ public void testAutoVerify() {
         when(AuthInstancesShadow.sFirebaseUser.getPhoneNumber()).thenReturn(PHONE);
         when(AuthInstancesShadow.sFirebaseUser.getEmail()).thenReturn(null);
         when(AuthInstancesShadow.sFirebaseAuth.signInWithCredential(any(AuthCredential.class)))
-                .thenReturn(new AutoCompleteTask(FakeAuthResult.INSTANCE
-                        , true, null));
+                .thenReturn(new AutoCompleteTask<>(FakeAuthResult.INSTANCE, true, null));
         mActivity.verifyPhoneNumber(PHONE, false);
-        verify(AuthInstancesShadow.sPhoneAuthProvider).verifyPhoneNumber(eq(PHONE), eq
-                (AUTO_RETRIEVAL_TIMEOUT_MILLIS), eq(TimeUnit.MILLISECONDS), eq(mActivity),
-                callbacksArgumentCaptor.capture(), isNull(PhoneAuthProvider.ForceResendingToken
-                        .class));
+        verify(AuthInstancesShadow.sPhoneAuthProvider).verifyPhoneNumber(
+                eq(PHONE),
+                eq(AUTO_RETRIEVAL_TIMEOUT_MILLIS),
+                eq(TimeUnit.MILLISECONDS),
+                eq(mActivity),
+                callbacksArgumentCaptor.capture(),
+                (PhoneAuthProvider.ForceResendingToken) isNull());
 
         PhoneAuthProvider.OnVerificationStateChangedCallbacks onVerificationStateChangedCallbacks
                 = callbacksArgumentCaptor.getValue();
@@ -288,12 +303,11 @@ public void testSMSAutoRetrieval() {
         when(AuthInstancesShadow.sFirebaseUser.getEmail()).thenReturn(null);
 
         when(AuthInstancesShadow.sFirebaseAuth.signInWithCredential(any(AuthCredential.class)))
-                .thenReturn(new AutoCompleteTask(FakeAuthResult.INSTANCE, true, null));
+                .thenReturn(new AutoCompleteTask<>(FakeAuthResult.INSTANCE, true, null));
         PhoneAuthProvider.OnVerificationStateChangedCallbacks callbacks =
                 testSendConfirmationCode();
         callbacks.onVerificationCompleted(credential);
-        SpacedEditText mConfirmationCodeEditText = (SpacedEditText) mActivity.findViewById(R.id
-                .confirmation_code);
+        SpacedEditText mConfirmationCodeEditText = (SpacedEditText) mActivity.findViewById(R.id.confirmation_code);
 
         //verify confirmation code set
         assertEquals("1 2 3 4 5 6", mConfirmationCodeEditText.getText().toString());
@@ -309,8 +323,8 @@ public void testEditPhoneNumber_togglesFragments() {
         TextView mEditPhoneTextView = (TextView) mActivity.findViewById(R.id.edit_phone_number);
         mEditPhoneTextView.performClick();
         VerifyPhoneNumberFragment verifyPhoneNumberFragment = (VerifyPhoneNumberFragment)
-                mActivity.getSupportFragmentManager().findFragmentByTag(VerifyPhoneNumberFragment
-                        .TAG);
+                mActivity.getSupportFragmentManager()
+                        .findFragmentByTag(VerifyPhoneNumberFragment.TAG);
         SubmitConfirmationCodeFragment submitConfirmationCodeFragment =
                 (SubmitConfirmationCodeFragment) mActivity.getSupportFragmentManager()
                         .findFragmentByTag(SubmitConfirmationCodeFragment.TAG);
@@ -323,10 +337,13 @@ public void testEditPhoneNumber_togglesFragments() {
 
     private PhoneAuthProvider.OnVerificationStateChangedCallbacks testSendConfirmationCode() {
         mActivity.verifyPhoneNumber(PHONE, false);
-        verify(AuthInstancesShadow.sPhoneAuthProvider).verifyPhoneNumber(eq(PHONE), eq
-                (AUTO_RETRIEVAL_TIMEOUT_MILLIS), eq(TimeUnit.MILLISECONDS), eq(mActivity),
-                callbacksArgumentCaptor.capture(), isNull(PhoneAuthProvider.ForceResendingToken
-                        .class));
+        verify(AuthInstancesShadow.sPhoneAuthProvider).verifyPhoneNumber(
+                eq(PHONE),
+                eq(AUTO_RETRIEVAL_TIMEOUT_MILLIS),
+                eq(TimeUnit.MILLISECONDS),
+                eq(mActivity),
+                callbacksArgumentCaptor.capture(),
+                (PhoneAuthProvider.ForceResendingToken) isNull());
 
         PhoneAuthProvider.OnVerificationStateChangedCallbacks onVerificationStateChangedCallbacks
                 = callbacksArgumentCaptor.getValue();
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/phone/SpacedEditTextTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/phone/SpacedEditTextTest.java
index b3d98a9c0..be45d4a11 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/phone/SpacedEditTextTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/phone/SpacedEditTextTest.java
@@ -44,7 +44,7 @@ public class SpacedEditTextTest {
     AttributeSet attrs;
     Context context;
     TypedArray array;
-    final float spacingPropotion = 1.1f;
+    final float spacingProportion = 1.1f;
 
     @Before
     public void setUp() throws Exception {
@@ -52,8 +52,8 @@ public void setUp() throws Exception {
         context = mock(Context.class);
         array = mock(TypedArray.class);
 
-        when(array.getFloat(R.styleable.SpacedEditText_spacingProportion, 1)).thenReturn
-                (spacingPropotion);
+        when(array.getFloat(R.styleable.SpacedEditText_spacingProportion, 1))
+                .thenReturn(spacingProportion);
         when(context.obtainStyledAttributes(attrs, R.styleable.SpacedEditText)).thenReturn(array);
         spacedEditText = new SpacedEditText(RuntimeEnvironment.application, attrs);
         spacedEditText.initAttrs(context, attrs);
@@ -105,12 +105,8 @@ public void testSpacedEditText_setInnerSelection() throws Exception {
     /**
      * 1. Tests whether the content is set to the expected value.
      * 2. Tests whether the original content is set to the original value.
-     * 3. Tests that the styles applied have the expected propotion
+     * 3. Tests that the styles applied have the expected proportion
      * 4. Tests that the styles have been applied only on the spaces to preserve fonts appearance.
-     *
-     * @param expectedSpacedText
-     * @param expectedOriginalText
-     * @param editText
      */
     private void testSpacing(String expectedSpacedText, String expectedOriginalText,
                              SpacedEditText editText) {
@@ -121,7 +117,7 @@ private void testSpacing(String expectedSpacedText, String expectedOriginalText,
         assertEquals(expectedOriginalText, editText.getUnspacedText().toString());
 
         for (ScaleXSpan span : spans) {
-            assertEquals(spacingPropotion, span.getScaleX());
+            assertEquals(spacingProportion, span.getScaleX());
 
             final int spanStart = editable.getSpanStart(span);
             final int spanEnd = editable.getSpanEnd(span);
diff --git a/database/src/androidTest/java/com/firebase/ui/database/Bean.java b/database/src/androidTest/java/com/firebase/ui/database/Bean.java
index 600497f0b..b6b189d65 100644
--- a/database/src/androidTest/java/com/firebase/ui/database/Bean.java
+++ b/database/src/androidTest/java/com/firebase/ui/database/Bean.java
@@ -23,22 +23,22 @@ public int getNumber() {
         return mNumber;
     }
 
-    public String getText() {
-        return mText;
-    }
-
-    public boolean isBool() {
-        return mBool;
-    }
-
     public void setNumber(int number) {
         mNumber = number;
     }
 
+    public String getText() {
+        return mText;
+    }
+
     public void setText(String text) {
         mText = text;
     }
 
+    public boolean isBool() {
+        return mBool;
+    }
+
     public void setBool(boolean bool) {
         mBool = bool;
     }
diff --git a/database/src/main/AndroidManifest.xml b/database/src/main/AndroidManifest.xml
index ff3841a92..b185d5bc7 100644
--- a/database/src/main/AndroidManifest.xml
+++ b/database/src/main/AndroidManifest.xml
@@ -2,12 +2,12 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.firebase.ui.database">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application>
         <meta-data
             android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version"/>
+            android:value="@integer/google_play_services_version" />
     </application>
 
 </manifest>
diff --git a/database/src/main/java/com/firebase/ui/database/ChangeEventListener.java b/database/src/main/java/com/firebase/ui/database/ChangeEventListener.java
index 626773d67..055fe5bce 100644
--- a/database/src/main/java/com/firebase/ui/database/ChangeEventListener.java
+++ b/database/src/main/java/com/firebase/ui/database/ChangeEventListener.java
@@ -59,8 +59,8 @@ enum EventType {
     void onDataChanged();
 
     /**
-     * This method will be triggered in the event that this listener either failed at the server,
-     * or is removed as a result of the security and Firebase Database rules.
+     * This method will be triggered in the event that this listener either failed at the server, or
+     * is removed as a result of the security and Firebase Database rules.
      *
      * @param error A description of the error that occurred
      */
diff --git a/database/src/main/java/com/firebase/ui/database/FirebaseListAdapter.java b/database/src/main/java/com/firebase/ui/database/FirebaseListAdapter.java
index 08b90c8bb..b62abbb32 100644
--- a/database/src/main/java/com/firebase/ui/database/FirebaseListAdapter.java
+++ b/database/src/main/java/com/firebase/ui/database/FirebaseListAdapter.java
@@ -34,11 +34,11 @@ public abstract class FirebaseListAdapter<T> extends BaseAdapter implements Fire
     protected final int mLayout;
 
     /**
-     * @param context    The {@link Activity} containing the {@link ListView}
+     * @param context     The {@link Activity} containing the {@link ListView}
      * @param snapshots   The data used to populate the adapter
      * @param modelLayout This is the layout used to represent a single list item. You will be
- *                    responsible for populating an instance of the corresponding view with the
- *                    data from an instance of modelClass.
+     *                    responsible for populating an instance of the corresponding view with the
+     *                    data from an instance of modelClass.
      */
     public FirebaseListAdapter(Context context,
                                ObservableSnapshotArray<T> snapshots,
@@ -139,10 +139,10 @@ public View getView(int position, View view, ViewGroup viewGroup) {
     }
 
     /**
-     * Each time the data at the given Firebase location changes,
-     * this method will be called for each item that needs to be displayed.
-     * The first two arguments correspond to the mLayout and mModelClass given to the constructor of
-     * this class. The third argument is the item's position in the list.
+     * Each time the data at the given Firebase location changes, this method will be called for
+     * each item that needs to be displayed. The first two arguments correspond to the mLayout and
+     * mModelClass given to the constructor of this class. The third argument is the item's position
+     * in the list.
      * <p>
      * Your implementation should populate the view using the data contained in the model.
      *
diff --git a/database/src/main/java/com/firebase/ui/database/FirebaseRecyclerAdapter.java b/database/src/main/java/com/firebase/ui/database/FirebaseRecyclerAdapter.java
index 7b91b09b4..116cec0b6 100644
--- a/database/src/main/java/com/firebase/ui/database/FirebaseRecyclerAdapter.java
+++ b/database/src/main/java/com/firebase/ui/database/FirebaseRecyclerAdapter.java
@@ -166,10 +166,10 @@ public void onBindViewHolder(VH viewHolder, int position) {
     }
 
     /**
-     * Each time the data at the given Firebase location changes,
-     * this method will be called for each item that needs to be displayed.
-     * The first two arguments correspond to the mLayout and mModelClass given to the constructor of
-     * this class. The third argument is the item's position in the list.
+     * Each time the data at the given Firebase location changes, this method will be called for
+     * each item that needs to be displayed. The first two arguments correspond to the mLayout and
+     * mModelClass given to the constructor of this class. The third argument is the item's position
+     * in the list.
      * <p>
      * Your implementation should populate the view using the data contained in the model.
      *
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index d4109e73e..d62b30efd 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -1,5 +1,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.firebase.ui">
-    <uses-permission android:name="android.permission.INTERNET"/>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
 </manifest>
diff --git a/library/src/main/java/com/firebase/ui/FirebaseUI.java b/library/src/main/java/com/firebase/ui/FirebaseUI.java
index ebf24d5f2..ba65eecd3 100644
--- a/library/src/main/java/com/firebase/ui/FirebaseUI.java
+++ b/library/src/main/java/com/firebase/ui/FirebaseUI.java
@@ -15,9 +15,9 @@
 package com.firebase.ui;
 
 /**
- * A placeholder class so there is some material to make an AAR. In theory we should just be
- * able to publish the monolith as a pom with only dependencies and no code but Android gradle
- * does not respect that properly.
+ * A placeholder class so there is some material to make an AAR. In theory we should just be able to
+ * publish the monolith as a pom with only dependencies and no code but Android gradle does not
+ * respect that properly.
  */
 public class FirebaseUI {
     public static final String NAME = "FirebaseUI";
diff --git a/storage/src/main/AndroidManifest.xml b/storage/src/main/AndroidManifest.xml
index 5a6731675..dff8a37bc 100644
--- a/storage/src/main/AndroidManifest.xml
+++ b/storage/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.firebase.ui.storage"/>
\ No newline at end of file
+<manifest package="com.firebase.ui.storage" />
diff --git a/storage/src/main/java/com/firebase/ui/storage/images/FirebaseImageLoader.java b/storage/src/main/java/com/firebase/ui/storage/images/FirebaseImageLoader.java
index f5392d369..8b013dd53 100644
--- a/storage/src/main/java/com/firebase/ui/storage/images/FirebaseImageLoader.java
+++ b/storage/src/main/java/com/firebase/ui/storage/images/FirebaseImageLoader.java
@@ -14,7 +14,7 @@
 
 /**
  * ModelLoader implementation to download images from FirebaseStorage with Glide.
- *
+ * <p>
  * Sample Usage:
  * <pre>
  *     StorageReference ref = FirebaseStorage.getInstance().getReference().child("myimage");

From 6aeafd49157b11a635d6fd948e2b6edb9c3910fa Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Wed, 5 Jul 2017 14:50:43 -0700
Subject: [PATCH 08/14] Code inspect cleanup (#785)

---
 .../firebase/uidemo/auth/AuthUiActivity.java  | 22 +++++-----
 .../java/com/firebase/ui/auth/AuthUI.java     |  2 +-
 .../ui/auth/provider/EmailProvider.java       |  8 ----
 .../ui/auth/provider/FacebookProvider.java    | 25 +++--------
 .../ui/auth/provider/GoogleProvider.java      | 13 +-----
 .../ui/auth/provider/IdpProvider.java         |  4 +-
 .../ui/auth/provider/PhoneProvider.java       |  8 ----
 .../firebase/ui/auth/provider/Provider.java   |  5 ---
 .../ui/auth/provider/TwitterProvider.java     | 12 +-----
 .../ui/auth/ui/ProgressDialogHolder.java      |  2 +-
 .../ui/accountlink/WelcomeBackIdpPrompt.java  |  2 +-
 .../WelcomeBackPasswordPrompt.java            |  1 -
 .../auth/ui/idp/AuthMethodPickerActivity.java |  2 +-
 .../ui/phone/BucketedTextChangeListener.java  | 10 ++---
 .../ui/phone/CompletableProgressDialog.java   |  5 ---
 .../ui/auth/ui/phone/CountryInfo.java         |  4 +-
 .../ui/auth/ui/phone/CountryListSpinner.java  |  2 +-
 .../auth/ui/phone/CustomCountDownTimer.java   |  4 +-
 .../phone/SubmitConfirmationCodeFragment.java | 18 +-------
 .../ui/phone/VerifyPhoneNumberFragment.java   |  2 +-
 .../ui/auth/util/GoogleSignInHelper.java      |  2 +-
 .../signincontainer/IdpSignInContainer.java   |  2 +-
 .../util/signincontainer/SignInDelegate.java  | 43 ++++++++-----------
 .../welcome_back_password_prompt_layout.xml   |  3 +-
 24 files changed, 58 insertions(+), 143 deletions(-)

diff --git a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
index f05e78a85..a65f64275 100644
--- a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
+++ b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
@@ -156,7 +156,7 @@ public void onCreate(Bundle savedInstanceState) {
             return;
         }
 
-        if (!isGoogleConfigured()) {
+        if (isGoogleMisconfigured()) {
             mUseGoogleProvider.setChecked(false);
             mUseGoogleProvider.setEnabled(false);
             mUseGoogleProvider.setText(R.string.google_label_missing_config);
@@ -171,7 +171,7 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
             });
         }
 
-        if (!isFacebookConfigured()) {
+        if (isFacebookMisconfigured()) {
             mUseFacebookProvider.setChecked(false);
             mUseFacebookProvider.setEnabled(false);
             mUseFacebookProvider.setText(R.string.facebook_label_missing_config);
@@ -186,13 +186,13 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
             });
         }
 
-        if (!isTwitterConfigured()) {
+        if (isTwitterMisconfigured()) {
             mUseTwitterProvider.setChecked(false);
             mUseTwitterProvider.setEnabled(false);
             mUseTwitterProvider.setText(R.string.twitter_label_missing_config);
         }
 
-        if (!isGoogleConfigured() || !isFacebookConfigured() || !isTwitterConfigured()) {
+        if (isGoogleMisconfigured() || isFacebookMisconfigured() || isTwitterMisconfigured()) {
             showSnackbar(R.string.configuration_required);
         }
     }
@@ -365,25 +365,23 @@ private String getSelectedPrivacyPolicyUrl() {
     }
 
     @MainThread
-    private boolean isGoogleConfigured() {
-        return !UNCHANGED_CONFIG_VALUE.equals(
-                getString(R.string.default_web_client_id));
+    private boolean isGoogleMisconfigured() {
+        return UNCHANGED_CONFIG_VALUE.equals(getString(R.string.default_web_client_id));
     }
 
     @MainThread
-    private boolean isFacebookConfigured() {
-        return !UNCHANGED_CONFIG_VALUE.equals(
-                getString(R.string.facebook_application_id));
+    private boolean isFacebookMisconfigured() {
+        return UNCHANGED_CONFIG_VALUE.equals(getString(R.string.facebook_application_id));
     }
 
     @MainThread
-    private boolean isTwitterConfigured() {
+    private boolean isTwitterMisconfigured() {
         List<String> twitterConfigs = Arrays.asList(
                 getString(R.string.twitter_consumer_key),
                 getString(R.string.twitter_consumer_secret)
         );
 
-        return !twitterConfigs.contains(UNCHANGED_CONFIG_VALUE);
+        return twitterConfigs.contains(UNCHANGED_CONFIG_VALUE);
     }
 
     @MainThread
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 d786e7dde..1adc2ea8b 100644
--- a/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
+++ b/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
@@ -97,7 +97,7 @@ public class AuthUI {
     public static final String TWITTER_PROVIDER = TwitterAuthProvider.PROVIDER_ID;
 
     /**
-     * Provider identifier for Phone, for use with {@link SignInIntentBuilder#setProviders}.
+     * Provider identifier for Phone, for use with {@link SignInIntentBuilder#setAvailableProviders(List)}.
      */
     public static final String PHONE_VERIFICATION_PROVIDER = PhoneAuthProvider.PROVIDER_ID;
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/EmailProvider.java b/auth/src/main/java/com/firebase/ui/auth/provider/EmailProvider.java
index be04312d8..d9de4f6c3 100644
--- a/auth/src/main/java/com/firebase/ui/auth/provider/EmailProvider.java
+++ b/auth/src/main/java/com/firebase/ui/auth/provider/EmailProvider.java
@@ -5,12 +5,10 @@
 import android.content.Intent;
 import android.support.annotation.LayoutRes;
 
-import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.ResultCodes;
 import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.email.RegisterEmailActivity;
-import com.google.firebase.auth.EmailAuthProvider;
 
 public class EmailProvider implements Provider {
     private static final int RC_EMAIL_FLOW = 2;
@@ -28,12 +26,6 @@ public String getName(Context context) {
         return context.getString(R.string.provider_name_email);
     }
 
-    @Override
-    @AuthUI.SupportedProvider
-    public String getProviderId() {
-        return EmailAuthProvider.PROVIDER_ID;
-    }
-
     @Override
     @LayoutRes
     public int getButtonLayout() {
diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java b/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java
index 45ec1cee8..878f97d25 100644
--- a/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java
+++ b/auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java
@@ -48,8 +48,6 @@ public class FacebookProvider implements IdpProvider, FacebookCallback<LoginResu
     private static final String TAG = "FacebookProvider";
     private static final String EMAIL = "email";
     private static final String PUBLIC_PROFILE = "public_profile";
-    private static final String ERROR = "err";
-    private static final String ERROR_MSG = "err_msg";
 
     private static CallbackManager sCallbackManager;
 
@@ -79,12 +77,6 @@ public String getName(Context context) {
         return context.getString(R.string.idp_name_facebook);
     }
 
-    @Override
-    @AuthUI.SupportedProvider
-    public String getProviderId() {
-        return FacebookAuthProvider.PROVIDER_ID;
-    }
-
     @Override
     @LayoutRes
     public int getButtonLayout() {
@@ -134,12 +126,12 @@ public void onCompleted(JSONObject object, GraphResponse response) {
                         FacebookRequestError requestError = response.getError();
                         if (requestError != null) {
                             Log.e(TAG, "Received Facebook error: " + requestError.getErrorMessage());
-                            onFailure(new Bundle());
+                            onFailure();
                             return;
                         }
                         if (object == null) {
                             Log.w(TAG, "Received null response from Facebook GraphRequest");
-                            onFailure(new Bundle());
+                            onFailure();
                         } else {
                             try {
                                 String email = object.getString("email");
@@ -160,18 +152,13 @@ public void onCompleted(JSONObject object, GraphResponse response) {
 
     @Override
     public void onCancel() {
-        Bundle extra = new Bundle();
-        extra.putString(ERROR, "cancelled");
-        onFailure(extra);
+        onFailure();
     }
 
     @Override
     public void onError(FacebookException error) {
         Log.e(TAG, "Error logging in with Facebook. " + error.getMessage());
-        Bundle extra = new Bundle();
-        extra.putString(ERROR, "error");
-        extra.putString(ERROR_MSG, error.getMessage());
-        onFailure(extra);
+        onFailure();
     }
 
     private void onSuccess(@Nullable String email, LoginResult loginResult) {
@@ -185,9 +172,9 @@ private IdpResponse createIdpResponse(@Nullable String email, LoginResult loginR
                 .build();
     }
 
-    private void onFailure(Bundle bundle) {
+    private void onFailure() {
         gcCallbackManager();
-        mCallbackObject.onFailure(bundle);
+        mCallbackObject.onFailure();
     }
 
     private void gcCallbackManager() {
diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/GoogleProvider.java b/auth/src/main/java/com/firebase/ui/auth/provider/GoogleProvider.java
index c7cc79ec4..7cd0cb0d1 100644
--- a/auth/src/main/java/com/firebase/ui/auth/provider/GoogleProvider.java
+++ b/auth/src/main/java/com/firebase/ui/auth/provider/GoogleProvider.java
@@ -17,7 +17,6 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Bundle;
 import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -26,7 +25,6 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.AuthUI.IdpConfig;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
@@ -46,7 +44,6 @@
 public class GoogleProvider implements IdpProvider, GoogleApiClient.OnConnectionFailedListener {
     private static final String TAG = "GoogleProvider";
     private static final int RC_SIGN_IN = 20;
-    private static final String ERROR_KEY = "error";
 
     private GoogleApiClient mGoogleApiClient;
     private FragmentActivity mActivity;
@@ -97,12 +94,6 @@ public String getName(Context context) {
         return context.getString(R.string.idp_name_google);
     }
 
-    @Override
-    @AuthUI.SupportedProvider
-    public String getProviderId() {
-        return GoogleAuthProvider.PROVIDER_ID;
-    }
-
     @Override
     @LayoutRes
     public int getButtonLayout() {
@@ -175,9 +166,7 @@ private void onError(GoogleSignInResult result) {
 
     private void onError(String errorMessage) {
         Log.e(TAG, "Error logging in with Google. " + errorMessage);
-        Bundle extra = new Bundle();
-        extra.putString(ERROR_KEY, errorMessage);
-        mIdpCallback.onFailure(extra);
+        mIdpCallback.onFailure();
     }
 
     @Override
diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/IdpProvider.java b/auth/src/main/java/com/firebase/ui/auth/provider/IdpProvider.java
index f9cac1f94..9b948a770 100644
--- a/auth/src/main/java/com/firebase/ui/auth/provider/IdpProvider.java
+++ b/auth/src/main/java/com/firebase/ui/auth/provider/IdpProvider.java
@@ -14,15 +14,13 @@
 
 package com.firebase.ui.auth.provider;
 
-import android.os.Bundle;
-
 import com.firebase.ui.auth.IdpResponse;
 
 public interface IdpProvider extends Provider {
     interface IdpCallback {
         void onSuccess(IdpResponse idpResponse);
 
-        void onFailure(Bundle extra);
+        void onFailure();
     }
 
     void setAuthenticationCallback(IdpCallback callback);
diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/PhoneProvider.java b/auth/src/main/java/com/firebase/ui/auth/provider/PhoneProvider.java
index 7c9b8db64..81b51465d 100644
--- a/auth/src/main/java/com/firebase/ui/auth/provider/PhoneProvider.java
+++ b/auth/src/main/java/com/firebase/ui/auth/provider/PhoneProvider.java
@@ -5,12 +5,10 @@
 import android.content.Intent;
 import android.support.annotation.LayoutRes;
 
-import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.ResultCodes;
 import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.phone.PhoneVerificationActivity;
-import com.google.firebase.auth.PhoneAuthProvider;
 
 public class PhoneProvider implements Provider {
 
@@ -29,12 +27,6 @@ public String getName(Context context) {
         return context.getString(R.string.provider_name_phone);
     }
 
-    @Override
-    @AuthUI.SupportedProvider
-    public String getProviderId() {
-        return PhoneAuthProvider.PROVIDER_ID;
-    }
-
     @Override
     @LayoutRes
     public int getButtonLayout() {
diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/Provider.java b/auth/src/main/java/com/firebase/ui/auth/provider/Provider.java
index b5f3435a7..4415ea8da 100644
--- a/auth/src/main/java/com/firebase/ui/auth/provider/Provider.java
+++ b/auth/src/main/java/com/firebase/ui/auth/provider/Provider.java
@@ -5,15 +5,10 @@
 import android.content.Intent;
 import android.support.annotation.LayoutRes;
 
-import com.google.firebase.auth.GoogleAuthProvider;
-
 public interface Provider {
     /** Retrieves the name of the IDP, for display on-screen. */
     String getName(Context context);
 
-    /** Retrieves the id of the IDP, e.g. {@link GoogleAuthProvider#PROVIDER_ID}. */
-    String getProviderId();
-
     /** Retrieves the layout id of the button to inflate and/or set a click listener. */
     @LayoutRes
     int getButtonLayout();
diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/TwitterProvider.java b/auth/src/main/java/com/firebase/ui/auth/provider/TwitterProvider.java
index a3beb2b60..cdca74033 100644
--- a/auth/src/main/java/com/firebase/ui/auth/provider/TwitterProvider.java
+++ b/auth/src/main/java/com/firebase/ui/auth/provider/TwitterProvider.java
@@ -3,11 +3,9 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Bundle;
 import android.support.annotation.LayoutRes;
 import android.util.Log;
 
-import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
 import com.google.firebase.auth.AuthCredential;
@@ -43,7 +41,7 @@ public static AuthCredential createAuthCredential(IdpResponse response) {
         return TwitterAuthProvider.getCredential(response.getIdpToken(), response.getIdpSecret());
     }
 
-    public static void initialize(Context context) {
+    private static void initialize(Context context) {
         TwitterAuthConfig authConfig = new TwitterAuthConfig(
                 context.getString(R.string.twitter_consumer_key),
                 context.getString(R.string.twitter_consumer_secret));
@@ -72,12 +70,6 @@ public String getName(Context context) {
         return context.getString(R.string.idp_name_twitter);
     }
 
-    @Override
-    @AuthUI.SupportedProvider
-    public String getProviderId() {
-        return TwitterAuthProvider.PROVIDER_ID;
-    }
-
     @Override
     @LayoutRes
     public int getButtonLayout() {
@@ -108,7 +100,7 @@ public void success(Result<TwitterSession> result) {
     @Override
     public void failure(TwitterException exception) {
         Log.e(TAG, "Failure logging in to Twitter. " + exception.getMessage());
-        mCallbackObject.onFailure(new Bundle());
+        mCallbackObject.onFailure();
     }
 
     private static class EmailCallback extends Callback<String> {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/ProgressDialogHolder.java b/auth/src/main/java/com/firebase/ui/auth/ui/ProgressDialogHolder.java
index c86780417..1b6ff9d8e 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/ProgressDialogHolder.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/ProgressDialogHolder.java
@@ -16,7 +16,7 @@ public ProgressDialogHolder(Context context) {
         mContext = context;
     }
 
-    public void showLoadingDialog(String message) {
+    private void showLoadingDialog(String message) {
         dismissDialog();
 
         if (mProgressDialog == null) {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java
index 34e1c7b1e..bf4067d41 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java
@@ -187,7 +187,7 @@ public void onFailure(@NonNull Exception e) {
     }
 
     @Override
-    public void onFailure(Bundle extra) {
+    public void onFailure() {
         finishWithError();
     }
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
index 7ab82eedd..38c4adcc3 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
@@ -89,7 +89,6 @@ protected void onCreate(Bundle savedInstanceState) {
         mIdpResponse = IdpResponse.fromResultIntent(getIntent());
         mEmail = mIdpResponse.getEmail();
 
-        TextView welcomeBackHeader = (TextView) findViewById(R.id.welcome_back_email_header);
         mPasswordLayout = (TextInputLayout) findViewById(R.id.password_layout);
         mPasswordField = (EditText) findViewById(R.id.password);
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
index b1331f2ba..c791e71b1 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
@@ -163,7 +163,7 @@ public void onSuccess(final IdpResponse response) {
     }
 
     @Override
-    public void onFailure(Bundle extra) {
+    public void onFailure() {
         // stay on this screen
         getDialogHolder().dismissDialog();
     }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/BucketedTextChangeListener.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/BucketedTextChangeListener.java
index ee63b73a6..b151a041c 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/BucketedTextChangeListener.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/BucketedTextChangeListener.java
@@ -86,7 +86,7 @@ public void onTextChanged(CharSequence s, int ignoredParam1, int ignoredParam2,
         final String enteredContent = numericContents.substring(0, enteredContentLength);
 
         // 3) Reset the text to be the content + required hyphens. The SET automatically inserts
-        // spaces requires for aesthetics. This requires removing and reseting the listener to
+        // spaces requires for aesthetics. This requires removing and resetting the listener to
         // avoid recursion.
         editText.removeTextChangedListener(this);
         editText.setText(enteredContent + postFixes[expectedContentLength - enteredContentLength]);
@@ -106,12 +106,12 @@ public void afterTextChanged(Editable s) {
     }
 
     /**
-     * {@link #generatePostfixArray(CharSequence, int)} with params ("-", 6) returns
+     * For example, passing in ("-", 6) would return the following result:
      * {"", "-", "--", "---", "----", "-----", "------"}
      *
-     * @param repeatableChar
-     * @param length
-     * @return
+     * @param repeatableChar the char to repeat to the specified length
+     * @param length the maximum length of repeated chars
+     * @return an increasing sequence array of chars up the specified length
      */
     private String[] generatePostfixArray(CharSequence repeatableChar, int length) {
         final String[] ret = new String[length + 1];
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CompletableProgressDialog.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CompletableProgressDialog.java
index 66fc89e4c..978f8336f 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CompletableProgressDialog.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CompletableProgressDialog.java
@@ -52,11 +52,6 @@ protected void onCreate(Bundle savedInstanceState) {
         }
     }
 
-    @Override
-    public void show() {
-        super.show();
-    }
-
     public void complete(String msg) {
         setMessage(msg);
         mProgress.setVisibility(View.GONE);
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryInfo.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryInfo.java
index 569cbcf66..31e0633d1 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryInfo.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryInfo.java
@@ -55,8 +55,8 @@ public boolean equals(Object o) {
 
         final CountryInfo that = (CountryInfo) o;
 
-        if (countryCode != that.countryCode) return false;
-        return locale != null ? locale.equals(that.locale) : that.locale == null;
+        return countryCode == that.countryCode
+                && (locale != null ? locale.equals(that.locale) : that.locale == null);
     }
 
     @Override
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListSpinner.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListSpinner.java
index b1f3c2c4d..ff0e3fd98 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListSpinner.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListSpinner.java
@@ -53,7 +53,7 @@ public CountryListSpinner(Context context, AttributeSet attrs, int defStyle) {
         init();
     }
 
-    public static void hideKeyboard(Context context, View view) {
+    private static void hideKeyboard(Context context, View view) {
         final InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
         if (imm != null) {
             imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CustomCountDownTimer.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CustomCountDownTimer.java
index 3bed8ac85..b15d737f8 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CustomCountDownTimer.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CustomCountDownTimer.java
@@ -37,8 +37,8 @@ public void renew() {
         update(mMillisInFuture);
     }
 
-    CountDownTimer create(long millisInFuture, long counDownInterval) {
-        return new CountDownTimer(millisInFuture, counDownInterval) {
+    private CountDownTimer create(long millisInFuture, long countDownInterval) {
+        return new CountDownTimer(millisInFuture, countDownInterval) {
             @Override
             public void onTick(long millisUntilFinished) {
                 CustomCountDownTimer.this.onTick(millisUntilFinished);
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java
index d3e3c31f2..974587cf2 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java
@@ -16,7 +16,6 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
 import android.support.annotation.VisibleForTesting;
@@ -108,10 +107,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
         if (savedInstanceState != null) {
-            Long t = savedInstanceState.getLong(EXTRA_MILLIS_UNTIL_FINISHED);
-            if (t != null) {
-                mCountdownTimer.update(t);
-            }
+            mCountdownTimer.update(savedInstanceState.getLong(EXTRA_MILLIS_UNTIL_FINISHED));
         }
 
         if (!(getActivity() instanceof PhoneVerificationActivity)) {
@@ -194,18 +190,6 @@ private void setupConfirmationCodeEditText() {
         mConfirmationCodeEditText.addTextChangedListener(listener);
     }
 
-    @NonNull
-    private View.OnFocusChangeListener createOnFocusChangeListener() {
-        return new View.OnFocusChangeListener() {
-            @Override
-            public void onFocusChange(View v, boolean hasFocus) {
-                if (hasFocus) {
-                    mConfirmationCodeEditText.setSelection(0);
-                }
-            }
-        };
-    }
-
     private BucketedTextChangeListener createBucketedTextChangeListener() {
         return new BucketedTextChangeListener(this.mConfirmationCodeEditText, 6, "-",
                 createBucketOnEditCallback(mSubmitConfirmationButton));
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java
index 2dd7dc4e9..b963a51fc 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/VerifyPhoneNumberFragment.java
@@ -175,7 +175,7 @@ public void onClick(View v) {
     }
 
     @Nullable
-    String getPseudoValidPhoneNumber() {
+    private String getPseudoValidPhoneNumber() {
         final CountryInfo countryInfo = (CountryInfo) countryListSpinner.getTag();
         final String everythingElse = mPhoneEditText.getText().toString();
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/GoogleSignInHelper.java b/auth/src/main/java/com/firebase/ui/auth/util/GoogleSignInHelper.java
index 53e9e1d99..0a83084f1 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/GoogleSignInHelper.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/GoogleSignInHelper.java
@@ -13,7 +13,7 @@
 import com.google.android.gms.tasks.TaskCompletionSource;
 
 public class GoogleSignInHelper extends GoogleApiHelper {
-    protected GoogleSignInHelper(FragmentActivity activity, GoogleApiClient.Builder builder) {
+    private GoogleSignInHelper(FragmentActivity activity, GoogleApiClient.Builder builder) {
         super(activity, builder);
     }
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java
index 023ce057e..b1e10d573 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java
@@ -156,7 +156,7 @@ public void onSuccess(final IdpResponse response) {
     }
 
     @Override
-    public void onFailure(Bundle extra) {
+    public void onFailure() {
         finish(ResultCodes.CANCELED, IdpResponse.getErrorCodeIntent(ErrorCodes.UNKNOWN_ERROR));
     }
 
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
index 48fc292a0..7f547469a 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
@@ -13,7 +13,6 @@
 import android.util.Log;
 
 import com.firebase.ui.auth.AuthUI;
-import com.firebase.ui.auth.AuthUI.IdpConfig;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.ResultCodes;
@@ -48,9 +47,7 @@
 import com.google.firebase.auth.TwitterAuthProvider;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Attempts to acquire a credential from Smart Lock for Passwords to sign in an existing account. If
@@ -238,29 +235,27 @@ private void handleCredential(Credential credential) {
     private void startAuthMethodChoice() {
         FlowParameters flowParams = getFlowParams();
         List<AuthUI.IdpConfig> idpConfigs = flowParams.providerInfo;
-        Map<String, IdpConfig> providerIdToConfig = new HashMap<>();
-        for (IdpConfig providerConfig : idpConfigs) {
-            providerIdToConfig.put(providerConfig.getProviderId(), providerConfig);
-        }
-
-        List<IdpConfig> visibleProviders = idpConfigs;
 
         // If there is only one provider selected, launch the flow directly
-        if (visibleProviders.size() == 1) {
-            String firstProvider = visibleProviders.get(0).getProviderId();
-            if (firstProvider.equals(EmailAuthProvider.PROVIDER_ID)) {
-                // Go directly to email flow
-                startActivityForResult(
-                        RegisterEmailActivity.createIntent(getContext(), flowParams),
-                        RC_EMAIL_FLOW);
-            } else if (firstProvider.equals(PhoneAuthProvider.PROVIDER_ID)) {
-                // Go directly to phone flow
-                startActivityForResult(
-                        PhoneVerificationActivity.createIntent(getContext(), flowParams, null),
-                        RC_PHONE_FLOW);
-            } else {
-                // Launch IDP flow
-                redirectToIdpSignIn(null, providerIdToAccountType(firstProvider));
+        if (idpConfigs.size() == 1) {
+            String firstProvider = idpConfigs.get(0).getProviderId();
+            switch (firstProvider) {
+                case EmailAuthProvider.PROVIDER_ID:
+                    // Go directly to email flow
+                    startActivityForResult(
+                            RegisterEmailActivity.createIntent(getContext(), flowParams),
+                            RC_EMAIL_FLOW);
+                    break;
+                case PhoneAuthProvider.PROVIDER_ID:
+                    // Go directly to phone flow
+                    startActivityForResult(
+                            PhoneVerificationActivity.createIntent(getContext(), flowParams, null),
+                            RC_PHONE_FLOW);
+                    break;
+                default:
+                    // Launch IDP flow
+                    redirectToIdpSignIn(null, providerIdToAccountType(firstProvider));
+                    break;
             }
         } else {
             startActivityForResult(
diff --git a/auth/src/main/res/layout/welcome_back_password_prompt_layout.xml b/auth/src/main/res/layout/welcome_back_password_prompt_layout.xml
index 523045798..48c4181f4 100644
--- a/auth/src/main/res/layout/welcome_back_password_prompt_layout.xml
+++ b/auth/src/main/res/layout/welcome_back_password_prompt_layout.xml
@@ -14,7 +14,6 @@
         android:orientation="vertical">
 
         <TextView
-            android:id="@+id/welcome_back_email_header"
             style="@style/FirebaseUI.Text.Heading"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -70,4 +69,4 @@
 
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>

From 226808bfb7dd2c09c45378f96985be6555aad48e Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Tue, 11 Jul 2017 16:12:33 +0000
Subject: [PATCH 09/14] Auth instances cleanup (#786)

---
 .../com/firebase/ui/auth/ui/FragmentBase.java |  8 +++
 .../ui/auth/ui/HelperActivityBase.java        |  8 ++-
 .../ui/accountlink/WelcomeBackIdpPrompt.java  |  5 +-
 .../WelcomeBackPasswordPrompt.java            |  6 +-
 .../ui/auth/ui/email/CheckEmailFragment.java  |  3 +-
 .../ui/email/RecoverPasswordActivity.java     |  3 +-
 .../auth/ui/email/RegisterEmailFragment.java  |  7 +-
 .../auth/ui/idp/AuthMethodPickerActivity.java |  5 +-
 .../auth/ui/idp/CredentialSignInHandler.java  |  3 +-
 .../ui/phone/PhoneVerificationActivity.java   |  7 +-
 .../{AuthInstances.java => AuthHelper.java}   | 28 ++++----
 .../signincontainer/IdpSignInContainer.java   |  5 +-
 .../util/signincontainer/SaveSmartLock.java   | 12 ++--
 .../util/signincontainer/SignInDelegate.java  |  5 +-
 ...ancesShadow.java => AuthHelperShadow.java} | 19 +++---
 .../CustomRobolectricGradleTestRunner.java    |  4 +-
 .../ui/auth/testhelpers/FakeAuthResult.java   |  2 +-
 .../ui/auth/testhelpers/TestHelper.java       |  2 +-
 .../ui/email/RecoverPasswordActivityTest.java |  8 +--
 .../ui/email/RegisterEmailActivityTest.java   | 10 +--
 .../email/WelcomeBackPasswordPromptTest.java  | 10 +--
 .../ui/idp/AuthMethodPickerActivityTest.java  | 24 +++----
 .../ui/idp/CredentialSignInHandlerTest.java   | 28 +++++---
 .../phone/PhoneVerificationActivityTest.java  | 68 +++++++++----------
 24 files changed, 146 insertions(+), 134 deletions(-)
 rename auth/src/main/java/com/firebase/ui/auth/util/{AuthInstances.java => AuthHelper.java} (54%)
 rename auth/src/test/java/com/firebase/ui/auth/testhelpers/{AuthInstancesShadow.java => AuthHelperShadow.java} (77%)

diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/FragmentBase.java b/auth/src/main/java/com/firebase/ui/auth/ui/FragmentBase.java
index 8532a92cb..338327ee1 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/FragmentBase.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/FragmentBase.java
@@ -8,16 +8,20 @@
 import android.support.v4.app.Fragment;
 import android.view.ContextThemeWrapper;
 
+import com.firebase.ui.auth.util.AuthHelper;
+
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class FragmentBase extends Fragment {
 
     private FlowParameters mFlowParameters;
+    private AuthHelper mAuthHelper;
     private ProgressDialogHolder mProgressDialogHolder;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        mAuthHelper = new AuthHelper(getFlowParams());
         ContextThemeWrapper context = new ContextThemeWrapper(
                 getContext(), getFlowParams().themeId);
         mProgressDialogHolder = new ProgressDialogHolder(context);
@@ -37,6 +41,10 @@ public FlowParameters getFlowParams() {
         return mFlowParameters;
     }
 
+    public AuthHelper getAuthHelper() {
+        return mAuthHelper;
+    }
+
     public ProgressDialogHolder getDialogHolder() {
         return mProgressDialogHolder;
     }
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java b/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java
index 25e7706cc..88c59ecaf 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java
@@ -11,6 +11,7 @@
 
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.ResultCodes;
+import com.firebase.ui.auth.util.AuthHelper;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.firebase.auth.FirebaseUser;
 
@@ -21,6 +22,7 @@
 public class HelperActivityBase extends AppCompatActivity {
 
     private FlowParameters mFlowParameters;
+    private AuthHelper mAuthHelper;
     private ProgressDialogHolder mProgressDialogHolder;
 
     public static Intent createBaseIntent(
@@ -37,6 +39,7 @@ public static Intent createBaseIntent(
     @Override
     protected void onCreate(Bundle savedInstance) {
         super.onCreate(savedInstance);
+        mAuthHelper = new AuthHelper(getFlowParams());
         mProgressDialogHolder = new ProgressDialogHolder(this);
     }
 
@@ -54,6 +57,10 @@ public FlowParameters getFlowParams() {
         return mFlowParameters;
     }
 
+    public AuthHelper getAuthHelper() {
+        return mAuthHelper;
+    }
+
     public ProgressDialogHolder getDialogHolder() {
         return mProgressDialogHolder;
     }
@@ -84,4 +91,3 @@ public void saveCredentialsOrFinish(
     }
 
 }
-
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java
index bf4067d41..a7b539594 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java
@@ -42,7 +42,6 @@
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.User;
-import com.firebase.ui.auth.util.AuthInstances;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
@@ -148,9 +147,9 @@ public void onSuccess(final IdpResponse idpResponse) {
             return;
         }
 
-        FirebaseUser currentUser = AuthInstances.getCurrentUser(getFlowParams());
+        FirebaseUser currentUser = getAuthHelper().getCurrentUser();
         if (currentUser == null) {
-            AuthInstances.getFirebaseAuth(getFlowParams())
+            getAuthHelper().getFirebaseAuth()
                     .signInWithCredential(newCredential)
                     .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
                         @Override
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
index 38c4adcc3..211facfc0 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java
@@ -43,7 +43,6 @@
 import com.firebase.ui.auth.ui.ImeHelper;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.email.RecoverPasswordActivity;
-import com.firebase.ui.auth.util.AuthInstances;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
@@ -84,8 +83,7 @@ protected void onCreate(Bundle savedInstanceState) {
         // Show keyboard
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
 
-        mSaveSmartLock = AuthInstances.getSaveSmartLockInstance(
-                this, getFlowParams());
+        mSaveSmartLock = getAuthHelper().getSaveSmartLockInstance(this);
         mIdpResponse = IdpResponse.fromResultIntent(getIntent());
         mEmail = mIdpResponse.getEmail();
 
@@ -145,7 +143,7 @@ private void validateAndSignIn(final String email, final String password) {
         }
         getDialogHolder().showLoadingDialog(R.string.progress_dialog_signing_in);
 
-        final FirebaseAuth firebaseAuth = AuthInstances.getFirebaseAuth(getFlowParams());
+        final FirebaseAuth firebaseAuth = getAuthHelper().getFirebaseAuth();
 
         // Sign in with known email and the password provided
         firebaseAuth.signInWithEmailAndPassword(email, password)
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java
index f28e38f40..6f341d50f 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/CheckEmailFragment.java
@@ -24,7 +24,6 @@
 import com.firebase.ui.auth.ui.ImeHelper;
 import com.firebase.ui.auth.ui.User;
 import com.firebase.ui.auth.ui.email.fieldvalidators.EmailFieldValidator;
-import com.firebase.ui.auth.util.AuthInstances;
 import com.firebase.ui.auth.util.GoogleApiHelper;
 import com.google.android.gms.auth.api.Auth;
 import com.google.android.gms.auth.api.credentials.Credential;
@@ -193,7 +192,7 @@ private void checkAccountExists(@NonNull final String email) {
         final String finalName = name;
         final Uri finalPhotoUri = photoUri;
 
-        FirebaseAuth auth = AuthInstances.getFirebaseAuth(getFlowParams());
+        FirebaseAuth auth = getAuthHelper().getFirebaseAuth();
         ProviderUtils.fetchTopProvider(auth, email)
                 .addOnSuccessListener(getActivity(), new OnSuccessListener<String>() {
                     @Override
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivity.java
index a49c7bf65..a13458df0 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivity.java
@@ -30,7 +30,6 @@
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.email.fieldvalidators.EmailFieldValidator;
-import com.firebase.ui.auth.util.AuthInstances;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.auth.FirebaseAuthInvalidUserException;
@@ -68,7 +67,7 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void next(final String email) {
-        AuthInstances.getFirebaseAuth(getFlowParams())
+        getAuthHelper().getFirebaseAuth()
                 .sendPasswordResetEmail(email)
                 .addOnFailureListener(
                         new TaskFailureLogger(TAG, "Error sending password reset email"))
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java
index ae210769e..4397f7bcc 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/RegisterEmailFragment.java
@@ -28,7 +28,6 @@
 import com.firebase.ui.auth.ui.email.fieldvalidators.EmailFieldValidator;
 import com.firebase.ui.auth.ui.email.fieldvalidators.PasswordFieldValidator;
 import com.firebase.ui.auth.ui.email.fieldvalidators.RequiredFieldValidator;
-import com.firebase.ui.auth.util.AuthInstances;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnFailureListener;
@@ -166,7 +165,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         }
 
         mActivity = (HelperActivityBase) getActivity();
-        mSaveSmartLock = AuthInstances.getSaveSmartLockInstance(getActivity(), getFlowParams());
+        mSaveSmartLock = getAuthHelper().getSaveSmartLockInstance(mActivity);
         new PreambleHandler(getContext(), getFlowParams(), R.string.button_text_save)
                 .setPreamble(mAgreementText);
     }
@@ -222,7 +221,7 @@ private void validateAndRegisterUser() {
     }
 
     private void registerUser(final String email, final String name, final String password) {
-        AuthInstances.getFirebaseAuth(getFlowParams())
+        getAuthHelper().getFirebaseAuth()
                 .createUserWithEmailAndPassword(email, password)
                 .addOnFailureListener(new TaskFailureLogger(TAG, "Error creating user"))
                 .addOnSuccessListener(new OnSuccessListener<AuthResult>() {
@@ -267,7 +266,7 @@ public void onFailure(@NonNull Exception e) {
                             // Collision with existing user email, it should be very hard for
                             // the user to even get to this error due to CheckEmailFragment.
 
-                            FirebaseAuth auth = AuthInstances.getFirebaseAuth(getFlowParams());
+                            FirebaseAuth auth = getAuthHelper().getFirebaseAuth();
                             ProviderUtils.fetchTopProvider(auth, email).addOnSuccessListener(
                                     getActivity(),
                                     new OnSuccessListener<String>() {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
index c791e71b1..771d2ad0d 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java
@@ -42,7 +42,6 @@
 import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.email.RegisterEmailActivity;
-import com.firebase.ui.auth.util.AuthInstances;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.firebase.auth.AuthCredential;
 
@@ -74,7 +73,7 @@ public static Intent createIntent(Context context, FlowParameters flowParams) {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.auth_method_picker_layout);
-        mSaveSmartLock = AuthInstances.getSaveSmartLockInstance(this, getFlowParams());
+        mSaveSmartLock = getAuthHelper().getSaveSmartLockInstance(this);
 
         populateIdpList(getFlowParams().providerInfo);
 
@@ -149,7 +148,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
     @Override
     public void onSuccess(final IdpResponse response) {
         AuthCredential credential = ProviderUtils.getAuthCredential(response);
-        AuthInstances.getFirebaseAuth(getFlowParams())
+        getAuthHelper().getFirebaseAuth()
                 .signInWithCredential(credential)
                 .addOnFailureListener(
                         new TaskFailureLogger(TAG, "Firebase sign in with credential "
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java b/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
index 57bcb127e..6c71bda91 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java
@@ -28,7 +28,6 @@
 import com.firebase.ui.auth.ui.User;
 import com.firebase.ui.auth.ui.accountlink.WelcomeBackIdpPrompt;
 import com.firebase.ui.auth.ui.accountlink.WelcomeBackPasswordPrompt;
-import com.firebase.ui.auth.util.AuthInstances;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnFailureListener;
@@ -70,7 +69,7 @@ public void onComplete(@NonNull Task<AuthResult> task) {
             if (task.getException() instanceof FirebaseAuthUserCollisionException) {
                 String email = mResponse.getEmail();
                 if (email != null) {
-                    FirebaseAuth auth = AuthInstances.getFirebaseAuth(mActivity.getFlowParams());
+                    FirebaseAuth auth = mActivity.getAuthHelper().getFirebaseAuth();
                     ProviderUtils.fetchTopProvider(auth, email)
                             .addOnSuccessListener(new StartWelcomeBackFlow())
                             .addOnFailureListener(new OnFailureListener() {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java
index e3cd5aafa..76579825b 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java
@@ -34,7 +34,6 @@
 import com.firebase.ui.auth.ui.ExtraConstants;
 import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.HelperActivityBase;
-import com.firebase.ui.auth.util.AuthInstances;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.FirebaseException;
@@ -122,7 +121,7 @@ protected void onStart() {
             sendCode(mPhoneNumber, false);
         } else if (mVerificationState == VerificationState.VERIFIED) {
             // activity was recreated when verified dialog was displayed
-            finish(AuthInstances.getCurrentUser(getFlowParams()));
+            finish(getAuthHelper().getCurrentUser());
         }
     }
 
@@ -233,7 +232,7 @@ private void sendCode(String phoneNumber, boolean forceResend) {
         mPhoneNumber = phoneNumber;
         mVerificationState = VerificationState.VERIFICATION_STARTED;
 
-        AuthInstances.getPhoneAuthProviderInstance().verifyPhoneNumber(
+        getAuthHelper().getPhoneAuthProviderInstance().verifyPhoneNumber(
                 phoneNumber,
                 AUTO_RETRIEVAL_TIMEOUT_MILLIS,
                 TimeUnit.MILLISECONDS,
@@ -306,7 +305,7 @@ private void showAlertDialog(@NonNull String s, DialogInterface.OnClickListener
     }
 
     private void signingWithCreds(@NonNull PhoneAuthCredential phoneAuthCredential) {
-        AuthInstances.getFirebaseAuth(getFlowParams())
+        getAuthHelper().getFirebaseAuth()
                 .signInWithCredential(phoneAuthCredential)
                 .addOnSuccessListener(this, new OnSuccessListener<AuthResult>() {
                     @Override
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/AuthInstances.java b/auth/src/main/java/com/firebase/ui/auth/util/AuthHelper.java
similarity index 54%
rename from auth/src/main/java/com/firebase/ui/auth/util/AuthInstances.java
rename to auth/src/main/java/com/firebase/ui/auth/util/AuthHelper.java
index 68745e8b9..23fda8c66 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/AuthInstances.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/AuthHelper.java
@@ -1,9 +1,9 @@
 package com.firebase.ui.auth.util;
 
 import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentActivity;
 
 import com.firebase.ui.auth.ui.FlowParameters;
+import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.android.gms.auth.api.Auth;
 import com.google.android.gms.auth.api.credentials.CredentialsApi;
@@ -16,29 +16,31 @@
  * Factory for instances of authentication classes. Should eventually be replaced by dependency
  * injection.
  */
-public class AuthInstances {
+public class AuthHelper {
+    private final FlowParameters mFlowParams;
 
-    public static FirebaseAuth getFirebaseAuth(FlowParameters parameters) {
-        return FirebaseAuth.getInstance(FirebaseApp.getInstance(parameters.appName));
+    public AuthHelper(FlowParameters params) {
+        mFlowParams = params;
     }
 
-    public static CredentialsApi getCredentialsApi() {
+    public FirebaseAuth getFirebaseAuth() {
+        return FirebaseAuth.getInstance(FirebaseApp.getInstance(mFlowParams.appName));
+    }
+
+    public CredentialsApi getCredentialsApi() {
         return Auth.CredentialsApi;
     }
 
     @Nullable
-    public static FirebaseUser getCurrentUser(FlowParameters parameters) {
-        return getFirebaseAuth(parameters).getCurrentUser();
+    public FirebaseUser getCurrentUser() {
+        return getFirebaseAuth().getCurrentUser();
     }
 
-    public static SaveSmartLock getSaveSmartLockInstance(FragmentActivity activity,
-                                                         FlowParameters parameters) {
-        return SaveSmartLock.getInstance(activity, parameters);
+    public SaveSmartLock getSaveSmartLockInstance(HelperActivityBase activity) {
+        return SaveSmartLock.getInstance(activity);
     }
 
-    public static PhoneAuthProvider getPhoneAuthProviderInstance() {
+    public PhoneAuthProvider getPhoneAuthProviderInstance() {
         return PhoneAuthProvider.getInstance();
     }
-
-
 }
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java
index b1e10d573..de54081e7 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/IdpSignInContainer.java
@@ -40,7 +40,6 @@
 import com.firebase.ui.auth.ui.TaskFailureLogger;
 import com.firebase.ui.auth.ui.User;
 import com.firebase.ui.auth.ui.idp.CredentialSignInHandler;
-import com.firebase.ui.auth.util.AuthInstances;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.GoogleAuthProvider;
@@ -86,7 +85,7 @@ public static IdpSignInContainer getInstance(FragmentActivity activity) {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mSaveSmartLock = AuthInstances.getSaveSmartLockInstance(getActivity(), getFlowParams());
+        mSaveSmartLock = getAuthHelper().getSaveSmartLockInstance(mActivity);
 
         User user = User.getUser(getArguments());
         String provider = user.getProvider();
@@ -143,7 +142,7 @@ public void onSaveInstanceState(Bundle outState) {
     @Override
     public void onSuccess(final IdpResponse response) {
         AuthCredential credential = ProviderUtils.getAuthCredential(response);
-        AuthInstances.getFirebaseAuth(getFlowParams())
+        getAuthHelper().getFirebaseAuth()
                 .signInWithCredential(credential)
                 .addOnFailureListener(
                         new TaskFailureLogger(TAG, "Failure authenticating with credential " +
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SaveSmartLock.java b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SaveSmartLock.java
index fff8a34c5..359c38d91 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SaveSmartLock.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SaveSmartLock.java
@@ -24,7 +24,6 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.text.TextUtils;
 import android.util.Log;
@@ -33,8 +32,7 @@
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.ResultCodes;
-import com.firebase.ui.auth.ui.FlowParameters;
-import com.firebase.ui.auth.util.AuthInstances;
+import com.firebase.ui.auth.ui.HelperActivityBase;
 import com.firebase.ui.auth.util.GoogleApiHelper;
 import com.firebase.ui.auth.util.PlayServicesHelper;
 import com.google.android.gms.auth.api.Auth;
@@ -59,14 +57,14 @@ public class SaveSmartLock extends SmartLockBase<Status> {
     private IdpResponse mResponse;
 
     @Nullable
-    public static SaveSmartLock getInstance(FragmentActivity activity, FlowParameters parameters) {
+    public static SaveSmartLock getInstance(HelperActivityBase activity) {
         SaveSmartLock result;
 
         FragmentManager fm = activity.getSupportFragmentManager();
         Fragment fragment = fm.findFragmentByTag(TAG);
         if (!(fragment instanceof SaveSmartLock)) {
             result = new SaveSmartLock();
-            result.setArguments(parameters.toBundle());
+            result.setArguments(activity.getFlowParams().toBundle());
             try {
                 fm.beginTransaction().add(result, TAG).disallowAddToBackStack().commit();
             } catch (IllegalStateException e) {
@@ -115,7 +113,7 @@ public void onConnected(Bundle bundle) {
             builder.setProfilePictureUri(Uri.parse(mProfilePictureUri));
         }
 
-        AuthInstances.getCredentialsApi()
+        getAuthHelper().getCredentialsApi()
                 .save(mGoogleApiClient, builder.build())
                 .setResultCallback(this);
     }
@@ -173,7 +171,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                 Credential credential = new Credential.Builder(mEmail).setPassword(mPassword)
                         .build();
 
-                AuthInstances.getCredentialsApi()
+                getAuthHelper().getCredentialsApi()
                         .save(mGoogleApiClient, credential)
                         .setResultCallback(this);
             } else {
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
index 7f547469a..8c20475d8 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java
@@ -23,7 +23,6 @@
 import com.firebase.ui.auth.ui.email.RegisterEmailActivity;
 import com.firebase.ui.auth.ui.idp.AuthMethodPickerActivity;
 import com.firebase.ui.auth.ui.phone.PhoneVerificationActivity;
-import com.firebase.ui.auth.util.AuthInstances;
 import com.firebase.ui.auth.util.GoogleApiHelper;
 import com.firebase.ui.auth.util.GoogleSignInHelper;
 import com.google.android.gms.auth.api.Auth;
@@ -104,7 +103,7 @@ public void onCreate(Bundle savedInstance) {
                     .build();
             mGoogleApiClient.connect();
 
-            AuthInstances.getCredentialsApi()
+            getAuthHelper().getCredentialsApi()
                     .request(mGoogleApiClient,
                             new CredentialRequest.Builder()
                                     .setPasswordLoginSupported(true)
@@ -276,7 +275,7 @@ private void signInWithEmailAndPassword(String email, String password) {
         final IdpResponse response =
                 new IdpResponse.Builder(EmailAuthProvider.PROVIDER_ID, email).build();
 
-        AuthInstances.getFirebaseAuth(getFlowParams())
+        getAuthHelper().getFirebaseAuth()
                 .signInWithEmailAndPassword(email, password)
                 .addOnFailureListener(new TaskFailureLogger(
                         TAG, "Error signing in with email and password"))
diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/AuthInstancesShadow.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/AuthHelperShadow.java
similarity index 77%
rename from auth/src/test/java/com/firebase/ui/auth/testhelpers/AuthInstancesShadow.java
rename to auth/src/test/java/com/firebase/ui/auth/testhelpers/AuthHelperShadow.java
index 560e6fdab..3a9656d53 100644
--- a/auth/src/test/java/com/firebase/ui/auth/testhelpers/AuthInstancesShadow.java
+++ b/auth/src/test/java/com/firebase/ui/auth/testhelpers/AuthHelperShadow.java
@@ -1,9 +1,7 @@
 package com.firebase.ui.auth.testhelpers;
 
-import android.support.v4.app.FragmentActivity;
-
-import com.firebase.ui.auth.ui.FlowParameters;
-import com.firebase.ui.auth.util.AuthInstances;
+import com.firebase.ui.auth.ui.HelperActivityBase;
+import com.firebase.ui.auth.util.AuthHelper;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.android.gms.auth.api.credentials.CredentialsApi;
 import com.google.firebase.auth.FirebaseAuth;
@@ -16,8 +14,8 @@
 
 import static org.mockito.Mockito.when;
 
-@Implements(AuthInstances.class)
-public class AuthInstancesShadow {
+@Implements(AuthHelper.class)
+public class AuthHelperShadow {
 
     public static final FirebaseAuth sFirebaseAuth;
     public static final FirebaseUser sFirebaseUser;
@@ -46,10 +44,10 @@ public class AuthInstancesShadow {
         sPhoneAuthProvider = Mockito.mock(PhoneAuthProvider.class);
     }
 
-    private AuthInstancesShadow() {}
+    public AuthHelperShadow() {}
 
     @Implementation
-    public static FirebaseAuth getFirebaseAuth(FlowParameters parameters) {
+    public static FirebaseAuth getFirebaseAuth() {
         return sFirebaseAuth;
     }
 
@@ -59,13 +57,12 @@ public static CredentialsApi getCredentialsApi() {
     }
 
     @Implementation
-    public static FirebaseUser getCurrentUser(FlowParameters parameters) {
+    public static FirebaseUser getCurrentUser() {
         return sFirebaseUser;
     }
 
     @Implementation
-    public static SaveSmartLock getSaveSmartLockInstance(FragmentActivity activity,
-                                                         FlowParameters parameters) {
+    public static SaveSmartLock getSaveSmartLockInstance(HelperActivityBase activity) {
         return sSaveSmartLock;
     }
 
diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/CustomRobolectricGradleTestRunner.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/CustomRobolectricGradleTestRunner.java
index fa30fdc07..340864245 100644
--- a/auth/src/test/java/com/firebase/ui/auth/testhelpers/CustomRobolectricGradleTestRunner.java
+++ b/auth/src/test/java/com/firebase/ui/auth/testhelpers/CustomRobolectricGradleTestRunner.java
@@ -17,7 +17,7 @@
 import com.facebook.login.LoginManager;
 import com.firebase.ui.auth.provider.FacebookProvider;
 import com.firebase.ui.auth.provider.GoogleProvider;
-import com.firebase.ui.auth.util.AuthInstances;
+import com.firebase.ui.auth.util.AuthHelper;
 
 import org.junit.runners.model.InitializationError;
 import org.robolectric.RobolectricTestRunner;
@@ -33,7 +33,7 @@ public CustomRobolectricGradleTestRunner(Class<?> klass) throws InitializationEr
     public InstrumentationConfiguration createClassLoaderConfig(Config config) {
         InstrumentationConfiguration.Builder builder = InstrumentationConfiguration.newBuilder();
 
-        builder.addInstrumentedClass(AuthInstances.class.getName());
+        builder.addInstrumentedClass(AuthHelper.class.getName());
         builder.addInstrumentedClass(FacebookProvider.class.getName());
         builder.addInstrumentedClass(GoogleProvider.class.getName());
         builder.addInstrumentedClass(LoginManager.class.getName());
diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/FakeAuthResult.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/FakeAuthResult.java
index f405277ba..be6b669c2 100644
--- a/auth/src/test/java/com/firebase/ui/auth/testhelpers/FakeAuthResult.java
+++ b/auth/src/test/java/com/firebase/ui/auth/testhelpers/FakeAuthResult.java
@@ -27,7 +27,7 @@ private FakeAuthResult() {
 
     @Override
     public FirebaseUser getUser() {
-        return AuthInstancesShadow.getCurrentUser(null);
+        return AuthHelperShadow.getCurrentUser();
     }
 
     @Override
diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java
index 8ec719385..01d1977d0 100644
--- a/auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java
+++ b/auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java
@@ -80,7 +80,7 @@ public static void verifySmartLockSave(String providerId, String email,
         ArgumentCaptor<String> passwordCaptor = ArgumentCaptor.forClass(String.class);
         ArgumentCaptor<IdpResponse> idpResponseCaptor = ArgumentCaptor.forClass(IdpResponse.class);
 
-        verify(AuthInstancesShadow.sSaveSmartLock).saveCredentialsOrFinish(
+        verify(AuthHelperShadow.sSaveSmartLock).saveCredentialsOrFinish(
                 userCaptor.capture(),
                 passwordCaptor.capture(),
                 idpResponseCaptor.capture());
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivityTest.java
index df6a87795..3dbdfbc6f 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivityTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivityTest.java
@@ -19,7 +19,7 @@
 
 import com.firebase.ui.auth.BuildConfig;
 import com.firebase.ui.auth.R;
-import com.firebase.ui.auth.testhelpers.AuthInstancesShadow;
+import com.firebase.ui.auth.testhelpers.AuthHelperShadow;
 import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
 import com.firebase.ui.auth.testhelpers.CustomRobolectricGradleTestRunner;
 import com.firebase.ui.auth.testhelpers.TestConstants;
@@ -56,14 +56,14 @@ private RecoverPasswordActivity createActivity() {
     }
 
     @Test
-    @Config(shadows = {AuthInstancesShadow.class})
+    @Config(shadows = {AuthHelperShadow.class})
     public void testNextButton_sendsEmail() {
         RecoverPasswordActivity recoverPasswordActivity = createActivity();
 
         Button nextButton = (Button) recoverPasswordActivity.findViewById(R.id.button_done);
-        when(AuthInstancesShadow.sFirebaseAuth.sendPasswordResetEmail(TestConstants.EMAIL))
+        when(AuthHelperShadow.sFirebaseAuth.sendPasswordResetEmail(TestConstants.EMAIL))
                 .thenReturn(new AutoCompleteTask<Void>(null, true, null));
         nextButton.performClick();
-        verify(AuthInstancesShadow.sFirebaseAuth).sendPasswordResetEmail(TestConstants.EMAIL);
+        verify(AuthHelperShadow.sFirebaseAuth).sendPasswordResetEmail(TestConstants.EMAIL);
     }
 }
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java
index b002cb074..b3f7b60f3 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java
@@ -23,7 +23,7 @@
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.BuildConfig;
 import com.firebase.ui.auth.R;
-import com.firebase.ui.auth.testhelpers.AuthInstancesShadow;
+import com.firebase.ui.auth.testhelpers.AuthHelperShadow;
 import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
 import com.firebase.ui.auth.testhelpers.CustomRobolectricGradleTestRunner;
 import com.firebase.ui.auth.testhelpers.FakeAuthResult;
@@ -99,10 +99,10 @@ public void testSignUpButton_validatesFields() {
     }
 
     @Test
-    @Config(shadows = {AuthInstancesShadow.class})
+    @Config(shadows = {AuthHelperShadow.class})
     public void testSignUpButton_successfulRegistrationShouldContinueToSaveCredentials() {
         // init mocks
-        reset(AuthInstancesShadow.sSaveSmartLock);
+        reset(AuthHelperShadow.sSaveSmartLock);
 
         TestHelper.initializeApp(RuntimeEnvironment.application);
         RegisterEmailActivity registerEmailActivity = createActivity();
@@ -118,10 +118,10 @@ public void testSignUpButton_successfulRegistrationShouldContinueToSaveCredentia
         name.setText(TestConstants.NAME);
         password.setText(TestConstants.PASSWORD);
 
-        when(AuthInstancesShadow.sFirebaseUser.updateProfile(any(UserProfileChangeRequest.class)))
+        when(AuthHelperShadow.sFirebaseUser.updateProfile(any(UserProfileChangeRequest.class)))
                 .thenReturn(new AutoCompleteTask<Void>(null, true, null));
 
-        when(AuthInstancesShadow.sFirebaseAuth
+        when(AuthHelperShadow.sFirebaseAuth
                      .createUserWithEmailAndPassword(
                              TestConstants.EMAIL,
                              TestConstants.PASSWORD))
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java
index 58d8efb7c..b5d67f57e 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java
@@ -22,7 +22,7 @@
 import com.firebase.ui.auth.BuildConfig;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
-import com.firebase.ui.auth.testhelpers.AuthInstancesShadow;
+import com.firebase.ui.auth.testhelpers.AuthHelperShadow;
 import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
 import com.firebase.ui.auth.testhelpers.CustomRobolectricGradleTestRunner;
 import com.firebase.ui.auth.testhelpers.FakeAuthResult;
@@ -90,16 +90,16 @@ public void testSignInButton_validatesFields() {
     }
 
     @Test
-    @Config(shadows = {AuthInstancesShadow.class})
+    @Config(shadows = {AuthHelperShadow.class})
     public void testSignInButton_signsInAndSavesCredentials() {
         // initialize mocks
-        reset(AuthInstancesShadow.sSaveSmartLock);
+        reset(AuthHelperShadow.sSaveSmartLock);
 
         WelcomeBackPasswordPrompt welcomeBackActivity = createActivity();
         EditText passwordField = (EditText) welcomeBackActivity.findViewById(R.id.password);
         passwordField.setText(TestConstants.PASSWORD);
 
-        when(AuthInstancesShadow.sFirebaseAuth.signInWithEmailAndPassword(
+        when(AuthHelperShadow.sFirebaseAuth.signInWithEmailAndPassword(
                 TestConstants.EMAIL,
                 TestConstants.PASSWORD)).thenReturn(
                 new AutoCompleteTask<>(FakeAuthResult.INSTANCE, true, null));
@@ -107,7 +107,7 @@ public void testSignInButton_signsInAndSavesCredentials() {
         Button signIn = (Button) welcomeBackActivity.findViewById(R.id.button_done);
         signIn.performClick();
 
-        verify(AuthInstancesShadow.sFirebaseAuth).signInWithEmailAndPassword(
+        verify(AuthHelperShadow.sFirebaseAuth).signInWithEmailAndPassword(
                 TestConstants.EMAIL,
                 TestConstants.PASSWORD);
 
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
index a4cd8d161..2e2bdd25f 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
@@ -22,7 +22,7 @@
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.BuildConfig;
 import com.firebase.ui.auth.R;
-import com.firebase.ui.auth.testhelpers.AuthInstancesShadow;
+import com.firebase.ui.auth.testhelpers.AuthHelperShadow;
 import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
 import com.firebase.ui.auth.testhelpers.CustomRobolectricGradleTestRunner;
 import com.firebase.ui.auth.testhelpers.FacebookProviderShadow;
@@ -116,14 +116,14 @@ public void testPhoneLoginFlow() {
     }
 
     @Test
-    @Config(shadows = {AuthInstancesShadow.class, AuthInstancesShadow.class})
+    @Config(shadows = {AuthHelperShadow.class, AuthHelperShadow.class})
     public void testFacebookLoginFlow() {
         // initialize mocks
-        reset(AuthInstancesShadow.sSaveSmartLock);
+        reset(AuthHelperShadow.sSaveSmartLock);
 
-        when(AuthInstancesShadow.sFirebaseUser.getProviders())
+        when(AuthHelperShadow.sFirebaseUser.getProviders())
                 .thenReturn(Arrays.asList(FacebookAuthProvider.PROVIDER_ID));
-        when(AuthInstancesShadow.sFirebaseAuth.signInWithCredential((AuthCredential) any()))
+        when(AuthHelperShadow.sFirebaseAuth.signInWithCredential((AuthCredential) any()))
                 .thenReturn(new AutoCompleteTask<>(FakeAuthResult.INSTANCE, true, null));
 
         List<String> providers = Arrays.asList(AuthUI.FACEBOOK_PROVIDER);
@@ -138,19 +138,19 @@ public void testFacebookLoginFlow() {
     }
 
     @Test
-    @Config(shadows = {GoogleProviderShadow.class, AuthInstancesShadow.class, AuthInstancesShadow.class})
+    @Config(shadows = {GoogleProviderShadow.class, AuthHelperShadow.class, AuthHelperShadow.class})
     public void testGoogleLoginFlow() {
         // initialize mocks
-        reset(AuthInstancesShadow.sSaveSmartLock);
+        reset(AuthHelperShadow.sSaveSmartLock);
 
         List<String> providers = Arrays.asList(AuthUI.GOOGLE_PROVIDER);
 
         AuthMethodPickerActivity authMethodPickerActivity = createActivity(providers);
 
-        when(AuthInstancesShadow.sFirebaseUser.getProviders())
+        when(AuthHelperShadow.sFirebaseUser.getProviders())
                 .thenReturn(Arrays.asList(GoogleAuthProvider.PROVIDER_ID));
 
-        when(AuthInstancesShadow.sFirebaseAuth.signInWithCredential((AuthCredential) any()))
+        when(AuthHelperShadow.sFirebaseAuth.signInWithCredential((AuthCredential) any()))
                 .thenReturn(new AutoCompleteTask<>(FakeAuthResult.INSTANCE, true, null));
 
         Button googleButton = (Button) authMethodPickerActivity.findViewById(R.id.google_button);
@@ -162,16 +162,16 @@ public void testGoogleLoginFlow() {
     }
 
     @Test
-    @Config(shadows = {AuthInstancesShadow.class})
+    @Config(shadows = {AuthHelperShadow.class})
     public void testTwitterLoginFlowStarts() {
         List<String> providers = Arrays.asList(AuthUI.TWITTER_PROVIDER);
 
         AuthMethodPickerActivity authMethodPickerActivity = createActivity(providers);
 
-        when(AuthInstancesShadow.sFirebaseUser.getProviders())
+        when(AuthHelperShadow.sFirebaseUser.getProviders())
                 .thenReturn(Arrays.asList(TwitterAuthProvider.PROVIDER_ID));
 
-        when(AuthInstancesShadow.sFirebaseAuth.signInWithCredential(any(AuthCredential.class)))
+        when(AuthHelperShadow.sFirebaseAuth.signInWithCredential(any(AuthCredential.class)))
                 .thenReturn(new AutoCompleteTask<>(FakeAuthResult.INSTANCE, true, null));
         Button twitterButton =
                 (Button) authMethodPickerActivity.findViewById(R.id.twitter_button);
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandlerTest.java
index 6bb22abab..eb2b79365 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandlerTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandlerTest.java
@@ -18,7 +18,7 @@
 
 import com.firebase.ui.auth.BuildConfig;
 import com.firebase.ui.auth.IdpResponse;
-import com.firebase.ui.auth.testhelpers.AuthInstancesShadow;
+import com.firebase.ui.auth.testhelpers.AuthHelperShadow;
 import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
 import com.firebase.ui.auth.testhelpers.CustomRobolectricGradleTestRunner;
 import com.firebase.ui.auth.testhelpers.FakeAuthResult;
@@ -31,9 +31,11 @@
 import com.firebase.ui.auth.ui.User;
 import com.firebase.ui.auth.ui.accountlink.WelcomeBackIdpPrompt;
 import com.firebase.ui.auth.ui.accountlink.WelcomeBackPasswordPrompt;
+import com.firebase.ui.auth.util.AuthHelper;
 import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.FirebaseAuth;
@@ -72,7 +74,7 @@ public void setUp() {
     }
 
     @Test
-    @Config(shadows = {AuthInstancesShadow.class})
+    @Config(shadows = {AuthHelperShadow.class})
     public void testSignInSucceeded() {
         AppCompatBase mockActivity = mock(AppCompatBase.class);
         IdpResponse idpResponse =
@@ -100,7 +102,7 @@ public void testSignInSucceeded() {
                 idpResponseCaptor.capture());
 
         assertEquals(smartLock, smartLockCaptor.getValue());
-        assertEquals(AuthInstancesShadow.sFirebaseUser, firebaseUserCaptor.getValue());
+        assertEquals(AuthHelperShadow.sFirebaseUser, firebaseUserCaptor.getValue());
 
         IdpResponse response = idpResponseCaptor.getValue();
         assertEquals(idpResponse.getProviderType(), response.getProviderType());
@@ -110,7 +112,7 @@ public void testSignInSucceeded() {
     }
 
     @Test
-    @Config(shadows = {AuthInstancesShadow.class})
+    @Config(shadows = {AuthHelperShadow.class})
     public void testSignInFailed_withFacebookAlreadyLinked() {
         AppCompatBase mockActivity = mock(AppCompatBase.class);
         IdpResponse idpResponse =
@@ -126,18 +128,23 @@ public void testSignInFailed_withFacebookAlreadyLinked() {
         FlowParameters mockFlowParams = mock(FlowParameters.class);
         when(mockActivity.getFlowParams()).thenReturn(mockFlowParams);
 
+        AuthHelper mockAuthHelper = mock(AuthHelper.class);
+        when(mockActivity.getAuthHelper()).thenReturn(mockAuthHelper);
+        AuthHelperShadow.getFirebaseAuth(); // Force static initialization
+        when(mockAuthHelper.getFirebaseAuth()).thenReturn(AuthHelperShadow.getFirebaseAuth());
+
         ProgressDialogHolder mockHolder = mock(ProgressDialogHolder.class);
         when(mockActivity.getDialogHolder()).thenReturn(mockHolder);
 
         // pretend the account has Facebook linked already
-        FirebaseAuth mockFirebaseAuth = AuthInstancesShadow.sFirebaseAuth;
+        FirebaseAuth mockFirebaseAuth = AuthHelperShadow.sFirebaseAuth;
         when(mockFirebaseAuth.fetchProvidersForEmail(TestConstants.EMAIL)).thenReturn(
                 new AutoCompleteTask<ProviderQueryResult>(
                         new FakeProviderQueryResult(
                                 Arrays.asList(FacebookAuthProvider.PROVIDER_ID)), true, null));
 
         // pretend there was already an account with this email
-        Task exceptionTask = Tasks.forException(
+        Task<AuthResult> exceptionTask = Tasks.forException(
                 new FirebaseAuthUserCollisionException(LINKING_ERROR, LINKING_EXPLANATION));
         credentialSignInHandler.onComplete(exceptionTask);
         ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
@@ -159,7 +166,7 @@ public void testSignInFailed_withFacebookAlreadyLinked() {
     }
 
     @Test
-    @Config(shadows = {AuthInstancesShadow.class})
+    @Config(shadows = {AuthHelperShadow.class})
     public void testSignInFailed_withPasswordAccountAlreadyLinked() {
         AppCompatBase mockActivity = mock(AppCompatBase.class);
         IdpResponse idpResponse =
@@ -175,6 +182,11 @@ public void testSignInFailed_withPasswordAccountAlreadyLinked() {
         FlowParameters mockFlowParams = mock(FlowParameters.class);
         when(mockActivity.getFlowParams()).thenReturn(mockFlowParams);
 
+        AuthHelper mockAuthHelper = mock(AuthHelper.class);
+        when(mockActivity.getAuthHelper()).thenReturn(mockAuthHelper);
+        AuthHelperShadow.getFirebaseAuth(); // Force static initialization
+        when(mockAuthHelper.getFirebaseAuth()).thenReturn(AuthHelperShadow.getFirebaseAuth());
+
         ProgressDialogHolder mockHolder = mock(ProgressDialogHolder.class);
         when(mockActivity.getDialogHolder()).thenReturn(mockHolder);
 
@@ -184,7 +196,7 @@ public void testSignInFailed_withPasswordAccountAlreadyLinked() {
                 new FirebaseAuthUserCollisionException(LINKING_ERROR, LINKING_EXPLANATION));
 
         // pretend the account has a Password account linked already
-        FirebaseAuth mockFirebaseAuth = AuthInstancesShadow.sFirebaseAuth;
+        FirebaseAuth mockFirebaseAuth = AuthHelperShadow.sFirebaseAuth;
         when(mockFirebaseAuth.fetchProvidersForEmail(TestConstants.EMAIL)).thenReturn(
                 new AutoCompleteTask<ProviderQueryResult>(
                         new FakeProviderQueryResult(
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java
index 10e8c6b91..b7d827017 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java
@@ -25,7 +25,7 @@
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.BuildConfig;
 import com.firebase.ui.auth.R;
-import com.firebase.ui.auth.testhelpers.AuthInstancesShadow;
+import com.firebase.ui.auth.testhelpers.AuthHelperShadow;
 import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
 import com.firebase.ui.auth.testhelpers.CustomRobolectricGradleTestRunner;
 import com.firebase.ui.auth.testhelpers.FakeAuthResult;
@@ -151,9 +151,9 @@ public void testBadPhoneNumber_showsInlineError() {
     }
 
     @Test
-    @Config(shadows = {AuthInstancesShadow.class})
+    @Config(shadows = {AuthHelperShadow.class})
     public void testVerifyPhoneNumberInvalidPhoneException_showsInlineError() {
-        reset(AuthInstancesShadow.sPhoneAuthProvider);
+        reset(AuthHelperShadow.sPhoneAuthProvider);
 
         mActivity.verifyPhoneNumber(PHONE, false);
         AlertDialog alert = ShadowAlertDialog.getLatestAlertDialog();
@@ -162,7 +162,7 @@ public void testVerifyPhoneNumberInvalidPhoneException_showsInlineError() {
         assertEquals(mActivity.getString(R.string.verifying), sAlert.getMessage());
 
         //was upstream method invoked
-        verify(AuthInstancesShadow.sPhoneAuthProvider).verifyPhoneNumber(
+        verify(AuthHelperShadow.sPhoneAuthProvider).verifyPhoneNumber(
                 eq(PHONE),
                 eq(AUTO_RETRIEVAL_TIMEOUT_MILLIS),
                 eq(TimeUnit.MILLISECONDS),
@@ -180,12 +180,12 @@ public void testVerifyPhoneNumberInvalidPhoneException_showsInlineError() {
     }
 
     @Test
-    @Config(shadows = {AuthInstancesShadow.class})
+    @Config(shadows = {AuthHelperShadow.class})
     public void testVerifyPhoneNumberNoMsgException_showsAlertDialog() {
-        reset(AuthInstancesShadow.sPhoneAuthProvider);
+        reset(AuthHelperShadow.sPhoneAuthProvider);
 
         mActivity.verifyPhoneNumber(PHONE, false);
-        verify(AuthInstancesShadow.sPhoneAuthProvider).verifyPhoneNumber(
+        verify(AuthHelperShadow.sPhoneAuthProvider).verifyPhoneNumber(
                 eq(PHONE),
                 eq(AUTO_RETRIEVAL_TIMEOUT_MILLIS),
                 eq(TimeUnit.MILLISECONDS),
@@ -203,17 +203,17 @@ public void testVerifyPhoneNumberNoMsgException_showsAlertDialog() {
     }
 
     @Test
-    @Config(shadows = {AuthInstancesShadow.class})
+    @Config(shadows = {AuthHelperShadow.class})
     public void testVerifyPhoneNumber_success() {
-        reset(AuthInstancesShadow.sPhoneAuthProvider);
+        reset(AuthHelperShadow.sPhoneAuthProvider);
         testSendConfirmationCode();
     }
 
     @Test
-    @Config(shadows = {AuthInstancesShadow.class})
+    @Config(shadows = {AuthHelperShadow.class})
     public void testSubmitCode_badCodeShowsAlertDialog() {
-        reset(AuthInstancesShadow.sPhoneAuthProvider);
-        when(AuthInstancesShadow.sFirebaseAuth.signInWithCredential(any(AuthCredential.class)))
+        reset(AuthHelperShadow.sPhoneAuthProvider);
+        when(AuthHelperShadow.sFirebaseAuth.signInWithCredential(any(AuthCredential.class)))
                 .thenReturn(new AutoCompleteTask<AuthResult>(
                         null, true,
                         new FirebaseAuthInvalidCredentialsException(
@@ -236,9 +236,9 @@ public void testSubmitCode_badCodeShowsAlertDialog() {
     }
 
     @Test
-    @Config(shadows = {AuthInstancesShadow.class})
+    @Config(shadows = {AuthHelperShadow.class})
     public void testresendCode_invokesUpstream() {
-        reset(AuthInstancesShadow.sPhoneAuthProvider);
+        reset(AuthHelperShadow.sPhoneAuthProvider);
         testSendConfirmationCode();
 
         //test resend code invisible
@@ -256,7 +256,7 @@ public void testresendCode_invokesUpstream() {
         assertEquals(View.GONE, r.getVisibility());
 
         //verify resend code was called
-        verify(AuthInstancesShadow.sPhoneAuthProvider).verifyPhoneNumber(
+        verify(AuthHelperShadow.sPhoneAuthProvider).verifyPhoneNumber(
                 eq(PHONE),
                 eq(AUTO_RETRIEVAL_TIMEOUT_MILLIS),
                 eq(TimeUnit.MILLISECONDS),
@@ -266,18 +266,18 @@ public void testresendCode_invokesUpstream() {
     }
 
     @Test
-    @Config(shadows = {AuthInstancesShadow.class})
+    @Config(shadows = {AuthHelperShadow.class})
     public void testAutoVerify() {
-        reset(AuthInstancesShadow.sPhoneAuthProvider);
-        reset(AuthInstancesShadow.sSaveSmartLock);
-        reset(AuthInstancesShadow.sFirebaseAuth);
+        reset(AuthHelperShadow.sPhoneAuthProvider);
+        reset(AuthHelperShadow.sSaveSmartLock);
+        reset(AuthHelperShadow.sFirebaseAuth);
 
-        when(AuthInstancesShadow.sFirebaseUser.getPhoneNumber()).thenReturn(PHONE);
-        when(AuthInstancesShadow.sFirebaseUser.getEmail()).thenReturn(null);
-        when(AuthInstancesShadow.sFirebaseAuth.signInWithCredential(any(AuthCredential.class)))
+        when(AuthHelperShadow.sFirebaseUser.getPhoneNumber()).thenReturn(PHONE);
+        when(AuthHelperShadow.sFirebaseUser.getEmail()).thenReturn(null);
+        when(AuthHelperShadow.sFirebaseAuth.signInWithCredential(any(AuthCredential.class)))
                 .thenReturn(new AutoCompleteTask<>(FakeAuthResult.INSTANCE, true, null));
         mActivity.verifyPhoneNumber(PHONE, false);
-        verify(AuthInstancesShadow.sPhoneAuthProvider).verifyPhoneNumber(
+        verify(AuthHelperShadow.sPhoneAuthProvider).verifyPhoneNumber(
                 eq(PHONE),
                 eq(AUTO_RETRIEVAL_TIMEOUT_MILLIS),
                 eq(TimeUnit.MILLISECONDS),
@@ -289,20 +289,20 @@ public void testAutoVerify() {
                 = callbacksArgumentCaptor.getValue();
 
         onVerificationStateChangedCallbacks.onVerificationCompleted(credential);
-        verify(AuthInstancesShadow.sFirebaseAuth).signInWithCredential(any(AuthCredential.class));
+        verify(AuthHelperShadow.sFirebaseAuth).signInWithCredential(any(AuthCredential.class));
     }
 
     @Test
-    @Config(shadows = {AuthInstancesShadow.class})
+    @Config(shadows = {AuthHelperShadow.class})
     public void testSMSAutoRetrieval() {
-        reset(AuthInstancesShadow.sPhoneAuthProvider);
-        reset(AuthInstancesShadow.sSaveSmartLock);
+        reset(AuthHelperShadow.sPhoneAuthProvider);
+        reset(AuthHelperShadow.sSaveSmartLock);
         when(credential.getSmsCode()).thenReturn("123456");
 
-        when(AuthInstancesShadow.sFirebaseUser.getPhoneNumber()).thenReturn(PHONE);
-        when(AuthInstancesShadow.sFirebaseUser.getEmail()).thenReturn(null);
+        when(AuthHelperShadow.sFirebaseUser.getPhoneNumber()).thenReturn(PHONE);
+        when(AuthHelperShadow.sFirebaseUser.getEmail()).thenReturn(null);
 
-        when(AuthInstancesShadow.sFirebaseAuth.signInWithCredential(any(AuthCredential.class)))
+        when(AuthHelperShadow.sFirebaseAuth.signInWithCredential(any(AuthCredential.class)))
                 .thenReturn(new AutoCompleteTask<>(FakeAuthResult.INSTANCE, true, null));
         PhoneAuthProvider.OnVerificationStateChangedCallbacks callbacks =
                 testSendConfirmationCode();
@@ -312,13 +312,13 @@ public void testSMSAutoRetrieval() {
         //verify confirmation code set
         assertEquals("1 2 3 4 5 6", mConfirmationCodeEditText.getText().toString());
         //verify credential saves
-        verify(AuthInstancesShadow.sFirebaseAuth).signInWithCredential(credential);
+        verify(AuthHelperShadow.sFirebaseAuth).signInWithCredential(credential);
     }
 
     @Test
-    @Config(shadows = {AuthInstancesShadow.class})
+    @Config(shadows = {AuthHelperShadow.class})
     public void testEditPhoneNumber_togglesFragments() {
-        reset(AuthInstancesShadow.sPhoneAuthProvider);
+        reset(AuthHelperShadow.sPhoneAuthProvider);
         testSendConfirmationCode();
         TextView mEditPhoneTextView = (TextView) mActivity.findViewById(R.id.edit_phone_number);
         mEditPhoneTextView.performClick();
@@ -337,7 +337,7 @@ public void testEditPhoneNumber_togglesFragments() {
 
     private PhoneAuthProvider.OnVerificationStateChangedCallbacks testSendConfirmationCode() {
         mActivity.verifyPhoneNumber(PHONE, false);
-        verify(AuthInstancesShadow.sPhoneAuthProvider).verifyPhoneNumber(
+        verify(AuthHelperShadow.sPhoneAuthProvider).verifyPhoneNumber(
                 eq(PHONE),
                 eq(AUTO_RETRIEVAL_TIMEOUT_MILLIS),
                 eq(TimeUnit.MILLISECONDS),

From ac7187956e952543889f66c31ad5f63ac3601342 Mon Sep 17 00:00:00 2001
From: Ashwin Raghav <ashwinraghav@google.com>
Date: Fri, 14 Jul 2017 08:21:33 -0700
Subject: [PATCH 10/14] Translations for auth (#771)

---
 app/build.gradle                              |  4 +
 app/src/main/AndroidManifest.xml              |  2 +-
 auth/build.gradle                             |  4 +
 .../ui/auth/ui/email/PreambleHandler.java     | 31 +++-----
 auth/src/main/res/values-b+es+419/strings.xml | 74 +++++++++++++++++
 auth/src/main/res/values-bg/strings.xml       | 74 +++++++++++++++++
 auth/src/main/res/values-bn/strings.xml       | 77 ++++++++++++++++++
 auth/src/main/res/values-ca/strings.xml       | 76 ++++++++++++++++++
 auth/src/main/res/values-cs/strings.xml       | 79 +++++++++++++++++++
 auth/src/main/res/values-da/strings.xml       | 77 ++++++++++++++++++
 auth/src/main/res/values-de-rAT/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-de-rCH/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-de/strings.xml       | 74 +++++++++++++++++
 auth/src/main/res/values-el/strings.xml       | 77 ++++++++++++++++++
 auth/src/main/res/values-en-rAU/strings.xml   | 77 ++++++++++++++++++
 auth/src/main/res/values-en-rCA/strings.xml   | 77 ++++++++++++++++++
 auth/src/main/res/values-en-rGB/strings.xml   | 77 ++++++++++++++++++
 auth/src/main/res/values-en-rIE/strings.xml   | 77 ++++++++++++++++++
 auth/src/main/res/values-en-rIN/strings.xml   | 77 ++++++++++++++++++
 auth/src/main/res/values-en-rSG/strings.xml   | 77 ++++++++++++++++++
 auth/src/main/res/values-en-rZA/strings.xml   | 77 ++++++++++++++++++
 auth/src/main/res/values-es-rAR/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-es-rBO/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-es-rCL/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-es-rCO/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-es-rCR/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-es-rDO/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-es-rEC/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-es-rGT/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-es-rHN/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-es-rMX/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-es-rNI/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-es-rPA/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-es-rPE/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-es-rPR/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-es-rPY/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-es-rSV/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-es-rUS/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-es-rUY/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-es-rVE/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-es/strings.xml       | 77 ++++++++++++++++++
 auth/src/main/res/values-fa/strings.xml       | 76 ++++++++++++++++++
 auth/src/main/res/values-fi/strings.xml       | 77 ++++++++++++++++++
 auth/src/main/res/values-fil/strings.xml      | 77 ++++++++++++++++++
 auth/src/main/res/values-fr-rCH/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-fr/strings.xml       | 74 +++++++++++++++++
 auth/src/main/res/values-gsw/strings.xml      | 74 +++++++++++++++++
 auth/src/main/res/values-gu/strings.xml       | 77 ++++++++++++++++++
 auth/src/main/res/values-hi/strings.xml       | 76 ++++++++++++++++++
 auth/src/main/res/values-hr/strings.xml       | 78 ++++++++++++++++++
 auth/src/main/res/values-hu/strings.xml       | 77 ++++++++++++++++++
 auth/src/main/res/values-in/strings.xml       | 77 ++++++++++++++++++
 auth/src/main/res/values-it/strings.xml       | 76 ++++++++++++++++++
 auth/src/main/res/values-ja/strings.xml       | 74 +++++++++++++++++
 auth/src/main/res/values-kn/strings.xml       | 74 +++++++++++++++++
 auth/src/main/res/values-ko/strings.xml       | 77 ++++++++++++++++++
 auth/src/main/res/values-ln/strings.xml       | 74 +++++++++++++++++
 auth/src/main/res/values-lt/strings.xml       | 77 ++++++++++++++++++
 auth/src/main/res/values-lv/strings.xml       | 78 ++++++++++++++++++
 auth/src/main/res/values-mo/strings.xml       | 75 ++++++++++++++++++
 auth/src/main/res/values-mr/strings.xml       | 74 +++++++++++++++++
 auth/src/main/res/values-ms/strings.xml       | 74 +++++++++++++++++
 auth/src/main/res/values-nb/strings.xml       | 77 ++++++++++++++++++
 auth/src/main/res/values-nl/strings.xml       | 74 +++++++++++++++++
 auth/src/main/res/values-no/strings.xml       | 77 ++++++++++++++++++
 auth/src/main/res/values-pl/strings.xml       | 76 ++++++++++++++++++
 auth/src/main/res/values-pt-rBR/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-pt-rPT/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-pt/strings.xml       | 74 +++++++++++++++++
 auth/src/main/res/values-ro/strings.xml       | 75 ++++++++++++++++++
 auth/src/main/res/values-ru/strings.xml       | 76 ++++++++++++++++++
 auth/src/main/res/values-sk/strings.xml       | 79 +++++++++++++++++++
 auth/src/main/res/values-sl/strings.xml       | 79 +++++++++++++++++++
 auth/src/main/res/values-sr/strings.xml       | 77 ++++++++++++++++++
 auth/src/main/res/values-sv/strings.xml       | 75 ++++++++++++++++++
 auth/src/main/res/values-sw360dp/dimens.xml   |  0
 auth/src/main/res/values-ta/strings.xml       | 77 ++++++++++++++++++
 auth/src/main/res/values-th/strings.xml       | 74 +++++++++++++++++
 auth/src/main/res/values-tl/strings.xml       | 77 ++++++++++++++++++
 auth/src/main/res/values-tr/strings.xml       | 74 +++++++++++++++++
 auth/src/main/res/values-uk/strings.xml       | 79 +++++++++++++++++++
 auth/src/main/res/values-ur/strings.xml       | 77 ++++++++++++++++++
 auth/src/main/res/values-vi/strings.xml       | 77 ++++++++++++++++++
 auth/src/main/res/values-zh-rCN/strings.xml   | 74 +++++++++++++++++
 auth/src/main/res/values-zh-rHK/strings.xml   | 77 ++++++++++++++++++
 auth/src/main/res/values-zh-rTW/strings.xml   | 77 ++++++++++++++++++
 auth/src/main/res/values-zh/strings.xml       | 74 +++++++++++++++++
 auth/src/main/res/values/strings.xml          | 18 ++---
 library/src/main/AndroidManifest.xml          |  1 +
 scripts/.gitignore                            |  1 +
 scripts/translations/base_string_script.py    | 44 +++++++++++
 scripts/translations/clean_up_translations.sh | 29 +++++++
 .../translations/remove_non_translatable.py   | 22 ++++++
 scripts/translations/remove_string.py         | 35 ++++++++
 94 files changed, 6354 insertions(+), 29 deletions(-)
 create mode 100755 auth/src/main/res/values-b+es+419/strings.xml
 create mode 100755 auth/src/main/res/values-bg/strings.xml
 create mode 100755 auth/src/main/res/values-bn/strings.xml
 create mode 100755 auth/src/main/res/values-ca/strings.xml
 create mode 100755 auth/src/main/res/values-cs/strings.xml
 create mode 100755 auth/src/main/res/values-da/strings.xml
 create mode 100755 auth/src/main/res/values-de-rAT/strings.xml
 create mode 100755 auth/src/main/res/values-de-rCH/strings.xml
 create mode 100755 auth/src/main/res/values-de/strings.xml
 create mode 100755 auth/src/main/res/values-el/strings.xml
 create mode 100755 auth/src/main/res/values-en-rAU/strings.xml
 create mode 100755 auth/src/main/res/values-en-rCA/strings.xml
 create mode 100755 auth/src/main/res/values-en-rGB/strings.xml
 create mode 100755 auth/src/main/res/values-en-rIE/strings.xml
 create mode 100755 auth/src/main/res/values-en-rIN/strings.xml
 create mode 100755 auth/src/main/res/values-en-rSG/strings.xml
 create mode 100755 auth/src/main/res/values-en-rZA/strings.xml
 create mode 100755 auth/src/main/res/values-es-rAR/strings.xml
 create mode 100755 auth/src/main/res/values-es-rBO/strings.xml
 create mode 100755 auth/src/main/res/values-es-rCL/strings.xml
 create mode 100755 auth/src/main/res/values-es-rCO/strings.xml
 create mode 100755 auth/src/main/res/values-es-rCR/strings.xml
 create mode 100755 auth/src/main/res/values-es-rDO/strings.xml
 create mode 100755 auth/src/main/res/values-es-rEC/strings.xml
 create mode 100755 auth/src/main/res/values-es-rGT/strings.xml
 create mode 100755 auth/src/main/res/values-es-rHN/strings.xml
 create mode 100755 auth/src/main/res/values-es-rMX/strings.xml
 create mode 100755 auth/src/main/res/values-es-rNI/strings.xml
 create mode 100755 auth/src/main/res/values-es-rPA/strings.xml
 create mode 100755 auth/src/main/res/values-es-rPE/strings.xml
 create mode 100755 auth/src/main/res/values-es-rPR/strings.xml
 create mode 100755 auth/src/main/res/values-es-rPY/strings.xml
 create mode 100755 auth/src/main/res/values-es-rSV/strings.xml
 create mode 100755 auth/src/main/res/values-es-rUS/strings.xml
 create mode 100755 auth/src/main/res/values-es-rUY/strings.xml
 create mode 100755 auth/src/main/res/values-es-rVE/strings.xml
 create mode 100755 auth/src/main/res/values-es/strings.xml
 create mode 100755 auth/src/main/res/values-fa/strings.xml
 create mode 100755 auth/src/main/res/values-fi/strings.xml
 create mode 100755 auth/src/main/res/values-fil/strings.xml
 create mode 100755 auth/src/main/res/values-fr-rCH/strings.xml
 create mode 100755 auth/src/main/res/values-fr/strings.xml
 create mode 100755 auth/src/main/res/values-gsw/strings.xml
 create mode 100755 auth/src/main/res/values-gu/strings.xml
 create mode 100755 auth/src/main/res/values-hi/strings.xml
 create mode 100755 auth/src/main/res/values-hr/strings.xml
 create mode 100755 auth/src/main/res/values-hu/strings.xml
 create mode 100755 auth/src/main/res/values-in/strings.xml
 create mode 100755 auth/src/main/res/values-it/strings.xml
 create mode 100755 auth/src/main/res/values-ja/strings.xml
 create mode 100755 auth/src/main/res/values-kn/strings.xml
 create mode 100755 auth/src/main/res/values-ko/strings.xml
 create mode 100755 auth/src/main/res/values-ln/strings.xml
 create mode 100755 auth/src/main/res/values-lt/strings.xml
 create mode 100755 auth/src/main/res/values-lv/strings.xml
 create mode 100755 auth/src/main/res/values-mo/strings.xml
 create mode 100755 auth/src/main/res/values-mr/strings.xml
 create mode 100755 auth/src/main/res/values-ms/strings.xml
 create mode 100755 auth/src/main/res/values-nb/strings.xml
 create mode 100755 auth/src/main/res/values-nl/strings.xml
 create mode 100755 auth/src/main/res/values-no/strings.xml
 create mode 100755 auth/src/main/res/values-pl/strings.xml
 create mode 100755 auth/src/main/res/values-pt-rBR/strings.xml
 create mode 100755 auth/src/main/res/values-pt-rPT/strings.xml
 create mode 100755 auth/src/main/res/values-pt/strings.xml
 create mode 100755 auth/src/main/res/values-ro/strings.xml
 create mode 100755 auth/src/main/res/values-ru/strings.xml
 create mode 100755 auth/src/main/res/values-sk/strings.xml
 create mode 100755 auth/src/main/res/values-sl/strings.xml
 create mode 100755 auth/src/main/res/values-sr/strings.xml
 create mode 100755 auth/src/main/res/values-sv/strings.xml
 mode change 100644 => 100755 auth/src/main/res/values-sw360dp/dimens.xml
 create mode 100755 auth/src/main/res/values-ta/strings.xml
 create mode 100755 auth/src/main/res/values-th/strings.xml
 create mode 100755 auth/src/main/res/values-tl/strings.xml
 create mode 100755 auth/src/main/res/values-tr/strings.xml
 create mode 100755 auth/src/main/res/values-uk/strings.xml
 create mode 100755 auth/src/main/res/values-ur/strings.xml
 create mode 100755 auth/src/main/res/values-vi/strings.xml
 create mode 100755 auth/src/main/res/values-zh-rCN/strings.xml
 create mode 100755 auth/src/main/res/values-zh-rHK/strings.xml
 create mode 100755 auth/src/main/res/values-zh-rTW/strings.xml
 create mode 100755 auth/src/main/res/values-zh/strings.xml
 create mode 100644 scripts/translations/base_string_script.py
 create mode 100755 scripts/translations/clean_up_translations.sh
 create mode 100644 scripts/translations/remove_non_translatable.py
 create mode 100644 scripts/translations/remove_string.py

diff --git a/app/build.gradle b/app/build.gradle
index 5658ad3cb..06831ca0a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,6 +23,10 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+
+    lintOptions {
+        disable 'MissingTranslation'
+    }
 }
 
 dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cb2589255..0d28748a7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
         android:allowBackup="true"
         android:fullBackupContent="true"
         android:icon="@mipmap/ic_launcher"
-        android:supportsRtl="false"
+        android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
         <activity android:name=".ChooserActivity">
diff --git a/auth/build.gradle b/auth/build.gradle
index 73ae08779..0235c65b3 100644
--- a/auth/build.gradle
+++ b/auth/build.gradle
@@ -34,6 +34,10 @@ android {
             }
         }
     }
+
+    lintOptions {
+        disable 'UnusedQuantity', 'TypographyEllipsis', 'TypographyQuotes'
+    }
 }
 
 dependencies {
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/email/PreambleHandler.java b/auth/src/main/java/com/firebase/ui/auth/ui/email/PreambleHandler.java
index f66b53cf9..06ebb1d51 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/email/PreambleHandler.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/email/PreambleHandler.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.net.Uri;
 import android.support.annotation.ColorInt;
+import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.customtabs.CustomTabsIntent;
 import android.support.v4.content.ContextCompat;
@@ -45,14 +46,12 @@ public void setPreamble(TextView textView) {
     }
 
     private void setupCreateAccountPreamble() {
-        int preambleType = getPreambleType();
-        if (preambleType == -1) {
+        String withTargets = getPreambleStringWithTargets();
+        if (withTargets == null) {
             return;
         }
 
-        String[] preambles =
-                mContext.getResources().getStringArray(R.array.create_account_preamble);
-        mBuilder = new SpannableStringBuilder(preambles[preambleType]);
+        mBuilder = new SpannableStringBuilder(withTargets);
 
         replaceTarget(BTN_TARGET, mButtonText);
         replaceUrlTarget(TOS_TARGET, R.string.terms_of_service, mFlowParameters.termsOfServiceUrl);
@@ -79,27 +78,23 @@ private void replaceUrlTarget(String target, @StringRes int replacementRes, Stri
         }
     }
 
-    /**
-     * 0 means we have both a TOS and a PP <p>1 means we only have a TOS <p>2 means we only have a
-     * PP <p>-1 means we have neither
-     */
-    private int getPreambleType() {
-        int preambleType;
-
+    @Nullable
+    private String getPreambleStringWithTargets() {
         boolean hasTos = !TextUtils.isEmpty(mFlowParameters.termsOfServiceUrl);
         boolean hasPp = !TextUtils.isEmpty(mFlowParameters.privacyPolicyUrl);
 
         if (hasTos && hasPp) {
-            preambleType = 0;
+            return mContext.getString(R.string.create_account_preamble_tos_and_pp,
+                                      BTN_TARGET, TOS_TARGET, PP_TARGET);
         } else if (hasTos) {
-            preambleType = 1;
+            return mContext.getString(R.string.create_account_preamble_tos_only,
+                                      BTN_TARGET, TOS_TARGET);
         } else if (hasPp) {
-            preambleType = 2;
+            return mContext.getString(R.string.create_account_preamble_pp_only,
+                                      BTN_TARGET, PP_TARGET);
         } else {
-            preambleType = -1;
+            return null;
         }
-
-        return preambleType;
     }
 
     private class CustomTabsSpan extends ClickableSpan {
diff --git a/auth/src/main/res/values-b+es+419/strings.xml b/auth/src/main/res/values-b+es+419/strings.xml
new file mode 100755
index 000000000..dfa7b7446
--- /dev/null
+++ b/auth/src/main/res/values-b+es+419/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Cargando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Acceder</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocurrió un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Correo electrónico</string>
+    <string name="provider_name_phone">Teléfono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Acceder con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Acceder con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Acceder con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Acceder con el correo electrónico</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Acceder con el teléfono</string>
+    <string name="next_default" translation_description="Button text to continue">Siguiente</string>
+    <string name="email_hint" translation_description="Hint in email input field">Correo electrónico</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de teléfono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contraseña</string>
+    <string name="required_field" translation_description="Inline error for required field">Este campo no puede estar en blanco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">La dirección de correo electrónico es incorrecta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ingresa tu dirección de correo electrónico para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Buscando cuentas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrarse</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nombre y apellido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrando…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contraseña no es lo suficientemente segura. Usa al menos %1$d carácter y una combinación de letras y números</item>
+        <item quantity="other">La contraseña no es lo suficientemente segura. Usa al menos %1$d caracteres y una combinación de letras y números</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No se pudo registrar la cuenta de correo electrónico</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ya existe una cuenta con esa dirección de correo electrónico.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Si presionas %1$s, indicas que aceptas las %2$s y la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Si presionas %1$s, indicas que aceptas las %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Si presionas %1$s, indicas que aceptas la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condiciones del servicio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidad</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">¡Te damos la bienvenida nuevamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya usaste %1$s. Accede con %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya usaste %1$s para acceder. Ingresa la contraseña correspondiente.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accediendo…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿Tienes problemas para acceder?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Revisa tu correo electrónico</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones para cambiar la contraseña.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que se enviaron a %1$s para recuperar la contraseña.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">La dirección de correo electrónico no coincide con una cuenta existente.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo de la app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Accediste como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ingresa tu número de teléfono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ingresa un número de teléfono válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ingresa el código de 6 dígitos que enviamos al número</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Se reenviará el código en 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica tu número de teléfono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorrecto. Vuelve a intentarlo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Aceptar</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de teléfono se usó demasiadas veces</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocurrió un problema durante la verificación de tu número de teléfono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código ya no es válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Acceder con el número de teléfono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Listo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">¡Verificado!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Se envió el código.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificar número de teléfono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Si presionas “%1$s”, es posible que se envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
+</resources>
diff --git a/auth/src/main/res/values-bg/strings.xml b/auth/src/main/res/values-bg/strings.xml
new file mode 100755
index 000000000..496d2b849
--- /dev/null
+++ b/auth/src/main/res/values-bg/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Зарежда се…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Вход</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Възникна грешка.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Имейл</string>
+    <string name="provider_name_phone">Телефон</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Вход с Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Вход с Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Вход с Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Вход с имейл</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Вход с телефон</string>
+    <string name="next_default" translation_description="Button text to continue">Напред</string>
+    <string name="email_hint" translation_description="Hint in email input field">Имейл</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Телефонен номер</string>
+    <string name="password_hint" translation_description="Hint for password input field">Парола</string>
+    <string name="required_field" translation_description="Inline error for required field">Трябва да се попълни.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Този имейл адрес е неправилен</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Въведете имейл адреса си, за да продължите</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Проверява се за съществуващи профили…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Регистрация</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Име и фамилия</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Запазване</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Създава се регистрация…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Паролата не е достатъчно надеждна. Използвайте поне %1$d знак и комбинация от букви и цифри</item>
+        <item quantity="other">Паролата не е достатъчно надеждна. Използвайте поне %1$d знака и комбинация от букви и цифри</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Регистрацията с имейл адрес не бе успешна</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Вече съществува профил с този имейл адрес.</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Докосвайки %1$s, приемате %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Общите условия</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Декларацията за поверителност</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Вече имате профил</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Добре дошли отново!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Вече използвахте %1$s. За да продължите, влезте с %2$s.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Вече използвахте %1$s за вход. Въведете паролата си за този профил.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Влизате…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Имате проблем при влизането?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Възстановяване на паролата</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Проверете електронната си поща</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">На този имейл адрес ще получите инструкции за повторно задаване на паролата.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Изпращане</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">За да възстановите паролата си, изпълнете инструкциите, изпратени до %1$s.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Изпраща се…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Този имейл адрес не съответства на съществуващ профил</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Лого на приложението</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Влязохте като %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Въвеждане на телефонния ви номер</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Въведете валиден телефонен номер</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Въведете 6-цифрения код, който изпратихме до</string>
+    <string name="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="verify_your_phone_title" translation_description="Button text to complete phone number verification">Потвърждаване на телефонния ви номер</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Потвърждава се…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">SMS съобщението се извлича…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Неправилен код. Опитайте отново.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">ОК</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Този телефонен номер е използван твърде много пъти</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">При потвърждаването на телефонния ви номер възникна проблем</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Този код вече не е валиден</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Вход с телефонен номер</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Готово</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Потвърдено!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Кодът е изпратен!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Изпраща се повторно…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Повторно изпращане на кода</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Потвърждаване на телефонния номер</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Напред</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Докосвайки „%1$s“, може да получите SMS съобщение. То може да се таксува по тарифите за данни и SMS.</string>
+</resources>
diff --git a/auth/src/main/res/values-bn/strings.xml b/auth/src/main/res/values-bn/strings.xml
new file mode 100755
index 000000000..4e99d2de8
--- /dev/null
+++ b/auth/src/main/res/values-bn/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">লোড হচ্ছে…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">সাইন-ইন করুন</string>
+    <string name="general_error" translation_description="Toast text flashing general error">একটি ত্রুটি ঘটেছে৷</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">ইমেল</string>
+    <string name="provider_name_phone">ফোন</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Google দিয়ে সাইন-ইন করুন</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Facebook দিয়ে সাইন-ইন করুন</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Twitter দিয়ে সাইন-ইন করুন</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">ইমেল দিয়ে সাইন-ইন করুন</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">ফোন দিয়ে সাইন-ইন করুন</string>
+    <string name="next_default" translation_description="Button text to continue">পরবর্তী</string>
+    <string name="email_hint" translation_description="Hint in email input field">ইমেল</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">ফোন নম্বর</string>
+    <string name="password_hint" translation_description="Hint for password input field">পাসওয়ার্ড</string>
+    <string name="required_field" translation_description="Inline error for required field">আপনি এটি খালি ছাড়তে পারেন না।</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">ইমেল অ্যাড্রেসটি সঠিক নয়</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">চালিয়ে যাওয়ার জন্য আপনার ইমেল অ্যাড্রেস লিখুন</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">আগে থেকে কোনও অ্যাকাউন্ট আছে কিনা চেক করা হচ্ছে...</string>
+    <string name="title_register_email" translation_description="Title for signup form">সাইন-আপ করুন</string>
+    <string name="name_hint" translation_description="Hint for last name input field">নাম ও পদবি</string>
+    <string name="button_text_save" translation_description="Button text to save input form">সেভ করুন</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">সাইন-আপ করা হচ্ছে...</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">পাসওয়ার্ডটি পর্যাপ্ত সুরক্ষিত নয়। কমপক্ষে %1$dটি বিশেষ বর্ণ এবং অক্ষর ও সংখ্যা মিশিয়ে ব্যবহার করুন</item>
+        <item quantity="other">পাসওয়ার্ডটি পর্যাপ্ত সুরক্ষিত নয়। কমপক্ষে %1$dটি বিশেষ বর্ণ এবং অক্ষর ও সংখ্যা মিশিয়ে ব্যবহার করুন</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">ইমেল অ্যাকাউন্টটি রেজিস্টার করা যায়নি</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">এই ইমেল অ্যাড্রেসে আগে থেকেই একটি অ্যাকাউন্ট আছে।</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">%1$s এ ট্যাপ করে আপনি জানাচ্ছেন যে আপনি %2$s এর সাথে সম্মত হন।</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">পরিষেবার শর্তাবলি</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">গোপনীয়তা নীতি</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">আপনার আগে থেকেই একটি অ্যাকাউন্ট আছে</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">আবার স্বাগতম!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">আপনি %1$s আগেই ব্যবহার করেছেন।
+        চালিয়ে যেতে %2$s দিয়ে সাইন-ইন করুন।</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">আপনি আগেই %1$s দিয়ে
+        সাইন-ইন করেছেন। সেই অ্যাকাউন্টের জন্য পাসওয়ার্ডটি লিখুন।</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">সাইন-ইন করা হচ্ছে…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">সাইন-ইন করতে সমস্যা হচ্ছে?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">পাসওয়ার্ড পুনরুদ্ধার করুন</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">আপনার ইমেল দেখুন</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">কিভাবে পাসওয়ার্ড পুনরুদ্ধার করতে হবে তা ইমেলে পাঠানো
+        নির্দেশাবলী থেকে জানুন।</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">পাঠান</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">আপনার পাসওয়ার্ড পুনরুদ্ধার করতে %1$s তে পাঠানো নির্দেশ অনুসরণ করুন।</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">পাঠানো হচ্ছে...</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">এই ইমেল অ্যাড্রেসটি আগে থেকে থাকা অ্যাকাউন্টের সাথে মিলছে না</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">অ্যাপের লোগো</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">%1$s হিসাবে সাইন-ইন করেছেন</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">আপনার ফোন নম্বর লিখুন</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">একটি সঠিক ফোন নম্বর লিখুন</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">আমাদের পাঠানো ৬-সংখ্যার কোডটি লিখুন</string>
+    <string name="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="verify_your_phone_title" translation_description="Button text to complete phone number verification">আপনার ফোন নম্বর যাচাই করুন</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">যাচাই করা হচ্ছে …</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">এসএমএসটি পুনরুদ্ধার করা হচ্ছে...</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">কোডটি ভুল। আবার চেষ্টা করুন।</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">ঠিক আছে</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">এই ফোন নম্বরটি অনেকবার ব্যবহার করা হয়েছে</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">আপনার ফোন নম্বরটি যাচাই করতে সমস্যা হয়েছে</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">এই কোডটি আর ব্যবহার করা যাবে না</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">ফোন নম্বর দিয়ে সাইন-ইন করুন</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">সম্পন্ন হয়েছে</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">যাচাই করা হয়েছে!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">কোডটি পাঠানো হয়েছে!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">আবার পাঠানো হচ্ছে...</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">কোডটি আবার পাঠান</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">ফোন নম্বর যাচাই করুন</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">চালিয়ে যান</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">%1$s এ ট্যাপ করলে আপনার ফোন থেকে একটি এসএমএস পাঠানো হতে পারে। মেসেজ ও ডেটার চার্জ লাগতে পারে।</string>
+</resources>
diff --git a/auth/src/main/res/values-ca/strings.xml b/auth/src/main/res/values-ca/strings.xml
new file mode 100755
index 000000000..d361c5eac
--- /dev/null
+++ b/auth/src/main/res/values-ca/strings.xml
@@ -0,0 +1,76 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">S\'està carregant…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Inicia la sessió</string>
+    <string name="general_error" translation_description="Toast text flashing general error">S\'ha produït un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Adreça electrònica</string>
+    <string name="provider_name_phone">Telèfon</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Inicia la sessió amb Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Inicia la sessió amb Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Inicia la sessió amb Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Inicia la sessió amb l\'adreça electrònica</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Inicia la sessió amb el telèfon</string>
+    <string name="next_default" translation_description="Button text to continue">Següent</string>
+    <string name="email_hint" translation_description="Hint in email input field">Adreça electrònica</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de telèfon</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contrasenya</string>
+    <string name="required_field" translation_description="Inline error for required field">Aquest camp no es pot deixar en blanc.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Aquesta adreça electrònica no és correcta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Introdueix l\'adreça electrònica per continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">S\'estan comprovant els comptes existents…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registra\'t</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nom i cognoms</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Desa</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">T\'estàs registrant…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contrasenya no és prou segura. Utilitza com a mínim %1$d caràcter i combina lletres i números.</item>
+        <item quantity="other">La contrasenya no és prou segura. Utilitza com a mínim %1$d caràcters i combina lletres i números.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No s\'ha pogut registrar el compte de correu electrònic</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ja hi ha un compte amb aquesta adreça electrònica.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">En tocar %1$s, indiques que acceptes les %2$s i la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">En tocar %1$s, indiques que acceptes les %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">En tocar %1$s, indiques que acceptes la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condicions del servei</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">política de privadesa</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ja tens un compte</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Benvingut de nou!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ja has utilitzat l\'adreça electrònica %1$s.
+        Inicia la sessió amb %2$s per continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ja has utilitzat l\'adreça electrònica %1$s
+        per iniciar la sessió. Introdueix la contrasenya d\'aquest compte.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">S\'està iniciant la sessió…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">No pots iniciar la sessió?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recupera la contrasenya</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Comprova el correu electrònic</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Rep un correu electrònic amb instruccions per restablir la contrasenya.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Envia</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Per recuperar la contrasenya, segueix les instruccions que s\'han enviat a %1$s.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">S\'està enviant…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Aquesta adreça electrònica no coincideix amb cap compte</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotip de l\'aplicació</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Has iniciat la sessió com a %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Introdueix el número de telèfon</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Introdueix un número de telèfon vàlid</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Introdueix el codi de 6 dígits que s\'ha enviat al número</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Torna a enviar el codi d\'aquí a 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica el número de telèfon</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">S\'està verificant…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">S\'està recuperant l\'SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">El codi no és correcte. Torna-ho a provar.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">D\'acord</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Aquest número de telèfon s\'ha utilitzat massa vegades</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Hi ha hagut un problema en verificar el número de telèfon</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Aquest codi ja no és vàlid</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Inicia la sessió amb el número de telèfon</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Fet</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">S\'ha verificat.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">S\'ha enviat el codi.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">S\'està tornant a enviar…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Torna a enviar el codi</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verifica el número de telèfon</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continua</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">En tocar %1$s, és possible que s\'enviï un SMS. Es poden aplicar tarifes de dades i missatges.</string>
+</resources>
diff --git a/auth/src/main/res/values-cs/strings.xml b/auth/src/main/res/values-cs/strings.xml
new file mode 100755
index 000000000..062f29935
--- /dev/null
+++ b/auth/src/main/res/values-cs/strings.xml
@@ -0,0 +1,79 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Načítání…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Přihlásit se</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Došlo k chybě.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-mail</string>
+    <string name="provider_name_phone">Telefon</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Přihlásit se přes Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Přihlásit se přes Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Přihlásit se přes Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Přihlásit se pomocí e-mailu</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Přihlásit se pomocí telefonu</string>
+    <string name="next_default" translation_description="Button text to continue">Další</string>
+    <string name="email_hint" translation_description="Hint in email input field">E-mail</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Telefonní číslo</string>
+    <string name="password_hint" translation_description="Hint for password input field">Heslo</string>
+    <string name="required_field" translation_description="Inline error for required field">Toto pole nesmí zůstat prázdné.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">E-mailová adresa není správná</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Nejprve zadejte svou e-mailovou adresu</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Vyhledávání stávajících účtů…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrace</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Jméno a příjmení</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Uložit</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrace…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Heslo není dostatečně silné. Použijte alespoň %1$d znak a kombinaci písmen a číslic</item>
+        <item quantity="few">Heslo není dostatečně silné. Použijte alespoň %1$d znaky a kombinaci písmen a číslic</item>
+        <item quantity="many">Heslo není dostatečně silné. Použijte alespoň %1$d znaku a kombinaci písmen a číslic</item>
+        <item quantity="other">Heslo není dostatečně silné. Použijte alespoň %1$d znaků a kombinaci písmen a číslic</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Registrace e-mailového účtu se nezdařila</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Účet s touto adresou již existuje.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Klepnutím na možnost %1$s vyjadřujete svůj souhlas s dokumenty %2$s a %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Klepnutím na možnost %1$s vyjadřujete svůj souhlas s dokumentem %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Klepnutím na možnost %1$s vyjadřujete svůj souhlas s dokumentem %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Smluvní podmínky</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Zásady ochrany soukromí</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Již máte účet</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Vítejte zpět!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Již jste použili adresu %1$s.
+        Chcete-li pokračovat, přihlaste se prostřednictvím služby %2$s.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">K přihlášení jste již použili adresu %1$s.
+        Zadejte příslušné heslo k účtu.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Přihlašování…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Máte potíže s přihlášením?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Obnovit heslo</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Zkontrolujte svůj e-mail</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Na tento e-mail vám zašleme pokyny,
+        jak heslo obnovit.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Odeslat</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Postupujte podle pokynů odeslaných na adresu %1$s a obnovte heslo.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Odesílání…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">E-mailová adresa neodpovídá žádnému stávajícímu účtu</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logo aplikace</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Jste přihlášeni jako %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Zadejte své telefonní číslo</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Zadejte platné telefonní číslo</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Zadejte šestimístný kód, který jsme vám zaslali</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Znovu zaslat kód za 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Ověřit telefonní číslo</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Ověřování…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Načítání SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Špatný kód. Zkuste to znovu.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">V pořádku</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Toto telefonní číslo již bylo použito příliš mnohokrát</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Při ověřování vašeho telefonního čísla došlo k potížím</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Platnost kódu vypršela</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Přihlášení pomocí telefonního čísla</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Hotovo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Ověřeno!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Kód odeslán!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Opakované odesílání…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Znovu poslat kód</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Ověřit telefonní číslo</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Pokračovat</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Po klepnutí na možnost %1$s může být odeslána SMS. Mohou být účtovány poplatky za zprávy a data.</string>
+</resources>
diff --git a/auth/src/main/res/values-da/strings.xml b/auth/src/main/res/values-da/strings.xml
new file mode 100755
index 000000000..ca7f37810
--- /dev/null
+++ b/auth/src/main/res/values-da/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Indlæser…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Log ind</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Der opstod en fejl.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Mail</string>
+    <string name="provider_name_phone">Telefon</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Log ind med Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Log ind med Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Log ind med Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Log ind med mail</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Log ind med telefon</string>
+    <string name="next_default" translation_description="Button text to continue">Næste</string>
+    <string name="email_hint" translation_description="Hint in email input field">Mail</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Telefonnummer</string>
+    <string name="password_hint" translation_description="Hint for password input field">Adgangskode</string>
+    <string name="required_field" translation_description="Inline error for required field">Dette felt skal udfyldes.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Mailadressen er ikke korrekt</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Angiv din mailadresse for at fortsætte</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Søger efter eksisterende konti…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Tilmeld dig</string>
+    <string name="name_hint" translation_description="Hint for last name input field">For- og efternavn</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Gem</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Tilmelder…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Adgangskoden er ikke stærk nok. Brug mindst %1$d tegn og en blanding af bogstaver og tal</item>
+        <item quantity="other">Adgangskoden er ikke stærk nok. Brug mindst %1$d tegn og en blanding af bogstaver og tal</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Registrering af mailkonto mislykkedes</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Der findes allerede en konto med den mailadresse.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Ved at trykke på %1$s accepterer du %2$s og %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Ved at trykke på %1$s accepterer du %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Ved at trykke på %1$s accepterer du %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Servicevilkår</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privatlivspolitik</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Du har allerede en konto</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Velkommen tilbage!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Du har allerede brugt %1$s.
+        Log ind med %2$s for at fortsætte.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Du har allerede brugt %1$s
+        til at logge ind. Angiv din adgangskode for den pågældende konto.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Logger ind…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Har du problemer med at logge ind?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Gendan adgangskode</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Tjek din mail.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Få en vejledning sendt til denne mail om, hvordan du
+        nulstiller din adgangskode.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Send</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Følg vejledningen, der blev sendt til %1$s, for at gendanne din adgangskode.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Sender…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Mailadressen matcher ikke en eksisterende konto</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">App-logo</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Du er logget ind som %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Angiv dit telefonnummer</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Angiv et gyldigt telefonnummer</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Angiv den 6-cifrede kode, vi sendte til</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Send koden igen om 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Bekræft dit telefonnummer</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Bekræfter…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Henter sms…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Koden er forkert. Prøv igen.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Dette telefonnummer er blevet brugt for mange gange</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Dit telefonnummer kunne ikke bekræftes</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Denne kode er ikke længere gyldig</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Log ind med telefonnummer</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Udført</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Bekræftet!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Kode sendt.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Sender igen…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Send koden igen</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Bekræft telefonnummer</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Fortsæt</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Når du trykker på \"%1$s\", sendes der en sms. Der opkræves muligvis gebyrer for beskeder og data.</string>
+</resources>
diff --git a/auth/src/main/res/values-de-rAT/strings.xml b/auth/src/main/res/values-de-rAT/strings.xml
new file mode 100755
index 000000000..6f2c00ca2
--- /dev/null
+++ b/auth/src/main/res/values-de-rAT/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Wird geladen…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Anmelden</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ein Fehler ist aufgetreten.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-Mail-Adresse</string>
+    <string name="provider_name_phone">Telefonnummer</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Über Google anmelden</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Über Facebook anmelden</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Über Twitter anmelden</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Mit einer E-Mail-Adresse anmelden</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Mit einer Telefonnummer anmelden</string>
+    <string name="next_default" translation_description="Button text to continue">Weiter</string>
+    <string name="email_hint" translation_description="Hint in email input field">E-Mail-Adresse</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Telefonnummer</string>
+    <string name="password_hint" translation_description="Hint for password input field">Passwort</string>
+    <string name="required_field" translation_description="Inline error for required field">Pflichtfeld.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Ungültige E-Mail-Adresse</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">E-Mail-Adresse eingeben, um fortzufahren</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Auf vorhandene Konten wird geprüft…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrieren</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Vor- und Nachname</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Speichern</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrierung wird durchgeführt…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Das Passwort ist zu schwach. Verwenden Sie mindestens %1$d Zeichen und eine Mischung aus Buchstaben und Ziffern.</item>
+        <item quantity="other">Das Passwort ist zu schwach. Verwenden Sie mindestens %1$d Zeichen und eine Mischung aus Buchstaben und Ziffern.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Registrierung des E-Mail-Kontos fehlgeschlagen</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ein Konto mit dieser E-Mail-Adresse ist bereits vorhanden.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Durch Tippen auf %1$s stimmen Sie den %2$s und der %3$s zu.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Durch Tippen auf %1$s stimmen Sie den %2$s zu.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Durch Tippen auf %1$s stimmen Sie der %2$s zu.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Nutzungsbedingungen</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Datenschutzerklärung</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Sie haben bereits ein Konto</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Willkommen zurück!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Sie haben %1$s bereits verwendet. Melden Sie sich mit %2$s an, um fortzufahren.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Sie haben %1$s bereits zur Anmeldung verwendet. Geben Sie das Passwort für dieses Konto ein.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Anmeldung wird durchgeführt…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Probleme bei der Anmeldung?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Passwort zurücksetzen</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Im Posteingang nachsehen</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">In der an diese E-Mail-Adresse gesendeten Anleitung wird beschrieben, wie Sie Ihr Passwort zurücksetzen können.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Senden</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Folgen Sie der an %1$s gesendeten Anleitung, um Ihr Passwort zurückzusetzen.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Wird gesendet…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Diese E-Mail-Adresse passt zu keinem Konto</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">App-Logo</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Angemeldet als %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Telefonnummer eingeben</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Geben Sie eine gültige Telefonnummer ein</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Geben Sie den sechsstelligen Code ein, der gesendet wurde an</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Code in 0:%02d erneut senden</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Telefonnummer bestätigen</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Wird bestätigt…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">SMS werden abgerufen…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Falscher Code. Versuchen Sie es noch einmal.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Diese Telefonnummer wurde schon zu oft verwendet</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Bei der Bestätigung Ihrer Telefonnummer ist ein Problem aufgetreten</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Dieser Code ist nicht mehr gültig</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Mit einer Telefonnummer anmelden</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Fertig</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Bestätigt</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Code gesendet</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Wird erneut gesendet…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Code erneut senden</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Telefonnummer bestätigen</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Weiter</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Wenn sie auf \"%1$s\" tippen, erhalten Sie möglicherweise eine SMS. Es können Gebühren für SMS und Datenübertragung anfallen.</string>
+</resources>
diff --git a/auth/src/main/res/values-de-rCH/strings.xml b/auth/src/main/res/values-de-rCH/strings.xml
new file mode 100755
index 000000000..6f2c00ca2
--- /dev/null
+++ b/auth/src/main/res/values-de-rCH/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Wird geladen…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Anmelden</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ein Fehler ist aufgetreten.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-Mail-Adresse</string>
+    <string name="provider_name_phone">Telefonnummer</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Über Google anmelden</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Über Facebook anmelden</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Über Twitter anmelden</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Mit einer E-Mail-Adresse anmelden</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Mit einer Telefonnummer anmelden</string>
+    <string name="next_default" translation_description="Button text to continue">Weiter</string>
+    <string name="email_hint" translation_description="Hint in email input field">E-Mail-Adresse</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Telefonnummer</string>
+    <string name="password_hint" translation_description="Hint for password input field">Passwort</string>
+    <string name="required_field" translation_description="Inline error for required field">Pflichtfeld.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Ungültige E-Mail-Adresse</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">E-Mail-Adresse eingeben, um fortzufahren</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Auf vorhandene Konten wird geprüft…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrieren</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Vor- und Nachname</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Speichern</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrierung wird durchgeführt…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Das Passwort ist zu schwach. Verwenden Sie mindestens %1$d Zeichen und eine Mischung aus Buchstaben und Ziffern.</item>
+        <item quantity="other">Das Passwort ist zu schwach. Verwenden Sie mindestens %1$d Zeichen und eine Mischung aus Buchstaben und Ziffern.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Registrierung des E-Mail-Kontos fehlgeschlagen</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ein Konto mit dieser E-Mail-Adresse ist bereits vorhanden.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Durch Tippen auf %1$s stimmen Sie den %2$s und der %3$s zu.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Durch Tippen auf %1$s stimmen Sie den %2$s zu.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Durch Tippen auf %1$s stimmen Sie der %2$s zu.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Nutzungsbedingungen</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Datenschutzerklärung</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Sie haben bereits ein Konto</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Willkommen zurück!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Sie haben %1$s bereits verwendet. Melden Sie sich mit %2$s an, um fortzufahren.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Sie haben %1$s bereits zur Anmeldung verwendet. Geben Sie das Passwort für dieses Konto ein.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Anmeldung wird durchgeführt…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Probleme bei der Anmeldung?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Passwort zurücksetzen</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Im Posteingang nachsehen</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">In der an diese E-Mail-Adresse gesendeten Anleitung wird beschrieben, wie Sie Ihr Passwort zurücksetzen können.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Senden</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Folgen Sie der an %1$s gesendeten Anleitung, um Ihr Passwort zurückzusetzen.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Wird gesendet…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Diese E-Mail-Adresse passt zu keinem Konto</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">App-Logo</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Angemeldet als %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Telefonnummer eingeben</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Geben Sie eine gültige Telefonnummer ein</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Geben Sie den sechsstelligen Code ein, der gesendet wurde an</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Code in 0:%02d erneut senden</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Telefonnummer bestätigen</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Wird bestätigt…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">SMS werden abgerufen…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Falscher Code. Versuchen Sie es noch einmal.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Diese Telefonnummer wurde schon zu oft verwendet</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Bei der Bestätigung Ihrer Telefonnummer ist ein Problem aufgetreten</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Dieser Code ist nicht mehr gültig</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Mit einer Telefonnummer anmelden</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Fertig</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Bestätigt</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Code gesendet</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Wird erneut gesendet…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Code erneut senden</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Telefonnummer bestätigen</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Weiter</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Wenn sie auf \"%1$s\" tippen, erhalten Sie möglicherweise eine SMS. Es können Gebühren für SMS und Datenübertragung anfallen.</string>
+</resources>
diff --git a/auth/src/main/res/values-de/strings.xml b/auth/src/main/res/values-de/strings.xml
new file mode 100755
index 000000000..6f2c00ca2
--- /dev/null
+++ b/auth/src/main/res/values-de/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Wird geladen…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Anmelden</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ein Fehler ist aufgetreten.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-Mail-Adresse</string>
+    <string name="provider_name_phone">Telefonnummer</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Über Google anmelden</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Über Facebook anmelden</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Über Twitter anmelden</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Mit einer E-Mail-Adresse anmelden</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Mit einer Telefonnummer anmelden</string>
+    <string name="next_default" translation_description="Button text to continue">Weiter</string>
+    <string name="email_hint" translation_description="Hint in email input field">E-Mail-Adresse</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Telefonnummer</string>
+    <string name="password_hint" translation_description="Hint for password input field">Passwort</string>
+    <string name="required_field" translation_description="Inline error for required field">Pflichtfeld.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Ungültige E-Mail-Adresse</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">E-Mail-Adresse eingeben, um fortzufahren</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Auf vorhandene Konten wird geprüft…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrieren</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Vor- und Nachname</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Speichern</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrierung wird durchgeführt…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Das Passwort ist zu schwach. Verwenden Sie mindestens %1$d Zeichen und eine Mischung aus Buchstaben und Ziffern.</item>
+        <item quantity="other">Das Passwort ist zu schwach. Verwenden Sie mindestens %1$d Zeichen und eine Mischung aus Buchstaben und Ziffern.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Registrierung des E-Mail-Kontos fehlgeschlagen</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ein Konto mit dieser E-Mail-Adresse ist bereits vorhanden.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Durch Tippen auf %1$s stimmen Sie den %2$s und der %3$s zu.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Durch Tippen auf %1$s stimmen Sie den %2$s zu.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Durch Tippen auf %1$s stimmen Sie der %2$s zu.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Nutzungsbedingungen</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Datenschutzerklärung</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Sie haben bereits ein Konto</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Willkommen zurück!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Sie haben %1$s bereits verwendet. Melden Sie sich mit %2$s an, um fortzufahren.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Sie haben %1$s bereits zur Anmeldung verwendet. Geben Sie das Passwort für dieses Konto ein.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Anmeldung wird durchgeführt…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Probleme bei der Anmeldung?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Passwort zurücksetzen</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Im Posteingang nachsehen</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">In der an diese E-Mail-Adresse gesendeten Anleitung wird beschrieben, wie Sie Ihr Passwort zurücksetzen können.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Senden</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Folgen Sie der an %1$s gesendeten Anleitung, um Ihr Passwort zurückzusetzen.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Wird gesendet…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Diese E-Mail-Adresse passt zu keinem Konto</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">App-Logo</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Angemeldet als %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Telefonnummer eingeben</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Geben Sie eine gültige Telefonnummer ein</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Geben Sie den sechsstelligen Code ein, der gesendet wurde an</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Code in 0:%02d erneut senden</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Telefonnummer bestätigen</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Wird bestätigt…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">SMS werden abgerufen…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Falscher Code. Versuchen Sie es noch einmal.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Diese Telefonnummer wurde schon zu oft verwendet</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Bei der Bestätigung Ihrer Telefonnummer ist ein Problem aufgetreten</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Dieser Code ist nicht mehr gültig</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Mit einer Telefonnummer anmelden</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Fertig</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Bestätigt</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Code gesendet</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Wird erneut gesendet…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Code erneut senden</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Telefonnummer bestätigen</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Weiter</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Wenn sie auf \"%1$s\" tippen, erhalten Sie möglicherweise eine SMS. Es können Gebühren für SMS und Datenübertragung anfallen.</string>
+</resources>
diff --git a/auth/src/main/res/values-el/strings.xml b/auth/src/main/res/values-el/strings.xml
new file mode 100755
index 000000000..bdbfccdec
--- /dev/null
+++ b/auth/src/main/res/values-el/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Γίνεται φόρτωση…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Σύνδεση</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Παρουσιάστηκε σφάλμα.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Ηλεκτρονικό ταχυδρομείο</string>
+    <string name="provider_name_phone">Τηλέφωνο</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Σύνδεση μέσω Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Σύνδεση μέσω Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Σύνδεση μέσω Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Σύνδεση μέσω ηλεκτρονικού ταχυδρομείου</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Σύνδεση μέσω τηλεφώνου</string>
+    <string name="next_default" translation_description="Button text to continue">Επόμενο</string>
+    <string name="email_hint" translation_description="Hint in email input field">Ηλεκτρονικό ταχυδρομείο</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Αριθμός τηλεφώνου</string>
+    <string name="password_hint" translation_description="Hint for password input field">Κωδικός πρόσβασης</string>
+    <string name="required_field" translation_description="Inline error for required field">Αυτό το πεδίο είναι υποχρεωτικό.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Αυτή η διεύθυνση ηλεκτρονικού ταχυδρομείου δεν είναι σωστή</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Εισαγάγετε τη διεύθυνση ηλεκτρονικού ταχυδρομείου για να συνεχίσετε</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Γίνεται έλεγχος για υπάρχοντες λογαριασμούς…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Εγγραφή</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Όνομα και επώνυμο</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Αποθήκευση</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Γίνεται εγγραφή…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Ο κωδικός πρόσβασης δεν είναι αρκετά ισχυρός. Χρησιμοποιήστε τουλάχιστον %1$d χαρακτήρα και έναν συνδυασμό γραμμάτων και αριθμών</item>
+        <item quantity="other">Ο κωδικός πρόσβασης δεν είναι αρκετά ισχυρός. Χρησιμοποιήστε τουλάχιστον %1$d χαρακτήρες και έναν συνδυασμό γραμμάτων και αριθμών</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Η εγγραφή του λογαριασμού ηλεκτρονικού ταχυδρομείου δεν ήταν επιτυχής</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Υπάρχει ήδη λογαριασμός με αυτήν τη διεύθυνση ηλεκτρονικού ταχυδρομείου.</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Αν πατήσετε %1$s, δηλώνετε ότι συμφωνείτε με την %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Όρους Παροχής Υπηρεσιών</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Πολιτική απορρήτου</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Έχετε ήδη λογαριασμό</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Καλώς ορίσατε και πάλι!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Έχετε ήδη χρησιμοποιήσει τη διεύθυνση %1$s.
+        Συνδεθείτε μέσω %2$s για να συνεχίσετε.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Έχετε ήδη χρησιμοποιήσει τη διεύθυνση %1$s
+        για να συνδεθείτε. Εισαγάγετε τον κωδικό πρόσβασής σας για αυτόν τον λογαριασμό.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Γίνεται σύνδεση…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Πρόβλημα κατά τη σύνδεση;</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Ανάκτηση κωδικού πρόσβασης</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Ελέγξτε τα εισερχόμενα του ηλεκτρονικού ταχυδρομείου σας</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Δείτε τις οδηγίες που στάλθηκαν σε αυτήν τη διεύθυνση ηλεκτρονικού ταχυδρομείου, οι οποίες εξηγούν πώς να
+        επαναφέρετε τον κωδικό πρόσβασής σας.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Αποστολή</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Ακολουθήστε τις οδηγίες που στάλθηκαν στο %1$s για να ανακτήσετε τον κωδικό πρόσβασής σας.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Γίνεται αποστολή…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Αυτή η διεύθυνση ηλεκτρονικού ταχυδρομείου δεν ταιριάζει με κάποιον υπάρχοντα λογαριασμό</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Λογότυπο εφαρμογής</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Είστε συνδεδεμένοι ως %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Εισαγάγετε τον αριθμό τηλεφώνου σας</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Καταχωρίστε έναν έγκυρο αριθμό τηλεφώνου</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Εισαγάγετε τον 6ψήφιο κωδικό που σας στείλαμε στο</string>
+    <string name="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="verify_your_phone_title" translation_description="Button text to complete phone number verification">Επαλήθευση του τηλεφώνου σας</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Γίνεται επαλήθευση…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Γίνεται ανάκτηση SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Εσφαλμένος κωδικός. Δοκιμάστε ξανά.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">ΟΚ</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Αυτός ο αριθμός τηλεφώνου χρησιμοποιήθηκε πάρα πολλές φορές</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Παρουσιάστηκε πρόβλημα με την επαλήθευση του αριθμού τηλεφώνου</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Αυτός ο κωδικός δεν είναι πλέον έγκυρος</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Σύνδεση με αριθμό τηλεφώνου</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Τέλος</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Επαληθεύτηκε!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Ο κωδικός στάλθηκε!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Επανάληψη αποστολής…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Επανάληψη αποστολής κωδικού</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Επαλήθευση αριθμού τηλεφώνου</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Συνέχεια</string>
+    <string name="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-en-rAU/strings.xml b/auth/src/main/res/values-en-rAU/strings.xml
new file mode 100755
index 000000000..3f2ae53a8
--- /dev/null
+++ b/auth/src/main/res/values-en-rAU/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Loading...</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Sign in</string>
+    <string name="general_error" translation_description="Toast text flashing general error">An error has occurred.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Email</string>
+    <string name="provider_name_phone">Phone</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Sign in with Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Sign in with Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Sign in with Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Sign in with email</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Sign in with phone</string>
+    <string name="next_default" translation_description="Button text to continue">Next</string>
+    <string name="email_hint" translation_description="Hint in email input field">Email</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Phone number</string>
+    <string name="password_hint" translation_description="Hint for password input field">Password</string>
+    <string name="required_field" translation_description="Inline error for required field">You can\'t leave this empty.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Incorrect email address</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Enter your email address to continue</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Checking for existing accounts…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Sign up</string>
+    <string name="name_hint" translation_description="Hint for last name input field">First name &amp; surname</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Save</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Signing up…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Password not strong enough. Use at least %1$d character and a mix of letters and numbers</item>
+        <item quantity="other">Password not strong enough. Use at least %1$d characters and a mix of letters and numbers</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Email account registration unsuccessful</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">An account already exists with that email address.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">By tapping %1$s you are indicating that you agree to the %2$s and the %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">By tapping %1$s you are indicating that you agree to the %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">By tapping %1$s you are indicating that you agree to the %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Terms of Service</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privacy Policy</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">You already have an account</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Welcome back!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">You\'ve already used %1$s.
+        Sign in with %2$s to continue.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">You\'ve already used %1$s
+        to sign in. Enter your password for that account.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Signing in…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Trouble signing in?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recover password</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Check your email</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Receive instructions to this email that explain how to
+        reset your password.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Send</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Follow the instructions sent to %1$s to recover your password.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Sending…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">That email address doesn\'t match an existing account</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">App logo</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Signed in as %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Enter your phone number</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Enter a valid phone number</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Enter the 6-digit code that we sent to</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Resend code in 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verify your phone number</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verifying…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Retrieving SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Wrong code. Try again.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">This phone number has been used too many times</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">There was a problem verifying your phone number</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">This code is no longer valid</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Sign in with phone number</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Done</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Verified.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Code sent.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Resending…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Resend code</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verify Phone Number</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continue</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">By tapping %1$s, an SMS may be sent. Message &amp; data rates may apply.</string>
+</resources>
diff --git a/auth/src/main/res/values-en-rCA/strings.xml b/auth/src/main/res/values-en-rCA/strings.xml
new file mode 100755
index 000000000..3f2ae53a8
--- /dev/null
+++ b/auth/src/main/res/values-en-rCA/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Loading...</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Sign in</string>
+    <string name="general_error" translation_description="Toast text flashing general error">An error has occurred.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Email</string>
+    <string name="provider_name_phone">Phone</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Sign in with Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Sign in with Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Sign in with Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Sign in with email</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Sign in with phone</string>
+    <string name="next_default" translation_description="Button text to continue">Next</string>
+    <string name="email_hint" translation_description="Hint in email input field">Email</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Phone number</string>
+    <string name="password_hint" translation_description="Hint for password input field">Password</string>
+    <string name="required_field" translation_description="Inline error for required field">You can\'t leave this empty.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Incorrect email address</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Enter your email address to continue</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Checking for existing accounts…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Sign up</string>
+    <string name="name_hint" translation_description="Hint for last name input field">First name &amp; surname</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Save</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Signing up…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Password not strong enough. Use at least %1$d character and a mix of letters and numbers</item>
+        <item quantity="other">Password not strong enough. Use at least %1$d characters and a mix of letters and numbers</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Email account registration unsuccessful</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">An account already exists with that email address.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">By tapping %1$s you are indicating that you agree to the %2$s and the %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">By tapping %1$s you are indicating that you agree to the %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">By tapping %1$s you are indicating that you agree to the %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Terms of Service</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privacy Policy</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">You already have an account</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Welcome back!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">You\'ve already used %1$s.
+        Sign in with %2$s to continue.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">You\'ve already used %1$s
+        to sign in. Enter your password for that account.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Signing in…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Trouble signing in?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recover password</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Check your email</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Receive instructions to this email that explain how to
+        reset your password.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Send</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Follow the instructions sent to %1$s to recover your password.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Sending…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">That email address doesn\'t match an existing account</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">App logo</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Signed in as %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Enter your phone number</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Enter a valid phone number</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Enter the 6-digit code that we sent to</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Resend code in 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verify your phone number</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verifying…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Retrieving SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Wrong code. Try again.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">This phone number has been used too many times</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">There was a problem verifying your phone number</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">This code is no longer valid</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Sign in with phone number</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Done</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Verified.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Code sent.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Resending…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Resend code</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verify Phone Number</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continue</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">By tapping %1$s, an SMS may be sent. Message &amp; data rates may apply.</string>
+</resources>
diff --git a/auth/src/main/res/values-en-rGB/strings.xml b/auth/src/main/res/values-en-rGB/strings.xml
new file mode 100755
index 000000000..3f2ae53a8
--- /dev/null
+++ b/auth/src/main/res/values-en-rGB/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Loading...</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Sign in</string>
+    <string name="general_error" translation_description="Toast text flashing general error">An error has occurred.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Email</string>
+    <string name="provider_name_phone">Phone</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Sign in with Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Sign in with Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Sign in with Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Sign in with email</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Sign in with phone</string>
+    <string name="next_default" translation_description="Button text to continue">Next</string>
+    <string name="email_hint" translation_description="Hint in email input field">Email</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Phone number</string>
+    <string name="password_hint" translation_description="Hint for password input field">Password</string>
+    <string name="required_field" translation_description="Inline error for required field">You can\'t leave this empty.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Incorrect email address</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Enter your email address to continue</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Checking for existing accounts…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Sign up</string>
+    <string name="name_hint" translation_description="Hint for last name input field">First name &amp; surname</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Save</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Signing up…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Password not strong enough. Use at least %1$d character and a mix of letters and numbers</item>
+        <item quantity="other">Password not strong enough. Use at least %1$d characters and a mix of letters and numbers</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Email account registration unsuccessful</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">An account already exists with that email address.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">By tapping %1$s you are indicating that you agree to the %2$s and the %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">By tapping %1$s you are indicating that you agree to the %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">By tapping %1$s you are indicating that you agree to the %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Terms of Service</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privacy Policy</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">You already have an account</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Welcome back!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">You\'ve already used %1$s.
+        Sign in with %2$s to continue.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">You\'ve already used %1$s
+        to sign in. Enter your password for that account.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Signing in…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Trouble signing in?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recover password</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Check your email</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Receive instructions to this email that explain how to
+        reset your password.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Send</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Follow the instructions sent to %1$s to recover your password.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Sending…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">That email address doesn\'t match an existing account</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">App logo</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Signed in as %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Enter your phone number</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Enter a valid phone number</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Enter the 6-digit code that we sent to</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Resend code in 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verify your phone number</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verifying…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Retrieving SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Wrong code. Try again.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">This phone number has been used too many times</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">There was a problem verifying your phone number</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">This code is no longer valid</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Sign in with phone number</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Done</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Verified.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Code sent.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Resending…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Resend code</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verify Phone Number</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continue</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">By tapping %1$s, an SMS may be sent. Message &amp; data rates may apply.</string>
+</resources>
diff --git a/auth/src/main/res/values-en-rIE/strings.xml b/auth/src/main/res/values-en-rIE/strings.xml
new file mode 100755
index 000000000..3f2ae53a8
--- /dev/null
+++ b/auth/src/main/res/values-en-rIE/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Loading...</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Sign in</string>
+    <string name="general_error" translation_description="Toast text flashing general error">An error has occurred.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Email</string>
+    <string name="provider_name_phone">Phone</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Sign in with Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Sign in with Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Sign in with Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Sign in with email</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Sign in with phone</string>
+    <string name="next_default" translation_description="Button text to continue">Next</string>
+    <string name="email_hint" translation_description="Hint in email input field">Email</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Phone number</string>
+    <string name="password_hint" translation_description="Hint for password input field">Password</string>
+    <string name="required_field" translation_description="Inline error for required field">You can\'t leave this empty.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Incorrect email address</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Enter your email address to continue</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Checking for existing accounts…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Sign up</string>
+    <string name="name_hint" translation_description="Hint for last name input field">First name &amp; surname</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Save</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Signing up…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Password not strong enough. Use at least %1$d character and a mix of letters and numbers</item>
+        <item quantity="other">Password not strong enough. Use at least %1$d characters and a mix of letters and numbers</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Email account registration unsuccessful</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">An account already exists with that email address.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">By tapping %1$s you are indicating that you agree to the %2$s and the %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">By tapping %1$s you are indicating that you agree to the %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">By tapping %1$s you are indicating that you agree to the %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Terms of Service</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privacy Policy</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">You already have an account</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Welcome back!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">You\'ve already used %1$s.
+        Sign in with %2$s to continue.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">You\'ve already used %1$s
+        to sign in. Enter your password for that account.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Signing in…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Trouble signing in?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recover password</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Check your email</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Receive instructions to this email that explain how to
+        reset your password.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Send</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Follow the instructions sent to %1$s to recover your password.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Sending…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">That email address doesn\'t match an existing account</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">App logo</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Signed in as %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Enter your phone number</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Enter a valid phone number</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Enter the 6-digit code that we sent to</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Resend code in 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verify your phone number</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verifying…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Retrieving SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Wrong code. Try again.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">This phone number has been used too many times</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">There was a problem verifying your phone number</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">This code is no longer valid</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Sign in with phone number</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Done</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Verified.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Code sent.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Resending…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Resend code</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verify Phone Number</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continue</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">By tapping %1$s, an SMS may be sent. Message &amp; data rates may apply.</string>
+</resources>
diff --git a/auth/src/main/res/values-en-rIN/strings.xml b/auth/src/main/res/values-en-rIN/strings.xml
new file mode 100755
index 000000000..3f2ae53a8
--- /dev/null
+++ b/auth/src/main/res/values-en-rIN/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Loading...</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Sign in</string>
+    <string name="general_error" translation_description="Toast text flashing general error">An error has occurred.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Email</string>
+    <string name="provider_name_phone">Phone</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Sign in with Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Sign in with Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Sign in with Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Sign in with email</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Sign in with phone</string>
+    <string name="next_default" translation_description="Button text to continue">Next</string>
+    <string name="email_hint" translation_description="Hint in email input field">Email</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Phone number</string>
+    <string name="password_hint" translation_description="Hint for password input field">Password</string>
+    <string name="required_field" translation_description="Inline error for required field">You can\'t leave this empty.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Incorrect email address</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Enter your email address to continue</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Checking for existing accounts…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Sign up</string>
+    <string name="name_hint" translation_description="Hint for last name input field">First name &amp; surname</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Save</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Signing up…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Password not strong enough. Use at least %1$d character and a mix of letters and numbers</item>
+        <item quantity="other">Password not strong enough. Use at least %1$d characters and a mix of letters and numbers</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Email account registration unsuccessful</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">An account already exists with that email address.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">By tapping %1$s you are indicating that you agree to the %2$s and the %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">By tapping %1$s you are indicating that you agree to the %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">By tapping %1$s you are indicating that you agree to the %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Terms of Service</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privacy Policy</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">You already have an account</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Welcome back!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">You\'ve already used %1$s.
+        Sign in with %2$s to continue.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">You\'ve already used %1$s
+        to sign in. Enter your password for that account.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Signing in…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Trouble signing in?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recover password</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Check your email</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Receive instructions to this email that explain how to
+        reset your password.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Send</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Follow the instructions sent to %1$s to recover your password.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Sending…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">That email address doesn\'t match an existing account</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">App logo</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Signed in as %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Enter your phone number</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Enter a valid phone number</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Enter the 6-digit code that we sent to</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Resend code in 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verify your phone number</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verifying…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Retrieving SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Wrong code. Try again.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">This phone number has been used too many times</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">There was a problem verifying your phone number</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">This code is no longer valid</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Sign in with phone number</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Done</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Verified.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Code sent.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Resending…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Resend code</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verify Phone Number</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continue</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">By tapping %1$s, an SMS may be sent. Message &amp; data rates may apply.</string>
+</resources>
diff --git a/auth/src/main/res/values-en-rSG/strings.xml b/auth/src/main/res/values-en-rSG/strings.xml
new file mode 100755
index 000000000..3f2ae53a8
--- /dev/null
+++ b/auth/src/main/res/values-en-rSG/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Loading...</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Sign in</string>
+    <string name="general_error" translation_description="Toast text flashing general error">An error has occurred.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Email</string>
+    <string name="provider_name_phone">Phone</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Sign in with Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Sign in with Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Sign in with Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Sign in with email</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Sign in with phone</string>
+    <string name="next_default" translation_description="Button text to continue">Next</string>
+    <string name="email_hint" translation_description="Hint in email input field">Email</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Phone number</string>
+    <string name="password_hint" translation_description="Hint for password input field">Password</string>
+    <string name="required_field" translation_description="Inline error for required field">You can\'t leave this empty.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Incorrect email address</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Enter your email address to continue</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Checking for existing accounts…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Sign up</string>
+    <string name="name_hint" translation_description="Hint for last name input field">First name &amp; surname</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Save</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Signing up…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Password not strong enough. Use at least %1$d character and a mix of letters and numbers</item>
+        <item quantity="other">Password not strong enough. Use at least %1$d characters and a mix of letters and numbers</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Email account registration unsuccessful</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">An account already exists with that email address.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">By tapping %1$s you are indicating that you agree to the %2$s and the %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">By tapping %1$s you are indicating that you agree to the %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">By tapping %1$s you are indicating that you agree to the %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Terms of Service</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privacy Policy</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">You already have an account</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Welcome back!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">You\'ve already used %1$s.
+        Sign in with %2$s to continue.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">You\'ve already used %1$s
+        to sign in. Enter your password for that account.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Signing in…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Trouble signing in?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recover password</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Check your email</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Receive instructions to this email that explain how to
+        reset your password.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Send</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Follow the instructions sent to %1$s to recover your password.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Sending…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">That email address doesn\'t match an existing account</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">App logo</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Signed in as %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Enter your phone number</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Enter a valid phone number</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Enter the 6-digit code that we sent to</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Resend code in 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verify your phone number</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verifying…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Retrieving SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Wrong code. Try again.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">This phone number has been used too many times</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">There was a problem verifying your phone number</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">This code is no longer valid</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Sign in with phone number</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Done</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Verified.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Code sent.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Resending…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Resend code</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verify Phone Number</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continue</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">By tapping %1$s, an SMS may be sent. Message &amp; data rates may apply.</string>
+</resources>
diff --git a/auth/src/main/res/values-en-rZA/strings.xml b/auth/src/main/res/values-en-rZA/strings.xml
new file mode 100755
index 000000000..3f2ae53a8
--- /dev/null
+++ b/auth/src/main/res/values-en-rZA/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Loading...</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Sign in</string>
+    <string name="general_error" translation_description="Toast text flashing general error">An error has occurred.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Email</string>
+    <string name="provider_name_phone">Phone</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Sign in with Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Sign in with Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Sign in with Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Sign in with email</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Sign in with phone</string>
+    <string name="next_default" translation_description="Button text to continue">Next</string>
+    <string name="email_hint" translation_description="Hint in email input field">Email</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Phone number</string>
+    <string name="password_hint" translation_description="Hint for password input field">Password</string>
+    <string name="required_field" translation_description="Inline error for required field">You can\'t leave this empty.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Incorrect email address</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Enter your email address to continue</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Checking for existing accounts…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Sign up</string>
+    <string name="name_hint" translation_description="Hint for last name input field">First name &amp; surname</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Save</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Signing up…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Password not strong enough. Use at least %1$d character and a mix of letters and numbers</item>
+        <item quantity="other">Password not strong enough. Use at least %1$d characters and a mix of letters and numbers</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Email account registration unsuccessful</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">An account already exists with that email address.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">By tapping %1$s you are indicating that you agree to the %2$s and the %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">By tapping %1$s you are indicating that you agree to the %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">By tapping %1$s you are indicating that you agree to the %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Terms of Service</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privacy Policy</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">You already have an account</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Welcome back!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">You\'ve already used %1$s.
+        Sign in with %2$s to continue.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">You\'ve already used %1$s
+        to sign in. Enter your password for that account.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Signing in…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Trouble signing in?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recover password</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Check your email</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Receive instructions to this email that explain how to
+        reset your password.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Send</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Follow the instructions sent to %1$s to recover your password.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Sending…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">That email address doesn\'t match an existing account</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">App logo</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Signed in as %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Enter your phone number</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Enter a valid phone number</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Enter the 6-digit code that we sent to</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Resend code in 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verify your phone number</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verifying…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Retrieving SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Wrong code. Try again.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">This phone number has been used too many times</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">There was a problem verifying your phone number</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">This code is no longer valid</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Sign in with phone number</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Done</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Verified.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Code sent.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Resending…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Resend code</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verify Phone Number</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continue</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">By tapping %1$s, an SMS may be sent. Message &amp; data rates may apply.</string>
+</resources>
diff --git a/auth/src/main/res/values-es-rAR/strings.xml b/auth/src/main/res/values-es-rAR/strings.xml
new file mode 100755
index 000000000..dfa7b7446
--- /dev/null
+++ b/auth/src/main/res/values-es-rAR/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Cargando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Acceder</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocurrió un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Correo electrónico</string>
+    <string name="provider_name_phone">Teléfono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Acceder con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Acceder con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Acceder con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Acceder con el correo electrónico</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Acceder con el teléfono</string>
+    <string name="next_default" translation_description="Button text to continue">Siguiente</string>
+    <string name="email_hint" translation_description="Hint in email input field">Correo electrónico</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de teléfono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contraseña</string>
+    <string name="required_field" translation_description="Inline error for required field">Este campo no puede estar en blanco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">La dirección de correo electrónico es incorrecta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ingresa tu dirección de correo electrónico para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Buscando cuentas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrarse</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nombre y apellido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrando…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contraseña no es lo suficientemente segura. Usa al menos %1$d carácter y una combinación de letras y números</item>
+        <item quantity="other">La contraseña no es lo suficientemente segura. Usa al menos %1$d caracteres y una combinación de letras y números</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No se pudo registrar la cuenta de correo electrónico</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ya existe una cuenta con esa dirección de correo electrónico.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Si presionas %1$s, indicas que aceptas las %2$s y la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Si presionas %1$s, indicas que aceptas las %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Si presionas %1$s, indicas que aceptas la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condiciones del servicio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidad</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">¡Te damos la bienvenida nuevamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya usaste %1$s. Accede con %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya usaste %1$s para acceder. Ingresa la contraseña correspondiente.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accediendo…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿Tienes problemas para acceder?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Revisa tu correo electrónico</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones para cambiar la contraseña.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que se enviaron a %1$s para recuperar la contraseña.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">La dirección de correo electrónico no coincide con una cuenta existente.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo de la app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Accediste como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ingresa tu número de teléfono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ingresa un número de teléfono válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ingresa el código de 6 dígitos que enviamos al número</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Se reenviará el código en 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica tu número de teléfono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorrecto. Vuelve a intentarlo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Aceptar</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de teléfono se usó demasiadas veces</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocurrió un problema durante la verificación de tu número de teléfono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código ya no es válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Acceder con el número de teléfono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Listo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">¡Verificado!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Se envió el código.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificar número de teléfono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Si presionas “%1$s”, es posible que se envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
+</resources>
diff --git a/auth/src/main/res/values-es-rBO/strings.xml b/auth/src/main/res/values-es-rBO/strings.xml
new file mode 100755
index 000000000..dfa7b7446
--- /dev/null
+++ b/auth/src/main/res/values-es-rBO/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Cargando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Acceder</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocurrió un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Correo electrónico</string>
+    <string name="provider_name_phone">Teléfono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Acceder con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Acceder con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Acceder con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Acceder con el correo electrónico</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Acceder con el teléfono</string>
+    <string name="next_default" translation_description="Button text to continue">Siguiente</string>
+    <string name="email_hint" translation_description="Hint in email input field">Correo electrónico</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de teléfono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contraseña</string>
+    <string name="required_field" translation_description="Inline error for required field">Este campo no puede estar en blanco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">La dirección de correo electrónico es incorrecta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ingresa tu dirección de correo electrónico para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Buscando cuentas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrarse</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nombre y apellido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrando…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contraseña no es lo suficientemente segura. Usa al menos %1$d carácter y una combinación de letras y números</item>
+        <item quantity="other">La contraseña no es lo suficientemente segura. Usa al menos %1$d caracteres y una combinación de letras y números</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No se pudo registrar la cuenta de correo electrónico</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ya existe una cuenta con esa dirección de correo electrónico.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Si presionas %1$s, indicas que aceptas las %2$s y la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Si presionas %1$s, indicas que aceptas las %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Si presionas %1$s, indicas que aceptas la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condiciones del servicio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidad</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">¡Te damos la bienvenida nuevamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya usaste %1$s. Accede con %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya usaste %1$s para acceder. Ingresa la contraseña correspondiente.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accediendo…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿Tienes problemas para acceder?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Revisa tu correo electrónico</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones para cambiar la contraseña.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que se enviaron a %1$s para recuperar la contraseña.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">La dirección de correo electrónico no coincide con una cuenta existente.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo de la app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Accediste como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ingresa tu número de teléfono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ingresa un número de teléfono válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ingresa el código de 6 dígitos que enviamos al número</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Se reenviará el código en 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica tu número de teléfono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorrecto. Vuelve a intentarlo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Aceptar</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de teléfono se usó demasiadas veces</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocurrió un problema durante la verificación de tu número de teléfono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código ya no es válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Acceder con el número de teléfono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Listo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">¡Verificado!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Se envió el código.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificar número de teléfono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Si presionas “%1$s”, es posible que se envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
+</resources>
diff --git a/auth/src/main/res/values-es-rCL/strings.xml b/auth/src/main/res/values-es-rCL/strings.xml
new file mode 100755
index 000000000..dfa7b7446
--- /dev/null
+++ b/auth/src/main/res/values-es-rCL/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Cargando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Acceder</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocurrió un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Correo electrónico</string>
+    <string name="provider_name_phone">Teléfono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Acceder con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Acceder con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Acceder con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Acceder con el correo electrónico</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Acceder con el teléfono</string>
+    <string name="next_default" translation_description="Button text to continue">Siguiente</string>
+    <string name="email_hint" translation_description="Hint in email input field">Correo electrónico</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de teléfono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contraseña</string>
+    <string name="required_field" translation_description="Inline error for required field">Este campo no puede estar en blanco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">La dirección de correo electrónico es incorrecta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ingresa tu dirección de correo electrónico para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Buscando cuentas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrarse</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nombre y apellido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrando…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contraseña no es lo suficientemente segura. Usa al menos %1$d carácter y una combinación de letras y números</item>
+        <item quantity="other">La contraseña no es lo suficientemente segura. Usa al menos %1$d caracteres y una combinación de letras y números</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No se pudo registrar la cuenta de correo electrónico</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ya existe una cuenta con esa dirección de correo electrónico.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Si presionas %1$s, indicas que aceptas las %2$s y la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Si presionas %1$s, indicas que aceptas las %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Si presionas %1$s, indicas que aceptas la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condiciones del servicio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidad</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">¡Te damos la bienvenida nuevamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya usaste %1$s. Accede con %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya usaste %1$s para acceder. Ingresa la contraseña correspondiente.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accediendo…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿Tienes problemas para acceder?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Revisa tu correo electrónico</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones para cambiar la contraseña.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que se enviaron a %1$s para recuperar la contraseña.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">La dirección de correo electrónico no coincide con una cuenta existente.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo de la app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Accediste como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ingresa tu número de teléfono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ingresa un número de teléfono válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ingresa el código de 6 dígitos que enviamos al número</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Se reenviará el código en 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica tu número de teléfono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorrecto. Vuelve a intentarlo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Aceptar</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de teléfono se usó demasiadas veces</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocurrió un problema durante la verificación de tu número de teléfono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código ya no es válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Acceder con el número de teléfono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Listo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">¡Verificado!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Se envió el código.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificar número de teléfono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Si presionas “%1$s”, es posible que se envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
+</resources>
diff --git a/auth/src/main/res/values-es-rCO/strings.xml b/auth/src/main/res/values-es-rCO/strings.xml
new file mode 100755
index 000000000..dfa7b7446
--- /dev/null
+++ b/auth/src/main/res/values-es-rCO/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Cargando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Acceder</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocurrió un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Correo electrónico</string>
+    <string name="provider_name_phone">Teléfono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Acceder con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Acceder con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Acceder con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Acceder con el correo electrónico</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Acceder con el teléfono</string>
+    <string name="next_default" translation_description="Button text to continue">Siguiente</string>
+    <string name="email_hint" translation_description="Hint in email input field">Correo electrónico</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de teléfono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contraseña</string>
+    <string name="required_field" translation_description="Inline error for required field">Este campo no puede estar en blanco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">La dirección de correo electrónico es incorrecta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ingresa tu dirección de correo electrónico para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Buscando cuentas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrarse</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nombre y apellido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrando…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contraseña no es lo suficientemente segura. Usa al menos %1$d carácter y una combinación de letras y números</item>
+        <item quantity="other">La contraseña no es lo suficientemente segura. Usa al menos %1$d caracteres y una combinación de letras y números</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No se pudo registrar la cuenta de correo electrónico</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ya existe una cuenta con esa dirección de correo electrónico.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Si presionas %1$s, indicas que aceptas las %2$s y la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Si presionas %1$s, indicas que aceptas las %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Si presionas %1$s, indicas que aceptas la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condiciones del servicio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidad</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">¡Te damos la bienvenida nuevamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya usaste %1$s. Accede con %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya usaste %1$s para acceder. Ingresa la contraseña correspondiente.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accediendo…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿Tienes problemas para acceder?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Revisa tu correo electrónico</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones para cambiar la contraseña.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que se enviaron a %1$s para recuperar la contraseña.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">La dirección de correo electrónico no coincide con una cuenta existente.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo de la app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Accediste como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ingresa tu número de teléfono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ingresa un número de teléfono válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ingresa el código de 6 dígitos que enviamos al número</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Se reenviará el código en 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica tu número de teléfono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorrecto. Vuelve a intentarlo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Aceptar</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de teléfono se usó demasiadas veces</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocurrió un problema durante la verificación de tu número de teléfono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código ya no es válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Acceder con el número de teléfono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Listo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">¡Verificado!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Se envió el código.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificar número de teléfono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Si presionas “%1$s”, es posible que se envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
+</resources>
diff --git a/auth/src/main/res/values-es-rCR/strings.xml b/auth/src/main/res/values-es-rCR/strings.xml
new file mode 100755
index 000000000..dfa7b7446
--- /dev/null
+++ b/auth/src/main/res/values-es-rCR/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Cargando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Acceder</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocurrió un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Correo electrónico</string>
+    <string name="provider_name_phone">Teléfono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Acceder con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Acceder con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Acceder con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Acceder con el correo electrónico</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Acceder con el teléfono</string>
+    <string name="next_default" translation_description="Button text to continue">Siguiente</string>
+    <string name="email_hint" translation_description="Hint in email input field">Correo electrónico</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de teléfono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contraseña</string>
+    <string name="required_field" translation_description="Inline error for required field">Este campo no puede estar en blanco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">La dirección de correo electrónico es incorrecta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ingresa tu dirección de correo electrónico para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Buscando cuentas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrarse</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nombre y apellido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrando…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contraseña no es lo suficientemente segura. Usa al menos %1$d carácter y una combinación de letras y números</item>
+        <item quantity="other">La contraseña no es lo suficientemente segura. Usa al menos %1$d caracteres y una combinación de letras y números</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No se pudo registrar la cuenta de correo electrónico</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ya existe una cuenta con esa dirección de correo electrónico.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Si presionas %1$s, indicas que aceptas las %2$s y la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Si presionas %1$s, indicas que aceptas las %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Si presionas %1$s, indicas que aceptas la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condiciones del servicio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidad</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">¡Te damos la bienvenida nuevamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya usaste %1$s. Accede con %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya usaste %1$s para acceder. Ingresa la contraseña correspondiente.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accediendo…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿Tienes problemas para acceder?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Revisa tu correo electrónico</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones para cambiar la contraseña.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que se enviaron a %1$s para recuperar la contraseña.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">La dirección de correo electrónico no coincide con una cuenta existente.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo de la app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Accediste como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ingresa tu número de teléfono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ingresa un número de teléfono válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ingresa el código de 6 dígitos que enviamos al número</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Se reenviará el código en 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica tu número de teléfono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorrecto. Vuelve a intentarlo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Aceptar</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de teléfono se usó demasiadas veces</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocurrió un problema durante la verificación de tu número de teléfono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código ya no es válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Acceder con el número de teléfono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Listo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">¡Verificado!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Se envió el código.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificar número de teléfono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Si presionas “%1$s”, es posible que se envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
+</resources>
diff --git a/auth/src/main/res/values-es-rDO/strings.xml b/auth/src/main/res/values-es-rDO/strings.xml
new file mode 100755
index 000000000..dfa7b7446
--- /dev/null
+++ b/auth/src/main/res/values-es-rDO/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Cargando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Acceder</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocurrió un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Correo electrónico</string>
+    <string name="provider_name_phone">Teléfono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Acceder con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Acceder con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Acceder con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Acceder con el correo electrónico</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Acceder con el teléfono</string>
+    <string name="next_default" translation_description="Button text to continue">Siguiente</string>
+    <string name="email_hint" translation_description="Hint in email input field">Correo electrónico</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de teléfono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contraseña</string>
+    <string name="required_field" translation_description="Inline error for required field">Este campo no puede estar en blanco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">La dirección de correo electrónico es incorrecta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ingresa tu dirección de correo electrónico para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Buscando cuentas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrarse</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nombre y apellido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrando…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contraseña no es lo suficientemente segura. Usa al menos %1$d carácter y una combinación de letras y números</item>
+        <item quantity="other">La contraseña no es lo suficientemente segura. Usa al menos %1$d caracteres y una combinación de letras y números</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No se pudo registrar la cuenta de correo electrónico</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ya existe una cuenta con esa dirección de correo electrónico.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Si presionas %1$s, indicas que aceptas las %2$s y la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Si presionas %1$s, indicas que aceptas las %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Si presionas %1$s, indicas que aceptas la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condiciones del servicio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidad</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">¡Te damos la bienvenida nuevamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya usaste %1$s. Accede con %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya usaste %1$s para acceder. Ingresa la contraseña correspondiente.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accediendo…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿Tienes problemas para acceder?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Revisa tu correo electrónico</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones para cambiar la contraseña.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que se enviaron a %1$s para recuperar la contraseña.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">La dirección de correo electrónico no coincide con una cuenta existente.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo de la app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Accediste como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ingresa tu número de teléfono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ingresa un número de teléfono válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ingresa el código de 6 dígitos que enviamos al número</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Se reenviará el código en 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica tu número de teléfono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorrecto. Vuelve a intentarlo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Aceptar</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de teléfono se usó demasiadas veces</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocurrió un problema durante la verificación de tu número de teléfono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código ya no es válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Acceder con el número de teléfono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Listo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">¡Verificado!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Se envió el código.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificar número de teléfono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Si presionas “%1$s”, es posible que se envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
+</resources>
diff --git a/auth/src/main/res/values-es-rEC/strings.xml b/auth/src/main/res/values-es-rEC/strings.xml
new file mode 100755
index 000000000..dfa7b7446
--- /dev/null
+++ b/auth/src/main/res/values-es-rEC/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Cargando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Acceder</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocurrió un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Correo electrónico</string>
+    <string name="provider_name_phone">Teléfono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Acceder con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Acceder con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Acceder con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Acceder con el correo electrónico</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Acceder con el teléfono</string>
+    <string name="next_default" translation_description="Button text to continue">Siguiente</string>
+    <string name="email_hint" translation_description="Hint in email input field">Correo electrónico</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de teléfono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contraseña</string>
+    <string name="required_field" translation_description="Inline error for required field">Este campo no puede estar en blanco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">La dirección de correo electrónico es incorrecta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ingresa tu dirección de correo electrónico para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Buscando cuentas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrarse</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nombre y apellido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrando…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contraseña no es lo suficientemente segura. Usa al menos %1$d carácter y una combinación de letras y números</item>
+        <item quantity="other">La contraseña no es lo suficientemente segura. Usa al menos %1$d caracteres y una combinación de letras y números</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No se pudo registrar la cuenta de correo electrónico</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ya existe una cuenta con esa dirección de correo electrónico.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Si presionas %1$s, indicas que aceptas las %2$s y la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Si presionas %1$s, indicas que aceptas las %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Si presionas %1$s, indicas que aceptas la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condiciones del servicio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidad</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">¡Te damos la bienvenida nuevamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya usaste %1$s. Accede con %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya usaste %1$s para acceder. Ingresa la contraseña correspondiente.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accediendo…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿Tienes problemas para acceder?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Revisa tu correo electrónico</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones para cambiar la contraseña.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que se enviaron a %1$s para recuperar la contraseña.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">La dirección de correo electrónico no coincide con una cuenta existente.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo de la app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Accediste como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ingresa tu número de teléfono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ingresa un número de teléfono válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ingresa el código de 6 dígitos que enviamos al número</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Se reenviará el código en 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica tu número de teléfono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorrecto. Vuelve a intentarlo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Aceptar</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de teléfono se usó demasiadas veces</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocurrió un problema durante la verificación de tu número de teléfono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código ya no es válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Acceder con el número de teléfono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Listo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">¡Verificado!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Se envió el código.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificar número de teléfono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Si presionas “%1$s”, es posible que se envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
+</resources>
diff --git a/auth/src/main/res/values-es-rGT/strings.xml b/auth/src/main/res/values-es-rGT/strings.xml
new file mode 100755
index 000000000..dfa7b7446
--- /dev/null
+++ b/auth/src/main/res/values-es-rGT/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Cargando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Acceder</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocurrió un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Correo electrónico</string>
+    <string name="provider_name_phone">Teléfono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Acceder con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Acceder con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Acceder con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Acceder con el correo electrónico</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Acceder con el teléfono</string>
+    <string name="next_default" translation_description="Button text to continue">Siguiente</string>
+    <string name="email_hint" translation_description="Hint in email input field">Correo electrónico</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de teléfono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contraseña</string>
+    <string name="required_field" translation_description="Inline error for required field">Este campo no puede estar en blanco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">La dirección de correo electrónico es incorrecta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ingresa tu dirección de correo electrónico para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Buscando cuentas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrarse</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nombre y apellido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrando…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contraseña no es lo suficientemente segura. Usa al menos %1$d carácter y una combinación de letras y números</item>
+        <item quantity="other">La contraseña no es lo suficientemente segura. Usa al menos %1$d caracteres y una combinación de letras y números</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No se pudo registrar la cuenta de correo electrónico</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ya existe una cuenta con esa dirección de correo electrónico.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Si presionas %1$s, indicas que aceptas las %2$s y la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Si presionas %1$s, indicas que aceptas las %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Si presionas %1$s, indicas que aceptas la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condiciones del servicio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidad</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">¡Te damos la bienvenida nuevamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya usaste %1$s. Accede con %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya usaste %1$s para acceder. Ingresa la contraseña correspondiente.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accediendo…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿Tienes problemas para acceder?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Revisa tu correo electrónico</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones para cambiar la contraseña.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que se enviaron a %1$s para recuperar la contraseña.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">La dirección de correo electrónico no coincide con una cuenta existente.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo de la app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Accediste como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ingresa tu número de teléfono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ingresa un número de teléfono válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ingresa el código de 6 dígitos que enviamos al número</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Se reenviará el código en 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica tu número de teléfono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorrecto. Vuelve a intentarlo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Aceptar</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de teléfono se usó demasiadas veces</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocurrió un problema durante la verificación de tu número de teléfono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código ya no es válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Acceder con el número de teléfono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Listo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">¡Verificado!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Se envió el código.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificar número de teléfono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Si presionas “%1$s”, es posible que se envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
+</resources>
diff --git a/auth/src/main/res/values-es-rHN/strings.xml b/auth/src/main/res/values-es-rHN/strings.xml
new file mode 100755
index 000000000..dfa7b7446
--- /dev/null
+++ b/auth/src/main/res/values-es-rHN/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Cargando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Acceder</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocurrió un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Correo electrónico</string>
+    <string name="provider_name_phone">Teléfono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Acceder con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Acceder con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Acceder con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Acceder con el correo electrónico</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Acceder con el teléfono</string>
+    <string name="next_default" translation_description="Button text to continue">Siguiente</string>
+    <string name="email_hint" translation_description="Hint in email input field">Correo electrónico</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de teléfono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contraseña</string>
+    <string name="required_field" translation_description="Inline error for required field">Este campo no puede estar en blanco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">La dirección de correo electrónico es incorrecta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ingresa tu dirección de correo electrónico para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Buscando cuentas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrarse</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nombre y apellido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrando…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contraseña no es lo suficientemente segura. Usa al menos %1$d carácter y una combinación de letras y números</item>
+        <item quantity="other">La contraseña no es lo suficientemente segura. Usa al menos %1$d caracteres y una combinación de letras y números</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No se pudo registrar la cuenta de correo electrónico</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ya existe una cuenta con esa dirección de correo electrónico.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Si presionas %1$s, indicas que aceptas las %2$s y la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Si presionas %1$s, indicas que aceptas las %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Si presionas %1$s, indicas que aceptas la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condiciones del servicio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidad</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">¡Te damos la bienvenida nuevamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya usaste %1$s. Accede con %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya usaste %1$s para acceder. Ingresa la contraseña correspondiente.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accediendo…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿Tienes problemas para acceder?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Revisa tu correo electrónico</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones para cambiar la contraseña.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que se enviaron a %1$s para recuperar la contraseña.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">La dirección de correo electrónico no coincide con una cuenta existente.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo de la app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Accediste como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ingresa tu número de teléfono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ingresa un número de teléfono válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ingresa el código de 6 dígitos que enviamos al número</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Se reenviará el código en 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica tu número de teléfono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorrecto. Vuelve a intentarlo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Aceptar</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de teléfono se usó demasiadas veces</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocurrió un problema durante la verificación de tu número de teléfono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código ya no es válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Acceder con el número de teléfono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Listo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">¡Verificado!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Se envió el código.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificar número de teléfono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Si presionas “%1$s”, es posible que se envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
+</resources>
diff --git a/auth/src/main/res/values-es-rMX/strings.xml b/auth/src/main/res/values-es-rMX/strings.xml
new file mode 100755
index 000000000..dfa7b7446
--- /dev/null
+++ b/auth/src/main/res/values-es-rMX/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Cargando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Acceder</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocurrió un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Correo electrónico</string>
+    <string name="provider_name_phone">Teléfono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Acceder con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Acceder con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Acceder con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Acceder con el correo electrónico</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Acceder con el teléfono</string>
+    <string name="next_default" translation_description="Button text to continue">Siguiente</string>
+    <string name="email_hint" translation_description="Hint in email input field">Correo electrónico</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de teléfono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contraseña</string>
+    <string name="required_field" translation_description="Inline error for required field">Este campo no puede estar en blanco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">La dirección de correo electrónico es incorrecta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ingresa tu dirección de correo electrónico para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Buscando cuentas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrarse</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nombre y apellido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrando…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contraseña no es lo suficientemente segura. Usa al menos %1$d carácter y una combinación de letras y números</item>
+        <item quantity="other">La contraseña no es lo suficientemente segura. Usa al menos %1$d caracteres y una combinación de letras y números</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No se pudo registrar la cuenta de correo electrónico</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ya existe una cuenta con esa dirección de correo electrónico.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Si presionas %1$s, indicas que aceptas las %2$s y la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Si presionas %1$s, indicas que aceptas las %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Si presionas %1$s, indicas que aceptas la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condiciones del servicio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidad</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">¡Te damos la bienvenida nuevamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya usaste %1$s. Accede con %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya usaste %1$s para acceder. Ingresa la contraseña correspondiente.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accediendo…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿Tienes problemas para acceder?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Revisa tu correo electrónico</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones para cambiar la contraseña.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que se enviaron a %1$s para recuperar la contraseña.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">La dirección de correo electrónico no coincide con una cuenta existente.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo de la app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Accediste como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ingresa tu número de teléfono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ingresa un número de teléfono válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ingresa el código de 6 dígitos que enviamos al número</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Se reenviará el código en 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica tu número de teléfono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorrecto. Vuelve a intentarlo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Aceptar</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de teléfono se usó demasiadas veces</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocurrió un problema durante la verificación de tu número de teléfono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código ya no es válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Acceder con el número de teléfono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Listo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">¡Verificado!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Se envió el código.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificar número de teléfono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Si presionas “%1$s”, es posible que se envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
+</resources>
diff --git a/auth/src/main/res/values-es-rNI/strings.xml b/auth/src/main/res/values-es-rNI/strings.xml
new file mode 100755
index 000000000..dfa7b7446
--- /dev/null
+++ b/auth/src/main/res/values-es-rNI/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Cargando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Acceder</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocurrió un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Correo electrónico</string>
+    <string name="provider_name_phone">Teléfono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Acceder con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Acceder con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Acceder con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Acceder con el correo electrónico</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Acceder con el teléfono</string>
+    <string name="next_default" translation_description="Button text to continue">Siguiente</string>
+    <string name="email_hint" translation_description="Hint in email input field">Correo electrónico</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de teléfono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contraseña</string>
+    <string name="required_field" translation_description="Inline error for required field">Este campo no puede estar en blanco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">La dirección de correo electrónico es incorrecta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ingresa tu dirección de correo electrónico para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Buscando cuentas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrarse</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nombre y apellido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrando…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contraseña no es lo suficientemente segura. Usa al menos %1$d carácter y una combinación de letras y números</item>
+        <item quantity="other">La contraseña no es lo suficientemente segura. Usa al menos %1$d caracteres y una combinación de letras y números</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No se pudo registrar la cuenta de correo electrónico</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ya existe una cuenta con esa dirección de correo electrónico.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Si presionas %1$s, indicas que aceptas las %2$s y la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Si presionas %1$s, indicas que aceptas las %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Si presionas %1$s, indicas que aceptas la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condiciones del servicio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidad</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">¡Te damos la bienvenida nuevamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya usaste %1$s. Accede con %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya usaste %1$s para acceder. Ingresa la contraseña correspondiente.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accediendo…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿Tienes problemas para acceder?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Revisa tu correo electrónico</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones para cambiar la contraseña.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que se enviaron a %1$s para recuperar la contraseña.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">La dirección de correo electrónico no coincide con una cuenta existente.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo de la app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Accediste como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ingresa tu número de teléfono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ingresa un número de teléfono válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ingresa el código de 6 dígitos que enviamos al número</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Se reenviará el código en 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica tu número de teléfono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorrecto. Vuelve a intentarlo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Aceptar</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de teléfono se usó demasiadas veces</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocurrió un problema durante la verificación de tu número de teléfono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código ya no es válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Acceder con el número de teléfono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Listo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">¡Verificado!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Se envió el código.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificar número de teléfono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Si presionas “%1$s”, es posible que se envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
+</resources>
diff --git a/auth/src/main/res/values-es-rPA/strings.xml b/auth/src/main/res/values-es-rPA/strings.xml
new file mode 100755
index 000000000..dfa7b7446
--- /dev/null
+++ b/auth/src/main/res/values-es-rPA/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Cargando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Acceder</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocurrió un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Correo electrónico</string>
+    <string name="provider_name_phone">Teléfono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Acceder con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Acceder con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Acceder con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Acceder con el correo electrónico</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Acceder con el teléfono</string>
+    <string name="next_default" translation_description="Button text to continue">Siguiente</string>
+    <string name="email_hint" translation_description="Hint in email input field">Correo electrónico</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de teléfono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contraseña</string>
+    <string name="required_field" translation_description="Inline error for required field">Este campo no puede estar en blanco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">La dirección de correo electrónico es incorrecta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ingresa tu dirección de correo electrónico para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Buscando cuentas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrarse</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nombre y apellido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrando…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contraseña no es lo suficientemente segura. Usa al menos %1$d carácter y una combinación de letras y números</item>
+        <item quantity="other">La contraseña no es lo suficientemente segura. Usa al menos %1$d caracteres y una combinación de letras y números</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No se pudo registrar la cuenta de correo electrónico</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ya existe una cuenta con esa dirección de correo electrónico.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Si presionas %1$s, indicas que aceptas las %2$s y la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Si presionas %1$s, indicas que aceptas las %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Si presionas %1$s, indicas que aceptas la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condiciones del servicio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidad</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">¡Te damos la bienvenida nuevamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya usaste %1$s. Accede con %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya usaste %1$s para acceder. Ingresa la contraseña correspondiente.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accediendo…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿Tienes problemas para acceder?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Revisa tu correo electrónico</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones para cambiar la contraseña.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que se enviaron a %1$s para recuperar la contraseña.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">La dirección de correo electrónico no coincide con una cuenta existente.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo de la app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Accediste como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ingresa tu número de teléfono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ingresa un número de teléfono válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ingresa el código de 6 dígitos que enviamos al número</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Se reenviará el código en 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica tu número de teléfono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorrecto. Vuelve a intentarlo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Aceptar</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de teléfono se usó demasiadas veces</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocurrió un problema durante la verificación de tu número de teléfono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código ya no es válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Acceder con el número de teléfono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Listo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">¡Verificado!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Se envió el código.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificar número de teléfono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Si presionas “%1$s”, es posible que se envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
+</resources>
diff --git a/auth/src/main/res/values-es-rPE/strings.xml b/auth/src/main/res/values-es-rPE/strings.xml
new file mode 100755
index 000000000..dfa7b7446
--- /dev/null
+++ b/auth/src/main/res/values-es-rPE/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Cargando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Acceder</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocurrió un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Correo electrónico</string>
+    <string name="provider_name_phone">Teléfono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Acceder con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Acceder con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Acceder con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Acceder con el correo electrónico</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Acceder con el teléfono</string>
+    <string name="next_default" translation_description="Button text to continue">Siguiente</string>
+    <string name="email_hint" translation_description="Hint in email input field">Correo electrónico</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de teléfono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contraseña</string>
+    <string name="required_field" translation_description="Inline error for required field">Este campo no puede estar en blanco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">La dirección de correo electrónico es incorrecta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ingresa tu dirección de correo electrónico para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Buscando cuentas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrarse</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nombre y apellido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrando…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contraseña no es lo suficientemente segura. Usa al menos %1$d carácter y una combinación de letras y números</item>
+        <item quantity="other">La contraseña no es lo suficientemente segura. Usa al menos %1$d caracteres y una combinación de letras y números</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No se pudo registrar la cuenta de correo electrónico</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ya existe una cuenta con esa dirección de correo electrónico.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Si presionas %1$s, indicas que aceptas las %2$s y la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Si presionas %1$s, indicas que aceptas las %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Si presionas %1$s, indicas que aceptas la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condiciones del servicio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidad</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">¡Te damos la bienvenida nuevamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya usaste %1$s. Accede con %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya usaste %1$s para acceder. Ingresa la contraseña correspondiente.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accediendo…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿Tienes problemas para acceder?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Revisa tu correo electrónico</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones para cambiar la contraseña.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que se enviaron a %1$s para recuperar la contraseña.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">La dirección de correo electrónico no coincide con una cuenta existente.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo de la app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Accediste como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ingresa tu número de teléfono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ingresa un número de teléfono válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ingresa el código de 6 dígitos que enviamos al número</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Se reenviará el código en 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica tu número de teléfono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorrecto. Vuelve a intentarlo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Aceptar</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de teléfono se usó demasiadas veces</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocurrió un problema durante la verificación de tu número de teléfono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código ya no es válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Acceder con el número de teléfono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Listo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">¡Verificado!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Se envió el código.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificar número de teléfono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Si presionas “%1$s”, es posible que se envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
+</resources>
diff --git a/auth/src/main/res/values-es-rPR/strings.xml b/auth/src/main/res/values-es-rPR/strings.xml
new file mode 100755
index 000000000..dfa7b7446
--- /dev/null
+++ b/auth/src/main/res/values-es-rPR/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Cargando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Acceder</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocurrió un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Correo electrónico</string>
+    <string name="provider_name_phone">Teléfono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Acceder con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Acceder con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Acceder con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Acceder con el correo electrónico</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Acceder con el teléfono</string>
+    <string name="next_default" translation_description="Button text to continue">Siguiente</string>
+    <string name="email_hint" translation_description="Hint in email input field">Correo electrónico</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de teléfono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contraseña</string>
+    <string name="required_field" translation_description="Inline error for required field">Este campo no puede estar en blanco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">La dirección de correo electrónico es incorrecta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ingresa tu dirección de correo electrónico para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Buscando cuentas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrarse</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nombre y apellido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrando…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contraseña no es lo suficientemente segura. Usa al menos %1$d carácter y una combinación de letras y números</item>
+        <item quantity="other">La contraseña no es lo suficientemente segura. Usa al menos %1$d caracteres y una combinación de letras y números</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No se pudo registrar la cuenta de correo electrónico</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ya existe una cuenta con esa dirección de correo electrónico.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Si presionas %1$s, indicas que aceptas las %2$s y la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Si presionas %1$s, indicas que aceptas las %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Si presionas %1$s, indicas que aceptas la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condiciones del servicio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidad</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">¡Te damos la bienvenida nuevamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya usaste %1$s. Accede con %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya usaste %1$s para acceder. Ingresa la contraseña correspondiente.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accediendo…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿Tienes problemas para acceder?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Revisa tu correo electrónico</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones para cambiar la contraseña.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que se enviaron a %1$s para recuperar la contraseña.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">La dirección de correo electrónico no coincide con una cuenta existente.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo de la app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Accediste como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ingresa tu número de teléfono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ingresa un número de teléfono válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ingresa el código de 6 dígitos que enviamos al número</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Se reenviará el código en 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica tu número de teléfono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorrecto. Vuelve a intentarlo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Aceptar</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de teléfono se usó demasiadas veces</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocurrió un problema durante la verificación de tu número de teléfono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código ya no es válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Acceder con el número de teléfono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Listo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">¡Verificado!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Se envió el código.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificar número de teléfono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Si presionas “%1$s”, es posible que se envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
+</resources>
diff --git a/auth/src/main/res/values-es-rPY/strings.xml b/auth/src/main/res/values-es-rPY/strings.xml
new file mode 100755
index 000000000..dfa7b7446
--- /dev/null
+++ b/auth/src/main/res/values-es-rPY/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Cargando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Acceder</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocurrió un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Correo electrónico</string>
+    <string name="provider_name_phone">Teléfono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Acceder con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Acceder con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Acceder con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Acceder con el correo electrónico</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Acceder con el teléfono</string>
+    <string name="next_default" translation_description="Button text to continue">Siguiente</string>
+    <string name="email_hint" translation_description="Hint in email input field">Correo electrónico</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de teléfono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contraseña</string>
+    <string name="required_field" translation_description="Inline error for required field">Este campo no puede estar en blanco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">La dirección de correo electrónico es incorrecta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ingresa tu dirección de correo electrónico para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Buscando cuentas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrarse</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nombre y apellido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrando…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contraseña no es lo suficientemente segura. Usa al menos %1$d carácter y una combinación de letras y números</item>
+        <item quantity="other">La contraseña no es lo suficientemente segura. Usa al menos %1$d caracteres y una combinación de letras y números</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No se pudo registrar la cuenta de correo electrónico</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ya existe una cuenta con esa dirección de correo electrónico.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Si presionas %1$s, indicas que aceptas las %2$s y la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Si presionas %1$s, indicas que aceptas las %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Si presionas %1$s, indicas que aceptas la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condiciones del servicio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidad</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">¡Te damos la bienvenida nuevamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya usaste %1$s. Accede con %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya usaste %1$s para acceder. Ingresa la contraseña correspondiente.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accediendo…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿Tienes problemas para acceder?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Revisa tu correo electrónico</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones para cambiar la contraseña.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que se enviaron a %1$s para recuperar la contraseña.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">La dirección de correo electrónico no coincide con una cuenta existente.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo de la app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Accediste como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ingresa tu número de teléfono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ingresa un número de teléfono válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ingresa el código de 6 dígitos que enviamos al número</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Se reenviará el código en 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica tu número de teléfono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorrecto. Vuelve a intentarlo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Aceptar</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de teléfono se usó demasiadas veces</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocurrió un problema durante la verificación de tu número de teléfono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código ya no es válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Acceder con el número de teléfono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Listo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">¡Verificado!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Se envió el código.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificar número de teléfono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Si presionas “%1$s”, es posible que se envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
+</resources>
diff --git a/auth/src/main/res/values-es-rSV/strings.xml b/auth/src/main/res/values-es-rSV/strings.xml
new file mode 100755
index 000000000..dfa7b7446
--- /dev/null
+++ b/auth/src/main/res/values-es-rSV/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Cargando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Acceder</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocurrió un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Correo electrónico</string>
+    <string name="provider_name_phone">Teléfono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Acceder con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Acceder con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Acceder con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Acceder con el correo electrónico</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Acceder con el teléfono</string>
+    <string name="next_default" translation_description="Button text to continue">Siguiente</string>
+    <string name="email_hint" translation_description="Hint in email input field">Correo electrónico</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de teléfono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contraseña</string>
+    <string name="required_field" translation_description="Inline error for required field">Este campo no puede estar en blanco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">La dirección de correo electrónico es incorrecta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ingresa tu dirección de correo electrónico para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Buscando cuentas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrarse</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nombre y apellido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrando…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contraseña no es lo suficientemente segura. Usa al menos %1$d carácter y una combinación de letras y números</item>
+        <item quantity="other">La contraseña no es lo suficientemente segura. Usa al menos %1$d caracteres y una combinación de letras y números</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No se pudo registrar la cuenta de correo electrónico</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ya existe una cuenta con esa dirección de correo electrónico.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Si presionas %1$s, indicas que aceptas las %2$s y la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Si presionas %1$s, indicas que aceptas las %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Si presionas %1$s, indicas que aceptas la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condiciones del servicio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidad</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">¡Te damos la bienvenida nuevamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya usaste %1$s. Accede con %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya usaste %1$s para acceder. Ingresa la contraseña correspondiente.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accediendo…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿Tienes problemas para acceder?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Revisa tu correo electrónico</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones para cambiar la contraseña.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que se enviaron a %1$s para recuperar la contraseña.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">La dirección de correo electrónico no coincide con una cuenta existente.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo de la app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Accediste como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ingresa tu número de teléfono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ingresa un número de teléfono válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ingresa el código de 6 dígitos que enviamos al número</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Se reenviará el código en 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica tu número de teléfono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorrecto. Vuelve a intentarlo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Aceptar</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de teléfono se usó demasiadas veces</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocurrió un problema durante la verificación de tu número de teléfono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código ya no es válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Acceder con el número de teléfono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Listo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">¡Verificado!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Se envió el código.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificar número de teléfono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Si presionas “%1$s”, es posible que se envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
+</resources>
diff --git a/auth/src/main/res/values-es-rUS/strings.xml b/auth/src/main/res/values-es-rUS/strings.xml
new file mode 100755
index 000000000..dfa7b7446
--- /dev/null
+++ b/auth/src/main/res/values-es-rUS/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Cargando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Acceder</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocurrió un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Correo electrónico</string>
+    <string name="provider_name_phone">Teléfono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Acceder con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Acceder con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Acceder con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Acceder con el correo electrónico</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Acceder con el teléfono</string>
+    <string name="next_default" translation_description="Button text to continue">Siguiente</string>
+    <string name="email_hint" translation_description="Hint in email input field">Correo electrónico</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de teléfono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contraseña</string>
+    <string name="required_field" translation_description="Inline error for required field">Este campo no puede estar en blanco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">La dirección de correo electrónico es incorrecta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ingresa tu dirección de correo electrónico para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Buscando cuentas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrarse</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nombre y apellido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrando…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contraseña no es lo suficientemente segura. Usa al menos %1$d carácter y una combinación de letras y números</item>
+        <item quantity="other">La contraseña no es lo suficientemente segura. Usa al menos %1$d caracteres y una combinación de letras y números</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No se pudo registrar la cuenta de correo electrónico</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ya existe una cuenta con esa dirección de correo electrónico.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Si presionas %1$s, indicas que aceptas las %2$s y la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Si presionas %1$s, indicas que aceptas las %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Si presionas %1$s, indicas que aceptas la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condiciones del servicio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidad</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">¡Te damos la bienvenida nuevamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya usaste %1$s. Accede con %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya usaste %1$s para acceder. Ingresa la contraseña correspondiente.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accediendo…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿Tienes problemas para acceder?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Revisa tu correo electrónico</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones para cambiar la contraseña.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que se enviaron a %1$s para recuperar la contraseña.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">La dirección de correo electrónico no coincide con una cuenta existente.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo de la app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Accediste como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ingresa tu número de teléfono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ingresa un número de teléfono válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ingresa el código de 6 dígitos que enviamos al número</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Se reenviará el código en 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica tu número de teléfono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorrecto. Vuelve a intentarlo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Aceptar</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de teléfono se usó demasiadas veces</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocurrió un problema durante la verificación de tu número de teléfono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código ya no es válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Acceder con el número de teléfono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Listo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">¡Verificado!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Se envió el código.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificar número de teléfono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Si presionas “%1$s”, es posible que se envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
+</resources>
diff --git a/auth/src/main/res/values-es-rUY/strings.xml b/auth/src/main/res/values-es-rUY/strings.xml
new file mode 100755
index 000000000..dfa7b7446
--- /dev/null
+++ b/auth/src/main/res/values-es-rUY/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Cargando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Acceder</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocurrió un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Correo electrónico</string>
+    <string name="provider_name_phone">Teléfono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Acceder con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Acceder con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Acceder con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Acceder con el correo electrónico</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Acceder con el teléfono</string>
+    <string name="next_default" translation_description="Button text to continue">Siguiente</string>
+    <string name="email_hint" translation_description="Hint in email input field">Correo electrónico</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de teléfono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contraseña</string>
+    <string name="required_field" translation_description="Inline error for required field">Este campo no puede estar en blanco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">La dirección de correo electrónico es incorrecta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ingresa tu dirección de correo electrónico para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Buscando cuentas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrarse</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nombre y apellido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrando…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contraseña no es lo suficientemente segura. Usa al menos %1$d carácter y una combinación de letras y números</item>
+        <item quantity="other">La contraseña no es lo suficientemente segura. Usa al menos %1$d caracteres y una combinación de letras y números</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No se pudo registrar la cuenta de correo electrónico</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ya existe una cuenta con esa dirección de correo electrónico.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Si presionas %1$s, indicas que aceptas las %2$s y la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Si presionas %1$s, indicas que aceptas las %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Si presionas %1$s, indicas que aceptas la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condiciones del servicio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidad</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">¡Te damos la bienvenida nuevamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya usaste %1$s. Accede con %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya usaste %1$s para acceder. Ingresa la contraseña correspondiente.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accediendo…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿Tienes problemas para acceder?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Revisa tu correo electrónico</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones para cambiar la contraseña.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que se enviaron a %1$s para recuperar la contraseña.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">La dirección de correo electrónico no coincide con una cuenta existente.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo de la app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Accediste como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ingresa tu número de teléfono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ingresa un número de teléfono válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ingresa el código de 6 dígitos que enviamos al número</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Se reenviará el código en 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica tu número de teléfono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorrecto. Vuelve a intentarlo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Aceptar</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de teléfono se usó demasiadas veces</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocurrió un problema durante la verificación de tu número de teléfono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código ya no es válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Acceder con el número de teléfono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Listo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">¡Verificado!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Se envió el código.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificar número de teléfono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Si presionas “%1$s”, es posible que se envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
+</resources>
diff --git a/auth/src/main/res/values-es-rVE/strings.xml b/auth/src/main/res/values-es-rVE/strings.xml
new file mode 100755
index 000000000..dfa7b7446
--- /dev/null
+++ b/auth/src/main/res/values-es-rVE/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Cargando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Acceder</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocurrió un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Correo electrónico</string>
+    <string name="provider_name_phone">Teléfono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Acceder con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Acceder con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Acceder con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Acceder con el correo electrónico</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Acceder con el teléfono</string>
+    <string name="next_default" translation_description="Button text to continue">Siguiente</string>
+    <string name="email_hint" translation_description="Hint in email input field">Correo electrónico</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de teléfono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contraseña</string>
+    <string name="required_field" translation_description="Inline error for required field">Este campo no puede estar en blanco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">La dirección de correo electrónico es incorrecta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ingresa tu dirección de correo electrónico para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Buscando cuentas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrarse</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nombre y apellido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrando…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contraseña no es lo suficientemente segura. Usa al menos %1$d carácter y una combinación de letras y números</item>
+        <item quantity="other">La contraseña no es lo suficientemente segura. Usa al menos %1$d caracteres y una combinación de letras y números</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No se pudo registrar la cuenta de correo electrónico</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ya existe una cuenta con esa dirección de correo electrónico.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Si presionas %1$s, indicas que aceptas las %2$s y la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Si presionas %1$s, indicas que aceptas las %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Si presionas %1$s, indicas que aceptas la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condiciones del servicio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidad</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">¡Te damos la bienvenida nuevamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya usaste %1$s. Accede con %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya usaste %1$s para acceder. Ingresa la contraseña correspondiente.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accediendo…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿Tienes problemas para acceder?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Revisa tu correo electrónico</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones para cambiar la contraseña.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que se enviaron a %1$s para recuperar la contraseña.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">La dirección de correo electrónico no coincide con una cuenta existente.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo de la app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Accediste como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ingresa tu número de teléfono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ingresa un número de teléfono válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ingresa el código de 6 dígitos que enviamos al número</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Se reenviará el código en 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica tu número de teléfono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorrecto. Vuelve a intentarlo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Aceptar</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de teléfono se usó demasiadas veces</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocurrió un problema durante la verificación de tu número de teléfono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código ya no es válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Acceder con el número de teléfono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Listo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">¡Verificado!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Se envió el código.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificar número de teléfono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Si presionas “%1$s”, es posible que se envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
+</resources>
diff --git a/auth/src/main/res/values-es/strings.xml b/auth/src/main/res/values-es/strings.xml
new file mode 100755
index 000000000..1abd57123
--- /dev/null
+++ b/auth/src/main/res/values-es/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Cargando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Iniciar sesión</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Se ha producido un error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Correo electrónico</string>
+    <string name="provider_name_phone">Teléfono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Iniciar sesión con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Iniciar sesión con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Iniciar sesión con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Iniciar sesión con el correo electrónico</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Iniciar sesión con el teléfono</string>
+    <string name="next_default" translation_description="Button text to continue">Siguiente</string>
+    <string name="email_hint" translation_description="Hint in email input field">Correo electrónico</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de teléfono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Contraseña</string>
+    <string name="required_field" translation_description="Inline error for required field">No puedes dejar este campo en blanco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">La dirección de correo electrónico no es correcta</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Para continuar, introduce tu dirección de correo electrónico</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Buscando cuentas ya disponibles…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrarse</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nombre y apellidos</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrando…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La contraseña no es lo suficientemente segura. Usa %1$d carácter como mínimo y combina letras y números.</item>
+        <item quantity="other">La contraseña no es lo suficientemente segura. Usa %1$d caracteres como mínimo y combina letras y números.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">No se ha podido registrar la cuenta de correo electrónico</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ya existe una cuenta con esa dirección de correo electrónico.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Al tocar %1$s, indicas que aceptas las %2$s y la %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Al tocar %1$s, indicas que aceptas las %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Al tocar %1$s, indicas que aceptas la %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Condiciones de Servicio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de Privacidad</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">¡Hola de nuevo!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya has usado %1$s.
+        Para continuar, inicia sesión con %2$s.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya has usado %1$s
+        para iniciar sesión. Introduce la contraseña de esa cuenta.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Iniciando sesión…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿No puedes iniciar sesión?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Consulta tu correo electrónico</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones
+       sobre cómo cambiar la contraseña.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que te hemos enviado a %1$s para recuperar la contraseña.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">La dirección de correo electrónico no coincide con ninguna cuenta</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo de la aplicación</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Has iniciado sesión como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Introduce tu número de teléfono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Introduce un número de teléfono válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Introduce el código de seis dígitos que hemos enviado a</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Volver a enviar el código en 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verificar el número de teléfono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">El código es incorrecto. Vuelve a intentarlo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Aceptar</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de teléfono se ha usado demasiadas veces</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">No se ha podido verificar el número de teléfono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código ya no es válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Iniciar sesión con el número de teléfono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Listo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Verificado</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Se ha enviado el código.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Enviándolo de nuevo…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Volver a enviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificar número de teléfono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Al tocar %1$s, podría enviarse un SMS. Es posible que se apliquen cargos de mensajería y de uso de datos.</string>
+</resources>
diff --git a/auth/src/main/res/values-fa/strings.xml b/auth/src/main/res/values-fa/strings.xml
new file mode 100755
index 000000000..032648d8f
--- /dev/null
+++ b/auth/src/main/res/values-fa/strings.xml
@@ -0,0 +1,76 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">درحال بارگیری…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">ورود به سیستم</string>
+    <string name="general_error" translation_description="Toast text flashing general error">خطایی رخ داد.</string>
+    <string name="idp_name_google">Google‏</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">رایانامه</string>
+    <string name="provider_name_phone">تلفن</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">ورود به سیستم با Google‎</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">ورود به سیستم با Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">ورود به سیستم با Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">ورود به سیستم با رایانامه</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">ورود به سیستم با تلفن</string>
+    <string name="next_default" translation_description="Button text to continue">بعدی</string>
+    <string name="email_hint" translation_description="Hint in email input field">رایانامه</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">شماره تلفن</string>
+    <string name="password_hint" translation_description="Hint for password input field">گذرواژه</string>
+    <string name="required_field" translation_description="Inline error for required field">اینجا نباید خالی باشد.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">آن آدرس رایانامه درست نیست</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">برای ادامه، آدرس رایانامه‌تان را وارد کنید</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">در حال بررسی حساب‌های موجود...</string>
+    <string name="title_register_email" translation_description="Title for signup form">ثبت‌نام</string>
+    <string name="name_hint" translation_description="Hint for last name input field">نام و نام خانوادگی</string>
+    <string name="button_text_save" translation_description="Button text to save input form">ذخیره</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">در حال ثبت‌نام...</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">گذرواژه به اندازه کافی قوی نیست. حداقل باید از %1$d نویسه و ترکیبی از حروف و اعداد استفاده شود</item>
+        <item quantity="other">گذرواژه به اندازه کافی قوی نیست. حداقل باید از %1$d نویسه و ترکیبی از حروف و اعداد استفاده شود</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">ثبت حساب رایانامه ناموفق بود</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">حسابی با این آدرس رایانامه از قبل وجود دارد.</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">با ضربه زدن روی %1$s موافقتتان را با %2$s اعلام می‌کنید.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">شرایط خدمات</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">«خط‌مشی حریم خصوصی»</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">از قبل حسابی دارید</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">باز هم خوش آمدید!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">قبلاً از %1$s استفاده کرده‌اید.
+      برای ادامه، با %2$s وارد سیستم شوید.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">قبلاً از %1$s برای ورود به سیستم
+      استفاده کرده‌اید. گذرواژه این حساب را وارد کنید.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">درحال ورود به سیستم…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">مشکل در ورود به سیستم؟</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">بازیابی گذرواژه</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">رایانامه‌تان را بررسی کنید</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">دستورالعمل نحوه بازنشانی گذرواژه‌تان به این رایانامه ارسال شده است، آن را ببینید.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">ارسال</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">برای بازیابی گذرواژه‌تان، دستورالعمل‌های ارسال‌شده به %1$s را دنبال کنید.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">درحال ارسال…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">هیچ حسابی منطبق با این آدرس رایانامه وجود ندارد</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">نشان‌واره برنامه</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">با %1$s وارد سیستم شده‌اید</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">شماره تلفن خود را وارد کنید</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">شماره تلفن معتبری وارد کنید</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">وارد کردن کد ۶ رقمی ارسال‌شده به</string>
+    <string name="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="verify_your_phone_title" translation_description="Button text to complete phone number verification">تأیید شماره تلفن</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">در حال تأیید...</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">در حال بازیابی پیامک...</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">کد اشتباه است. دوباره امتحان کنید.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">تأیید</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">از این شماره تلفن به دفعات زیاد استفاده شده است</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">هنگام تأیید شماره تلفنتان مشکلی پیش آمد</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">این کد دیگر معتبر نیست</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">ورود به سیستم با شماره تلفن</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">انجام شد</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">تأیید شد!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">کد ارسال شد!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">در حال ارسال مجدد...</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">ارسال مجدد کد</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">تأیید شماره تلفن</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">ادامه</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">با ضربه زدن روی «%1$s»، پیامکی برایتان ارسال می‌شود. هزینه پیام و داده اعمال خواهد شد.</string>
+</resources>
diff --git a/auth/src/main/res/values-fi/strings.xml b/auth/src/main/res/values-fi/strings.xml
new file mode 100755
index 000000000..b4e7ff348
--- /dev/null
+++ b/auth/src/main/res/values-fi/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Ladataan…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Kirjaudu sisään</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Tapahtui virhe.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Sähköposti</string>
+    <string name="provider_name_phone">Puhelin</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Kirjaudu Google-tilillä</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Kirjaudu Facebook-tilillä</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Kirjaudu Twitter-tilillä</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Kirjaudu sähköpostilla</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Kirjaudu puhelimella</string>
+    <string name="next_default" translation_description="Button text to continue">Seuraava</string>
+    <string name="email_hint" translation_description="Hint in email input field">Sähköposti</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Puhelinnumero</string>
+    <string name="password_hint" translation_description="Hint for password input field">Salasana</string>
+    <string name="required_field" translation_description="Inline error for required field">Tätä ei voi jättää tyhjäksi.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Virheellinen sähköpostiosoite</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Jatka antamalla sähköpostiosoite.</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Tarkistetaan nykyisiä tilejä…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Hanki tili</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Etu- ja sukunimi</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Tallenna</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Rekisteröityminen käynnissä…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Salasana ei ole tarpeeksi vahva. Siinä on oltava vähintään %1$d merkkiä – sekä kirjaimia että numeroita.</item>
+        <item quantity="other">Salasana ei ole tarpeeksi vahva. Siinä on oltava vähintään %1$d merkkiä – sekä kirjaimia että numeroita.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Sähköpostitilin rekisteröinti epäonnistui.</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Kyseisellä sähköpostiosoitteella on jo rekisteröity tili.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Valitsemalla %1$s vahvistat, että hyväksyt %2$s ja %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Valitsemalla %1$s vahvistat, että hyväksyt %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Valitsemalla %1$s vahvistat, että hyväksyt %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Käyttöehdot</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">tietosuojakäytännön</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Sinulla on jo tili.</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Tervetuloa takaisin!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Olet jo käyttänyt osoitetta %1$s.
+        Jatka kirjautumalla palvelun %2$s kautta.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Olet jo käyttänyt osoitetta %1$s
+        kirjautumiseen. Anna kyseisen tilin salasana.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Kirjaudutaan sisään…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Eikö kirjautuminen onnistu?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Palauta salasana</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Tarkista sähköpostisi</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Tilaa tähän sähköpostiin ohjeet, joissa neuvotaan, miten
+        voit nollata salasanan.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Lähetä</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Palauta salasana noudattamalla osoitteeseen %1$s lähetettyjä ohjeita.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Lähetetään…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Sähköpostiosoite ei vastaa aiemmin luotua tiliä.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Sovelluksen logo</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Kirjautunut sisään käyttäjänä %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Anna puhelinnumerosi</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Anna voimassa oleva puhelinnumero.</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Anna 6 merkin pituinen koodi, jonka lähetimme numeroon</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Lähetä koodi uudelleen seuraavan ajan kuluttua: 0:%02d.</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Puhelinnumeron vahvistaminen</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Vahvistetaan…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Noudetaan tekstiviesti…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Väärä koodi. Yritä uudelleen.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Ok</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Tätä puhelinnumeroa on käytetty liian monta kertaa.</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Puhelinnumerosi vahvistamisessa tapahtui virhe.</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Tämä koodi ei ole enää voimassa.</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Kirjaudu puhelinnumerolla</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Valmis</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Vahvistettu!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Koodi lähetetty</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Lähetetään uudelleen…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Lähetä koodi uudelleen</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Vahvista puhelinnumero</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Jatka</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Kun napautat %1$s, tekstiviesti voidaan lähettää. Datan ja viestien käyttö voi olla maksullista.</string>
+</resources>
diff --git a/auth/src/main/res/values-fil/strings.xml b/auth/src/main/res/values-fil/strings.xml
new file mode 100755
index 000000000..22b39cdfb
--- /dev/null
+++ b/auth/src/main/res/values-fil/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Naglo-load…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Mag-sign in</string>
+    <string name="general_error" translation_description="Toast text flashing general error">May nangyaring error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Fecebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Email</string>
+    <string name="provider_name_phone">Telepono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Mag-sign in sa Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Mag-sign in sa Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Mag-sign in sa Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Mag-sign in gamit ang email</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Mag-sign in gamit ang telepono</string>
+    <string name="next_default" translation_description="Button text to continue">Susunod</string>
+    <string name="email_hint" translation_description="Hint in email input field">Mag-email</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Numero ng Telepono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Password</string>
+    <string name="required_field" translation_description="Inline error for required field">Hindi mo ito maaaring iwanan na walang laman.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Mali ang email address na iyon</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ilagay ang iyong email address upang magpatuloy</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Tinitingnan ang mga umiiral nang account…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Mag-sign up</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Pangalan at apelyido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">I-save</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Nagsa-sign up...</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Hindi masyadong malakas ang password. Gumamit ng %1$d character man lang at kumbinasyon ng mga titik at mga numero</item>
+        <item quantity="other">Hindi masyadong malakas ang password. Gumamit ng %1$d na character man lang at kumbinasyon ng mga titik at mga numero</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Hindi nagtagumpay ang pagpaparehistro ng email account</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Mayroon nang account gamit ang email address na iyon.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Sa pag-tap sa %1$s, ipinababatid mo na sang-ayon ka sa %2$s at sa %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Sa pag-tap sa %1$s, ipinababatid mo na sang-ayon ka sa %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Sa pag-tap sa %1$s, ipinababatid mo na sang-ayon ka sa %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Mga Tuntunin ng Serbisyo</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Patakaran sa Privacy</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Mayroon ka nang account</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Maligayang pagbabalik!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Nagamit mo na ang %1$s.
+        Mag-sign in gamit ang %2$s upang magpatuloy.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Nagamit mo na ang %1$s
+        upang mag-sign in. Ilagay ang iyong password para sa account na iyon.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Nagsa-sign in…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Nagkaproblema sa pag-sign in?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">I-recover ang password</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Suriin ang iyong email</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Kumuha ng mga tagubilin na ipadala sa email na ito na magpapaliwanag kung paano 
+        i-reset ang iyong password.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Ipadala</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sundin ang mga tagubilin na ipinadala sa %1$s upang ma-recover ang iyong password.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Ipinapadala...</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Hindi tumutugma ang email address na iyon sa isang kasalukuyang account</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logo ng app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Naka-sign in bilang %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ilagay ang numero ng iyong telepono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Maglagay ng wastong numero ng telepono</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ilagay ang 6-digit na code na ipinadala namin sa</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Ipadala muli ang code sa loob ng 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">I-verify ang numero ng iyong telepono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Bine-verify …</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Kinukuha ang sms…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Maling code. Subukang muli.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Masyadong maraming beses nang nagamit ang numero ng teleponong ito</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Nagkaproblema sa pag-verify ng numero ng iyong telepono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Wala nang bisa ang code na ito</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Mag-sign in gamit ang numero ng telepono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Tapos Na</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Na-verify!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Naipadala ang code!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Ipinapadalang muli…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Ipadala Muli ang Code</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">I-verify ang Numero ng Telepono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Magpatuloy</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Sa pag-tap sa “%1$s,“ maaaring magpadala ng SMS. Maaaring ipatupad ang mga rate ng pagmemensahe at data.</string>
+</resources>
diff --git a/auth/src/main/res/values-fr-rCH/strings.xml b/auth/src/main/res/values-fr-rCH/strings.xml
new file mode 100755
index 000000000..26135c87f
--- /dev/null
+++ b/auth/src/main/res/values-fr-rCH/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Chargement…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Se connecter</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Une erreur s\'est produite.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-mail</string>
+    <string name="provider_name_phone">Téléphone</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Se connecter avec Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Se connecter avec Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Se connecter avec Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Se connecter avec une adresse e-mail</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Se connecter avec un téléphone</string>
+    <string name="next_default" translation_description="Button text to continue">Suivant</string>
+    <string name="email_hint" translation_description="Hint in email input field">E-mail</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Numéro de téléphone</string>
+    <string name="password_hint" translation_description="Hint for password input field">Mot de passe</string>
+    <string name="required_field" translation_description="Inline error for required field">Ce champ est obligatoire.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Cette adresse e-mail n\'est pas valide</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Saisissez votre adresse e-mail pour continuer</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Vérification des comptes existants…</string>
+    <string name="title_register_email" translation_description="Title for signup form">S\'inscrire</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nom et prénom</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Enregistrer</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Inscription…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Le mot de passe n\'est pas assez sécurisé. Utilisez au moins %1$d caractère et une combinaison de chiffres et de lettres.</item>
+        <item quantity="other">Le mot de passe n\'est pas assez sécurisé. Utilisez au moins %1$d caractères et une combinaison de chiffres et de lettres.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Échec de la création du compte avec une adresse e-mail</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Il existe déjà un compte associé à cette adresse e-mail.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">En appuyant sur %1$s, vous acceptez les %2$s et les %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">En appuyant sur %1$s, vous acceptez les %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">En appuyant sur %1$s, vous acceptez les %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Conditions d\'utilisation</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Règles de confidentialité</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Vous avez déjà un compte</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Bienvenue !</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Vous avez déjà utilisé l\'adresse e-mail %1$s. Connectez-vous avec %2$s pour continuer.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Vous avez déjà utilisé l\'adresse e-mail %1$s pour vous connecter. Saisissez le mot de passe du compte.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Connexion…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Vous ne parvenez pas à vous connecter ?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Récupérer votre mot de passe</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Consultez votre boîte de réception</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Les instructions relatives à la réinitialisation de votre mot de passe seront envoyées à cette adresse e-mail.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Envoyer</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Suivez les instructions envoyées à l\'adresse %1$s pour récupérer votre mot de passe.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Envoi…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Cette adresse e-mail ne correspond à aucun compte existant</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logo de l\'application</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Connecté avec l\'adresse %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Saisissez votre numéro de téléphone</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Saisissez un numéro de téléphone valide</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Saisissez le code à six chiffres envoyé au</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Renvoyer le code dans 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Valider votre numéro de téléphone</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Validation…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Récupération du SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Code erroné. Veuillez réessayer.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Ce numéro de téléphone a été utilisé un trop grand nombre de fois</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Un problème est survenu lors de la validation de votre numéro de téléphone</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Ce code n\'est plus valide</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Connectez-vous avec votre numéro de téléphone</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">OK</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Le code a bien été validé.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Le code a bien été envoyé.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Nouvel envoi du code…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Renvoyer le code</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Valider le numéro de téléphone</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuer</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">En appuyant sur \"%1$s\", vous déclencherez peut-être l\'envoi d\'un SMS. Des frais de messages et de données peuvent être facturés.</string>
+</resources>
diff --git a/auth/src/main/res/values-fr/strings.xml b/auth/src/main/res/values-fr/strings.xml
new file mode 100755
index 000000000..26135c87f
--- /dev/null
+++ b/auth/src/main/res/values-fr/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Chargement…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Se connecter</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Une erreur s\'est produite.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-mail</string>
+    <string name="provider_name_phone">Téléphone</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Se connecter avec Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Se connecter avec Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Se connecter avec Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Se connecter avec une adresse e-mail</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Se connecter avec un téléphone</string>
+    <string name="next_default" translation_description="Button text to continue">Suivant</string>
+    <string name="email_hint" translation_description="Hint in email input field">E-mail</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Numéro de téléphone</string>
+    <string name="password_hint" translation_description="Hint for password input field">Mot de passe</string>
+    <string name="required_field" translation_description="Inline error for required field">Ce champ est obligatoire.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Cette adresse e-mail n\'est pas valide</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Saisissez votre adresse e-mail pour continuer</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Vérification des comptes existants…</string>
+    <string name="title_register_email" translation_description="Title for signup form">S\'inscrire</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nom et prénom</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Enregistrer</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Inscription…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Le mot de passe n\'est pas assez sécurisé. Utilisez au moins %1$d caractère et une combinaison de chiffres et de lettres.</item>
+        <item quantity="other">Le mot de passe n\'est pas assez sécurisé. Utilisez au moins %1$d caractères et une combinaison de chiffres et de lettres.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Échec de la création du compte avec une adresse e-mail</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Il existe déjà un compte associé à cette adresse e-mail.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">En appuyant sur %1$s, vous acceptez les %2$s et les %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">En appuyant sur %1$s, vous acceptez les %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">En appuyant sur %1$s, vous acceptez les %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Conditions d\'utilisation</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Règles de confidentialité</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Vous avez déjà un compte</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Bienvenue !</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Vous avez déjà utilisé l\'adresse e-mail %1$s. Connectez-vous avec %2$s pour continuer.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Vous avez déjà utilisé l\'adresse e-mail %1$s pour vous connecter. Saisissez le mot de passe du compte.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Connexion…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Vous ne parvenez pas à vous connecter ?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Récupérer votre mot de passe</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Consultez votre boîte de réception</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Les instructions relatives à la réinitialisation de votre mot de passe seront envoyées à cette adresse e-mail.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Envoyer</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Suivez les instructions envoyées à l\'adresse %1$s pour récupérer votre mot de passe.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Envoi…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Cette adresse e-mail ne correspond à aucun compte existant</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logo de l\'application</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Connecté avec l\'adresse %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Saisissez votre numéro de téléphone</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Saisissez un numéro de téléphone valide</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Saisissez le code à six chiffres envoyé au</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Renvoyer le code dans 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Valider votre numéro de téléphone</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Validation…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Récupération du SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Code erroné. Veuillez réessayer.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Ce numéro de téléphone a été utilisé un trop grand nombre de fois</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Un problème est survenu lors de la validation de votre numéro de téléphone</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Ce code n\'est plus valide</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Connectez-vous avec votre numéro de téléphone</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">OK</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Le code a bien été validé.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Le code a bien été envoyé.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Nouvel envoi du code…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Renvoyer le code</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Valider le numéro de téléphone</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuer</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">En appuyant sur \"%1$s\", vous déclencherez peut-être l\'envoi d\'un SMS. Des frais de messages et de données peuvent être facturés.</string>
+</resources>
diff --git a/auth/src/main/res/values-gsw/strings.xml b/auth/src/main/res/values-gsw/strings.xml
new file mode 100755
index 000000000..6f2c00ca2
--- /dev/null
+++ b/auth/src/main/res/values-gsw/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Wird geladen…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Anmelden</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ein Fehler ist aufgetreten.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-Mail-Adresse</string>
+    <string name="provider_name_phone">Telefonnummer</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Über Google anmelden</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Über Facebook anmelden</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Über Twitter anmelden</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Mit einer E-Mail-Adresse anmelden</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Mit einer Telefonnummer anmelden</string>
+    <string name="next_default" translation_description="Button text to continue">Weiter</string>
+    <string name="email_hint" translation_description="Hint in email input field">E-Mail-Adresse</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Telefonnummer</string>
+    <string name="password_hint" translation_description="Hint for password input field">Passwort</string>
+    <string name="required_field" translation_description="Inline error for required field">Pflichtfeld.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Ungültige E-Mail-Adresse</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">E-Mail-Adresse eingeben, um fortzufahren</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Auf vorhandene Konten wird geprüft…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrieren</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Vor- und Nachname</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Speichern</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrierung wird durchgeführt…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Das Passwort ist zu schwach. Verwenden Sie mindestens %1$d Zeichen und eine Mischung aus Buchstaben und Ziffern.</item>
+        <item quantity="other">Das Passwort ist zu schwach. Verwenden Sie mindestens %1$d Zeichen und eine Mischung aus Buchstaben und Ziffern.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Registrierung des E-Mail-Kontos fehlgeschlagen</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ein Konto mit dieser E-Mail-Adresse ist bereits vorhanden.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Durch Tippen auf %1$s stimmen Sie den %2$s und der %3$s zu.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Durch Tippen auf %1$s stimmen Sie den %2$s zu.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Durch Tippen auf %1$s stimmen Sie der %2$s zu.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Nutzungsbedingungen</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Datenschutzerklärung</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Sie haben bereits ein Konto</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Willkommen zurück!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Sie haben %1$s bereits verwendet. Melden Sie sich mit %2$s an, um fortzufahren.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Sie haben %1$s bereits zur Anmeldung verwendet. Geben Sie das Passwort für dieses Konto ein.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Anmeldung wird durchgeführt…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Probleme bei der Anmeldung?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Passwort zurücksetzen</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Im Posteingang nachsehen</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">In der an diese E-Mail-Adresse gesendeten Anleitung wird beschrieben, wie Sie Ihr Passwort zurücksetzen können.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Senden</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Folgen Sie der an %1$s gesendeten Anleitung, um Ihr Passwort zurückzusetzen.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Wird gesendet…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Diese E-Mail-Adresse passt zu keinem Konto</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">App-Logo</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Angemeldet als %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Telefonnummer eingeben</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Geben Sie eine gültige Telefonnummer ein</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Geben Sie den sechsstelligen Code ein, der gesendet wurde an</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Code in 0:%02d erneut senden</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Telefonnummer bestätigen</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Wird bestätigt…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">SMS werden abgerufen…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Falscher Code. Versuchen Sie es noch einmal.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Diese Telefonnummer wurde schon zu oft verwendet</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Bei der Bestätigung Ihrer Telefonnummer ist ein Problem aufgetreten</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Dieser Code ist nicht mehr gültig</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Mit einer Telefonnummer anmelden</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Fertig</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Bestätigt</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Code gesendet</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Wird erneut gesendet…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Code erneut senden</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Telefonnummer bestätigen</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Weiter</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Wenn sie auf \"%1$s\" tippen, erhalten Sie möglicherweise eine SMS. Es können Gebühren für SMS und Datenübertragung anfallen.</string>
+</resources>
diff --git a/auth/src/main/res/values-gu/strings.xml b/auth/src/main/res/values-gu/strings.xml
new file mode 100755
index 000000000..d854bc111
--- /dev/null
+++ b/auth/src/main/res/values-gu/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">લોડ કરી રહ્યું છે...</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">સાઇન ઇન કરો</string>
+    <string name="general_error" translation_description="Toast text flashing general error">એક ભૂલ આવી છે.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">ઇમેઇલ</string>
+    <string name="provider_name_phone">ફોન</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Google વડે સાઇન ઇન કરો</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Facebook વડે સાઇન ઇન કરો</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Twitter વડે સાઇન ઇન કરો</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">ઇમેઇલ વડે સાઇન ઇન કરો</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">ફોન વડે સાઇન ઇન કરો</string>
+    <string name="next_default" translation_description="Button text to continue">આગળ</string>
+    <string name="email_hint" translation_description="Hint in email input field">ઇમેઇલ</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">ફોન નંબર</string>
+    <string name="password_hint" translation_description="Hint for password input field">પાસવર્ડ</string>
+    <string name="required_field" translation_description="Inline error for required field">તમારે આ ફીલ્ડ ભરવું આવશ્યક છે.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">તે ઇમેઇલ ઍડ્રેસ સાચું નથી</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">આગળ વધવા માટે તમારું ઇમેઇલ ઍડ્રેસ દાખલ કરો</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">વર્તમાન એકાઉન્ટ તપાસી રહ્યાં છીએ...</string>
+    <string name="title_register_email" translation_description="Title for signup form">સાઇન અપ</string>
+    <string name="name_hint" translation_description="Hint for last name input field">નામ અને અટક</string>
+    <string name="button_text_save" translation_description="Button text to save input form">સાચવો</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">સાઇન અપ કરી રહ્યાં છીએ…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">પાસવર્ડ પૂરતો સશક્ત નથી. ઓછામાં ઓછા %1$d અક્ષર અને વર્ણ તથા સંખ્યાઓના સંયોજનનો ઉપયોગ કરો</item>
+        <item quantity="other">પાસવર્ડ પૂરતો સશક્ત નથી. ઓછામાં ઓછા %1$d અક્ષર અને વર્ણ તથા સંખ્યાઓના સંયોજનનો ઉપયોગ કરો</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">ઇમેઇલ એકાઉન્ટની નોંધણી અસફળ</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">તે ઇમેઇલ ઍડ્રેસ ધરાવતું એક એકાઉન્ટ પહેલાંથી જ અસ્તિત્વમાં છે.</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">%1$s ટૅપ કરીને, તમે સૂચવો છો કે તમે %2$s સાથે સંમત થાઓ છો.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">સેવાની શરતો</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">ગોપનીયતા નીતિ</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">તમારી પાસે પહેલેથી જ એક એકાઉન્ટ છે</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">ફરી સ્વાગત છે!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">તમે પહેલાંથી જ %1$sનો ઉપયોગ કરી લીધો છે.
+        આગળ વધવા માટે %2$s વડે સાઇન ઇન કરો.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">તમે સાઇન ઇન કરવા માટે પહેલેથી %1$sનો
+        ઉપયોગ કરી લીધો છે. તે એકાઉન્ટ માટેનો તમારો પાસવર્ડ દાખલ કરો.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">સાઇન ઇન કરી રહ્યાં છીએ…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">સાઇન ઇન કરવામાં સમસ્યા આવી રહી છે?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">પાસવર્ડ પુનઃપ્રાપ્ત કરો</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">તમારું ઇમેઇલ ઍડ્રેસ તપાસો</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">આ ઇમેઇલમાં મોકલવામાં આવેલ સૂચનાઓ મેળવો જે તમારો
+        પાસવર્ડ કેવી રીતે રીસેટ કરવો તે સમજાવે છે.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">મોકલો</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">તમારો પાસવર્ડ પુનઃપ્રાપ્ત કરવા માટે %1$s પર મોકલેલ સૂચનાઓનું પાલન કરો.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">મોકલી રહ્યાં છીએ…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">તે ઇમેઇલ ઍડ્રેસ અસ્તિત્વમાં છે તે એકાઉન્ટ સાથે મેળ ખાતું નથી</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">ઍપ્લિકેશન લોગો</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">%1$s તરીકે સાઇન ઇન કર્યું</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">તમારો ફોન નંબર દાખલ કરો</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">એક માન્ય ફોન નંબર દાખલ કરો</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">અમે આ ફોન નંબર પર મોકલેલ 6-અંકનો કોડ દાખલ કરો</string>
+    <string name="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="verify_your_phone_title" translation_description="Button text to complete phone number verification">તમારો ફોન નંબર ચકાસો</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">ચકાસી રહ્યાં છીએ …</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">SMS પુનઃપ્રાપ્ત કરી રહ્યાં છીએ…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">કોડ ખોટો છે. ફરી પ્રયાસ કરો.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">ઓકે</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">આ ફોન નંબરનો ઉપયોગ ઘણી બધી વખત થઇ ગયો છે</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">તમારો ફોન નંબર ચકાસવામાં સમસ્યા આવી હતી</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">આ કોડ હવે માન્ય નથી</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">ફોન નંબર વડે સાઇન ઇન કરો</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">થઈ ગયું</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">ચકાસેલ!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">કોડ મોકલ્યો!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">ફરીથી મોકલી રહ્યાં છીએ…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">કોડ ફરીથી મોકલો</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">ફોન નંબર ચકાસો</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">આગળ વધો</string>
+    <string name="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-hi/strings.xml b/auth/src/main/res/values-hi/strings.xml
new file mode 100755
index 000000000..4dfd35f34
--- /dev/null
+++ b/auth/src/main/res/values-hi/strings.xml
@@ -0,0 +1,76 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">लोड हो रहा है...</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">प्रवेश करें</string>
+    <string name="general_error" translation_description="Toast text flashing general error">कोई गड़बड़ी हुई.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">ईमेल</string>
+    <string name="provider_name_phone">फ़ोन</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Google से प्रवेश करें</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Facebook से प्रवेश करें</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Twitter से प्रवेश करें</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">ईमेल से प्रवेश करें</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">फ़ोन से प्रवेश करें</string>
+    <string name="next_default" translation_description="Button text to continue">अगला</string>
+    <string name="email_hint" translation_description="Hint in email input field">ईमेल</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">फ़ोन नंबर</string>
+    <string name="password_hint" translation_description="Hint for password input field">पासवर्ड</string>
+    <string name="required_field" translation_description="Inline error for required field">आप इसे खाली नहीं छोड़ सकते.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">वह ईमेल पता सही नहीं है</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">जारी रखने के लिए अपना ईमेल पता डालें</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">मौजूदा खातों की जांच की जा रही है…</string>
+    <string name="title_register_email" translation_description="Title for signup form">साइन अप करें</string>
+    <string name="name_hint" translation_description="Hint for last name input field">नाम और उपनाम</string>
+    <string name="button_text_save" translation_description="Button text to save input form">सहेजें</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">साइन अप करना…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">पासवर्ड पर्याप्त रूप से मजबूत नहीं है. कम से कम %1$d वर्णों का उपयोग करें जो अक्षरों और नंबरों दोनों को मिलाकर बना हो</item>
+        <item quantity="other">पासवर्ड पर्याप्त रूप से मजबूत नहीं है. कम से कम %1$d वर्णों का उपयोग करें जो अक्षरों और नंबरों दोनों को मिलाकर बना हो</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">ईमेल खाता पंजीकरण असफल रहा</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">उस ईमेल पते के साथ एक खाता पहले से मौजूद है.</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">%1$s पर टैप करके आप बताते हैं कि आप %2$s से सहमत हैं.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">सेवा की शर्तें</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">निजता नीति</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">आपके पास पहले से ही एक खाता है</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">आपका फिर से स्वागत है!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">आपने पहले ही %1$s का उपयोग कर लिया है.
+ जारी रखने के लिए %2$s से प्रवेश करें.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">आपने पहले ही प्रवेश करने के लिए %1$s का उपयोग कर लिया है.
+ उस खाते के लिए अपना पासवर्ड डालें.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">प्रवेश हो रहा है...</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">प्रवेश करने में समस्या?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">पासवर्ड फिर से पाएं</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">अपना ईमेल जांचें</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">इस ईमेल पर भेजे गए निर्देश पाएं जो आपको अपना पासवर्ड रीसेट करना बताएंगे.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">भेजें</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">अपना पासवर्ड फिर से पाने के लिए %1$s पर भेजे गए निर्देशों का पालन करें.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">भेज रहा है…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">वह ईमेल पता किसी मौजूदा खाते से मेल नहीं खाता है</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">ऐप्लिकेशन लोगो</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">%1$s के रूप में प्रवेश किया</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">अपना फ़ोन नंबर डालें</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">कोई मान्य फ़ोन नंबर डालें</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">हमारी ओर से भेजा गया 6-अंकों वाला कोड डालें</string>
+    <string name="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="verify_your_phone_title" translation_description="Button text to complete phone number verification">अपने फ़ोन नंबर की पुष्टि करें</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">पुष्टि कर रहा है…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">sms फिर से लाया जा रहा है…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">गलत कोड. फिर से कोशिश करें.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">ठीक</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">इस फ़ोन नंबर का उपयोग कई बार किया गया है</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">आपके फ़ोन नंबर की पुष्टि करने में कोई समस्या हुई</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">यह कोड अब मान्य नहीं है</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">फ़ोन नंबर के साथ प्रवेश करें</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">हो गया</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">पुष्टि हो चुकी है!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">कोड भेज दिया गया!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">फिर से भेजा जा रहा है…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">कोड फिर से भेजें</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">फ़ोन नंबर की पुष्टि करें</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">जारी रखें</string>
+    <string name="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-hr/strings.xml b/auth/src/main/res/values-hr/strings.xml
new file mode 100755
index 000000000..5094806f1
--- /dev/null
+++ b/auth/src/main/res/values-hr/strings.xml
@@ -0,0 +1,78 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Učitavanje…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Prijava</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Došlo je do pogreške.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-adresa</string>
+    <string name="provider_name_phone">Telefon</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Prijava putem Googlea</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Prijava putem Facebooka</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Prijava putem Twittera</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Prijava putem e-adrese</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Prijava putem telefona</string>
+    <string name="next_default" translation_description="Button text to continue">Dalje</string>
+    <string name="email_hint" translation_description="Hint in email input field">E-adresa</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Telefonski broj</string>
+    <string name="password_hint" translation_description="Hint for password input field">Zaporka</string>
+    <string name="required_field" translation_description="Inline error for required field">Ne možete to ostaviti prazno.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Ta e-adresa nije točna</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Unesite svoju e-adresu za nastavak</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Traženje postojećih računa...</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registracija</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Ime i prezime</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Spremi</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registriranje....</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Zaporka nije dovoljno jaka. Upotrijebite najmanje %1$d znak i koristite kombinaciju slova i znamenki.</item>
+        <item quantity="few">Zaporka nije dovoljno jaka. Upotrijebite najmanje %1$d znaka i koristite kombinaciju slova i znamenki.</item>
+        <item quantity="other">Zaporka nije dovoljno jaka. Upotrijebite najmanje %1$d znakova i koristite kombinaciju slova i znamenki.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Registracija računa putem e-adrese nije uspjela</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Račun s tom e-adresom već postoji.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Dodirivanjem gumba %1$s potvrđujete da prihvaćate odredbe koje sadrže %2$s i %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Dodirivanjem gumba %1$s potvrđujete da prihvaćate odredbe koje sadrže %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Dodirivanjem gumba %1$s potvrđujete da prihvaćate odredbe koje sadrže %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Uvjeti pružanja usluge</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Pravila o privatnosti</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Već imate račun</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Dobro došli natrag!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Već ste upotrijebili e-adresu %1$s.
+        Za nastavak se prijavite putem usluge %2$s.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Za prijavu ste već upotrijebili e-adresu %1$s.
+        Unesite zaporku za taj račun.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Prijava...</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Problem s prijavom?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Ponovno postavljanje zaporke</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Provjerite e-poštu</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Provjerite upute za ponovno postavljanje zaporke koje smo
+        poslali na vašu e-adresu.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Pošalji</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Slijedite upute za ponovno postavljanje zaporke koje smo poslali na e-adresu %1$s.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Slanje…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Ta e-adresa ne pripada postojećem računu</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotip aplikacije</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Prijavljeni ste kao %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Unesite telefonski broj</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Unesite važeći telefonski broj</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Unesite 6-znamenkasti kôd koji smo poslali na broj</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Ponovno slanje koda za 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Potvrda telefonskog broja</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Potvrđivanje…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Dohvaćanje SMS-a…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Pogrešan kôd. Pokušajte ponovo.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">U redu</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Taj telefonski broj upotrijebljen je previše puta</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Došlo je do problema s potvrdom vašeg telefonskog broja</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Kôd više nije važeći</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Prijava putem telefonskog broja</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Gotovo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Potvrda je uspjela!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Kôd je poslan!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Ponovno slanje…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Ponovo pošalji kôd</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Potvrda telefonskog broja</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Nastavi</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Dodirivanje gumba \"%1$s\" može dovesti do slanja SMS poruke. Mogu se primijeniti naknade za slanje poruka i podatkovni promet.</string>
+</resources>
diff --git a/auth/src/main/res/values-hu/strings.xml b/auth/src/main/res/values-hu/strings.xml
new file mode 100755
index 000000000..8b458aa34
--- /dev/null
+++ b/auth/src/main/res/values-hu/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Betöltés…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Bejelentkezés</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Hiba történt.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-mail</string>
+    <string name="provider_name_phone">Telefon</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Bejelentkezés Google-fiókkal</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Bejelentkezés Facebook-fiókkal</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Bejelentkezés Twitter-fiókkal</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Bejelentkezés e-mail-fiókkal</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Bejelentkezés telefonnal</string>
+    <string name="next_default" translation_description="Button text to continue">Következő</string>
+    <string name="email_hint" translation_description="Hint in email input field">E-mail</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Telefonszám</string>
+    <string name="password_hint" translation_description="Hint for password input field">Jelszó</string>
+    <string name="required_field" translation_description="Inline error for required field">Ezt nem hagyhatja üresen.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Az e-mail-cím helytelen.</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">A folytatáshoz adja meg e-mail-címét.</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Meglévő fiókok ellenőrzése…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Regisztráció</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Utónév és vezetéknév</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Mentés</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Regisztráció...</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">A jelszó nem elég erős. Legalább %1$d karaktert használjon, amelyben betűk és számok is szerepeljenek.</item>
+        <item quantity="other">A jelszó nem elég erős. Legalább %1$d karaktert használjon, amelyben betűk és számok is szerepeljenek.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Az e-mail-fiók regisztrációja sikertelen volt.</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ezzel az e-mail-címmel már létezik fiók.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Ha a(z) %1$s gombra koppint, az azt jelenti, hogy elfogadja a következőket: %2$s és %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Ha a(z) %1$s gombra koppint, az azt jelenti, hogy elfogadja a következőt: %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Ha a(z) %1$s gombra koppint, az azt jelenti, hogy elfogadja a következőt: %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Általános Szerződési Feltételek</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Adatvédelmi irányelvek</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Már rendelkezik fiókkal</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Örülünk, hogy visszatért!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Már használta a következő e-mail-címet: %1$s.
+        A folytatáshoz jelentkezzen be %2$s-fiókjával.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ezt az e-mail-fiókot (%1$s) már használta
+        bejelentkezésre. Adja meg a fiókhoz tartozó jelszót.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Bejelentkezés...</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Problémái vannak a bejelentkezéssel?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Jelszó visszaállítása</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Ellenőrizze az e-mailjeit.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Olvassa el az e-mailben elküldött utasításokat, amelyekből megtudhatja, hogyan
+        állíthatja vissza a jelszavát.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Küldés</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">A jelszó visszaállításához kövesse az ide (%1$s) elküldött utasításokat.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Küldés…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Ehhez az e-mail-címhez egyetlen meglévő fiók sem tartozik.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Alkalmazás emblémája</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Bejelentkezve a következőként: %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Adja meg telefonszámát</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Érvényes telefonszámot adjon meg.</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Adja meg a telefonszámra elküldött 6 számjegyű kódot</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Kód újraküldése ennyi idő elteltével: 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Telefonszám igazolása</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Ellenőrzés...</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">SMS lekérése…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Hibás kód. Próbálja újra.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Rendben</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Ezt a telefonszámot már túl sokszor használták.</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Hiba történt a telefonszám ellenőrzésekor.</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Ez a kód már nem érvényes.</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Bejelentkezés telefonszámmal</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Kész</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Ellenőrzött!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">A kódot elküldtük.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Újraküldés…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Kód újraküldése</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Telefonszám igazolása</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Folytatás</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Ha a(z) „%1$s” gombra koppint, a rendszer SMS-t küldhet Önnek. A szolgáltató ezért üzenet- és adatforgalmi díjat számíthat fel.</string>
+</resources>
diff --git a/auth/src/main/res/values-in/strings.xml b/auth/src/main/res/values-in/strings.xml
new file mode 100755
index 000000000..ad90d88f6
--- /dev/null
+++ b/auth/src/main/res/values-in/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Memuat…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Login</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Telah terjadi error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Email</string>
+    <string name="provider_name_phone">Telepon</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Login dengan Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Login dengan Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Login dengan Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Login dengan email</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Login dengan nomor telepon</string>
+    <string name="next_default" translation_description="Button text to continue">Berikutnya</string>
+    <string name="email_hint" translation_description="Hint in email input field">Email</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Nomor Telepon</string>
+    <string name="password_hint" translation_description="Hint for password input field">Sandi</string>
+    <string name="required_field" translation_description="Inline error for required field">Anda wajib mengisinya.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Alamat email yang dimasukkan salah</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Masukkan alamat email Anda untuk melanjutkan</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Memeriksa akun yang ada…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Daftar</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nama depan &amp; belakang</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Simpan</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Mendaftar…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Sandi tidak cukup kuat. Gunakan minimal %1$d karakter dan merupakan kombinasi huruf dan angka</item>
+        <item quantity="other">Sandi tidak cukup kuat. Gunakan minimal %1$d karakter dan merupakan kombinasi huruf dan angka</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Pendaftaran akun email tidak berhasil</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Sudah ada akun dengan alamat email tersebut.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Dengan menge-tap %1$s Anda menyatakan setuju dengan %2$s dan %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Dengan menge-tap %1$s Anda menyatakan setuju dengan %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Dengan menge-tap %1$s Anda menyatakan setuju dengan %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Persyaratan Layanan</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Kebijakan Privasi</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Anda sudah memiliki akun</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Selamat datang kembali!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Anda telah menggunakan %1$s.
+        Login dengan %2$s untuk melanjutkan.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Anda telah menggunakan %1$s
+        untuk login. Masukkan sandi untuk akun tersebut.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Login...</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Terjadi masalah saat login?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Pulihkan sandi</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Periksa email Anda</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Dapatkan petunjuk yang dikirimkan ke email ini yang menjelaskan cara
+        menyetel ulang sandi Anda.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Kirim</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Ikuti petunjuk yang dikirimkan ke %1$s untuk memulihkan sandi Anda.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Mengirim...</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Alamat email tidak cocok dengan akun yang ada</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logo aplikasi</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Login sebagai %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Masukkan nomor telepon Anda</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Masukkan nomor telepon yang valid</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Masukkan kode 6 digit yang kami kirimkan ke</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Kirimkan ulang kode dalam 0.%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifikasi nomor telepon Anda</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Memverifikasi…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Mengambil sms…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Kode salah. Coba lagi.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Oke</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Nomor telepon ini sudah terlalu sering digunakan</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ada masalah saat memverifikasi nomor telepon Anda</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Kode ini sudah tidak valid</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Login dengan nomor telepon</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Selesai</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Terverifikasi!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Kode terkirim!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Mengirim ulang…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Kirim Ulang Kode</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verifikasi Nomor Telepon</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Lanjutkan</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Dengan menge-tap “%1$s“, SMS mungkin akan dikirim. Mungkin dikenakan biaya pesan &amp; data.</string>
+</resources>
diff --git a/auth/src/main/res/values-it/strings.xml b/auth/src/main/res/values-it/strings.xml
new file mode 100755
index 000000000..fcc788940
--- /dev/null
+++ b/auth/src/main/res/values-it/strings.xml
@@ -0,0 +1,76 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Caricamento in corso…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Accedi</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Si è verificato un errore.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Indirizzo email</string>
+    <string name="provider_name_phone">Telefono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Accedi con Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Accedi con Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Accedi con Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Accedi con l\'indirizzo email</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Accedi con il telefono</string>
+    <string name="next_default" translation_description="Button text to continue">Avanti</string>
+    <string name="email_hint" translation_description="Hint in email input field">Indirizzo email</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Numero di telefono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Password</string>
+    <string name="required_field" translation_description="Inline error for required field">Questo campo non può restare vuoto.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">L\'indirizzo email non è corretto</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Inserisci il tuo indirizzo email per continuare</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Verifica degli account esistenti in corso…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrati</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nome e cognome</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Salva</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrazione in corso…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">La password non è abbastanza efficace. Utilizza almeno %1$d carattere e una combinazione di lettere e numeri.</item>
+        <item quantity="other">La password non è abbastanza efficace. Utilizza almeno %1$d caratteri e una combinazione di lettere e numeri.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Registrazione account di posta elettronica non riuscita</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Esiste già un account con questo indirizzo email.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Se tocchi %1$s, accetti i %2$s e le %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Se tocchi %1$s, accetti i %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Se tocchi %1$s, accetti le %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Termini di servizio</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Norme sulla privacy</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Hai già un account</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Bentornato.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Hai già utilizzato %1$s.
+        Accedi con %2$s per continuare.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Hai già utilizzato %1$s
+        per accedere. Inserisci la password di questo account.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accesso in corso…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Problemi di accesso?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recupera la password</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Controlla la tua casella di posta</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">A questo indirizzo email verranno inviate le istruzioni che spiegano come reimpostare la password.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Invia</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Seguire le istruzioni inviate all\'indirizzo email %1$s per recuperare la password.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Invio in corso…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">L\'indirizzo email non corrisponde a un account esistente</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logo dell\'applicazione</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Eccesso eseguito come %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Inserisci il numero di telefono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Inserisci un numero di telefono valido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Inserisci il codice a 6 cifre che abbiamo inviato al numero</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Invia di nuovo il codice tra 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifica il numero di telefono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verifica in corso…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recupero SMS in corso…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Codice errato. Riprova.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Questo numero di telefono è stato usato troppe volte</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Si è verificato un problema durante la verifica del tuo numero di telefono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Questo codice non è più valido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Accedi con il numero di telefono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Fine</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Verifica eseguita.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Codice inviato.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Nuovo invio in corso…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Invia di nuovo il codice</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verifica numero di telefono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continua</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Se tocchi \"%1$s\", è possibile che venga inviato un SMS. Potrebbero essere applicate le tariffe per l\'invio dei messaggi e per il traffico dati.</string>
+</resources>
diff --git a/auth/src/main/res/values-ja/strings.xml b/auth/src/main/res/values-ja/strings.xml
new file mode 100755
index 000000000..78947f6a3
--- /dev/null
+++ b/auth/src/main/res/values-ja/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">読み込んでいます…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">ログイン</string>
+    <string name="general_error" translation_description="Toast text flashing general error">エラーが発生しました。</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">メールアドレス</string>
+    <string name="provider_name_phone">電話番号</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Google でログイン</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Facebook でログイン</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Twitter でログイン</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">メールアドレスでログイン</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">電話番号でログイン</string>
+    <string name="next_default" translation_description="Button text to continue">次へ</string>
+    <string name="email_hint" translation_description="Hint in email input field">メールアドレス</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">電話番号</string>
+    <string name="password_hint" translation_description="Hint for password input field">パスワード</string>
+    <string name="required_field" translation_description="Inline error for required field">入力必須項目です。</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">メールアドレスが正しくありません</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">続行するにはメールアドレスを入力してください</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">既存のアカウントを確認しています…</string>
+    <string name="title_register_email" translation_description="Title for signup form">登録</string>
+    <string name="name_hint" translation_description="Hint for last name input field">あなたの名前</string>
+    <string name="button_text_save" translation_description="Button text to save input form">保存</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">登録しています…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">パスワードが十分に安全ではありません。%1$d 文字以上で、文字と数字を組み合わせたパスワードを使用してください</item>
+        <item quantity="other">パスワードが十分に安全ではありません。%1$d 文字以上で、文字と数字を組み合わせたパスワードを使用してください</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">メール アカウントの登録に失敗しました</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">このメールアドレスのアカウントがすでに存在します。</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">[%1$s] をタップすると、%2$s に同意したことになります。</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">利用規約</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">プライバシー ポリシー</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">アカウントをすでにお持ちです</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">こんにちは</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">%1$s をすでに使用しています。%2$s でログインして続行してください。</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">すでに %1$s を使用してログインしています。このアカウントのパスワードを入力してください。</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">ログインしています…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">ログインできない場合</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">パスワードの復元</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">メールをご確認ください</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">このメールアドレスに送信された、パスワードの再設定方法をご確認ください。</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">送信</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">%1$s に送信された手順に沿ってパスワードを復元してください</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">送信しています…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">メールアドレスが既存のアカウントと一致しません</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">アプリのロゴ</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">%1$s でログインしています</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">電話番号を入力してください</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">有効な電話番号を入力してください</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">送信された 6 桁のコードを入力してください</string>
+    <string name="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="verify_your_phone_title" translation_description="Button text to complete phone number verification">電話番号を確認</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">確認しています…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">SMS を取得しています…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">コードが間違っています。もう一度お試しください。</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">この電話番号は何度も使用されています</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">電話番号の確認中に問題が発生しました</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">このコードは無効になりました</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">電話番号でログイン</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">完了</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">確認済み</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">コード送信完了</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">再送信しています…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">コードを再送信</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">電話番号を確認</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">続行</string>
+    <string name="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-kn/strings.xml b/auth/src/main/res/values-kn/strings.xml
new file mode 100755
index 000000000..c5bba2f91
--- /dev/null
+++ b/auth/src/main/res/values-kn/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">ಲೋಡ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">ಸೈನ್ ಇನ್‌</string>
+    <string name="general_error" translation_description="Toast text flashing general error">ದೋಷ ಸಂಭವಿಸಿದೆ.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">ಇಮೇಲ್</string>
+    <string name="provider_name_phone">ಫೋನ್</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Google ಮೂಲಕ ಸೈನ್ ಇನ್ ಮಾಡಿ</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Facebook ಮೂಲಕ ಸೈನ್ ಇನ್ ಮಾಡಿ</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Twitter ಮೂಲಕ ಸೈನ್ ಇನ್ ಮಾಡಿ</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">ಇಮೇಲ್ ಜೊತೆ ಸೈನ್ ಇನ್ ಮಾಡಿ</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">ಫೋನ್‌ ಮೂಲಕ ಸೈನ್‌ ಇನ್‌ ಮಾಡಿ</string>
+    <string name="next_default" translation_description="Button text to continue">ಮುಂದೆ</string>
+    <string name="email_hint" translation_description="Hint in email input field">ಇಮೇಲ್</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">ಫೋನ್ ಸಂಖ್ಯೆ</string>
+    <string name="password_hint" translation_description="Hint for password input field">ಪಾಸ್‌ವರ್ಡ್</string>
+    <string name="required_field" translation_description="Inline error for required field">ನೀವು ಇದನ್ನು ಖಾಲಿ ಬಿಡುವಂತಿಲ್ಲ.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">ಆ ಇಮೇಲ್ ವಿಳಾಸ ಸರಿಯಾಗಿಲ್ಲ</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">ಮುಂದುವರಿಸಲು ನಿಮ್ಮ ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಖಾತೆಗಳಿಗಾಗಿ ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ...</string>
+    <string name="title_register_email" translation_description="Title for signup form">ಸೈನ್ ಅಪ್</string>
+    <string name="name_hint" translation_description="Hint for last name input field">ಮೊದಲ ಮತ್ತು ಕೊನೆಯ ಹೆಸರು</string>
+    <string name="button_text_save" translation_description="Button text to save input form">ಉಳಿಸಿ</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">ಸೈನ್ ಅಪ್ ಮಾಡಲಾಗುತ್ತಿದೆ...</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">ಪಾಸ್‍‌ವರ್ಡ್‌ ಸಾಕಷ್ಟು ಪ್ರಬಲವಾಗಿಲ್ಲ. ಕನಿಷ್ಠ %1$d ಅಕ್ಷರಗಳಿರಲಿ ಹಾಗೂ ಅದರಲ್ಲಿ ಅಕ್ಷರಗಳು ಮತ್ತು ಸಂಖ್ಯೆಗಳ ಮಿಕ್ಸ್‌ ಬಳಸಿ</item>
+        <item quantity="other">ಪಾಸ್‍‌ವರ್ಡ್‌ ಸಾಕಷ್ಟು ಪ್ರಬಲವಾಗಿಲ್ಲ. ಕನಿಷ್ಠ %1$d ಅಕ್ಷರಗಳಿರಲಿ ಹಾಗೂ ಅದರಲ್ಲಿ ಅಕ್ಷರಗಳು ಮತ್ತು ಸಂಖ್ಯೆಗಳ ಮಿಕ್ಸ್‌ ಬಳಸಿ</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">ಇಮೇಲ್ ಖಾತೆ ನೋಂದಣಿ ಮಾಡುವಿಕೆಯು ವಿಫಲವಾಗಿದೆ</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">ಆ ಇಮೇಲ್ ವಿಳಾಸದ ಜೊತೆಗೆ ಈಗಾಗಲೇ ಖಾತೆಯೊಂದು ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ.</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">%1$s ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡುವ ಮೂಲಕ, ನೀವು %2$sಅನ್ನು ಒಪ್ಪುತ್ತೀರಿ ಎಂದು ಸೂಚಿಸುತ್ತಿದ್ದೀರಿ.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">ಸೇವಾ ನಿಯಮಗಳು</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">ಗೌಪ್ಯತಾ ನೀತಿ</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">ನೀವು ಈಗಾಗಲೇ ಖಾತೆಯನ್ನು ಹೊಂದಿರುವಿರಿ</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">ಮರಳಿ ಸುಸ್ವಾಗತ!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">ನೀವು ಈಗಾಗಲೇ %1$s ಅನ್ನು ಬಳಸುತ್ತಿರುವಿರಿ. ಮುಂದುವರಿಸಲು %2$s ಜೊತೆ ಸೈನ್ ಇನ್ ಮಾಡಿ.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">ನೀವು ಈಗಾಗಲೇ ಸೈನ್ ಇನ್ ಮಾಡಲು %1$sನ್ನು ಬಳಸಿದ್ದೀರಿ. ಆ ಖಾತೆಗೆ ಸೈನ್ ಇನ್ ಆಗಲು ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ನಮೂದಿಸಿ.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">ಸೈನ್ ಇನ್ ಮಾಡಲಾಗುತ್ತಿದೆ…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">ಸೈನ್ ಇನ್ ಮಾಡುವಲ್ಲಿ ಸಮಸ್ಯೆ ಕಂಡುಬಂದಿದೆಯೇ?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">ಪಾಸ್‌ವರ್ಡ್ ಹಿಂಪಡೆಯಿರಿ</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">ನಿಮ್ಮ ಇಮೇಲ್‌ ಅನ್ನು ಪರಿಶೀಲಿಸಿ</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ಮರುಹೊಂದಿಸುವುದು ಹೇಗೆ ಎಂದು ತಿಳಿಸುವ ಸೂಚನೆಗಳನ್ನು ಈ ಇಮೇಲ್‌ ಮೂಲಕ ಪಡೆಯಿರಿ.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">ಕಳುಹಿಸಿ</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ಮರುಪಡೆಯಲು %1$s ಗೆ ಕಳುಹಿಸಲಾದ ಸೂಚನೆಗಳನ್ನು ಅನುಸರಿಸಿ.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ...</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">ಆ ಇಮೇಲ್‌ ವಿಳಾಸವು ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಖಾತೆಗೆ ಹೊಂದಾಣಿಕೆಯಾಗುವುದಿಲ್ಲ</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">ಅಪ್ಲಿಕೇಶನ್‌ ಲೋಗೊ</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">ನೀವು %1$s ನಿಂದ ಸೈನ್ ಇನ್ ಮಾಡಿರುವಿರಿ</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">ನಿಮ್ಮ ಫೋನ್‌ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">ಮಾನ್ಯವಾದ ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">ನಾವು ಕಳುಹಿಸಿರುವ 6 ಅಂಕಿಯ ಕೋಡ್‌ ನಮೂದಿಸಿ</string>
+    <string name="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="verify_your_phone_title" translation_description="Button text to complete phone number verification">ನಿಮ್ಮ ಪೋನ್‌ ಸಂಖ್ಯೆಯನ್ನು ಪರಿಶೀಲಿಸಿ</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ...</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">ಎಸ್‌ಎಂಎಸ್‌ ಹಿಂಪಡೆಯಲಾಗುತ್ತಿದೆ…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">ಕೋಡ್ ತಪ್ಪಾಗಿದೆ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">ಸರಿ</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">ಈ ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ಈಗಾಗಲೇ ಹಲವಾರು ಬಾರಿ ಬಳಸಲಾಗಿದೆ</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">ನಿಮ್ಮ ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ಪರಿಶೀಲಿಸುವಲ್ಲಿ ತೊಂದರೆ ಇದೆ</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">ಈ ಕೋಡ್ ಇನ್ನು ಮುಂದೆ ಮಾನ್ಯವಾಗಿರುವುದಿಲ್ಲ</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">ಫೋನ್‌ ಸಂಖ್ಯೆಯ ಮೂಲಕ ಸೈನ್‌ ಇನ್‌ ಮಾಡಿ</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">ಮುಗಿದಿದೆ</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">ಪರಿಶೀಲಿಸಲಾಗಿದೆ</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">ಕೋಡ್‌ ಕಳುಹಿಸಲಾಗಿದೆ!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">ಪುನಃ ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">ಕೋಡ್ ಪುನಃ ಕಳುಹಿಸಿ</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ಪರಿಶೀಲಿಸಿ</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">ಮುಂದುವರಿಸಿ</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">\"%1$s\" ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡುವ ಮೂಲಕ, ಎಸ್‌ಎಂಎಸ್‌ ಅನ್ನು ಕಳುಹಿಸಬಹುದಾಗಿದೆ. ಸಂದೇಶ ಮತ್ತು ಡೇಟಾ ದರಗಳು ಅನ್ವಯಿಸಬಹುದು.</string>
+</resources>
diff --git a/auth/src/main/res/values-ko/strings.xml b/auth/src/main/res/values-ko/strings.xml
new file mode 100755
index 000000000..821420db4
--- /dev/null
+++ b/auth/src/main/res/values-ko/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">로드 중…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">로그인</string>
+    <string name="general_error" translation_description="Toast text flashing general error">오류가 발생했습니다.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">이메일</string>
+    <string name="provider_name_phone">전화</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Google 계정으로 로그인</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Facebook으로 로그인</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Twitter로 로그인</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">이메일로 로그인</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">전화로 로그인</string>
+    <string name="next_default" translation_description="Button text to continue">다음</string>
+    <string name="email_hint" translation_description="Hint in email input field">이메일</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">전화번호</string>
+    <string name="password_hint" translation_description="Hint for password input field">비밀번호</string>
+    <string name="required_field" translation_description="Inline error for required field">이 입력란을 비워둘 수 없습니다.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">이메일 주소가 잘못되었습니다.</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">계속하려면 이메일 주소를 입력하세요.</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">기존 계정 확인 중…</string>
+    <string name="title_register_email" translation_description="Title for signup form">가입</string>
+    <string name="name_hint" translation_description="Hint for last name input field">이름 및 성</string>
+    <string name="button_text_save" translation_description="Button text to save input form">저장</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">가입하는 중…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">안전한 비밀번호가 아닙니다. 길이가 %1$d자 이상이고 문자와 숫자가 조합되어야 합니다.</item>
+        <item quantity="other">안전한 비밀번호가 아닙니다. 길이가 %1$d자 이상이고 문자와 숫자가 조합되어야 합니다.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">이메일 계정 등록 실패</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">해당 이메일 주소를 갖는 계정이 이미 있습니다.</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">%1$s을(를) 탭하면 %2$s에 동의하는 것으로 간주됩니다.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">서비스 약관</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">개인정보처리방침</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">계정이 이미 있음</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">환영합니다.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">%1$s을(를) 이미 사용하고 있습니다.
+        계속하려면 %2$s(으)로 로그인하세요.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">이미 %1$s을(를) 사용하여
+        로그인했습니다. 해당 계정의 비밀번호를 입력하세요.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">로그인 중...</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">로그인하는 데 문제가 있나요?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">비밀번호 복구</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">이메일 확인</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">비밀번호 재설정 방법을 안내하는 이메일을
+        보내 드립니다.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">보내기</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">%1$s(으)로 발송된 이메일의 안내에 따라 비밀번호를 복구하세요.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">전송 중...</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">이메일 주소가 기존 계정과 일치하지 않습니다.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">앱 로고</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">%1$s(으)로 로그인됨</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">전화번호 입력</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">올바른 전화번호를 입력하세요.</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">전송된 6자리 코드를 입력하세요.</string>
+    <string name="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="verify_your_phone_title" translation_description="Button text to complete phone number verification">전화번호 인증</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">인증 중…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">SMS 검색 중…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">코드가 잘못되었습니다. 다시 시도하세요.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">확인</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">이 전화번호로 전송 시도를 너무 많이 했습니다.</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">전화번호를 인증하는 중에 문제가 발생했습니다.</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">더 이상 유효하지 않은 코드입니다.</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">전화번호로 로그인</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">완료</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">인증되었습니다.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">코드가 전송되었습니다.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">다시 전송하는 중…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">코드 재전송</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">전화번호 인증</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">계속</string>
+    <string name="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-ln/strings.xml b/auth/src/main/res/values-ln/strings.xml
new file mode 100755
index 000000000..26135c87f
--- /dev/null
+++ b/auth/src/main/res/values-ln/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Chargement…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Se connecter</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Une erreur s\'est produite.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-mail</string>
+    <string name="provider_name_phone">Téléphone</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Se connecter avec Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Se connecter avec Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Se connecter avec Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Se connecter avec une adresse e-mail</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Se connecter avec un téléphone</string>
+    <string name="next_default" translation_description="Button text to continue">Suivant</string>
+    <string name="email_hint" translation_description="Hint in email input field">E-mail</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Numéro de téléphone</string>
+    <string name="password_hint" translation_description="Hint for password input field">Mot de passe</string>
+    <string name="required_field" translation_description="Inline error for required field">Ce champ est obligatoire.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Cette adresse e-mail n\'est pas valide</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Saisissez votre adresse e-mail pour continuer</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Vérification des comptes existants…</string>
+    <string name="title_register_email" translation_description="Title for signup form">S\'inscrire</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nom et prénom</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Enregistrer</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Inscription…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Le mot de passe n\'est pas assez sécurisé. Utilisez au moins %1$d caractère et une combinaison de chiffres et de lettres.</item>
+        <item quantity="other">Le mot de passe n\'est pas assez sécurisé. Utilisez au moins %1$d caractères et une combinaison de chiffres et de lettres.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Échec de la création du compte avec une adresse e-mail</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Il existe déjà un compte associé à cette adresse e-mail.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">En appuyant sur %1$s, vous acceptez les %2$s et les %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">En appuyant sur %1$s, vous acceptez les %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">En appuyant sur %1$s, vous acceptez les %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Conditions d\'utilisation</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Règles de confidentialité</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Vous avez déjà un compte</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Bienvenue !</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Vous avez déjà utilisé l\'adresse e-mail %1$s. Connectez-vous avec %2$s pour continuer.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Vous avez déjà utilisé l\'adresse e-mail %1$s pour vous connecter. Saisissez le mot de passe du compte.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Connexion…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Vous ne parvenez pas à vous connecter ?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Récupérer votre mot de passe</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Consultez votre boîte de réception</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Les instructions relatives à la réinitialisation de votre mot de passe seront envoyées à cette adresse e-mail.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Envoyer</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Suivez les instructions envoyées à l\'adresse %1$s pour récupérer votre mot de passe.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Envoi…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Cette adresse e-mail ne correspond à aucun compte existant</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logo de l\'application</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Connecté avec l\'adresse %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Saisissez votre numéro de téléphone</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Saisissez un numéro de téléphone valide</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Saisissez le code à six chiffres envoyé au</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Renvoyer le code dans 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Valider votre numéro de téléphone</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Validation…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Récupération du SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Code erroné. Veuillez réessayer.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Ce numéro de téléphone a été utilisé un trop grand nombre de fois</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Un problème est survenu lors de la validation de votre numéro de téléphone</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Ce code n\'est plus valide</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Connectez-vous avec votre numéro de téléphone</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">OK</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Le code a bien été validé.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Le code a bien été envoyé.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Nouvel envoi du code…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Renvoyer le code</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Valider le numéro de téléphone</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuer</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">En appuyant sur \"%1$s\", vous déclencherez peut-être l\'envoi d\'un SMS. Des frais de messages et de données peuvent être facturés.</string>
+</resources>
diff --git a/auth/src/main/res/values-lt/strings.xml b/auth/src/main/res/values-lt/strings.xml
new file mode 100755
index 000000000..8609c543b
--- /dev/null
+++ b/auth/src/main/res/values-lt/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Įkeliama…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Prisijungti</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Įvyko klaida.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">El. paštas</string>
+    <string name="provider_name_phone">Telefonas</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Prisijungti per „Google“</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Prisijungti per „Facebook“</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Prisijungti per „Twitter“</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Prisijungti nurodant el. pašto adresą</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Prisijungti nurodant telefono numerį</string>
+    <string name="next_default" translation_description="Button text to continue">Kitas</string>
+    <string name="email_hint" translation_description="Hint in email input field">El. pašto adresas</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Telefono numeris</string>
+    <string name="password_hint" translation_description="Hint for password input field">Slaptažodis</string>
+    <string name="required_field" translation_description="Inline error for required field">Šį lauką būtina užpildyti.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Šis el. pašto adresas netinkamas</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Norėdami tęsti įveskite el. pašto adresą</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Tikrinama, ar yra esamų paskyrų…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Prisiregistruoti</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Vardas ir pavardė</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Išsaugoti</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Prisiregistruojama…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Slaptažodis nepakankamai sudėtingas. Naudokite bent %1$d simbolį ir raidžių bei skaičių derinį.</item>
+        <item quantity="few">Slaptažodis nepakankamai sudėtingas. Naudokite bent %1$d simbolius ir raidžių bei skaičių derinį.</item>
+        <item quantity="many">Slaptažodis nepakankamai sudėtingas. Naudokite bent %1$d simbolio ir raidžių bei skaičių derinį.</item>
+        <item quantity="other">Slaptažodis nepakankamai sudėtingas. Naudokite bent %1$d simbolių ir raidžių bei skaičių derinį.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">El. pašto paskyros užregistruoti nepavyko</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Šiuo el. pašto adresu jau užregistruota paskyra.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Paliesdami „%1$s“ nurodote, kad sutinkate su %2$s ir %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Paliesdami „%1$s“ nurodote, kad sutinkate su %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Paliesdami %1$s nurodote, kad sutinkate su %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Paslaugų teikimo sąlygomis</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privatumo politika</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Jūs jau turite paskyrą</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Sveiki sugrįžę!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Jau panaudojote %1$s.
+Jei norite tęsti, prisijunkite per „%2$s“.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Jūs jau prisijungėte naudodami %1$s. Įveskite tos paskyros slaptažodį.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Prisijungiama…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Kyla problemų prisijungiant?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Atkurti slaptažodį</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Patikrinkite el. paštą</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Gaukite instrukcijas su nurodymais, kaip pakeisti slaptažodį, šiuo el. pašto adresu.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Siųsti</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Vadovaudamiesi el. pašto adresu %1$s išsiųstais nurodymais atkurkite slaptažodį.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Siunčiama…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Šis el. pašto adresas neatitinka esamos paskyros</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Programos logotipas</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Esate prisijungę kaip %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Įveskite telefono numerį</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Įveskite tinkamą telefono numerį</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Įveskite 6 skaitmenų kodą, kurį išsiuntėme</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Siųsti kodą iš naujo po 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Patvirtinti telefono numerį</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Patvirtinama…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Gaunama SMS...</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Klaidingas kodas. Bandykite dar kartą.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Gerai</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Šis telefono numeris panaudotas per daug kartų</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Patvirtinant telefono numerį kilo problema</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Šis kodas nebegalioja</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Prisijungti nurodant telefono numerį</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Atlikta</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Patvirtinta.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Kodas išsiųstas.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Siunčiama iš naujo…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Siųsti kodą iš naujo</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Patvirtinti telefono numerį</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Tęsti</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Palietus „%1$s“ gali būti išsiųstas SMS pranešimas. Gali būti taikomi pranešimų ir duomenų įkainiai.</string>
+</resources>
diff --git a/auth/src/main/res/values-lv/strings.xml b/auth/src/main/res/values-lv/strings.xml
new file mode 100755
index 000000000..bdc6238c0
--- /dev/null
+++ b/auth/src/main/res/values-lv/strings.xml
@@ -0,0 +1,78 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Notiek ielāde…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Pierakstīties</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ir radusies kļūda.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-pasts</string>
+    <string name="provider_name_phone">Tālrunis</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Pierakstīties ar Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Pierakstīties ar Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Pierakstīties ar Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Pierakstīties ar e-pasta adresi</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Pierakstīties ar tālruni</string>
+    <string name="next_default" translation_description="Button text to continue">Tālāk</string>
+    <string name="email_hint" translation_description="Hint in email input field">E-pasts</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Tālruņa numurs</string>
+    <string name="password_hint" translation_description="Hint for password input field">Parole</string>
+    <string name="required_field" translation_description="Inline error for required field">Šo laukumu nedrīkst atstāt tukšu.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Šī e-pasta adrese nav pareiza</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Lai turpinātu, ievadiet e-pasta adresi</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Tiek pārbaudīti esošie konti...</string>
+    <string name="title_register_email" translation_description="Title for signup form">Reģistrācija</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Vārds un uzvārds</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Saglabāt</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Notiek reģistrācija...</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="zero">Parole nav pietiekami droša. Izmantojiet vismaz %1$d rakstzīmes un burtu un ciparu kombināciju</item>
+        <item quantity="one">Parole nav pietiekami droša. Izmantojiet vismaz %1$d rakstzīmi un burtu un ciparu kombināciju</item>
+        <item quantity="other">Parole nav pietiekami droša. Izmantojiet vismaz %1$d rakstzīmes un burtu un ciparu kombināciju</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Nesekmīga e-pasta konta reģistrācija</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Ar šo e-pasta adresi jau pastāv konts.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Pieskaroties pogai %1$s, jūs norādāt, ka piekrītat šādiem noteikumiem: %2$s un %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Pieskaroties pogai %1$s, jūs norādāt, ka piekrītat šādiem noteikumiem: %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Pieskaroties pogai %1$s, jūs norādāt, ka piekrītat šādiem noteikumiem: %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Pakalpojumu sniegšanas noteikumi</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Konfidencialitātes politika</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Jums jau ir konts</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Laipni lūdzam atpakaļ!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Esat jau izmantojis e-pasta adresi %1$s.
+        Pierakstieties pakalpojumā %2$s, lai turpinātu.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Esat jau izmantojis e-pasta adresi %1$s,
+        lai pierakstītos. Ievadiet šī konta paroli.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Notiek pierakstīšanās…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Vai jums ir problēmas ar pierakstīšanos?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Paroles atgūšana</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Pārbaudiet savu e-pastu</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Saņemiet uz šo e-pasta adresi nosūtītus norādījumus ar skaidrojumu,
+        kā atiestatīt paroli.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Sūtīt</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Izpildiet uz e-pasta adresi %1$s nosūtītos norādījumus, lai atgūtu paroli.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Notiek sūtīšana…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">E-pasta adrese neatbilst esošam kontam</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Lietotnes logotips</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Pierakstījies kā %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ievadiet savu tālruņa numuru</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ievadiet derīgu tālruņa numuru</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ievadiet 6 ciparu kodu, ko nosūtījām</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Vēlreiz nosūtīt kodu pēc 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verificēt tālruņa numuru</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Notiek verifikācija...</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Notiek īsziņas izgūšana…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Nepareizs kods. Mēģiniet vēlreiz.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Labi</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Šis tālruņa numurs ir izmantots pārāk daudz reižu</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Verificējot jūsu tālruņa numuru, radās problēma</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Šis kods vairs nav derīgs</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Pierakstieties ar tālruņa numuru</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Gatavs</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Verificēts.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Kods ir nosūtīts.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Notiek atkārtota sūtīšana…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Vēlreiz nosūtīt kodu</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verificēt tālruņa numuru</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Turpināt</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Pieskaroties pogai %1$s, var tikt nosūtīta īsziņa. Var tikt piemērota maksa par ziņojumiem un datu pārsūtīšanu.</string>
+</resources>
diff --git a/auth/src/main/res/values-mo/strings.xml b/auth/src/main/res/values-mo/strings.xml
new file mode 100755
index 000000000..83d44f16a
--- /dev/null
+++ b/auth/src/main/res/values-mo/strings.xml
@@ -0,0 +1,75 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Se încarcă…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Conectați-vă</string>
+    <string name="general_error" translation_description="Toast text flashing general error">A apărut o eroare.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Adresă de e-mail</string>
+    <string name="provider_name_phone">Număr de telefon</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Conectați-vă cu Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Conectați-vă cu Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Conectați-vă cu Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Conectați-vă cu adresa de e-mail</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Conectați-vă cu numărul de telefon</string>
+    <string name="next_default" translation_description="Button text to continue">Înainte</string>
+    <string name="email_hint" translation_description="Hint in email input field">Adresă de e-mail</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Număr de telefon</string>
+    <string name="password_hint" translation_description="Hint for password input field">Parolă</string>
+    <string name="required_field" translation_description="Inline error for required field">Câmpul este obligatoriu.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Adresa de e-mail nu este corectă</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Introduceți adresa de e-mail pentru a continua</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Se caută conturi existente…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Înscrieți-vă</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Prenume și nume de familie</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Salvați</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Se creează un cont...</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Parola nu este suficient de puternică. Folosiți cel puțin %1$d caracter și o combinație de litere și cifre.</item>
+        <item quantity="few">Parola nu este suficient de puternică. Folosiți cel puțin %1$d caractere și o combinație de litere și cifre.</item>
+        <item quantity="other">Parola nu este suficient de puternică. Folosiți cel puțin %1$d de caractere și o combinație de litere și cifre.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Contul de e-mail nu a fost înregistrat</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Există deja un cont cu respectiva adresă de e-mail.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Dacă atingeți %1$s, indicați că sunteți de acord cu %2$s și cu %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Dacă atingeți %1$s, indicați că sunteți de acord cu %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Dacă atingeți %1$s, indicați că sunteți de acord cu %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Termeni și condițiile</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Politica de confidențialitate</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Aveți deja un cont</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Bine ați revenit!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ați folosit deja %1$s. Pentru a continua, conectați-vă cu %2$s.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ați folosit deja %1$s pentru a vă conecta. Introduceți parola acestui cont.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Se conectează...</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Nu reușiți să vă conectați?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperați parola</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Verificați căsuța de e-mail</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Primiți instrucțiuni de resetare a parolei la această adresă de e-mail.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Trimiteți</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Urmați instrucțiunile trimise la %1$s pentru a vă recupera parola.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Se trimite…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Adresa de e-mail nu corespunde unui cont existent</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Sigla aplicației</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">V-ați conectat ca %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Introduceți numărul de telefon</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Introduceți un număr valid de telefon</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Introduceți codul din 6 cifre pe care l-am trimis la</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Retrimiteți codul în 00:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Confirmați numărul de telefon</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Se confirmă...</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Se obține SMS-ul…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Cod greșit. Încercați din nou.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Acest număr de telefon a fost folosit de prea multe ori</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">A apărut o problemă la confirmarea numărului de telefon</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Codul nu mai este valid</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Conectați-vă cu numărul de telefon</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Gata</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Confirmat!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Codul a fost trimis!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Se retrimite…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Retrimiteți codul</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Confirmați numărul de telefon</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuați</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Dacă atingeți „%1$s”, poate fi trimis un SMS. Se pot aplica tarife pentru mesaje și date.</string>
+</resources>
diff --git a/auth/src/main/res/values-mr/strings.xml b/auth/src/main/res/values-mr/strings.xml
new file mode 100755
index 000000000..b1d217141
--- /dev/null
+++ b/auth/src/main/res/values-mr/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">लोड करत आहे...</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">साइन इन करा</string>
+    <string name="general_error" translation_description="Toast text flashing general error">एक एरर आला आहे.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">ईमेल</string>
+    <string name="provider_name_phone">फोन</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Googleने साइन इन करा</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Facebookने साइन इन करा</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Twitterने साइन इन करा</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">ईमेलने साइन इन करा</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">फोनने साइन इन करा</string>
+    <string name="next_default" translation_description="Button text to continue">पुढील</string>
+    <string name="email_hint" translation_description="Hint in email input field">ईमेल</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">फोन नंबर</string>
+    <string name="password_hint" translation_description="Hint for password input field">पासवर्ड</string>
+    <string name="required_field" translation_description="Inline error for required field">तुम्ही हे रिक्त सोडू शकत नाही.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">तो ईमेल अॅड्रेस चुकीचा आहे</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">सुरू ठेवण्यासाठी तुमचा ईमेल अॅड्रेस टाका</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">सध्याच्या खात्यांसाठी तपासत आहे...</string>
+    <string name="title_register_email" translation_description="Title for signup form">साइन अप करा</string>
+    <string name="name_hint" translation_description="Hint for last name input field">नाव आणि आडनाव</string>
+    <string name="button_text_save" translation_description="Button text to save input form">सेव्ह करा</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">साइन अप करत आहे…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">पासवर्ड हवा तितका सक्षम नाही. कमीत कमी %1$d वर्ण आणि अंक व अक्षराचे मिश्रण वापरा</item>
+        <item quantity="other">पासवर्ड हवा तितका सक्षम नाही. कमीत कमी %1$d वर्ण आणि अंक अक्षरांचे मिश्रण वापरा</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">ईमेल खात्याची नोंदणी अयशस्वी झाली</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">त्या ईमेल अॅड्रेसवर आधीपासूनच एक खाते नोंदवलेले आहे.</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">%1$s वर टॅप करून तुम्ही %2$sशी सहमती असल्याचे दाखवत आहात.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">सेवा अटी</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">गोपनीयता धोरण</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">तुमचे आधीच एक खाते आहे</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">पुन्हा एकदा स्वागत आहे!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">तुम्ही %1$s आधीच वापरला आहे. सुरू ठेवण्यासाठी %2$s ने साइन इन करा.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">तुम्ही %1$s आधीच वापरला आहे. साइन इन करण्यासाठी तुमचा त्या खात्याचा पासवर्ड टाका.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">साइन इन करत आहे...</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">साइन इन करताना समस्या आली?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">पासवर्ड पुन्हा मिळवा</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">तुमचा ईमेल तपासा</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">तुमचा पासवर्ड रीसेट कसा करावा यासंबंधित या ईमेलवर पाठवलेल्या सूचना मिळवा.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">पाठवा</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">तुमचा पासवर्ड परत मिळवण्यासाठी %1$sवर पाठवलेल्या सूचनांचे पालन करा.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">पाठवत आहे...</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">तो ईमेल अॅड्रेस सध्याच्या खात्याशी जुळत नाही</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">अ‍ॅप लोगो</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">%1$s म्हणून साइन इन केले</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">तुमचा फोन नंबर टाका</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">कृपया वैध फोन नंबर टाका</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">वर आम्ही पाठवलेला 6 अंकी कोड टाका</string>
+    <string name="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="verify_your_phone_title" translation_description="Button text to complete phone number verification">तुमच्या फोन नंबरची पडताळणी करा</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">पडताळणी करत आहे…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">sms पुन्हा मिळवत आहे…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">कोड चुकीचा आहे. पुन्हा प्रयत्न करा.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">ठीक आहे</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">हा फोन नंबर बर्‍याच वेळा वापरण्‍यात आला आहे</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">तुमच्‍या फोन नंबरची पडताळणी करण्‍यात एक समस्या होती</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">हा कोड यापुढे वैध नसेल</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">फोन नंबरने साइन इन करा</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">पूर्ण झाले</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">पडताळणी झाली!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">कोड पाठवला!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">पुन्हा पाठवत आहे…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">कोड पुन्हा पाठवा</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">फोन नंबरची पडताळणी करा</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">सुरू ठेवा</string>
+    <string name="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-ms/strings.xml b/auth/src/main/res/values-ms/strings.xml
new file mode 100755
index 000000000..91fec94e6
--- /dev/null
+++ b/auth/src/main/res/values-ms/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Memuatkan...</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Log masuk</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ralat telah berlaku.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-mel</string>
+    <string name="provider_name_phone">Telefon</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Log masuk dengan Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Log masuk dengan Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Log masuk dengan Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Log masuk dengan e-mel</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Log masuk dengan telefon</string>
+    <string name="next_default" translation_description="Button text to continue">Seterusnya</string>
+    <string name="email_hint" translation_description="Hint in email input field">E-mel</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Nombor Telefon</string>
+    <string name="password_hint" translation_description="Hint for password input field">Kata Laluan</string>
+    <string name="required_field" translation_description="Inline error for required field">Anda tidak boleh membiarkan ruang ini kosong.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Alamat e-mel itu tidak betul</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Masukkan alamat e-mel anda untuk teruskan</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Menyemak akaun sedia ada…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Daftar</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nama pertama &amp; keluarga</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Simpan</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Mendaftar…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Kata laluan tidak kukuh. Gunakan sekuang-kurangnya %1$d aksara dan gabungkan huruf dengan nombor</item>
+        <item quantity="other">Kata laluan tidak kukuh. Gunakan sekuang-kurangnya %1$d aksara dan gabungkan huruf dengan nombor</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Pendaftaran akaun e-mel tidak berjaya</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Akaun dengan alamat e-mel tersebut sudah wujud.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Dengan mengetik %1$s, anda menyatakan bahawa anda bersetuju dengan %2$s dan %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Dengan mengetik %1$s, anda menyatakan bahawa anda bersetuju dengan %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Dengan mengetik %1$s, anda menyatakan bahawa anda bersetuju dengan %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Syarat Perkhidmatan</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Dasar Privasi</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Anda sudah mempunyai akaun</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Selamat kembali!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Anda sudah menggunakan %1$s. Log masuk dengan %2$s untuk teruskan.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Anda sudah menggunakan %1$s untuk log masuk. Masukkan kata laluan anda untuk akaun tersebut.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Log masuk...</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Menghadapi masalah log masuk?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Pulihkan kata laluan</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Semak e-mel anda</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Dapatkan arahan pada e-mel ini untuk mengetahui cara menetapkan semula kata laluan anda.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Hantar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Ikut arahan yang dihantar ke %1$s untuk memulihkan kata laluan anda.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Menghantar...</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Alamat e-mel tersebut tidak sepadan dengan akaun sedia ada</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logo apl</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Dilog masuk sebagai %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Masukkan nombor telefon anda</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Masukkan nombor telefon yang sah</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Masukkan kod 6 digit yang kami hantar ke</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Hantar semula kod dalam 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Sahkan nombor telefon anda</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Mengesahkan…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Mendapatkan SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Kod salah. Cuba lagi.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Nombor telefon ini terlalu kerap digunakan</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Terdapat masalah sewaktu mengesahkan nombor telefon anda</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Kod ini tidak sah lagi</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Log masuk dengan nombor telefon</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Selesai</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Disahkan!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Kod dihantar!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Menghantar semula…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Hantar Semula Kod</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Sahkan Nombor Telefon</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Teruskan</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Dengan mengetik “%1$s”, SMS akan dihantar. Tertakluk pada kadar mesej &amp; data.</string>
+</resources>
diff --git a/auth/src/main/res/values-nb/strings.xml b/auth/src/main/res/values-nb/strings.xml
new file mode 100755
index 000000000..82ce81bcd
--- /dev/null
+++ b/auth/src/main/res/values-nb/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Laster inn …</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Logg på</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Det har oppstått en feil.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-post</string>
+    <string name="provider_name_phone">Telefon</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Logg på med Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Logg på med Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Logg på med Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Logg på med e-postadresse</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Logg på med telefonnummeret ditt</string>
+    <string name="next_default" translation_description="Button text to continue">Neste</string>
+    <string name="email_hint" translation_description="Hint in email input field">E-post</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Telefonnummer</string>
+    <string name="password_hint" translation_description="Hint for password input field">Passord</string>
+    <string name="required_field" translation_description="Inline error for required field">Du må fylle ut dette feltet.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">E-postadressen er ikke riktig</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Oppgi e-postadressen din for å fortsette</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Ser etter eksisterende kontoer …</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrering</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Fornavn og etternavn</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Lagre</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrerer …</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Passordet er ikke sterkt nok. Bruk minst %1$d tegn og en blanding av bokstaver og tall</item>
+        <item quantity="other">Passordet er ikke sterkt nok. Bruk minst %1$d tegn og en blanding av bokstaver og tall</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Kunne ikke registrere e-postkontoen</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Det finnes allerede en konto med denne e-postadressen.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Når du trykker på %1$s, godtar du %2$s og %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Når du trykker på %1$s, godtar du %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Når du trykker på %1$s, godtar du %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">vilkårene</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Personvernregler</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Du har allerede en konto</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Velkommen tilbake!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Du har allerede brukt %1$s.
+        Logg på med %2$s for å fortsette.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Du har allerede brukt %1$s
+        for å logge på. Angi passordet ditt for denne kontoen.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Logger på …</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Har du problemer med å logge på?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Gjenopprett passordet</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Sjekk e-posten din</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Få instruksjoner sendt til denne e-postadressen for hvordan du
+        tilbakestiller passordet ditt.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Send</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Følg veiledningen som er sendt til %1$s, for å gjenopprette passordet ditt.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Sender …</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Denne e-postadressen samsvarer ikke med en eksisterende konto</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">App-logo</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Logget på som %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Oppgi telefonnummeret ditt</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Oppgi et gyldig telefonnummer</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Oppgi den 6-sifrede koden vi sendte til</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Send koden på nytt om 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Bekreft telefonnummeret ditt</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Bekrefter …</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Henter SMS …</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Feil kode. Prøv på nytt.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Dette telefonnummeret er brukt for mange ganger</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Kunne ikke bekrefte telefonnummeret ditt</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Denne koden er ikke lenger gyldig</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Logg på med telefonnummer</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Ferdig</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Bekreftet.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Koden er sendt.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Sender på nytt …</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Send koden på nytt</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Bekreft telefonnummeret</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Fortsett</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Når du trykker på «%1$s», kan det bli sendt en SMS. Kostnader for meldinger og datatrafikk kan påløpe.</string>
+</resources>
diff --git a/auth/src/main/res/values-nl/strings.xml b/auth/src/main/res/values-nl/strings.xml
new file mode 100755
index 000000000..375f45d14
--- /dev/null
+++ b/auth/src/main/res/values-nl/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Laden…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Inloggen</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Er is een fout opgetreden.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-mail</string>
+    <string name="provider_name_phone">Telefoon</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Inloggen met Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Inloggen met Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Inloggen met Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Inloggen met e-mailadres</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Inloggen met telefoon</string>
+    <string name="next_default" translation_description="Button text to continue">Volgende</string>
+    <string name="email_hint" translation_description="Hint in email input field">E-mail</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Telefoonnummer</string>
+    <string name="password_hint" translation_description="Hint for password input field">Wachtwoord</string>
+    <string name="required_field" translation_description="Inline error for required field">Dit veld mag niet leeg zijn.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Dit e-mailadres is niet juist</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Voer uw e-mailadres in om verder te gaan</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Controleren op bestaande accounts…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Aanmelden</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Voor- en achternaam</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Opslaan</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Aanmelden…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Uw wachtwoord is niet sterk genoeg. Gebruik ten minste %1$d teken en een combinatie van letters en cijfers.</item>
+        <item quantity="other">Uw wachtwoord is niet sterk genoeg. Gebruik ten minste %1$d tekens en een combinatie van letters en cijfers.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Registratie van e-mailaccount is mislukt</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Er bestaat al een account met dit e-mailadres.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Door op %1$s te tikken, geeft u aan dat u akkoord gaat met de %2$s en het %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Door op %1$s te tikken, geeft u aan dat u akkoord gaat met de %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Door op %1$s te tikken, geeft u aan dat u akkoord gaat met het %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Servicevoorwaarden</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privacybeleid</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">U heeft al een account</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Welkom terug.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">U heeft %1$s al gebruikt. Log in met %2$s om verder te gaan.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">U heeft al ingelogd met %1$s. Voer uw wachtwoord in voor dit account.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Inloggen…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Problemen met inloggen?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Wachtwoord herstellen</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Controleer uw inbox</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Er wordt een e-mail naar dit adres verzonden met instructies om uw wachtwoord te resetten.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Verzenden</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Volg de instructies die we naar %1$s hebben verzonden om uw wachtwoord te herstellen.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Verzenden…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Dit e-mailadres komt niet overeen met een bestaand account</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">App-logo</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Ingelogd als %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Voer uw telefoonnummer in</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Voer een geldig telefoonnummer in</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Voer de zescijferige code in die we hebben verzonden naar</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Code opnieuw verzenden over 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Uw telefoonnummer verifiëren</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verifiëren…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Sms ophalen…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Onjuiste code. Probeer het opnieuw.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Dit telefoonnummer is te vaak gebruikt</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Er is een probleem met de verificatie van uw telefoonnummer</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Deze code is niet meer geldig</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Inloggen met telefoonnummer</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Gereed</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Geverifieerd</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Code verzonden</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Opnieuw verzenden…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Code opnieuw verzenden</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Telefoonnummer verifiëren</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Doorgaan</string>
+    <string name="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>
+</resources>
diff --git a/auth/src/main/res/values-no/strings.xml b/auth/src/main/res/values-no/strings.xml
new file mode 100755
index 000000000..82ce81bcd
--- /dev/null
+++ b/auth/src/main/res/values-no/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Laster inn …</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Logg på</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Det har oppstått en feil.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-post</string>
+    <string name="provider_name_phone">Telefon</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Logg på med Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Logg på med Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Logg på med Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Logg på med e-postadresse</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Logg på med telefonnummeret ditt</string>
+    <string name="next_default" translation_description="Button text to continue">Neste</string>
+    <string name="email_hint" translation_description="Hint in email input field">E-post</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Telefonnummer</string>
+    <string name="password_hint" translation_description="Hint for password input field">Passord</string>
+    <string name="required_field" translation_description="Inline error for required field">Du må fylle ut dette feltet.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">E-postadressen er ikke riktig</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Oppgi e-postadressen din for å fortsette</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Ser etter eksisterende kontoer …</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrering</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Fornavn og etternavn</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Lagre</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrerer …</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Passordet er ikke sterkt nok. Bruk minst %1$d tegn og en blanding av bokstaver og tall</item>
+        <item quantity="other">Passordet er ikke sterkt nok. Bruk minst %1$d tegn og en blanding av bokstaver og tall</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Kunne ikke registrere e-postkontoen</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Det finnes allerede en konto med denne e-postadressen.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Når du trykker på %1$s, godtar du %2$s og %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Når du trykker på %1$s, godtar du %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Når du trykker på %1$s, godtar du %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">vilkårene</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Personvernregler</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Du har allerede en konto</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Velkommen tilbake!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Du har allerede brukt %1$s.
+        Logg på med %2$s for å fortsette.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Du har allerede brukt %1$s
+        for å logge på. Angi passordet ditt for denne kontoen.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Logger på …</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Har du problemer med å logge på?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Gjenopprett passordet</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Sjekk e-posten din</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Få instruksjoner sendt til denne e-postadressen for hvordan du
+        tilbakestiller passordet ditt.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Send</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Følg veiledningen som er sendt til %1$s, for å gjenopprette passordet ditt.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Sender …</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Denne e-postadressen samsvarer ikke med en eksisterende konto</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">App-logo</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Logget på som %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Oppgi telefonnummeret ditt</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Oppgi et gyldig telefonnummer</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Oppgi den 6-sifrede koden vi sendte til</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Send koden på nytt om 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Bekreft telefonnummeret ditt</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Bekrefter …</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Henter SMS …</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Feil kode. Prøv på nytt.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Dette telefonnummeret er brukt for mange ganger</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Kunne ikke bekrefte telefonnummeret ditt</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Denne koden er ikke lenger gyldig</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Logg på med telefonnummer</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Ferdig</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Bekreftet.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Koden er sendt.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Sender på nytt …</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Send koden på nytt</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Bekreft telefonnummeret</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Fortsett</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Når du trykker på «%1$s», kan det bli sendt en SMS. Kostnader for meldinger og datatrafikk kan påløpe.</string>
+</resources>
diff --git a/auth/src/main/res/values-pl/strings.xml b/auth/src/main/res/values-pl/strings.xml
new file mode 100755
index 000000000..24b5d92b4
--- /dev/null
+++ b/auth/src/main/res/values-pl/strings.xml
@@ -0,0 +1,76 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Wczytuję…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Zaloguj się</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Wystąpił błąd.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-mail</string>
+    <string name="provider_name_phone">Telefon</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Zaloguj się przez Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Zaloguj się przez Facebooka</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Zaloguj się przez Twittera</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Zaloguj się za pomocą e-maila</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Zaloguj się z użyciem numeru telefonu</string>
+    <string name="next_default" translation_description="Button text to continue">Dalej</string>
+    <string name="email_hint" translation_description="Hint in email input field">Adres e-mail</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Numer telefonu</string>
+    <string name="password_hint" translation_description="Hint for password input field">Hasło</string>
+    <string name="required_field" translation_description="Inline error for required field">Nie możesz zostawić tego pola pustego.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Nieprawidłowy adres e-mail</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Aby kontynuować, wpisz adres e-mail</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Szukam istniejących kont...</string>
+    <string name="title_register_email" translation_description="Title for signup form">Rejestracja</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Imię i nazwisko</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Zapisz</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Rejestruję...</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Hasło jest za słabe. Powinno mieć przynajmniej %1$d znak i być kombinacją liter i cyfr.</item>
+        <item quantity="few">Hasło jest za słabe. Powinno mieć przynajmniej %1$d znaki i być kombinacją liter i cyfr.</item>
+        <item quantity="many">Hasło jest za słabe. Powinno mieć przynajmniej %1$d znaków i być kombinacją liter i cyfr.</item>
+        <item quantity="other">Hasło jest za słabe. Powinno mieć przynajmniej %1$d znaku i być kombinacją liter i cyfr</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Rejestracja konta e-mail nie powiodła się</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Istnieje już konto z tym adresem e-mail</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Klikając %1$s, potwierdzasz, że znane Ci są %2$s oraz %3$s i akceptujesz je.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Klikając %1$s, potwierdzasz że znane Ci są %2$s i akceptujesz je.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Klikając %1$s, potwierdzasz że znana Ci jest %2$s i wyrażasz na nią zgodę.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Warunki korzystania z usługi</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Polityka prywatności</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Masz już konto</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Witamy z powrotem</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Adres %1$s został już przez Ciebie użyty. Aby kontynuować, zaloguj się przez: %2$s.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Adres %1$s został już przez Ciebie użyty do logowania. Wpisz hasło tego konta.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Loguję…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Masz problem z zalogowaniem się?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Odzyskiwanie hasła</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Sprawdź pocztę</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Na ten adres e-mail zostaną wysłane instrukcje wyjaśniające, jak zresetować hasło.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Wyślij</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Aby odzyskać hasło, wykonaj instrukcje, które wysłaliśmy Ci na adres %1$s.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Wysyłam…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Nie istnieje konto, do którego pasuje ten adres e-mail.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logo aplikacji</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Używasz konta %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Wpisz numer telefonu</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Wpisz prawidłowy numer telefonu</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Wpisz sześciocyfrowy kod, który wysłaliśmy na numer</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Kod można ponownie wysłać za 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Zweryfikuj swój numer telefonu</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Weryfikuję…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Odbieranie SMS-a…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Nieprawidłowy kod. Spróbuj jeszcze raz.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Ten numer telefonu został użyty zbyt wiele razy.</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Podczas weryfikacji Twojego numeru telefonu wystąpił problem.</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Ten kod stracił ważność.</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Zaloguj się z użyciem numeru telefonu</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Gotowe</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Zweryfikowano.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Kod wysłany.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Wysyłam ponownie…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Wyślij kod ponownie</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Zweryfikuj numer telefonu</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Dalej</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Gdy klikniesz „%1$s”, może zostać wysłany SMS. Może to skutkować pobraniem opłaty za przesłanie wiadomości i danych.</string>
+</resources>
diff --git a/auth/src/main/res/values-pt-rBR/strings.xml b/auth/src/main/res/values-pt-rBR/strings.xml
new file mode 100755
index 000000000..f941886be
--- /dev/null
+++ b/auth/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Carregando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Fazer login</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocorreu um erro.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-mail</string>
+    <string name="provider_name_phone">Smartphone</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Fazer login com o Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Fazer login com o Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Fazer login com o Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Fazer login com o e-mail</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Fazer login com o telefone</string>
+    <string name="next_default" translation_description="Button text to continue">Próxima</string>
+    <string name="email_hint" translation_description="Hint in email input field">E-mail</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de telefone</string>
+    <string name="password_hint" translation_description="Hint for password input field">Senha</string>
+    <string name="required_field" translation_description="Inline error for required field">Esse campo não pode ficar em branco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Endereço de e-mail inválido</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Digite seu endereço de e-mail para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Verificando contas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Inscrever-se</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nome e sobrenome</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Salvar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Concluindo sua inscrição...</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">A senha não é forte o suficiente. Use pelo menos %1$d caractere e combine letras e números.</item>
+        <item quantity="other">A senha não é forte o suficiente. Use pelo menos %1$d caracteres e combine letras e números.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Falha no registro da conta do e-mail</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Já existe uma conta com esse endereço de e-mail.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Ao tocar em \"%1$s\", você indica que está de acordo com os %2$s e a %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Ao tocar em \"%1$s\", você indica que está de acordo com os %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Ao tocar em \"%1$s\", você indica que está de acordo com a %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Termos de Serviço</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidade</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Você já tem uma conta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">É bom ver você novamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Você já usou o e-mail %1$s. Faça login com o %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Você já usou o e-mail %1$s para fazer login. Insira a senha dessa conta.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Fazendo login...</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Problemas com login?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar a senha</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Verifique seu e-mail</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Veja como redefinir sua senha nas instruções enviadas para este e-mail.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Siga as instruções enviadas para %1$s para recuperar sua senha.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">O endereço de e-mail não corresponde a uma conta existente</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo do app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Conectado como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Insira o número do seu telefone</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Insira um número de telefone válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Insira o código de 6 dígitos enviado para</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Reenviar código em 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Confirmar seu número de telefone</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando...</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorreto. Tente novamente.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Ok</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de telefone já foi usado muitas vezes</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocorreu um problema na verificação do seu número de telefone</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código não é mais válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Fazer login com o número de telefone</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Concluído</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Verificado.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Código enviado.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Confirmar número de telefone</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Você poderá receber um SMS ao tocar em \"%1$s\". Tarifas de mensagens e dados podem ser cobradas.</string>
+</resources>
diff --git a/auth/src/main/res/values-pt-rPT/strings.xml b/auth/src/main/res/values-pt-rPT/strings.xml
new file mode 100755
index 000000000..06cef3d5a
--- /dev/null
+++ b/auth/src/main/res/values-pt-rPT/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">A carregar…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Iniciar sessão</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocorreu um erro.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Email</string>
+    <string name="provider_name_phone">Telefone</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Iniciar sessão com o Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Iniciar sessão com o Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Iniciar sessão com o Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Iniciar sessão com o email</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Iniciar sessão com o telemóvel</string>
+    <string name="next_default" translation_description="Button text to continue">Seguinte</string>
+    <string name="email_hint" translation_description="Hint in email input field">Email</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de telefone</string>
+    <string name="password_hint" translation_description="Hint for password input field">Palavra-passe</string>
+    <string name="required_field" translation_description="Inline error for required field">Não pode deixar este campo em branco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">O endereço de email não está correto</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Introduza o endereço de email para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">A verificar a existência de contas…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Inscrever-se</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nome próprio e apelido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">A realizar a inscrição...</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">A palavra-passe não é suficientemente forte. Utilize, pelo menos, %1$d caracteres e uma combinação de letras e números</item>
+        <item quantity="other">A palavra-passe não é suficientemente forte. Utilize, pelo menos, %1$d caracteres e uma combinação de letras e números</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">O registo da conta de email não foi bem-sucedido</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Já existe uma conta com o endereço de email em questão.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Ao tocar em %1$s, indica que aceita os %2$s e a %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Ao tocar em %1$s, indica que aceita os %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Ao tocar em %1$s, indica que aceita a %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Termos de Utilização</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de Privacidade</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Já tem uma conta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Bem-vindo de volta!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Já utilizou %1$s. Inicie sessão com %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Já utilizou %1$s para iniciar sessão. Introduza a palavra-passe da conta em questão.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">A iniciar sessão…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Está com problemas ao iniciar sessão?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar a palavra-passe</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Verifique o seu e-mail</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Utilize este endereço de email para obter instruções que explicam como repor a palavra-passe.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Siga as instruções enviadas para %1$s para recuperar a palavra-passe.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">A enviar…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">O endereço de email introduzido não corresponde a uma conta existente</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logótipo da aplicação</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Sessão iniciada como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Introduza o seu número de telefone</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Introduza um número de telefone válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Introduza o código de 6 dígitos que enviámos para</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Reenviar código em 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Validar o número de telefone</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">A verificar...</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">A obter SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código errado. Tente novamente.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de telefone foi utilizado demasiadas vezes</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocorreu um problema ao validar o número de telefone</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código já não é válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Iniciar sessão com o número de telefone</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Concluído</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Validado!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Código enviado!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">A reenviar…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Validar número de telefone</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Ao tocar em \"%1$s\", pode gerar o envio de uma SMS. Podem aplicar-se tarifas de mensagens e dados.</string>
+</resources>
diff --git a/auth/src/main/res/values-pt/strings.xml b/auth/src/main/res/values-pt/strings.xml
new file mode 100755
index 000000000..f941886be
--- /dev/null
+++ b/auth/src/main/res/values-pt/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Carregando…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Fazer login</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ocorreu um erro.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-mail</string>
+    <string name="provider_name_phone">Smartphone</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Fazer login com o Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Fazer login com o Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Fazer login com o Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Fazer login com o e-mail</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Fazer login com o telefone</string>
+    <string name="next_default" translation_description="Button text to continue">Próxima</string>
+    <string name="email_hint" translation_description="Hint in email input field">E-mail</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Número de telefone</string>
+    <string name="password_hint" translation_description="Hint for password input field">Senha</string>
+    <string name="required_field" translation_description="Inline error for required field">Esse campo não pode ficar em branco.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Endereço de e-mail inválido</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Digite seu endereço de e-mail para continuar</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Verificando contas existentes…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Inscrever-se</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Nome e sobrenome</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Salvar</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Concluindo sua inscrição...</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">A senha não é forte o suficiente. Use pelo menos %1$d caractere e combine letras e números.</item>
+        <item quantity="other">A senha não é forte o suficiente. Use pelo menos %1$d caracteres e combine letras e números.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Falha no registro da conta do e-mail</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Já existe uma conta com esse endereço de e-mail.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Ao tocar em \"%1$s\", você indica que está de acordo com os %2$s e a %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Ao tocar em \"%1$s\", você indica que está de acordo com os %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Ao tocar em \"%1$s\", você indica que está de acordo com a %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Termos de Serviço</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidade</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Você já tem uma conta</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">É bom ver você novamente!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Você já usou o e-mail %1$s. Faça login com o %2$s para continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Você já usou o e-mail %1$s para fazer login. Insira a senha dessa conta.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Fazendo login...</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Problemas com login?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar a senha</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Verifique seu e-mail</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Veja como redefinir sua senha nas instruções enviadas para este e-mail.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Siga as instruções enviadas para %1$s para recuperar sua senha.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">O endereço de e-mail não corresponde a uma conta existente</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotipo do app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Conectado como %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Insira o número do seu telefone</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Insira um número de telefone válido</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Insira o código de 6 dígitos enviado para</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Reenviar código em 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Confirmar seu número de telefone</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando...</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorreto. Tente novamente.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Ok</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Este número de telefone já foi usado muitas vezes</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Ocorreu um problema na verificação do seu número de telefone</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Este código não é mais válido</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Fazer login com o número de telefone</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Concluído</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Verificado.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Código enviado.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Reenviando…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Confirmar número de telefone</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Você poderá receber um SMS ao tocar em \"%1$s\". Tarifas de mensagens e dados podem ser cobradas.</string>
+</resources>
diff --git a/auth/src/main/res/values-ro/strings.xml b/auth/src/main/res/values-ro/strings.xml
new file mode 100755
index 000000000..83d44f16a
--- /dev/null
+++ b/auth/src/main/res/values-ro/strings.xml
@@ -0,0 +1,75 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Se încarcă…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Conectați-vă</string>
+    <string name="general_error" translation_description="Toast text flashing general error">A apărut o eroare.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Adresă de e-mail</string>
+    <string name="provider_name_phone">Număr de telefon</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Conectați-vă cu Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Conectați-vă cu Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Conectați-vă cu Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Conectați-vă cu adresa de e-mail</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Conectați-vă cu numărul de telefon</string>
+    <string name="next_default" translation_description="Button text to continue">Înainte</string>
+    <string name="email_hint" translation_description="Hint in email input field">Adresă de e-mail</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Număr de telefon</string>
+    <string name="password_hint" translation_description="Hint for password input field">Parolă</string>
+    <string name="required_field" translation_description="Inline error for required field">Câmpul este obligatoriu.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Adresa de e-mail nu este corectă</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Introduceți adresa de e-mail pentru a continua</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Se caută conturi existente…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Înscrieți-vă</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Prenume și nume de familie</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Salvați</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Se creează un cont...</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Parola nu este suficient de puternică. Folosiți cel puțin %1$d caracter și o combinație de litere și cifre.</item>
+        <item quantity="few">Parola nu este suficient de puternică. Folosiți cel puțin %1$d caractere și o combinație de litere și cifre.</item>
+        <item quantity="other">Parola nu este suficient de puternică. Folosiți cel puțin %1$d de caractere și o combinație de litere și cifre.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Contul de e-mail nu a fost înregistrat</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Există deja un cont cu respectiva adresă de e-mail.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Dacă atingeți %1$s, indicați că sunteți de acord cu %2$s și cu %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Dacă atingeți %1$s, indicați că sunteți de acord cu %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Dacă atingeți %1$s, indicați că sunteți de acord cu %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Termeni și condițiile</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Politica de confidențialitate</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Aveți deja un cont</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Bine ați revenit!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ați folosit deja %1$s. Pentru a continua, conectați-vă cu %2$s.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ați folosit deja %1$s pentru a vă conecta. Introduceți parola acestui cont.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Se conectează...</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Nu reușiți să vă conectați?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperați parola</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Verificați căsuța de e-mail</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Primiți instrucțiuni de resetare a parolei la această adresă de e-mail.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Trimiteți</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Urmați instrucțiunile trimise la %1$s pentru a vă recupera parola.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Se trimite…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Adresa de e-mail nu corespunde unui cont existent</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Sigla aplicației</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">V-ați conectat ca %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Introduceți numărul de telefon</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Introduceți un număr valid de telefon</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Introduceți codul din 6 cifre pe care l-am trimis la</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Retrimiteți codul în 00:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Confirmați numărul de telefon</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Se confirmă...</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Se obține SMS-ul…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Cod greșit. Încercați din nou.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Acest număr de telefon a fost folosit de prea multe ori</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">A apărut o problemă la confirmarea numărului de telefon</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Codul nu mai este valid</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Conectați-vă cu numărul de telefon</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Gata</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Confirmat!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Codul a fost trimis!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Se retrimite…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Retrimiteți codul</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Confirmați numărul de telefon</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuați</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Dacă atingeți „%1$s”, poate fi trimis un SMS. Se pot aplica tarife pentru mesaje și date.</string>
+</resources>
diff --git a/auth/src/main/res/values-ru/strings.xml b/auth/src/main/res/values-ru/strings.xml
new file mode 100755
index 000000000..443ab99c0
--- /dev/null
+++ b/auth/src/main/res/values-ru/strings.xml
@@ -0,0 +1,76 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Загрузка…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Войти</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Произошла ошибка</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Адрес электронной почты</string>
+    <string name="provider_name_phone">Телефон</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Войти через аккаунт Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Войти через аккаунт Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Войти через аккаунт Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Войти по адресу электронной почты</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Войти по номеру телефона</string>
+    <string name="next_default" translation_description="Button text to continue">Далее</string>
+    <string name="email_hint" translation_description="Hint in email input field">Адрес электронной почты</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Номер телефона</string>
+    <string name="password_hint" translation_description="Hint for password input field">Пароль</string>
+    <string name="required_field" translation_description="Inline error for required field">Это поле должно быть заполнено.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Неверный адрес электронной почты.</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Введите адрес электронной почты.</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Проверка существующих аккаунтов…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Регистрация</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Имя и фамилия</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Сохранить</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Идет регистрация…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Пароль должен состоять из букв и цифр и содержать не меньше %1$d символа.</item>
+        <item quantity="few">Пароль должен состоять из букв и цифр и содержать не меньше %1$d символов.</item>
+        <item quantity="many">Пароль должен состоять из букв и цифр и содержать не меньше %1$d символов.</item>
+        <item quantity="other">Пароль должен состоять из букв и цифр и содержать не меньше %1$d символа.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Не удалось зарегистрировать аккаунт</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Аккаунт с таким адресом электронной почты уже существует.</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Нажимая кнопку \"%1$s\", вы принимаете %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Условия использования</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Политику конфиденциальности</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">У вас уже есть аккаунт</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Рады видеть вас снова!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Вы уже использовали адрес %1$s. Войдите через аккаунт %2$s.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Вы уже использовали адрес %1$s. Введите пароль для этого аккаунта.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Выполняется вход…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Проблемы со входом в систему?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Восстановление пароля</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Проверьте электронную почту</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">На этот адрес будет отправлено письмо с инструкциями по сбросу пароля.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Отправить</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">На адрес %1$s отправлено письмо с инструкциями по сбросу пароля.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Отправка...</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Нет аккаунта с таким адресом электронной почты.</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Логотип приложения</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Вы вошли как %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Введите номер телефона</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Введите действительный номер телефона.</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Введите 6-значный код, отправленный на номер</string>
+    <string name="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="verify_your_phone_title" translation_description="Button text to complete phone number verification">Подтвердить номер телефона</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Проверка…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Получение SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Неверный код. Повторите попытку.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">ОК</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Этот номер телефона использовался слишком много раз.</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Не удалось подтвердить номер телефона.</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Этот код уже неактивен.</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Войти по номеру телефона</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Готово</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Проверка выполнена.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Код отправлен</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Повторная отправка…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Отправить код ещё раз</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Подтвердить номер телефона</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Продолжить</string>
+    <string name="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-sk/strings.xml b/auth/src/main/res/values-sk/strings.xml
new file mode 100755
index 000000000..79138bf3f
--- /dev/null
+++ b/auth/src/main/res/values-sk/strings.xml
@@ -0,0 +1,79 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Načítava sa…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Prihlásiť sa</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Vyskytla sa chyba.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-mail</string>
+    <string name="provider_name_phone">Telefón</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Prihlásiť sa cez Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Prihlásiť sa cez Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Prihlásiť sa cez Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Prihlásiť sa e-mailom</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Prihlásiť sa telefónom</string>
+    <string name="next_default" translation_description="Button text to continue">Ďalej</string>
+    <string name="email_hint" translation_description="Hint in email input field">E-mail</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Telefónne číslo</string>
+    <string name="password_hint" translation_description="Hint for password input field">Heslo</string>
+    <string name="required_field" translation_description="Inline error for required field">Toto pole nesmie byť prázdne.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Táto e-mailová adresa nie je správna</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Zadajte svoju e-mailovú adresu, aby ste mohli pokračovať</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Kontrolujú sa existujúce účty…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrovať sa</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Krstné meno a priezvisko</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Uložiť</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Prebieha registrácia...</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Heslo nie je dostatočne silné. Použite aspoň %1$d znak a kombináciu písmen a čísel</item>
+        <item quantity="few">Heslo nie je dostatočne silné. Použite aspoň %1$d znaky a kombináciu písmen a čísel</item>
+        <item quantity="many">Heslo nie je dostatočne silné. Použite aspoň %1$d znaku a kombináciu písmen a čísel</item>
+        <item quantity="other">Heslo nie je dostatočne silné. Použite aspoň %1$d znakov a kombináciu písmen a čísel</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Registrácia e-mailového účtu nebola úspešná</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Už existuje účet s touto e-mailovou adresou.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Klepnutím na tlačidlo %1$s vyjadrujete súhlas so zmluvnými podmienkami %2$s a pravidlami ochrany súkromia %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Klepnutím na tlačidlo %1$s vyjadrujete súhlas so zmluvnými podmienkami %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Klepnutím na tlačidlo %1$s vyjadrujete súhlas s pravidlami ochrany súkromia %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Zmluvné podmienky</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Pravidlá ochrany súkromia</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Už máte účet</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Vitajte späť!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Už ste použili adresu %1$s.
+        Ak chcete pokračovať, prihláste sa pomocou účtu %2$s.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Na prihlásenie ste už použili adresu %1$s.
+        Zadajte svoje heslo pre daný účet.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Prihlasovanie…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Máte problémy s prihlásením?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Obnovenie hesla</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Skontrolujte si e-mail</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Nechajte si na tento e-mail poslať pokyny s vysvetlením, ako
+        obnoviť svoje heslo.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Odoslať</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Obnovte si heslo podľa pokynov odoslaných na adresu %1$s.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Odosiela sa…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Táto e-mailová adresa sa nezhoduje s existujúcim účtom</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logo aplikácie</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Je prihlásený účet %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Zadajte svoje telefónne číslo</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Zadajte platné telefónne číslo</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Zadajte 6-ciferný kód, ktorý sme odoslali na adresu</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Kód sa znova odošle o 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Overiť telefónne číslo</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Overuje sa...</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Načítava sa SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Nesprávny kód. Skúste to znova.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Toto telefónne číslo bolo použité príliš veľakrát</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Vyskytol sa problém s overením vášho telefónneho čísla</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Tento kód už nie je platný</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Prihláste sa telefónnym číslom</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Hotovo</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Overené.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Kód bol odoslaný.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Znova sa odosiela…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Znova odoslať kód</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Overiť telefónne číslo</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Pokračovať</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Klepnutím na tlačidlo %1$s možno odoslať SMS. Môžu sa účtovať poplatky za správy a dáta.</string>
+</resources>
diff --git a/auth/src/main/res/values-sl/strings.xml b/auth/src/main/res/values-sl/strings.xml
new file mode 100755
index 000000000..648d3bfba
--- /dev/null
+++ b/auth/src/main/res/values-sl/strings.xml
@@ -0,0 +1,79 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Nalaganje ...</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Prijava</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Prišlo je do napake.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-pošta</string>
+    <string name="provider_name_phone">Telefon</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Prijava z Google Računom</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Prijava z računom za Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Prijava z računom za Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Prijava z e-poštnim naslovom</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Prijava s telefonom</string>
+    <string name="next_default" translation_description="Button text to continue">Naprej</string>
+    <string name="email_hint" translation_description="Hint in email input field">E-pošta</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Telefonska številka</string>
+    <string name="password_hint" translation_description="Hint for password input field">Geslo</string>
+    <string name="required_field" translation_description="Inline error for required field">To polje ne sme biti prazno.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">E-poštni naslov ni pravilen</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Če želite nadaljevati, vnesite svoj e-poštni naslov</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Preverjanje, ali že obstajajo računi …</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrirajte se</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Ime in priimek</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Shrani</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registriranje ...</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Geslo ni dovolj zapleteno. Uporabite vsaj %1$d znak in kombinacijo črk ter številk.</item>
+        <item quantity="two">Geslo ni dovolj zapleteno. Uporabite vsaj %1$d znaka in kombinacijo črk ter številk.</item>
+        <item quantity="few">Geslo ni dovolj zapleteno. Uporabite vsaj %1$d znake in kombinacijo črk ter številk.</item>
+        <item quantity="other">Geslo ni dovolj zapleteno. Uporabite vsaj %1$d znakov in kombinacijo črk ter številk.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Registracija e-poštnega računa ni bila uspešna</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Račun s tem e-poštnim naslovom že obstaja.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Če se dotaknete možnosti %1$s, potrjujete, da se strinjate z dokumentoma %2$s in %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Če se dotaknete možnosti %1$s, potrjujete, da se strinjate z dokumentom %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Če se dotaknete možnosti %1$s, potrjujete, da se strinjate z dokumentom %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">pogoji storitve</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Pravilnik o zasebnosti</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Račun že imate</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Dobrodošli nazaj!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">E-poštni naslov %1$s ste že uporabili.
+        Če želite nadaljevati, se prijavite z računom za %2$s.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">E-poštni naslov %1$s ste že uporabili
+        za prijavo. Vnesite geslo za ta račun.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Prijavljanje ...</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Ali imate težave pri prijavi?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Obnovitev gesla</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Preverite e-pošto</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Na ta e-poštni naslov vam bomo poslali navodila za
+        ponastavitev gesla.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Pošlji</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Če želite obnoviti geslo, upoštevajte navodila, poslana na naslov %1$s.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Pošiljanje ...</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">E-poštni naslov se ne ujema z obstoječim računom</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logotip aplikacije</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Prijavljeni ste kot %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Vnesite telefonsko številko</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Vnesite veljavno telefonsko številko</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Vnesite 6-mestno kodo, ki smo jo poslali na številko</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Ponovno pošlji kodo čez 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Preverjanje telefonske številke</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Preverjanje ...</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Pridobivanje sporočila SMS …</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Napačna koda. Poskusite znova.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">V redu</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Telefonska številka je bila uporabljena prevečkrat</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Pri preverjanju telefonske številke je prišlo do težave</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Koda ni več veljavna</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Prijava s telefonsko številko</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Končano</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Preverjeno.</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Koda je poslana.</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Ponovno pošiljanje …</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Ponovno pošlji kodo</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Preverjanje telefonske številke</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Naprej</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Če se dotaknete možnosti »%1$s«, bo morda poslano sporočilo SMS. Pošiljanje sporočila in prenos podatkov boste morda morali plačati.</string>
+</resources>
diff --git a/auth/src/main/res/values-sr/strings.xml b/auth/src/main/res/values-sr/strings.xml
new file mode 100755
index 000000000..7fef2046a
--- /dev/null
+++ b/auth/src/main/res/values-sr/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Учитава се…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Пријави ме</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Дошло је до грешке.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Имејл</string>
+    <string name="provider_name_phone">Телефон</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Пријави ме помоћу Google-а</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Пријави ме помоћу Facebook-а</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Пријави ме помоћу Twitter-а</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Пријави ме помоћу имејла</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Пријави ме помоћу телефона</string>
+    <string name="next_default" translation_description="Button text to continue">Даље</string>
+    <string name="email_hint" translation_description="Hint in email input field">Имејл</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Број телефона</string>
+    <string name="password_hint" translation_description="Hint for password input field">Лозинка</string>
+    <string name="required_field" translation_description="Inline error for required field">Ово поље не може да буде празно.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Имејл адреса није тачна</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Унесите имејл адресу да бисте наставили</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Траже се постојећи налози…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Региструјте се</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Име и презиме</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Сачувај</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Регистрација је у току…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Лозинка није довољно јака. Употребите бар %1$d знак, уз комбинацију бројева и слова</item>
+        <item quantity="few">Лозинка није довољно јака. Употребите бар %1$d знака, уз комбинацију бројева и слова</item>
+        <item quantity="other">Лозинка није довољно јака. Употребите бар %1$d знакова, уз комбинацију бројева и слова</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Регистрација налога преко имејла није успела</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Већ постоји налог са том имејл адресом.</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Додиром на %1$s потврђујете да прихватате %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Услови коришћења услуге</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Политику приватности</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Већ имате налог</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Добро дошли поново!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Већ сте користили адресу %1$s.
+        Пријавите се преко %2$s-а да бисте наставили.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Већ сте користили адресу %1$s
+        за пријављивање. Унесите лозинку за тај налог.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Пријављивање…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Имате проблема при пријављивању?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Повратите лозинку</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Проверите имејл</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">На овај имејл ћете добити упутства како да ресетујете лозинку.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Пошаљи</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Пратите упутства која су вам послана на %1$s да бисте повратили лозинку.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Шаље се…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Имејл адреса не одговара ни једном налогу</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Логотип апликације</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Пријављени сте као %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Унесите број телефона</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Унесите важећи број телефона</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Унесите 6-цифрени кôд који смо послали на</string>
+    <string name="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="verify_your_phone_title" translation_description="Button text to complete phone number verification">Верификујте број телефона</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Проверава се…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">SMS се преузима…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Кôд није тачан. Пробајте поново.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Потврди</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Овај број телефона је употребљен превише пута</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Дошло је до проблема при верификацији броја телефона</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Тај кôд више не важи</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Пријавите се помоћу броја телефона</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Готово</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Потврђено је!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Кôд је послат!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Поново се шаље…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Поново пошаљи кôд</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Верификуј број телефона</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Настави</string>
+    <string name="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-sv/strings.xml b/auth/src/main/res/values-sv/strings.xml
new file mode 100755
index 000000000..843c956bb
--- /dev/null
+++ b/auth/src/main/res/values-sv/strings.xml
@@ -0,0 +1,75 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Läser in…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Logga in</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Ett fel har uppstått.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-post</string>
+    <string name="provider_name_phone">Telefon</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Logga in med Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Logga in med Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Logga in med Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Logga in med e-post</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Logga in med telefon</string>
+    <string name="next_default" translation_description="Button text to continue">Nästa</string>
+    <string name="email_hint" translation_description="Hint in email input field">E-post</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Telefonnummer</string>
+    <string name="password_hint" translation_description="Hint for password input field">Lösenord</string>
+    <string name="required_field" translation_description="Inline error for required field">Du måste fylla i det här fältet.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">E-postadressen är ogiltig</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ange din e-postadress om du vill fortsätta</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Söker efter befintliga konton …</string>
+    <string name="title_register_email" translation_description="Title for signup form">Registrera dig</string>
+    <string name="name_hint" translation_description="Hint for last name input field">För- och efternamn</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Spara</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registrerar …</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Lösenordet är inte tillräckligt starkt. Använd minst %1$d tecken och en blandning av bokstäver och siffror.</item>
+        <item quantity="other">Lösenordet är inte tillräckligt starkt. Använd minst %1$d tecken och en blandning av bokstäver och siffror.</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Det gick inte att registrera e-postkontot</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Det finns redan ett konto med den e-postadressen.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Genom att trycka på %1$s godkänner du tjänstens %2$s och %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Genom att trycka på %1$s godkänner du tjänstens %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Genom att trycka på %1$s godkänner du tjänstens %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">användarvillkoren</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Sekretesspolicy</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Du har redan ett konto</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Välkommen tillbaka!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Du har redan använt %1$s.
+        Logga in med %2$s om du vill fortsätta.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Du har redan loggat in med %1$s. Ange lösenordet för det kontot.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Loggar in...</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Har du problem med att logga in?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Återställa lösenord</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Kolla dina e-postmeddelanden</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Få ett e-postmeddelande med anvisningar för hur du återställer lösenordet.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Skicka</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Följ anvisningarna som har skickats till %1$s för att återställa ditt lösenord.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Skickar...</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">E-postadressen matchar inget befintligt konto</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Appens logotyp</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Inloggad som %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ange ditt telefonnummer</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Ange ett giltigt telefonnummer</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ange den sexsiffriga koden vi skickade till</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Skicka kod igen om 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verifiera ditt telefonnummer</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verifierar …</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Hämtar sms …</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Fel kod. Försök igen.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Det här telefonnumret har använts för många gånger</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Det gick inte att verifiera telefonnumret</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Koden är inte längre giltig</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Logga in med telefonnummer</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Klart</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Verifierat!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Koden har skickats!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Skickar igen …</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Skicka koden igen</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verifiera telefonnummer</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Fortsätt</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Genom att trycka på %1$s skickas ett sms. Meddelande- och dataavgifter kan tillkomma.</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-ta/strings.xml b/auth/src/main/res/values-ta/strings.xml
new file mode 100755
index 000000000..12d0498eb
--- /dev/null
+++ b/auth/src/main/res/values-ta/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">ஏற்றுகிறது…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">உள்நுழைக</string>
+    <string name="general_error" translation_description="Toast text flashing general error">பிழை ஏற்பட்டது.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">மின்னஞ்சல்</string>
+    <string name="provider_name_phone">ஃபோன்</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Google மூலம் உள்நுழைக</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Facebook மூலம் உள்நுழைக</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Twitter மூலம் உள்நுழைக</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">மின்னஞ்சல் மூலம் உள்நுழைக</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">ஃபோன் எண் மூலம் உள்நுழைக</string>
+    <string name="next_default" translation_description="Button text to continue">அடுத்து</string>
+    <string name="email_hint" translation_description="Hint in email input field">மின்னஞ்சல்</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">ஃபோன் எண்</string>
+    <string name="password_hint" translation_description="Hint for password input field">கடவுச்சொல்</string>
+    <string name="required_field" translation_description="Inline error for required field">இதை காலியாக விடக்கூடாது.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">மின்னஞ்சல் முகவரி தவறாக உள்ளது</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">தொடர, மின்னஞ்சல் முகவரியை உள்ளிடவும்</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">ஏற்கனவே உள்ள கணக்குகளைச் சரிபார்க்கிறது…</string>
+    <string name="title_register_email" translation_description="Title for signup form">பதிவு செய்க</string>
+    <string name="name_hint" translation_description="Hint for last name input field">பெயரின் முற்பகுதி மற்றும் பிற்பகுதி</string>
+    <string name="button_text_save" translation_description="Button text to save input form">சேமி</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">பதிவு செய்கிறது…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">கடவுச்சொல் வலுவானதாக இல்லை. குறைந்தது %1$d எழுத்துக்குறியும், எழுத்துகளும் எண்களும் கலந்த கலவையும் இருக்க வேண்டும்</item>
+        <item quantity="other">கடவுச்சொல் வலுவானதாக இல்லை. குறைந்தது %1$d எழுத்துக்குறிகளும், எழுத்துகளும் எண்களும் கலந்த கலவையும் இருக்க வேண்டும்</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">மின்னஞ்சல் கணக்கைப் பதிவு செய்ய முடியவில்லை</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">அந்த மின்னஞ்சல் முகவரியுடன் ஏற்கனவே ஒரு கணக்கு உள்ளது.</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">%1$s என்பதைத் தட்டுவதன் மூலம், %2$sஐ ஏற்பதாகக் குறிப்பிடுகிறீர்கள்.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">சேவை விதிமுறைகள்</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">தனியுரிமைக் கொள்கை</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">ஏற்கனவே உங்களிடம் கணக்கு உள்ளது</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">மீண்டும் வரவேற்கிறோம்!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">ஏற்கனவே %1$sஐப் பயன்படுத்தியுள்ளீர்கள்.
+        தொடர, %2$s மூலம் உள்நுழையவும்.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">ஏற்கனவே %1$sஐப் பயன்படுத்தி
+        உள்நுழைந்திருக்கிறீர்கள். அந்தக் கணக்கிற்கான கடவுச்சொல்லை உள்ளிடவும்.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">உள்நுழைகிறீர்கள்…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">உள்நுழைவதில் சிக்கலா?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">கடவுச்சொல்லை மீட்டெடு</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">உங்கள் மின்னஞ்சலைப் பார்க்கவும்</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">கடவுச்சொல்லை மீட்டமைப்பது தொடர்பான வழிமுறைகளை இந்த மின்னஞ்சலில்
+        பார்க்கவும்.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">அனுப்பு</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">கடவுச்சொல்லை மீட்டெடுக்க, %1$sக்கு அனுப்பிய வழிமுறைகளைப் பின்பற்றவும்.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">அனுப்புகிறது…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">மின்னஞ்சல் முகவரி தற்போதைய கணக்குடன் பொருந்தவில்லை</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">பயன்பாட்டு லோகோ</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">உள்நுழைந்துள்ள முகவரி: %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">ஃபோன் எண்ணை உள்ளிடவும்</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">சரியான ஃபோன் எண்ணை உள்ளிடவும்</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">இந்த எண்ணுக்கு நாங்கள் அனுப்பிய 6 இலக்கக் குறியீட்டை உள்ளிடவும்:</string>
+    <string name="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="verify_your_phone_title" translation_description="Button text to complete phone number verification">ஃபோன் எண்ணைச் சரிபார்</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">சரிபார்க்கிறது …</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">smsஐ மீட்டெடுக்கிறது…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">தவறான குறியீடு. மீண்டும் முயலவும்.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">சரி</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">இந்த ஃபோன் எண் பலமுறை பயன்படுத்தப்பட்டுள்ளது</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">உங்கள் ஃபோன் எண்ணைச் சரிபார்ப்பதில் சிக்கல் ஏற்பட்டது</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">இந்தக் குறியீடு இனி செல்லுபடியாகாது</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">ஃபோன் எண் மூலம் உள்நுழையவும்</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">முடிந்தது</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">சரிபார்க்கப்பட்டது!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">குறியீடு அனுப்பப்பட்டது!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">மீண்டும் அனுப்புகிறது…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">குறியீட்டை மீண்டும் அனுப்பு</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">ஃபோன் எண்ணைச் சரிபார்</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">தொடர்க</string>
+    <string name="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-th/strings.xml b/auth/src/main/res/values-th/strings.xml
new file mode 100755
index 000000000..1e839ae6b
--- /dev/null
+++ b/auth/src/main/res/values-th/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">กำลังโหลด…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">ลงชื่อเข้าใช้</string>
+    <string name="general_error" translation_description="Toast text flashing general error">เกิดข้อผิดพลาด</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">อีเมล</string>
+    <string name="provider_name_phone">โทรศัพท์</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">ลงชื่อเข้าใช้ด้วย Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">ลงชื่อเข้าใช้ด้วย Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">ลงชื่อเข้าใช้ด้วย Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">ลงชื่อเข้าใช้ด้วยอีเมล</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">ลงชื่อเข้าใช้ด้วยโทรศัพท์</string>
+    <string name="next_default" translation_description="Button text to continue">ถัดไป</string>
+    <string name="email_hint" translation_description="Hint in email input field">อีเมล</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">หมายเลขโทรศัพท์</string>
+    <string name="password_hint" translation_description="Hint for password input field">รหัสผ่าน</string>
+    <string name="required_field" translation_description="Inline error for required field">ต้องป้อนข้อมูลในช่องนี้</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">ที่อยู่อีเมลนี้ไม่ถูกต้อง</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">ป้อนที่อยู่อีเมลของคุณเพื่อดำเนินการต่อ</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">กำลังตรวจสอบบัญชีที่มีอยู่…</string>
+    <string name="title_register_email" translation_description="Title for signup form">ลงชื่อสมัครใช้</string>
+    <string name="name_hint" translation_description="Hint for last name input field">ชื่อและนามสกุล</string>
+    <string name="button_text_save" translation_description="Button text to save input form">บันทึก</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">กำลังลงชื่อสมัครใช้…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">รหัสผ่านไม่รัดกุมมากพอ ใช้อักขระอย่างน้อย %1$d ตัวและต้องเป็นตัวอักษรปนกับตัวเลข</item>
+        <item quantity="other">รหัสผ่านไม่รัดกุมมากพอ ใช้อักขระอย่างน้อย %1$d ตัวและต้องเป็นตัวอักษรปนกับตัวเลข</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">การลงทะเบียนบัญชีอีเมลไม่สำเร็จ</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">มีบัญชีที่ใช้ที่อยู่อีเมลนี้อยู่แล้ว</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">การแตะ%1$sแสดงว่าคุณยอมรับ%2$s</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">ข้อกำหนดในการให้บริการ</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">นโยบายความเป็นส่วนตัว</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">คุณมีบัญชีอยู่แล้ว</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">ยินดีต้อนรับอีกครั้ง!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">คุณใช้ %1$s อยู่แล้ว ลงชื่อเข้าใช้ด้วย %2$s เพื่อดำเนินการต่อ</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">คุณใช้ %1$s ในการลงชื่อเข้าใช้อยู่แล้ว โปรดป้อนรหัสผ่านสำหรับบัญชีดังกล่าว</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">กำลังลงชื่อเข้าใช้…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">หากพบปัญหาในการลงชื่อเช้าใช้</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">กู้คืนรหัสผ่าน</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">ตรวจสอบอีเมลของคุณ</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">ดูวิธีการที่ส่งไปยังอีเมลนี้ซึ่งอธิบายเกี่ยวกับวิธีรีเซ็ตรหัสผ่านของคุณ</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">ส่ง</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">ทำตามวิธีการที่ส่งไปยัง %1$s เพื่อกู้คืนรหัสผ่านของคุณ</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">กำลังส่ง…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">ที่อยู่อีเมลไม่ตรงกับบัญชีที่มีอยู่</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">โลโก้แอป</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">ลงชื่อเข้าใช้ด้วย %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">ป้อนหมายเลขโทรศัพท์ของคุณ</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">ป้อนหมายเลขโทรศัพท์ที่ถูกต้อง</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">ป้อนรหัส 6 หลักที่เราส่งไปยัง</string>
+    <string name="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="verify_your_phone_title" translation_description="Button text to complete phone number verification">ยืนยันหมายเลขโทรศัพท์</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">กำลังยืนยัน…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">กำลังเรียกข้อมูล SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">รหัสไม่ถูกต้อง โปรดลองอีกครั้ง</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">ตกลง</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">มีการใช้หมายเลขโทรศัพท์นี้หลายครั้งเกินไป</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">เกิดปัญหาในการยืนยันหมายเลขโทรศัพท์ของคุณ</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">ไม่สามารถใช้รหัสนี้ได้อีกต่อไป</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">ลงชื่อเข้าใช้ด้วยหมายเลขโทรศัพท์</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">เสร็จสิ้น</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">ยืนยันแล้ว</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">ส่งรหัสแล้ว</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">กำลังส่งอีกครั้ง…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">ส่งรหัสอีกครั้ง</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">ยืนยันหมายเลขโทรศัพท์</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">ต่อไป</string>
+    <string name="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-tl/strings.xml b/auth/src/main/res/values-tl/strings.xml
new file mode 100755
index 000000000..22b39cdfb
--- /dev/null
+++ b/auth/src/main/res/values-tl/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Naglo-load…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Mag-sign in</string>
+    <string name="general_error" translation_description="Toast text flashing general error">May nangyaring error.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Fecebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Email</string>
+    <string name="provider_name_phone">Telepono</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Mag-sign in sa Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Mag-sign in sa Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Mag-sign in sa Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Mag-sign in gamit ang email</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Mag-sign in gamit ang telepono</string>
+    <string name="next_default" translation_description="Button text to continue">Susunod</string>
+    <string name="email_hint" translation_description="Hint in email input field">Mag-email</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Numero ng Telepono</string>
+    <string name="password_hint" translation_description="Hint for password input field">Password</string>
+    <string name="required_field" translation_description="Inline error for required field">Hindi mo ito maaaring iwanan na walang laman.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Mali ang email address na iyon</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Ilagay ang iyong email address upang magpatuloy</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Tinitingnan ang mga umiiral nang account…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Mag-sign up</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Pangalan at apelyido</string>
+    <string name="button_text_save" translation_description="Button text to save input form">I-save</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Nagsa-sign up...</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Hindi masyadong malakas ang password. Gumamit ng %1$d character man lang at kumbinasyon ng mga titik at mga numero</item>
+        <item quantity="other">Hindi masyadong malakas ang password. Gumamit ng %1$d na character man lang at kumbinasyon ng mga titik at mga numero</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Hindi nagtagumpay ang pagpaparehistro ng email account</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Mayroon nang account gamit ang email address na iyon.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Sa pag-tap sa %1$s, ipinababatid mo na sang-ayon ka sa %2$s at sa %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Sa pag-tap sa %1$s, ipinababatid mo na sang-ayon ka sa %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Sa pag-tap sa %1$s, ipinababatid mo na sang-ayon ka sa %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Mga Tuntunin ng Serbisyo</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Patakaran sa Privacy</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Mayroon ka nang account</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Maligayang pagbabalik!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Nagamit mo na ang %1$s.
+        Mag-sign in gamit ang %2$s upang magpatuloy.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Nagamit mo na ang %1$s
+        upang mag-sign in. Ilagay ang iyong password para sa account na iyon.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Nagsa-sign in…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Nagkaproblema sa pag-sign in?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">I-recover ang password</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Suriin ang iyong email</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Kumuha ng mga tagubilin na ipadala sa email na ito na magpapaliwanag kung paano 
+        i-reset ang iyong password.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Ipadala</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sundin ang mga tagubilin na ipinadala sa %1$s upang ma-recover ang iyong password.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Ipinapadala...</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Hindi tumutugma ang email address na iyon sa isang kasalukuyang account</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Logo ng app</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Naka-sign in bilang %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Ilagay ang numero ng iyong telepono</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Maglagay ng wastong numero ng telepono</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ilagay ang 6-digit na code na ipinadala namin sa</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Ipadala muli ang code sa loob ng 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">I-verify ang numero ng iyong telepono</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Bine-verify …</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Kinukuha ang sms…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Maling code. Subukang muli.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Masyadong maraming beses nang nagamit ang numero ng teleponong ito</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Nagkaproblema sa pag-verify ng numero ng iyong telepono</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Wala nang bisa ang code na ito</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Mag-sign in gamit ang numero ng telepono</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Tapos Na</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Na-verify!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Naipadala ang code!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Ipinapadalang muli…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Ipadala Muli ang Code</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">I-verify ang Numero ng Telepono</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Magpatuloy</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Sa pag-tap sa “%1$s,“ maaaring magpadala ng SMS. Maaaring ipatupad ang mga rate ng pagmemensahe at data.</string>
+</resources>
diff --git a/auth/src/main/res/values-tr/strings.xml b/auth/src/main/res/values-tr/strings.xml
new file mode 100755
index 000000000..cd3d5177c
--- /dev/null
+++ b/auth/src/main/res/values-tr/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Yükleniyor…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Oturum aç</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Bir hata oluştu.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">E-posta</string>
+    <string name="provider_name_phone">Telefon</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Google ile oturum aç</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Facebook ile oturum aç</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Twitter ile oturum aç</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">E-posta ile oturum aç</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Telefonla oturum aç</string>
+    <string name="next_default" translation_description="Button text to continue">İleri</string>
+    <string name="email_hint" translation_description="Hint in email input field">E-posta</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Telefon Numarası</string>
+    <string name="password_hint" translation_description="Hint for password input field">Şifre</string>
+    <string name="required_field" translation_description="Inline error for required field">Bunu boş bırakamazsınız.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">E-posta adresi doğru değil</string>
+    <string name="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="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Mevcut hesaplar kontrol ediliyor...</string>
+    <string name="title_register_email" translation_description="Title for signup form">Kaydol</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Ad ve Soyadı</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Kaydet</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Kaydolunuyor...</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Şifre yeterince güçlü değil. En az %1$d karakter kullanın ve hem harf hem de rakam ekleyin</item>
+        <item quantity="other">Şifre yeterince güçlü değil. En az %1$d karakter kullanın ve hem harf hem de rakam ekleyin</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">E-posta hesabı kaydı başarısız oldu</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Bu e-posta adresiyle kayıtlı bir hesap zaten var.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">%1$s öğesine dokunarak şunları kabul ettiğinizi bildirirsiniz: %2$s ve %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">%1$s öğesine dokunarak şunu kabul ettiğinizi bildirirsiniz: %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">%1$s öğesine dokunarak şunu kabul ettiğinizi bildirirsiniz: %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Hizmet Şartları</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Gizlilik Politikası</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Zaten bir hesabınız var</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Tekrar hoş geldiniz!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">%1$s adresini zaten kullandınız. Devam etmek için %2$s ile oturum açın.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">%1$s adresini oturum açmak için zaten kullandınız. Bu hesap için şifrenizi girin.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Oturum açılıyor...</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Oturum açılamıyor mu?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Şifreyi kurtarın</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">E-postanızı kontrol edin</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Şifrenizi nasıl sıfırlayacağınızı açıklayan talimatlar bu e-postaya gönderilsin.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Gönder</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Şifrenizi kurtarmak için %1$s adresine gönderilen talimatları uygulayın.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Gönderiliyor…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Bu e-posta adresi mevcut bir hesapla eşleşmiyor</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Uygulama logosu</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">%1$s olarak oturum açıldı</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Telefon numaranızı girin</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Geçerli bir telefon numarası girin</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Şu telefon numarasına gönderdiğimiz 6 haneli kodu girin:</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">0:%02d içinde kodu yeniden gönder</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Telefon numaranızı doğrulayın</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Doğrulanıyor...</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">SMS alınıyor…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Yanlış kod. Tekrar deneyin.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Tamam</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Bu telefon numarası çok fazla kez kullanıldı</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Telefon numaranız doğrulanırken bir sorun oluştu</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Bu kod artık geçerli değil</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Telefon numarasıyla oturum açın</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Bitti</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Doğrulandı!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Kod gönderildi!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Yeniden gönderiliyor…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Kodu Yeniden Gönder</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Telefon Numarasını Doğrula</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Devam</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">\"%1$s\" öğesine dokunarak SMS gönderilebilir. Mesaj ve veri ücretleri uygulanabilir.</string>
+</resources>
diff --git a/auth/src/main/res/values-uk/strings.xml b/auth/src/main/res/values-uk/strings.xml
new file mode 100755
index 000000000..233f90e7f
--- /dev/null
+++ b/auth/src/main/res/values-uk/strings.xml
@@ -0,0 +1,79 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Завантаження…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Увійти</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Сталася помилка.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Електронна адреса</string>
+    <string name="provider_name_phone">Телефон</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Увійти через Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Увійти через Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Увійти через Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Увійти, використовуючи електронну адресу</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Увійти, використовуючи телефон</string>
+    <string name="next_default" translation_description="Button text to continue">Далі</string>
+    <string name="email_hint" translation_description="Hint in email input field">Електронна адреса</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Номер телефону</string>
+    <string name="password_hint" translation_description="Hint for password input field">Пароль</string>
+    <string name="required_field" translation_description="Inline error for required field">Потрібно заповнити це поле.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Електронна адреса неправильна</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Щоб продовжити, введіть електронну адресу</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Перевірка наявних облікових записів…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Зареєструватися</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Ім’я та прізвище</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Зберегти</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Реєстрація…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Пароль недостатньо надійний. Введіть принаймні %1$d символ та комбінацію літер і цифр</item>
+        <item quantity="few">Пароль недостатньо надійний. Введіть принаймні %1$d символи та комбінацію літер і цифр</item>
+        <item quantity="many">Пароль недостатньо надійний. Введіть принаймні %1$d символів та комбінацію літер і цифр</item>
+        <item quantity="other">Пароль недостатньо надійний. Введіть принаймні %1$d символу та комбінацію літер і цифр</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Не вдалося зареєструвати обліковий запис електронної пошти</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Обліковий запис із такою електронною адресою вже існує.</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Торкаючись кнопки \"%1$s\", ви приймаєте %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Умови використання</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Політику конфіденційності</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">У вас уже є обліковий запис</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">З поверненням!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ви вже використовували електронну адресу %1$s.
+        Щоб продовжити, увійдіть в обліковий запис %2$s.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ви вже використовували електронну адресу %1$s
+        для входу. Введіть пароль для цього облікового запису.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Виконується вхід…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Не вдається ввійти?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Відновити пароль</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Перевірте свою електронну пошту</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">На цю електронну адресу надійдуть інструкції,
+        як скинути пароль.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Надіслати</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Виконайте інструкції з відновлення пароля, надіслані на адресу %1$s.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Надсилання…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Ця електронна адреса не відповідає адресі наявного облікового запису</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Логотип додатка</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Ви ввійшли як %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Введіть свій номер телефону</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Введіть дійсний номер телефону</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Введіть 6-значний код, який ми надіслали на номер</string>
+    <string name="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="verify_your_phone_title" translation_description="Button text to complete phone number verification">Підтвердити номер телефону</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Підтвердження…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Отримання SMS…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Неправильний код. Повторіть спробу.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">ОК</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Цей номер телефону використовувався забагато разів</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Не вдалося підтвердити ваш номер телефону</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Цей код уже не дійсний</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Увійти, використовуючи номер телефону</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Готово</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Підтверджено</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Код надіслано</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Повторне надсилання…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Повторно надіслати код</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Підтвердити номер телефону</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Продовжити</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Коли ви торкнетесь опції \"%1$s\", вам може надійти SMS-повідомлення. За SMS і використання трафіку може стягуватися плата.</string>
+</resources>
diff --git a/auth/src/main/res/values-ur/strings.xml b/auth/src/main/res/values-ur/strings.xml
new file mode 100755
index 000000000..8dcd2cb0a
--- /dev/null
+++ b/auth/src/main/res/values-ur/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">لوڈ ہو رہا ہے…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">سائن ان کریں</string>
+    <string name="general_error" translation_description="Toast text flashing general error">ایک خرابی آ گئی ہے۔</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">ای میل</string>
+    <string name="provider_name_phone">فون</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Google کے ساتھ سائن ان کریں</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Facebook کے ساتھ سائن ان کریں</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Twitter کے ساتھ سائن ان کریں</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">ای میل کے ساتھ سائن ان کریں</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">فون کے ساتھ سائں ان کریں</string>
+    <string name="next_default" translation_description="Button text to continue">اگلا</string>
+    <string name="email_hint" translation_description="Hint in email input field">ای میل</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">فون نمبر</string>
+    <string name="password_hint" translation_description="Hint for password input field">پاس ورڈ</string>
+    <string name="required_field" translation_description="Inline error for required field">آپ اسے خالی نہیں چھوڑ سکتے۔</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">یہ ای میل پتہ غلط ہے</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">جاری رکھنے کے لیے اپنا ای میل پتہ درج کریں</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">موجودہ اکاؤنٹس چیک ہو رہے ہیں…</string>
+    <string name="title_register_email" translation_description="Title for signup form">سائن اپ کریں</string>
+    <string name="name_hint" translation_description="Hint for last name input field">پہلا اور آخری نام</string>
+    <string name="button_text_save" translation_description="Button text to save input form">محفوظ کریں</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">سائن اپ ہو رہا ہے…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">پاس ورڈ کافی مضبوط نہیں ہے۔ کم از کم %1$d کریکٹر اور حروف و اعداد کا مرکب استعمال کریں</item>
+        <item quantity="other">پاس ورڈ کافی مضبوط نہیں ہے۔ کم از کم %1$d کریکٹرز اور حروف و اعداد کا مرکب استعمال کریں</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">ای میل اکاؤنٹ کی رجسٹریشن نا کام رہی</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">اس ای میل پتہ کے ساتھ ایک اکاؤنٹ پہلے سے ہی موجود ہے۔</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">%1$s کو تھپتھپا کر آپ نشاندہی کر رہے ہیں کہ آپ %2$s سے اتفاق کرتے ہیں۔</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">سروس کی شرائط</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">رازداری کی پالیسی</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">آپ کے پاس پہلے سے ہی ایک اکاؤنٹ موجود ہے</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">واپسی پر خوش آمدید!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">آپ نے پہلے ہی %1$s استعمال کر لیا ہے۔
+        جاری رکھنے کے لیے %2$s کے ساتھ سائن ان کریں۔</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">آپ نے پہلے ہی %1$s استعمال کر لیا ہے
+        سائن کرنے کے لیے۔ اس کاؤنٹ کے لیے اپنا پاس ورڈ درج کریں۔</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">سائن ان ہو رہا ہے…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">سائن ان کرنے میں دشواری؟</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">پاس ورڈ بازیافت کریں</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">اپنا ای میل چیک کریں</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">اس ای میل پر بھیجی گئی وہ ہدایات حاصل کریں جن میں اس بات کی وضاحت ہے کہ کیسے
+        اپنا پاس ورڈ دوبارہ ترتیب دیں۔</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">بھیجیں</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">اپنے پاس ورڈ کو بازیافت کرنے کے لیے %1$s پر بھیجی گئی ہدایات کی پیروی کریں۔</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">بھیجا جا رہا ہے…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">یہ ای میل پتہ کسی موجودہ اکاؤنٹ کے مماثل نہیں ہے</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">ایپ لوگو</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">%1$s کے بطور سائن ان ہوا</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">اپنا فون نمبر درج کریں</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">براہ کرم ایک درست فون نمبر درج کریں</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">ہماری جانب سے حسبِ ذیل کو بھیجا گیا 6 عدد کا کوڈ درج کریں</string>
+    <string name="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="verify_your_phone_title" translation_description="Button text to complete phone number verification">اپنے فون نمبر کی توثیق کریں</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">توثیق ہو رہی ہے …</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">sms بازیافت کیا جا رہا ہے…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">غلط کوڈ۔ دوبارہ کوشش کریں۔</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">ٹھیک ہے</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">یہ فون نمبر پہلے ہی کافی مرتبہ استعمال ہو چکا ہے</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">آپ کے فون نمبر کی توثیق کرنے میں ایک مسئلہ تھا</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">یہ کوڈ اب جائز نہیں رہا</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">فون نمبر کے ساتھ سائن ان کریں</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">ہو گیا</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">توثیق مکمل!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">کوڈ بھیج دیا گیا!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">دوبارہ بھیجا جا رہا ہے…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">کوڈ دوبارہ بھیجیں</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">فون نمبر کی توثیق کریں</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">جاری رکھیں</string>
+    <string name="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-vi/strings.xml b/auth/src/main/res/values-vi/strings.xml
new file mode 100755
index 000000000..9e94263c8
--- /dev/null
+++ b/auth/src/main/res/values-vi/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Đang tải...</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">Đăng nhập</string>
+    <string name="general_error" translation_description="Toast text flashing general error">Đã xảy ra lỗi.</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">Email</string>
+    <string name="provider_name_phone">Điện thoại</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">Đăng nhập bằng Google</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">Đăng nhập bằng Facebook</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">Đăng nhập bằng Twitter</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">Đăng nhập bằng email</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">Đăng nhập bằng điện thoại</string>
+    <string name="next_default" translation_description="Button text to continue">Tiếp</string>
+    <string name="email_hint" translation_description="Hint in email input field">Email</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">Số điện thoại</string>
+    <string name="password_hint" translation_description="Hint for password input field">Mật khẩu</string>
+    <string name="required_field" translation_description="Inline error for required field">Bạn không được để trống trường này.</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">Địa chỉ email đó không đúng</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Nhập địa chỉ email của bạn để tiếp tục</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Đang kiểm tra các tài khoản hiện có…</string>
+    <string name="title_register_email" translation_description="Title for signup form">Đăng ký</string>
+    <string name="name_hint" translation_description="Hint for last name input field">Họ và tên</string>
+    <string name="button_text_save" translation_description="Button text to save input form">Lưu</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Đang đăng ký…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">Mật khẩu không đủ mạnh. Sử dụng ít nhất %1$d ký tự, kết hợp chữ cái và số</item>
+        <item quantity="other">Mật khẩu không đủ mạnh. Sử dụng ít nhất %1$d ký tự, kết hợp chữ cái và số</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">Đăng ký tài khoản email không thành công</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Tài khoản có địa chỉ email đó đã tồn tại.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Bằng cách nhấn vào %1$s, bạn cho biết rằng bạn đồng ý với %2$s và %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Bằng cách nhấn vào %1$s, bạn cho biết rằng bạn đồng ý với %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Bằng cách nhấn vào %1$s, bạn cho biết rằng bạn đồng ý với %2$s.</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Điều khoản dịch vụ</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Chính sách bảo mật</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Bạn đã có tài khoản</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">Chào mừng bạn quay trở lại!</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Bạn đã sử dụng %1$s.
+        Đăng nhập bằng %2$s để tiếp tục.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Bạn đã sử dụng %1$s
+        để đăng nhập. Hãy nhập mật khẩu của bạn cho tài khoản đó.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Đang đăng nhập...</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Bạn gặp sự cố khi đăng nhập?</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">Khôi phục mật khẩu</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Kiểm tra email của bạn</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Xem hướng dẫn gửi tới email này có giải thích cách
+        đặt lại mật khẩu của bạn.</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">Gửi</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Làm theo hướng dẫn gửi tới %1$s để khôi phục mật khẩu của bạn.</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Đang gửi…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Địa chỉ email đó không khớp với tài khoản hiện có</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">Biểu trưng ứng dụng</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Đã đăng nhập bằng %1$s</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">Nhập số điện thoại của bạn</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">Nhập số điện thoại hợp lệ</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Nhập mã 6 chữ số mà chúng tôi đã gửi cho bạn</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Gửi lại mã sau 0:%02d</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Xác minh số điện thoại của bạn</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Đang xác minh …</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Đang truy xuất sms…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Sai mã. Hãy thử lại.</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Số điện thoại này đã được sử dụng quá nhiều lần</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">Đã xảy ra sự cố khi xác minh số điện thoại của bạn</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">Mã này không còn hợp lệ</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">Đăng nhập bằng số điện thoại</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">Xong</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">Đã xác minh!</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">Đã gửi mã!</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">Đang gửi lại…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">Gửi lại mã</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Xác minh số điện thoại</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Tiếp tục</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Bằng cách nhấn vào “%1$s“, bạn có thể nhận được một tin nhắn SMS. Cước tin nhắn và dữ liệu có thể áp dụng.</string>
+</resources>
diff --git a/auth/src/main/res/values-zh-rCN/strings.xml b/auth/src/main/res/values-zh-rCN/strings.xml
new file mode 100755
index 000000000..1286c1600
--- /dev/null
+++ b/auth/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">正在加载…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">登录</string>
+    <string name="general_error" translation_description="Toast text flashing general error">发生错误。</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">电子邮件地址</string>
+    <string name="provider_name_phone">电话号码</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">使用 Google 帐号登录</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">使用 Facebook 帐号登录</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">使用 Twitter 帐号登录</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">使用电子邮件地址登录</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">使用电话号码登录</string>
+    <string name="next_default" translation_description="Button text to continue">继续</string>
+    <string name="email_hint" translation_description="Hint in email input field">电子邮件地址</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">电话号码</string>
+    <string name="password_hint" translation_description="Hint for password input field">密码</string>
+    <string name="required_field" translation_description="Inline error for required field">此处不能留空。</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">该电子邮件地址不正确</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">请输入您的电子邮件地址以继续</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">正在检查是否存在现有帐号…</string>
+    <string name="title_register_email" translation_description="Title for signup form">注册</string>
+    <string name="name_hint" translation_description="Hint for last name input field">姓名</string>
+    <string name="button_text_save" translation_description="Button text to save input form">保存</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">正在注册…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">密码的安全系数不够高。请使用至少 %1$d 个字符，并混合使用字母和数字</item>
+        <item quantity="other">密码的安全系数不够高。请使用至少 %1$d 个字符，并混合使用字母和数字</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">未能使用电子邮件地址注册帐号</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">已存在一个使用该电子邮件地址的帐号。</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">点按“%1$s”即表示您同意 %2$s。</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">服务条款</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">隐私权政策</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">您已经有帐号了</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">欢迎回来！</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">您已经使用了 %1$s。请使用 %2$s 帐号登录以继续操作。</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">您已经使用 %1$s 登录了，请输入该帐号的密码。</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">正在登录…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">登录时遇到问题？</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">找回密码</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">请查收电子邮件</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">向此电子邮件地址发送关于如何重置密码的说明。</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">发送</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">请按照发送到 %1$s 的说明找回密码。</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">正在发送…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">该电子邮件地址没有相匹配的现有帐号</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">应用徽标</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">已使用 %1$s 登录</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">输入您的电话号码</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">请输入有效的电话号码</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">输入我们发送至以下电话号码的 6 位数验证码</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">%02d 后可重新发送验证码</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">验证您的电话号码</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">正在验证…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">正在检索短信…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">验证码有误，请重试。</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">确定</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">此电话号码的使用次数过多</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">验证您的电话号码时出现问题</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">此验证码已失效</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">使用电话号码登录</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">完成</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">已验证！</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">验证码已发送！</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">正在重新发送…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">重新发送验证码</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">验证电话号码</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">继续</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">点按“%1$s”后，系统会向您发送一条短信。这可能会产生短信费用和上网流量费。</string>
+</resources>
diff --git a/auth/src/main/res/values-zh-rHK/strings.xml b/auth/src/main/res/values-zh-rHK/strings.xml
new file mode 100755
index 000000000..b5d7aaa29
--- /dev/null
+++ b/auth/src/main/res/values-zh-rHK/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">載入中…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">登入</string>
+    <string name="general_error" translation_description="Toast text flashing general error">發生錯誤。</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">電子郵件</string>
+    <string name="provider_name_phone">電話號碼</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">使用 Google 帳戶登入</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">使用 Facebook 帳戶登入</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">使用 Twitter 帳戶登入</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">使用電子郵件地址登入</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">使用電話號碼登入</string>
+    <string name="next_default" translation_description="Button text to continue">繼續</string>
+    <string name="email_hint" translation_description="Hint in email input field">電子郵件</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">電話號碼</string>
+    <string name="password_hint" translation_description="Hint for password input field">密碼</string>
+    <string name="required_field" translation_description="Inline error for required field">此欄位不可留空。</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">電子郵件地址不正確</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">如要繼續，請輸入您的電子郵件地址</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">正在檢查是否已有帳戶…</string>
+    <string name="title_register_email" translation_description="Title for signup form">註冊</string>
+    <string name="name_hint" translation_description="Hint for last name input field">姓氏和名字</string>
+    <string name="button_text_save" translation_description="Button text to save input form">儲存</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">註冊中…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">密碼安全強度不足。請使用至少 %1$d 個字元並混用字母和數字</item>
+        <item quantity="other">密碼安全強度不足。請使用至少 %1$d 個字元並混用字母和數字</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">電子郵件帳戶註冊失敗</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">這個電子郵件地址已連結一個帳戶。</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">輕觸 [%1$s] 即表示您同意《%2$s》。</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">服務條款</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">隱私權政策</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">您已經有帳戶</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">歡迎回來！</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">目前您用於登入的帳戶是 %1$s。
+        如要繼續，請使用 %2$s 帳戶登入。</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">您已使用 %1$s
+        登入。請輸入這個帳戶的密碼。</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">登入中...</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">無法登入嗎？</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">重新取得密碼</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">請查看您的電子郵件信箱</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">這個電子郵件會收到重設密碼的
+        操作說明。</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">傳送</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">請依照傳送至 %1$s 的操作說明，重新取得密碼。</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">傳送中…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">找不到與這個電子郵件地址相符的帳戶</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">應用程式標誌</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">以 %1$s 的身分登入</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">請輸入您的電話號碼</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">請輸入有效的電話號碼</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">請輸入傳送至以下電話號碼的 6 位數驗證碼</string>
+    <string name="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="verify_your_phone_title" translation_description="Button text to complete phone number verification">驗證您的電話號碼</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">驗證中…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">擷取簡訊中…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">驗證碼錯誤，請再試一次。</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">確定</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">使用這個電話號碼的次數過多</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">驗證電話號碼時發生問題</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">這個代碼已經失效</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">使用電話號碼登入</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">完成</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">已驗證！</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">已發送驗證碼！</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">重新發送中…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">重新傳送驗證碼</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">驗證電話號碼</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">繼續</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">輕觸 [%1$s] 後，系統將會傳送簡訊。您可能需支付簡訊和數據傳輸費用。</string>
+</resources>
diff --git a/auth/src/main/res/values-zh-rTW/strings.xml b/auth/src/main/res/values-zh-rTW/strings.xml
new file mode 100755
index 000000000..b5d7aaa29
--- /dev/null
+++ b/auth/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,77 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">載入中…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">登入</string>
+    <string name="general_error" translation_description="Toast text flashing general error">發生錯誤。</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">電子郵件</string>
+    <string name="provider_name_phone">電話號碼</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">使用 Google 帳戶登入</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">使用 Facebook 帳戶登入</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">使用 Twitter 帳戶登入</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">使用電子郵件地址登入</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">使用電話號碼登入</string>
+    <string name="next_default" translation_description="Button text to continue">繼續</string>
+    <string name="email_hint" translation_description="Hint in email input field">電子郵件</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">電話號碼</string>
+    <string name="password_hint" translation_description="Hint for password input field">密碼</string>
+    <string name="required_field" translation_description="Inline error for required field">此欄位不可留空。</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">電子郵件地址不正確</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">如要繼續，請輸入您的電子郵件地址</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">正在檢查是否已有帳戶…</string>
+    <string name="title_register_email" translation_description="Title for signup form">註冊</string>
+    <string name="name_hint" translation_description="Hint for last name input field">姓氏和名字</string>
+    <string name="button_text_save" translation_description="Button text to save input form">儲存</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">註冊中…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">密碼安全強度不足。請使用至少 %1$d 個字元並混用字母和數字</item>
+        <item quantity="other">密碼安全強度不足。請使用至少 %1$d 個字元並混用字母和數字</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">電子郵件帳戶註冊失敗</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">這個電子郵件地址已連結一個帳戶。</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">輕觸 [%1$s] 即表示您同意《%2$s》。</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">服務條款</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">隱私權政策</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">您已經有帳戶</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">歡迎回來！</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">目前您用於登入的帳戶是 %1$s。
+        如要繼續，請使用 %2$s 帳戶登入。</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">您已使用 %1$s
+        登入。請輸入這個帳戶的密碼。</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">登入中...</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">無法登入嗎？</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">重新取得密碼</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">請查看您的電子郵件信箱</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">這個電子郵件會收到重設密碼的
+        操作說明。</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">傳送</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">請依照傳送至 %1$s 的操作說明，重新取得密碼。</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">傳送中…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">找不到與這個電子郵件地址相符的帳戶</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">應用程式標誌</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">以 %1$s 的身分登入</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">請輸入您的電話號碼</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">請輸入有效的電話號碼</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">請輸入傳送至以下電話號碼的 6 位數驗證碼</string>
+    <string name="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="verify_your_phone_title" translation_description="Button text to complete phone number verification">驗證您的電話號碼</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">驗證中…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">擷取簡訊中…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">驗證碼錯誤，請再試一次。</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">確定</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">使用這個電話號碼的次數過多</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">驗證電話號碼時發生問題</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">這個代碼已經失效</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">使用電話號碼登入</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">完成</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">已驗證！</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">已發送驗證碼！</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">重新發送中…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">重新傳送驗證碼</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">驗證電話號碼</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">繼續</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">輕觸 [%1$s] 後，系統將會傳送簡訊。您可能需支付簡訊和數據傳輸費用。</string>
+</resources>
diff --git a/auth/src/main/res/values-zh/strings.xml b/auth/src/main/res/values-zh/strings.xml
new file mode 100755
index 000000000..1286c1600
--- /dev/null
+++ b/auth/src/main/res/values-zh/strings.xml
@@ -0,0 +1,74 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">正在加载…</string>
+    <string name="sign_in_default" translation_description="Button text to sign in">登录</string>
+    <string name="general_error" translation_description="Toast text flashing general error">发生错误。</string>
+    <string name="idp_name_google">Google</string>
+    <string name="idp_name_facebook">Facebook</string>
+    <string name="idp_name_twitter">Twitter</string>
+    <string name="provider_name_email">电子邮件地址</string>
+    <string name="provider_name_phone">电话号码</string>
+    <string name="sign_in_with_google" translation_description="Sign in button text">使用 Google 帐号登录</string>
+    <string name="sign_in_with_facebook" translation_description="Sign in button text">使用 Facebook 帐号登录</string>
+    <string name="sign_in_with_twitter" translation_description="Sign in button text">使用 Twitter 帐号登录</string>
+    <string name="sign_in_with_email" translation_description="Sign in button text">使用电子邮件地址登录</string>
+    <string name="sign_in_with_phone" translation_description="Sign in button text">使用电话号码登录</string>
+    <string name="next_default" translation_description="Button text to continue">继续</string>
+    <string name="email_hint" translation_description="Hint in email input field">电子邮件地址</string>
+    <string name="phone_hint" translation_description="Hint for phone input field">电话号码</string>
+    <string name="password_hint" translation_description="Hint for password input field">密码</string>
+    <string name="required_field" translation_description="Inline error for required field">此处不能留空。</string>
+    <string name="invalid_email_address" translation_description="Inline error for invalid email address">该电子邮件地址不正确</string>
+    <string name="missing_email_address" translation_description="Inline error for empty email address in input field">请输入您的电子邮件地址以继续</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">正在检查是否存在现有帐号…</string>
+    <string name="title_register_email" translation_description="Title for signup form">注册</string>
+    <string name="name_hint" translation_description="Hint for last name input field">姓名</string>
+    <string name="button_text_save" translation_description="Button text to save input form">保存</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">正在注册…</string>
+    <plurals name="error_weak_password" translation_description="Inline error for weak password">
+        <item quantity="one">密码的安全系数不够高。请使用至少 %1$d 个字符，并混合使用字母和数字</item>
+        <item quantity="other">密码的安全系数不够高。请使用至少 %1$d 个字符，并混合使用字母和数字</item>
+    </plurals>
+    <string name="email_account_creation_error" translation_description="Inline error for signup failure">未能使用电子邮件地址注册帐号</string>
+    <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">已存在一个使用该电子邮件地址的帐号。</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">点按“%1$s”即表示您同意 %2$s。</string>
+    <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">服务条款</string>
+    <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">隐私权政策</string>
+    <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">您已经有帐号了</string>
+    <string name="welcome_back_email_header" translation_description="Message for returning users">欢迎回来！</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">您已经使用了 %1$s。请使用 %2$s 帐号登录以继续操作。</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">您已经使用 %1$s 登录了，请输入该帐号的密码。</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">正在登录…</string>
+    <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">登录时遇到问题？</string>
+    <string name="title_recover_password_activity" translation_description="Recover password screen title">找回密码</string>
+    <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">请查收电子邮件</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">向此电子邮件地址发送关于如何重置密码的说明。</string>
+    <string name="button_text_send" translation_description="Button text to send recovery email">发送</string>
+    <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">请按照发送到 %1$s 的说明找回密码。</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">正在发送…</string>
+    <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">该电子邮件地址没有相匹配的现有帐号</string>
+    <string name="accessibility_logo" translation_description="Content description for app logo">应用徽标</string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">已使用 %1$s 登录</string>
+    <string name="verify_phone_number_title" translation_description="Phone number entry form title">输入您的电话号码</string>
+    <string name="invalid_phone_number" translation_description="Inline error when phone number entered is invalid">请输入有效的电话号码</string>
+    <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">输入我们发送至以下电话号码的 6 位数验证码</string>
+    <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">%02d 后可重新发送验证码</string>
+    <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">验证您的电话号码</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">正在验证…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">正在检索短信…</string>
+    <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">验证码有误，请重试。</string>
+    <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">确定</string>
+    <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">此电话号码的使用次数过多</string>
+    <string name="error_quota_exceeded" translation_description="Error message when the Firebase project's quota has been exceeded.">验证您的电话号码时出现问题</string>
+    <string name="error_session_expired" translation_description="Error message when SMS confirmation code has expired.">此验证码已失效</string>
+    <string name="sign_in_with_phone_number" translation_description="Label for phone number input form">使用电话号码登录</string>
+    <string name="done" translation_description="Progress dialog success transition once sms is sent">完成</string>
+    <string name="verified" translation_description="Progress dialog success transition when phone number was verified">已验证！</string>
+    <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">验证码已发送！</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">正在重新发送…</string>
+    <string name="resend_code" translation_description="Link text to resend verification sms">重新发送验证码</string>
+    <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">验证电话号码</string>
+    <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">继续</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">点按“%1$s”后，系统会向您发送一条短信。这可能会产生短信费用和上网流量费。</string>
+</resources>
diff --git a/auth/src/main/res/values/strings.xml b/auth/src/main/res/values/strings.xml
index f475fc76d..02a4c9e2a 100644
--- a/auth/src/main/res/values/strings.xml
+++ b/auth/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name">ui_flow</string>
+    <string name="app_name" translatable="false">ui_flow</string>
 
     <!-- Common -->
     <string name="default_toolbar_title" translatable="false">@string/app_name</string>
@@ -42,11 +42,9 @@
     </plurals>
     <string name="email_account_creation_error" translation_description="Inline error for signup failure">Email account registration unsuccessful</string>
     <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">An account already exists with that email address.</string>
-    <string-array name="create_account_preamble" translation_description="Terms of service preamble" formatted="false">
-        <item>By tapping %BTN% you are indicating that you agree to the %TOS% and the %PP%.</item>
-        <item>By tapping %BTN% you are indicating that you agree to the %TOS%.</item>
-        <item>By tapping %BTN% you are indicating that you agree to the %PP%.</item>
-    </string-array>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">By tapping <xliff:g example="SAVE" id="btn" translation_description="">%1$s</xliff:g> you are indicating that you agree to the <xliff:g example="https://google.com/terms" id="tos" translation_description="">%2$s</xliff:g> and the <xliff:g example="https://google.com/privacy" id="pp" translation_description="">%3$s</xliff:g>.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">By tapping <xliff:g example="SAVE" id="btn" translation_description="">%1$s</xliff:g> you are indicating that you agree to the <xliff:g example="https://google.com/terms" id="tos" translation_description="">%2$s</xliff:g>.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">By tapping <xliff:g example="SAVE" id="btn" translation_description="">%1$s</xliff:g> you are indicating that you agree to the <xliff:g example="https://google.com/privacy" id="pp" translation_description="">%2$s</xliff:g>.</string>
     <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Terms of Service</string>
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privacy Policy</string>
 
@@ -56,11 +54,11 @@
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">You already have an account</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Welcome back!</string>
     <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">
-        You\'ve already used <xliff:g id="email_addr" example="jane.doe@example.com" translation_description="">%1$s</xliff:g>.
-        Sign in with <xliff:g id="provider_name" example="Google" translation_description="">%2$s</xliff:g> to continue.
+        You\'ve already used <xliff:g example="jane.doe@example.com" id="email_addr" translation_description="">%1$s</xliff:g>.
+        Sign in with <xliff:g example="Google" id="provider_name" translation_description="">%2$s</xliff:g> to continue.
     </string>
     <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">
-        You\'ve already used <xliff:g id="email_addr" example="jane.doe@example.com" translation_description="">%1$s</xliff:g>
+        You\'ve already used <xliff:g example="jane.doe@example.com" id="email_addr" translation_description="">%1$s</xliff:g>
         to sign in. Enter your password for that account.
     </string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Signing in…</string>
@@ -78,7 +76,7 @@
 
     <!-- accessibility -->
     <string name="accessibility_logo" translation_description="Content description for app logo">App logo</string>
-    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Signed in as <xliff:g id="email_addr" example="jane.doe@example.com" translation_description="">%1$s</xliff:g></string>
+    <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Signed in as <xliff:g example="jane.doe@example.com" id="email_addr" translation_description="">%1$s</xliff:g></string>
 
     <!-- phone number auth -->
     <string name="verify_phone_number_title" translation_description="Phone number entry form title">Enter your phone number</string>
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index d62b30efd..a9983db53 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.firebase.ui">
 
+    <application android:supportsRtl="true"/>
     <uses-permission android:name="android.permission.INTERNET" />
 
 </manifest>
diff --git a/scripts/.gitignore b/scripts/.gitignore
index ed9d497d3..e3668aee5 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -1 +1,2 @@
 compat_reports
+*.pyc
diff --git a/scripts/translations/base_string_script.py b/scripts/translations/base_string_script.py
new file mode 100644
index 000000000..867e8360a
--- /dev/null
+++ b/scripts/translations/base_string_script.py
@@ -0,0 +1,44 @@
+# coding=UTF-8
+
+import os
+import re
+import sys
+
+# Constants
+START_STR = '<string'
+END_STR = '</string'
+
+class BaseStringScript:
+
+  def ProcessTag(self, lines):
+    return lines
+
+  def ProcessFile(self, file_name):
+    lines = []
+
+    in_tag = False
+    curr_tag = []
+
+    with open(file_name, 'r') as myfile:
+      data = myfile.read()
+
+      for line in data.split('\n'):
+        if START_STR in line and END_STR in line:
+          lines += self.ProcessTag([line])
+        else:
+          if START_STR in line:
+            in_tag = True
+
+          if in_tag:
+            curr_tag.append(line)
+          else:
+            lines.append(line)
+
+          if END_STR in line:
+            in_tag = False
+            lines += self.ProcessTag(curr_tag)
+            curr_tag = []
+
+    with open(file_name, 'w') as myfile:
+      myfile.write('\n'.join(lines))
+
diff --git a/scripts/translations/clean_up_translations.sh b/scripts/translations/clean_up_translations.sh
new file mode 100755
index 000000000..9fd340b1c
--- /dev/null
+++ b/scripts/translations/clean_up_translations.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+# This script should be run after a new round of translations
+
+# Directory where this script lives
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+# Find all non-default strings files
+function find_files {
+    find . -path "*/src/main/res/values-*" -type f -name "string*.xml"
+}
+
+# Move locales that our system misconfigured
+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
+    echo "Processing: $file"
+
+    # Remove non-translatable strings
+    python $DIR/remove_non_translatable.py $file
+done
diff --git a/scripts/translations/remove_non_translatable.py b/scripts/translations/remove_non_translatable.py
new file mode 100644
index 000000000..bcfb05c5a
--- /dev/null
+++ b/scripts/translations/remove_non_translatable.py
@@ -0,0 +1,22 @@
+# coding=UTF-8
+
+import os
+import re
+import sys
+
+from base_string_script import BaseStringScript
+
+NON_TRANSLATABLE = 'translatable="false"'
+
+class RemoveNonTranslatableScript(BaseStringScript):
+
+  def ProcessTag(self, lines):
+    if NON_TRANSLATABLE in '\n'.join(lines):
+      return []
+    else:
+      return lines
+
+# Process all files
+for file_name in sys.argv[1:]:
+  rnts = RemoveNonTranslatableScript()
+  rnts.ProcessFile(file_name)
\ No newline at end of file
diff --git a/scripts/translations/remove_string.py b/scripts/translations/remove_string.py
new file mode 100644
index 000000000..b411a75b6
--- /dev/null
+++ b/scripts/translations/remove_string.py
@@ -0,0 +1,35 @@
+# coding=UTF-8
+#
+# Description:
+# Removes a string resource from resource files.
+#
+# Usage:
+# python remove_string.py [string_name] [file1] [file2] ...
+#   string_name: the name of a string resource, like app_name
+
+import os
+import re
+import sys
+
+from base_string_script import BaseStringScript
+
+# Get string to remove
+QUERY = 'name="{}"'.format(sys.argv[1])
+
+# List of iles
+FILES = sys.argv[2:]
+
+# Remove any tags with the wrong name
+class RemoveStringScript(BaseStringScript):
+
+  def ProcessTag(self, lines):
+    if QUERY in '\n'.join(lines):
+      return []
+    else:
+      return lines
+
+# Process all files
+for file_name in FILES:
+  rss = RemoveStringScript()
+  rss.ProcessFile(file_name)
+

From 2524b0e12a4de4b58fc1b1a0da4840c3e79d514b Mon Sep 17 00:00:00 2001
From: Sam Stern <samstern@google.com>
Date: Fri, 14 Jul 2017 16:03:41 -0400
Subject: [PATCH 11/14] List all error messages, add more helpful descriptions
 (#801)

---
 .../firebase/ui/auth/FirebaseAuthError.java   | 109 ++++++++++++++++++
 .../ui/phone/PhoneVerificationActivity.java   |  30 ++---
 .../phone/PhoneVerificationActivityTest.java  |  11 +-
 3 files changed, 130 insertions(+), 20 deletions(-)
 create mode 100644 auth/src/main/java/com/firebase/ui/auth/FirebaseAuthError.java

diff --git a/auth/src/main/java/com/firebase/ui/auth/FirebaseAuthError.java b/auth/src/main/java/com/firebase/ui/auth/FirebaseAuthError.java
new file mode 100644
index 000000000..45ad781fa
--- /dev/null
+++ b/auth/src/main/java/com/firebase/ui/auth/FirebaseAuthError.java
@@ -0,0 +1,109 @@
+package com.firebase.ui.auth;
+
+import android.support.annotation.RestrictTo;
+
+import com.google.firebase.auth.FirebaseAuthException;
+
+/**
+ * List of all possible results of {@link FirebaseAuthException#getErrorCode()} and their meanings.
+ *
+ * This is a temporary band-aid until we have better documentation and exposure for these
+ * error codes in the real Firebase Auth SDK.
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public enum FirebaseAuthError {
+
+    ERROR_INVALID_CUSTOM_TOKEN("The custom token format is incorrect. Please check the documentation."),
+
+    ERROR_CUSTOM_TOKEN_MISMATCH("Invalid configuration. Ensure your app's SHA1 is correct in the Firebase console."),
+
+    ERROR_INVALID_CREDENTIAL("The supplied auth credential is malformed or has expired."),
+
+    ERROR_INVALID_EMAIL("The email address is badly formatted."),
+
+    ERROR_WRONG_PASSWORD("The password is invalid or the user does not have a password."),
+
+    ERROR_USER_MISMATCH("The supplied credentials do not correspond to the previously signed in user."),
+
+    ERROR_REQUIRES_RECENT_LOGIN("This operation is sensitive and requires recent authentication. Log in again before retrying this request."),
+
+    ERROR_ACCOUNT_EXISTS_WITH_DIFFERENT_CREDENTIAL("An account already exists with the same email address but different sign-in credentials. Sign in using a provider associated with this email address."),
+
+    ERROR_EMAIL_ALREADY_IN_USE("The email address is already in use by another account."),
+
+    ERROR_CREDENTIAL_ALREADY_IN_USE("This credential is already associated with a different user account."),
+
+    ERROR_USER_DISABLED( "The user account has been disabled by an administrator."),
+
+    ERROR_USER_TOKEN_EXPIRED("The user's credential has expired. The user must sign in again."),
+
+    ERROR_USER_NOT_FOUND("There is no user record corresponding to this identifier. The user may have been deleted."),
+
+    ERROR_INVALID_USER_TOKEN("The user's credential is no longer valid. The user must sign in again."),
+
+    ERROR_OPERATION_NOT_ALLOWED("This operation is not allowed. Enable the sign-in method in the Authentication tab of the Firebase console"),
+
+    ERROR_TOO_MANY_REQUESTS("We have blocked all requests from this device due to unusual activity. Try again later."),
+
+    ERROR_WEAK_PASSWORD("The given password is too weak, please choose a stronger password."),
+
+    ERROR_EXPIRED_ACTION_CODE("The out of band code has expired."),
+
+    ERROR_INVALID_ACTION_CODE("The out of band code is invalid. This can happen if the code is malformed, expired, or has already been used."),
+
+    ERROR_INVALID_MESSAGE_PAYLOAD("The email template corresponding to this action contains invalid characters in its message. Please fix by going to the Auth email templates section in the Firebase Console."),
+
+    ERROR_INVALID_RECIPIENT_EMAIL("The email corresponding to this action failed to send as the provided recipient email address is invalid."),
+
+    ERROR_INVALID_SENDER("The email template corresponding to this action contains an invalid sender email or name. Please fix by going to the Auth email templates section in the Firebase Console."),
+
+    ERROR_MISSING_EMAIL("An email address must be provided."),
+
+    ERROR_MISSING_PASSWORD("A password must be provided."),
+
+    ERROR_MISSING_PHONE_NUMBER("To send verification codes, provide a phone number for the recipient."),
+
+    ERROR_INVALID_PHONE_NUMBER("The format of the phone number provided is incorrect. Please enter the phone number in a format that can be parsed into E.164 format. E.164 phone numbers are written in the format [+][country code][subscriber number including area code]."),
+
+    ERROR_MISSING_VERIFICATION_CODE("The phone auth credential was created with an empty sms verification code"),
+
+    ERROR_INVALID_VERIFICATION_CODE("The sms verification code used to create the phone auth credential is invalid. Please resend the verification code sms and be sure use the verification code provided by the user."),
+
+    ERROR_MISSING_VERIFICATION_ID("The phone auth credential was created with an empty verification ID"),
+
+    ERROR_INVALID_VERIFICATION_ID("The verification ID used to create the phone auth credential is invalid."),
+
+    ERROR_RETRY_PHONE_AUTH("An error occurred during authentication using the PhoneAuthCredential. Please retry authentication."),
+
+    ERROR_SESSION_EXPIRED("The sms code has expired. Please re-send the verification code to try again."),
+
+    ERROR_QUOTA_EXCEEDED("The sms quota for this project has been exceeded."),
+
+    ERROR_APP_NOT_AUTHORIZED("This app is not authorized to use Firebase Authentication. Please verify that the correct package name and SHA-1 are configured in the Firebase Console."),
+
+    ERROR_API_NOT_AVAILABLE("The API that you are calling is not available on devices without Google Play Services."),
+
+    ERROR_UNKNOWN("An unknown error occurred.");
+
+    /**
+     * Get an {@link FirebaseAuthError} from an exception, returning {@link #ERROR_UNKNOWN} as
+     * a default.
+     */
+    public static FirebaseAuthError fromException(FirebaseAuthException ex) {
+        try {
+            return FirebaseAuthError.valueOf(ex.getErrorCode());
+        } catch (IllegalArgumentException e) {
+            return FirebaseAuthError.ERROR_UNKNOWN;
+        }
+    }
+
+    private final String description;
+
+    FirebaseAuthError(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java
index 76579825b..deb59e20a 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java
@@ -27,6 +27,7 @@
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.firebase.ui.auth.FirebaseAuthError;
 import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.ResultCodes;
@@ -60,11 +61,7 @@ private enum VerificationState {
 
     private static final long SHORT_DELAY_MILLIS = 750;
     @VisibleForTesting static final long AUTO_RETRIEVAL_TIMEOUT_MILLIS = 120000;
-    @VisibleForTesting static final String ERROR_INVALID_PHONE = "ERROR_INVALID_PHONE_NUMBER";
-    @VisibleForTesting static final String ERROR_INVALID_VERIFICATION = "ERROR_INVALID_VERIFICATION_CODE";
-    private static final String ERROR_TOO_MANY_REQUESTS = "ERROR_TOO_MANY_REQUESTS";
-    private static final String ERROR_QUOTA_EXCEEDED = "ERROR_QUOTA_EXCEEDED";
-    private static final String ERROR_SESSION_EXPIRED = "ERROR_SESSION_EXPIRED";
+
     private static final String KEY_VERIFICATION_PHONE = "KEY_VERIFICATION_PHONE";
     private static final String KEY_STATE = "KEY_STATE";
 
@@ -202,9 +199,10 @@ private void onVerificationFailed(@NonNull FirebaseException ex) {
             return;
         }
         if (ex instanceof FirebaseAuthException) {
-            FirebaseAuthException firebaseAuthException = (FirebaseAuthException) ex;
-            switch (firebaseAuthException.getErrorCode()) {
-                case ERROR_INVALID_PHONE:
+            FirebaseAuthError error = FirebaseAuthError.fromException((FirebaseAuthException) ex);
+
+            switch (error) {
+                case ERROR_INVALID_PHONE_NUMBER:
                     verifyPhoneNumberFragment.showError(getString(R.string.invalid_phone_number));
                     dismissLoadingDialog();
                     break;
@@ -217,9 +215,9 @@ private void onVerificationFailed(@NonNull FirebaseException ex) {
                     dismissLoadingDialog();
                     break;
                 default:
-                    Log.w(PHONE_VERIFICATION_LOG_TAG, ex.getLocalizedMessage());
+                    Log.w(PHONE_VERIFICATION_LOG_TAG, error.getDescription(), ex);
                     dismissLoadingDialog();
-                    showAlertDialog(ex.getLocalizedMessage(), null);
+                    showAlertDialog(error.getDescription(), null);
             }
         } else {
             Log.w(PHONE_VERIFICATION_LOG_TAG, ex.getLocalizedMessage());
@@ -331,10 +329,11 @@ public void onFailure(@NonNull Exception e) {
                         dismissLoadingDialog();
                         //incorrect confirmation code
                         if (e instanceof FirebaseAuthInvalidCredentialsException) {
-                            FirebaseAuthInvalidCredentialsException firebaseAuthInvalidCredentialsException
-                                    = (FirebaseAuthInvalidCredentialsException) e;
-                            switch (firebaseAuthInvalidCredentialsException.getErrorCode()) {
-                                case ERROR_INVALID_VERIFICATION:
+                            FirebaseAuthError error = FirebaseAuthError.fromException(
+                                    (FirebaseAuthInvalidCredentialsException) e);
+
+                            switch (error) {
+                                case ERROR_INVALID_VERIFICATION_CODE:
                                     showAlertDialog(
                                             getString(R.string.incorrect_code_dialog_body),
                                             new DialogInterface.OnClickListener() {
@@ -357,7 +356,8 @@ public void onClick(DialogInterface dialog, int which) {
                                             });
                                     break;
                                 default:
-                                    showAlertDialog(e.getLocalizedMessage(), null);
+                                    Log.w(PHONE_VERIFICATION_LOG_TAG, error.getDescription(), e);
+                                    showAlertDialog(error.getDescription(), null);
                             }
                         } else {
                             showAlertDialog(e.getLocalizedMessage(), null);
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java
index b7d827017..3f8c7d1ed 100644
--- a/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java
+++ b/auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivityTest.java
@@ -24,6 +24,7 @@
 
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.BuildConfig;
+import com.firebase.ui.auth.FirebaseAuthError;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.testhelpers.AuthHelperShadow;
 import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
@@ -58,8 +59,6 @@
 import static com.firebase.ui.auth.ui.phone.PhoneTestConstants.YE_COUNTRY_CODE;
 import static com.firebase.ui.auth.ui.phone.PhoneTestConstants.YE_RAW_PHONE;
 import static com.firebase.ui.auth.ui.phone.PhoneVerificationActivity.AUTO_RETRIEVAL_TIMEOUT_MILLIS;
-import static com.firebase.ui.auth.ui.phone.PhoneVerificationActivity.ERROR_INVALID_PHONE;
-import static com.firebase.ui.auth.ui.phone.PhoneVerificationActivity.ERROR_INVALID_VERIFICATION;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertNull;
@@ -173,7 +172,9 @@ public void testVerifyPhoneNumberInvalidPhoneException_showsInlineError() {
         PhoneAuthProvider.OnVerificationStateChangedCallbacks onVerificationStateChangedCallbacks
                 = callbacksArgumentCaptor.getValue();
         onVerificationStateChangedCallbacks.onVerificationFailed(
-                new FirebaseAuthException(ERROR_INVALID_PHONE, "any_message"));
+                new FirebaseAuthException(
+                        FirebaseAuthError.ERROR_INVALID_PHONE_NUMBER.toString(),
+                        "any_message"));
 
         //was error displayed
         assertEquals(mErrorEditText.getText(), mActivity.getString(R.string.invalid_phone_number));
@@ -199,7 +200,7 @@ public void testVerifyPhoneNumberNoMsgException_showsAlertDialog() {
         onVerificationStateChangedCallbacks.onVerificationFailed(
                 new FirebaseAuthException("some_code", "custom_message"));
         assertTrue(mActivity.getAlertDialog().isShowing());
-        assertEquals("custom_message", getAlertDialogMessage());
+        assertEquals(FirebaseAuthError.ERROR_UNKNOWN.getDescription(), getAlertDialogMessage());
     }
 
     @Test
@@ -217,7 +218,7 @@ public void testSubmitCode_badCodeShowsAlertDialog() {
                 .thenReturn(new AutoCompleteTask<AuthResult>(
                         null, true,
                         new FirebaseAuthInvalidCredentialsException(
-                                ERROR_INVALID_VERIFICATION,
+                                FirebaseAuthError.ERROR_INVALID_VERIFICATION_CODE.toString(),
                                 "any_msg")));
         testSendConfirmationCode();
         SpacedEditText mConfirmationCodeEditText = (SpacedEditText) mActivity.findViewById(R.id.confirmation_code);

From 9b543ba76501cdee601b8a0cac2c8f77c994c3a2 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Mon, 17 Jul 2017 15:00:04 +0000
Subject: [PATCH 12/14] Fix PhoneAuthProvider not using specified FirebaseApp
 (#803)

---
 .../firebase/ui/auth/ui/phone/PhoneVerificationActivity.java  | 2 +-
 auth/src/main/java/com/firebase/ui/auth/util/AuthHelper.java  | 4 ++--
 .../com/firebase/ui/auth/testhelpers/AuthHelperShadow.java    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java
index deb59e20a..b94c0b0cc 100644
--- a/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java
+++ b/auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneVerificationActivity.java
@@ -230,7 +230,7 @@ private void sendCode(String phoneNumber, boolean forceResend) {
         mPhoneNumber = phoneNumber;
         mVerificationState = VerificationState.VERIFICATION_STARTED;
 
-        getAuthHelper().getPhoneAuthProviderInstance().verifyPhoneNumber(
+        getAuthHelper().getPhoneAuthProvider().verifyPhoneNumber(
                 phoneNumber,
                 AUTO_RETRIEVAL_TIMEOUT_MILLIS,
                 TimeUnit.MILLISECONDS,
diff --git a/auth/src/main/java/com/firebase/ui/auth/util/AuthHelper.java b/auth/src/main/java/com/firebase/ui/auth/util/AuthHelper.java
index 23fda8c66..faec0243f 100644
--- a/auth/src/main/java/com/firebase/ui/auth/util/AuthHelper.java
+++ b/auth/src/main/java/com/firebase/ui/auth/util/AuthHelper.java
@@ -40,7 +40,7 @@ public SaveSmartLock getSaveSmartLockInstance(HelperActivityBase activity) {
         return SaveSmartLock.getInstance(activity);
     }
 
-    public PhoneAuthProvider getPhoneAuthProviderInstance() {
-        return PhoneAuthProvider.getInstance();
+    public PhoneAuthProvider getPhoneAuthProvider() {
+        return PhoneAuthProvider.getInstance(getFirebaseAuth());
     }
 }
diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/AuthHelperShadow.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/AuthHelperShadow.java
index 3a9656d53..aac94791a 100644
--- a/auth/src/test/java/com/firebase/ui/auth/testhelpers/AuthHelperShadow.java
+++ b/auth/src/test/java/com/firebase/ui/auth/testhelpers/AuthHelperShadow.java
@@ -67,7 +67,7 @@ public static SaveSmartLock getSaveSmartLockInstance(HelperActivityBase activity
     }
 
     @Implementation
-    public static PhoneAuthProvider getPhoneAuthProviderInstance() {
+    public static PhoneAuthProvider getPhoneAuthProvider() {
         return sPhoneAuthProvider;
     }
 

From 90a5f3bf51634c8e5ba2039736f8b3f8d442af59 Mon Sep 17 00:00:00 2001
From: Alex Saveau <saveau.alexandre@gmail.com>
Date: Mon, 17 Jul 2017 15:03:54 +0000
Subject: [PATCH 13/14] Cleanup translation PR (#778)

---
 app/src/main/AndroidManifest.xml              |  2 +
 auth/build.gradle                             |  8 ++--
 auth/src/main/res/values-bn/strings.xml       | 19 ++++-----
 auth/src/main/res/values-ca/strings.xml       |  6 +--
 auth/src/main/res/values-cs/strings.xml       |  9 ++---
 auth/src/main/res/values-da/strings.xml       | 11 ++----
 auth/src/main/res/values-de-rAT/strings.xml   |  2 +-
 auth/src/main/res/values-de-rCH/strings.xml   |  2 +-
 auth/src/main/res/values-de/strings.xml       |  2 +-
 auth/src/main/res/values-el/strings.xml       | 11 ++----
 auth/src/main/res/values-en-rAU/strings.xml   | 11 ++----
 auth/src/main/res/values-en-rCA/strings.xml   | 11 ++----
 auth/src/main/res/values-en-rGB/strings.xml   | 11 ++----
 auth/src/main/res/values-en-rIE/strings.xml   | 11 ++----
 auth/src/main/res/values-en-rIN/strings.xml   | 11 ++----
 auth/src/main/res/values-en-rSG/strings.xml   | 11 ++----
 auth/src/main/res/values-en-rZA/strings.xml   | 11 ++----
 auth/src/main/res/values-es/strings.xml       |  9 ++---
 auth/src/main/res/values-fa/strings.xml       | 16 ++++----
 auth/src/main/res/values-fi/strings.xml       |  9 ++---
 auth/src/main/res/values-fil/strings.xml      | 13 +++----
 auth/src/main/res/values-fr-rCH/strings.xml   |  2 +-
 auth/src/main/res/values-fr/strings.xml       |  2 +-
 auth/src/main/res/values-gsw/strings.xml      |  2 +-
 auth/src/main/res/values-gu/strings.xml       | 13 +++----
 auth/src/main/res/values-hi/strings.xml       | 10 ++---
 auth/src/main/res/values-hr/strings.xml       | 17 ++++----
 auth/src/main/res/values-hu/strings.xml       | 15 +++----
 auth/src/main/res/values-in/strings.xml       | 13 +++----
 auth/src/main/res/values-it/strings.xml       |  8 ++--
 auth/src/main/res/values-kn/strings.xml       | 10 ++---
 auth/src/main/res/values-ko/strings.xml       | 13 +++----
 auth/src/main/res/values-ln/strings.xml       |  2 +-
 auth/src/main/res/values-lt/strings.xml       |  5 +--
 auth/src/main/res/values-lv/strings.xml       | 15 +++----
 auth/src/main/res/values-mo/strings.xml       |  6 +--
 auth/src/main/res/values-mr/strings.xml       |  8 ++--
 auth/src/main/res/values-ms/strings.xml       |  6 +--
 auth/src/main/res/values-nb/strings.xml       |  9 ++---
 auth/src/main/res/values-nl/strings.xml       |  2 +-
 auth/src/main/res/values-no/strings.xml       |  9 ++---
 auth/src/main/res/values-pl/strings.xml       |  4 +-
 auth/src/main/res/values-pt-rBR/strings.xml   | 14 +++----
 auth/src/main/res/values-pt-rPT/strings.xml   |  6 +--
 auth/src/main/res/values-pt/strings.xml       | 14 +++----
 auth/src/main/res/values-ro/strings.xml       |  6 +--
 auth/src/main/res/values-ru/strings.xml       | 10 ++---
 auth/src/main/res/values-sk/strings.xml       | 13 +++----
 auth/src/main/res/values-sl/strings.xml       | 19 ++++-----
 auth/src/main/res/values-sr/strings.xml       |  6 +--
 auth/src/main/res/values-sv/strings.xml       |  7 ++--
 auth/src/main/res/values-ta/strings.xml       |  9 ++---
 auth/src/main/res/values-th/strings.xml       |  2 +-
 auth/src/main/res/values-tl/strings.xml       | 13 +++----
 auth/src/main/res/values-tr/strings.xml       | 10 ++---
 auth/src/main/res/values-uk/strings.xml       | 17 ++++----
 auth/src/main/res/values-ur/strings.xml       | 11 ++----
 auth/src/main/res/values-vi/strings.xml       | 13 +++----
 auth/src/main/res/values-zh-rHK/strings.xml   | 11 ++----
 auth/src/main/res/values-zh-rTW/strings.xml   | 11 ++----
 auth/src/main/res/values/strings.xml          |  2 +-
 library/src/main/AndroidManifest.xml          |  3 +-
 scripts/translations/base_string_script.py    |  5 +--
 scripts/translations/clean_up_translations.sh |  1 +
 scripts/translations/fix_typography.py        | 39 +++++++++++++++++++
 .../translations/remove_non_translatable.py   |  8 ++--
 scripts/translations/remove_string.py         |  7 ++--
 67 files changed, 280 insertions(+), 344 deletions(-)
 create mode 100644 scripts/translations/fix_typography.py

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0d28748a7..172ab6bb1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,6 +16,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
+
         <activity android:name=".ChooserActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -46,6 +47,7 @@
         <activity
             android:name=".storage.ImageActivity"
             android:label="@string/name_image" />
+
     </application>
 
 </manifest>
diff --git a/auth/build.gradle b/auth/build.gradle
index 0235c65b3..8613ea5a2 100644
--- a/auth/build.gradle
+++ b/auth/build.gradle
@@ -27,6 +27,10 @@ android {
         }
     }
 
+    lintOptions {
+        disable 'UnusedQuantity'
+    }
+
     testOptions {
         unitTests.all {
             testLogging {
@@ -34,10 +38,6 @@ android {
             }
         }
     }
-
-    lintOptions {
-        disable 'UnusedQuantity', 'TypographyEllipsis', 'TypographyQuotes'
-    }
 }
 
 dependencies {
diff --git a/auth/src/main/res/values-bn/strings.xml b/auth/src/main/res/values-bn/strings.xml
index 4e99d2de8..19cca693d 100755
--- a/auth/src/main/res/values-bn/strings.xml
+++ b/auth/src/main/res/values-bn/strings.xml
@@ -19,11 +19,11 @@
     <string name="required_field" translation_description="Inline error for required field">আপনি এটি খালি ছাড়তে পারেন না।</string>
     <string name="invalid_email_address" translation_description="Inline error for invalid email address">ইমেল অ্যাড্রেসটি সঠিক নয়</string>
     <string name="missing_email_address" translation_description="Inline error for empty email address in input field">চালিয়ে যাওয়ার জন্য আপনার ইমেল অ্যাড্রেস লিখুন</string>
-    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">আগে থেকে কোনও অ্যাকাউন্ট আছে কিনা চেক করা হচ্ছে...</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">আগে থেকে কোনও অ্যাকাউন্ট আছে কিনা চেক করা হচ্ছে…</string>
     <string name="title_register_email" translation_description="Title for signup form">সাইন-আপ করুন</string>
     <string name="name_hint" translation_description="Hint for last name input field">নাম ও পদবি</string>
     <string name="button_text_save" translation_description="Button text to save input form">সেভ করুন</string>
-    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">সাইন-আপ করা হচ্ছে...</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">সাইন-আপ করা হচ্ছে…</string>
     <plurals name="error_weak_password" translation_description="Inline error for weak password">
         <item quantity="one">পাসওয়ার্ডটি পর্যাপ্ত সুরক্ষিত নয়। কমপক্ষে %1$dটি বিশেষ বর্ণ এবং অক্ষর ও সংখ্যা মিশিয়ে ব্যবহার করুন</item>
         <item quantity="other">পাসওয়ার্ডটি পর্যাপ্ত সুরক্ষিত নয়। কমপক্ষে %1$dটি বিশেষ বর্ণ এবং অক্ষর ও সংখ্যা মিশিয়ে ব্যবহার করুন</item>
@@ -37,19 +37,16 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">গোপনীয়তা নীতি</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">আপনার আগে থেকেই একটি অ্যাকাউন্ট আছে</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">আবার স্বাগতম!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">আপনি %1$s আগেই ব্যবহার করেছেন।
-        চালিয়ে যেতে %2$s দিয়ে সাইন-ইন করুন।</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">আপনি আগেই %1$s দিয়ে
-        সাইন-ইন করেছেন। সেই অ্যাকাউন্টের জন্য পাসওয়ার্ডটি লিখুন।</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">আপনি %1$s আগেই ব্যবহার করেছেন। চালিয়ে যেতে %2$s দিয়ে সাইন-ইন করুন।</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">আপনি আগেই %1$s দিয়ে সাইন-ইন করেছেন। সেই অ্যাকাউন্টের জন্য পাসওয়ার্ডটি লিখুন।</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">সাইন-ইন করা হচ্ছে…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">সাইন-ইন করতে সমস্যা হচ্ছে?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">পাসওয়ার্ড পুনরুদ্ধার করুন</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">আপনার ইমেল দেখুন</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">কিভাবে পাসওয়ার্ড পুনরুদ্ধার করতে হবে তা ইমেলে পাঠানো
-        নির্দেশাবলী থেকে জানুন।</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">কিভাবে পাসওয়ার্ড পুনরুদ্ধার করতে হবে তা ইমেলে পাঠানো নির্দেশাবলী থেকে জানুন।</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">পাঠান</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">আপনার পাসওয়ার্ড পুনরুদ্ধার করতে %1$s তে পাঠানো নির্দেশ অনুসরণ করুন।</string>
-    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">পাঠানো হচ্ছে...</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">পাঠানো হচ্ছে…</string>
     <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">এই ইমেল অ্যাড্রেসটি আগে থেকে থাকা অ্যাকাউন্টের সাথে মিলছে না</string>
     <string name="accessibility_logo" translation_description="Content description for app logo">অ্যাপের লোগো</string>
     <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">%1$s হিসাবে সাইন-ইন করেছেন</string>
@@ -59,7 +56,7 @@
     <string name="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="verify_your_phone_title" translation_description="Button text to complete phone number verification">আপনার ফোন নম্বর যাচাই করুন</string>
     <string name="verifying" translation_description="Progress dialog text while phone number is being verified">যাচাই করা হচ্ছে …</string>
-    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">এসএমএসটি পুনরুদ্ধার করা হচ্ছে...</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">এসএমএসটি পুনরুদ্ধার করা হচ্ছে…</string>
     <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">কোডটি ভুল। আবার চেষ্টা করুন।</string>
     <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">ঠিক আছে</string>
     <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">এই ফোন নম্বরটি অনেকবার ব্যবহার করা হয়েছে</string>
@@ -69,7 +66,7 @@
     <string name="done" translation_description="Progress dialog success transition once sms is sent">সম্পন্ন হয়েছে</string>
     <string name="verified" translation_description="Progress dialog success transition when phone number was verified">যাচাই করা হয়েছে!</string>
     <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">কোডটি পাঠানো হয়েছে!</string>
-    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">আবার পাঠানো হচ্ছে...</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">আবার পাঠানো হচ্ছে…</string>
     <string name="resend_code" translation_description="Link text to resend verification sms">কোডটি আবার পাঠান</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">ফোন নম্বর যাচাই করুন</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">চালিয়ে যান</string>
diff --git a/auth/src/main/res/values-ca/strings.xml b/auth/src/main/res/values-ca/strings.xml
index d361c5eac..91e6db934 100755
--- a/auth/src/main/res/values-ca/strings.xml
+++ b/auth/src/main/res/values-ca/strings.xml
@@ -37,10 +37,8 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">política de privadesa</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ja tens un compte</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Benvingut de nou!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ja has utilitzat l\'adreça electrònica %1$s.
-        Inicia la sessió amb %2$s per continuar.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ja has utilitzat l\'adreça electrònica %1$s
-        per iniciar la sessió. Introdueix la contrasenya d\'aquest compte.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ja has utilitzat l\'adreça electrònica %1$s. Inicia la sessió amb %2$s per continuar.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ja has utilitzat l\'adreça electrònica %1$s per iniciar la sessió. Introdueix la contrasenya d\'aquest compte.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">S\'està iniciant la sessió…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">No pots iniciar la sessió?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Recupera la contrasenya</string>
diff --git a/auth/src/main/res/values-cs/strings.xml b/auth/src/main/res/values-cs/strings.xml
index 062f29935..05a80d1f4 100755
--- a/auth/src/main/res/values-cs/strings.xml
+++ b/auth/src/main/res/values-cs/strings.xml
@@ -39,16 +39,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Zásady ochrany soukromí</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Již máte účet</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Vítejte zpět!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Již jste použili adresu %1$s.
-        Chcete-li pokračovat, přihlaste se prostřednictvím služby %2$s.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">K přihlášení jste již použili adresu %1$s.
-        Zadejte příslušné heslo k účtu.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Již jste použili adresu %1$s. Chcete-li pokračovat, přihlaste se prostřednictvím služby %2$s.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">K přihlášení jste již použili adresu %1$s. Zadejte příslušné heslo k účtu.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Přihlašování…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Máte potíže s přihlášením?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Obnovit heslo</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Zkontrolujte svůj e-mail</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Na tento e-mail vám zašleme pokyny,
-        jak heslo obnovit.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Na tento e-mail vám zašleme pokyny, jak heslo obnovit.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Odeslat</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Postupujte podle pokynů odeslaných na adresu %1$s a obnovte heslo.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Odesílání…</string>
diff --git a/auth/src/main/res/values-da/strings.xml b/auth/src/main/res/values-da/strings.xml
index ca7f37810..46ed50371 100755
--- a/auth/src/main/res/values-da/strings.xml
+++ b/auth/src/main/res/values-da/strings.xml
@@ -37,16 +37,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privatlivspolitik</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Du har allerede en konto</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Velkommen tilbage!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Du har allerede brugt %1$s.
-        Log ind med %2$s for at fortsætte.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Du har allerede brugt %1$s
-        til at logge ind. Angiv din adgangskode for den pågældende konto.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Du har allerede brugt %1$s. Log ind med %2$s for at fortsætte.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Du har allerede brugt %1$s til at logge ind. Angiv din adgangskode for den pågældende konto.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Logger ind…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Har du problemer med at logge ind?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Gendan adgangskode</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Tjek din mail.</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Få en vejledning sendt til denne mail om, hvordan du
-        nulstiller din adgangskode.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Få en vejledning sendt til denne mail om, hvordan du nulstiller din adgangskode.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Send</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Følg vejledningen, der blev sendt til %1$s, for at gendanne din adgangskode.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Sender…</string>
@@ -73,5 +70,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">Send koden igen</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Bekræft telefonnummer</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Fortsæt</string>
-    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Når du trykker på \"%1$s\", sendes der en sms. Der opkræves muligvis gebyrer for beskeder og data.</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Når du trykker på “%1$s”, sendes der en sms. Der opkræves muligvis gebyrer for beskeder og data.</string>
 </resources>
diff --git a/auth/src/main/res/values-de-rAT/strings.xml b/auth/src/main/res/values-de-rAT/strings.xml
index 6f2c00ca2..46b133ecb 100755
--- a/auth/src/main/res/values-de-rAT/strings.xml
+++ b/auth/src/main/res/values-de-rAT/strings.xml
@@ -70,5 +70,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">Code erneut senden</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Telefonnummer bestätigen</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Weiter</string>
-    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Wenn sie auf \"%1$s\" tippen, erhalten Sie möglicherweise eine SMS. Es können Gebühren für SMS und Datenübertragung anfallen.</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Wenn sie auf “%1$s” tippen, erhalten Sie möglicherweise eine SMS. Es können Gebühren für SMS und Datenübertragung anfallen.</string>
 </resources>
diff --git a/auth/src/main/res/values-de-rCH/strings.xml b/auth/src/main/res/values-de-rCH/strings.xml
index 6f2c00ca2..46b133ecb 100755
--- a/auth/src/main/res/values-de-rCH/strings.xml
+++ b/auth/src/main/res/values-de-rCH/strings.xml
@@ -70,5 +70,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">Code erneut senden</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Telefonnummer bestätigen</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Weiter</string>
-    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Wenn sie auf \"%1$s\" tippen, erhalten Sie möglicherweise eine SMS. Es können Gebühren für SMS und Datenübertragung anfallen.</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Wenn sie auf “%1$s” tippen, erhalten Sie möglicherweise eine SMS. Es können Gebühren für SMS und Datenübertragung anfallen.</string>
 </resources>
diff --git a/auth/src/main/res/values-de/strings.xml b/auth/src/main/res/values-de/strings.xml
index 6f2c00ca2..46b133ecb 100755
--- a/auth/src/main/res/values-de/strings.xml
+++ b/auth/src/main/res/values-de/strings.xml
@@ -70,5 +70,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">Code erneut senden</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Telefonnummer bestätigen</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Weiter</string>
-    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Wenn sie auf \"%1$s\" tippen, erhalten Sie möglicherweise eine SMS. Es können Gebühren für SMS und Datenübertragung anfallen.</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Wenn sie auf “%1$s” tippen, erhalten Sie möglicherweise eine SMS. Es können Gebühren für SMS und Datenübertragung anfallen.</string>
 </resources>
diff --git a/auth/src/main/res/values-el/strings.xml b/auth/src/main/res/values-el/strings.xml
index bdbfccdec..76f4c98d3 100755
--- a/auth/src/main/res/values-el/strings.xml
+++ b/auth/src/main/res/values-el/strings.xml
@@ -37,16 +37,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Πολιτική απορρήτου</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Έχετε ήδη λογαριασμό</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Καλώς ορίσατε και πάλι!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Έχετε ήδη χρησιμοποιήσει τη διεύθυνση %1$s.
-        Συνδεθείτε μέσω %2$s για να συνεχίσετε.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Έχετε ήδη χρησιμοποιήσει τη διεύθυνση %1$s
-        για να συνδεθείτε. Εισαγάγετε τον κωδικό πρόσβασής σας για αυτόν τον λογαριασμό.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Έχετε ήδη χρησιμοποιήσει τη διεύθυνση %1$s. Συνδεθείτε μέσω %2$s για να συνεχίσετε.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Έχετε ήδη χρησιμοποιήσει τη διεύθυνση %1$s για να συνδεθείτε. Εισαγάγετε τον κωδικό πρόσβασής σας για αυτόν τον λογαριασμό.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Γίνεται σύνδεση…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Πρόβλημα κατά τη σύνδεση;</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Ανάκτηση κωδικού πρόσβασης</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Ελέγξτε τα εισερχόμενα του ηλεκτρονικού ταχυδρομείου σας</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Δείτε τις οδηγίες που στάλθηκαν σε αυτήν τη διεύθυνση ηλεκτρονικού ταχυδρομείου, οι οποίες εξηγούν πώς να
-        επαναφέρετε τον κωδικό πρόσβασής σας.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Δείτε τις οδηγίες που στάλθηκαν σε αυτήν τη διεύθυνση ηλεκτρονικού ταχυδρομείου, οι οποίες εξηγούν πώς να επαναφέρετε τον κωδικό πρόσβασής σας.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Αποστολή</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Ακολουθήστε τις οδηγίες που στάλθηκαν στο %1$s για να ανακτήσετε τον κωδικό πρόσβασής σας.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Γίνεται αποστολή…</string>
@@ -73,5 +70,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">Επανάληψη αποστολής κωδικού</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Επαλήθευση αριθμού τηλεφώνου</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Συνέχεια</string>
-    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Αν πατήσετε \"%1$s\", μπορεί να σταλεί ένα SMS. Ενδέχεται να ισχύουν χρεώσεις μηνυμάτων και δεδομένων.</string>
+    <string name="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-en-rAU/strings.xml b/auth/src/main/res/values-en-rAU/strings.xml
index 3f2ae53a8..202e97f50 100755
--- a/auth/src/main/res/values-en-rAU/strings.xml
+++ b/auth/src/main/res/values-en-rAU/strings.xml
@@ -1,5 +1,5 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Loading...</string>
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Loading…</string>
     <string name="sign_in_default" translation_description="Button text to sign in">Sign in</string>
     <string name="general_error" translation_description="Toast text flashing general error">An error has occurred.</string>
     <string name="idp_name_google">Google</string>
@@ -37,16 +37,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privacy Policy</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">You already have an account</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Welcome back!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">You\'ve already used %1$s.
-        Sign in with %2$s to continue.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">You\'ve already used %1$s
-        to sign in. Enter your password for that account.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">You\'ve already used %1$s. Sign in with %2$s to continue.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">You\'ve already used %1$s to sign in. Enter your password for that account.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Signing in…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Trouble signing in?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Recover password</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Check your email</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Receive instructions to this email that explain how to
-        reset your password.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Receive instructions to this email that explain how to reset your password.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Send</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Follow the instructions sent to %1$s to recover your password.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Sending…</string>
diff --git a/auth/src/main/res/values-en-rCA/strings.xml b/auth/src/main/res/values-en-rCA/strings.xml
index 3f2ae53a8..202e97f50 100755
--- a/auth/src/main/res/values-en-rCA/strings.xml
+++ b/auth/src/main/res/values-en-rCA/strings.xml
@@ -1,5 +1,5 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Loading...</string>
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Loading…</string>
     <string name="sign_in_default" translation_description="Button text to sign in">Sign in</string>
     <string name="general_error" translation_description="Toast text flashing general error">An error has occurred.</string>
     <string name="idp_name_google">Google</string>
@@ -37,16 +37,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privacy Policy</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">You already have an account</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Welcome back!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">You\'ve already used %1$s.
-        Sign in with %2$s to continue.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">You\'ve already used %1$s
-        to sign in. Enter your password for that account.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">You\'ve already used %1$s. Sign in with %2$s to continue.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">You\'ve already used %1$s to sign in. Enter your password for that account.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Signing in…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Trouble signing in?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Recover password</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Check your email</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Receive instructions to this email that explain how to
-        reset your password.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Receive instructions to this email that explain how to reset your password.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Send</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Follow the instructions sent to %1$s to recover your password.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Sending…</string>
diff --git a/auth/src/main/res/values-en-rGB/strings.xml b/auth/src/main/res/values-en-rGB/strings.xml
index 3f2ae53a8..202e97f50 100755
--- a/auth/src/main/res/values-en-rGB/strings.xml
+++ b/auth/src/main/res/values-en-rGB/strings.xml
@@ -1,5 +1,5 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Loading...</string>
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Loading…</string>
     <string name="sign_in_default" translation_description="Button text to sign in">Sign in</string>
     <string name="general_error" translation_description="Toast text flashing general error">An error has occurred.</string>
     <string name="idp_name_google">Google</string>
@@ -37,16 +37,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privacy Policy</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">You already have an account</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Welcome back!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">You\'ve already used %1$s.
-        Sign in with %2$s to continue.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">You\'ve already used %1$s
-        to sign in. Enter your password for that account.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">You\'ve already used %1$s. Sign in with %2$s to continue.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">You\'ve already used %1$s to sign in. Enter your password for that account.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Signing in…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Trouble signing in?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Recover password</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Check your email</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Receive instructions to this email that explain how to
-        reset your password.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Receive instructions to this email that explain how to reset your password.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Send</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Follow the instructions sent to %1$s to recover your password.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Sending…</string>
diff --git a/auth/src/main/res/values-en-rIE/strings.xml b/auth/src/main/res/values-en-rIE/strings.xml
index 3f2ae53a8..202e97f50 100755
--- a/auth/src/main/res/values-en-rIE/strings.xml
+++ b/auth/src/main/res/values-en-rIE/strings.xml
@@ -1,5 +1,5 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Loading...</string>
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Loading…</string>
     <string name="sign_in_default" translation_description="Button text to sign in">Sign in</string>
     <string name="general_error" translation_description="Toast text flashing general error">An error has occurred.</string>
     <string name="idp_name_google">Google</string>
@@ -37,16 +37,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privacy Policy</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">You already have an account</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Welcome back!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">You\'ve already used %1$s.
-        Sign in with %2$s to continue.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">You\'ve already used %1$s
-        to sign in. Enter your password for that account.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">You\'ve already used %1$s. Sign in with %2$s to continue.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">You\'ve already used %1$s to sign in. Enter your password for that account.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Signing in…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Trouble signing in?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Recover password</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Check your email</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Receive instructions to this email that explain how to
-        reset your password.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Receive instructions to this email that explain how to reset your password.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Send</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Follow the instructions sent to %1$s to recover your password.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Sending…</string>
diff --git a/auth/src/main/res/values-en-rIN/strings.xml b/auth/src/main/res/values-en-rIN/strings.xml
index 3f2ae53a8..202e97f50 100755
--- a/auth/src/main/res/values-en-rIN/strings.xml
+++ b/auth/src/main/res/values-en-rIN/strings.xml
@@ -1,5 +1,5 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Loading...</string>
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Loading…</string>
     <string name="sign_in_default" translation_description="Button text to sign in">Sign in</string>
     <string name="general_error" translation_description="Toast text flashing general error">An error has occurred.</string>
     <string name="idp_name_google">Google</string>
@@ -37,16 +37,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privacy Policy</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">You already have an account</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Welcome back!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">You\'ve already used %1$s.
-        Sign in with %2$s to continue.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">You\'ve already used %1$s
-        to sign in. Enter your password for that account.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">You\'ve already used %1$s. Sign in with %2$s to continue.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">You\'ve already used %1$s to sign in. Enter your password for that account.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Signing in…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Trouble signing in?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Recover password</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Check your email</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Receive instructions to this email that explain how to
-        reset your password.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Receive instructions to this email that explain how to reset your password.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Send</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Follow the instructions sent to %1$s to recover your password.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Sending…</string>
diff --git a/auth/src/main/res/values-en-rSG/strings.xml b/auth/src/main/res/values-en-rSG/strings.xml
index 3f2ae53a8..202e97f50 100755
--- a/auth/src/main/res/values-en-rSG/strings.xml
+++ b/auth/src/main/res/values-en-rSG/strings.xml
@@ -1,5 +1,5 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Loading...</string>
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Loading…</string>
     <string name="sign_in_default" translation_description="Button text to sign in">Sign in</string>
     <string name="general_error" translation_description="Toast text flashing general error">An error has occurred.</string>
     <string name="idp_name_google">Google</string>
@@ -37,16 +37,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privacy Policy</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">You already have an account</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Welcome back!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">You\'ve already used %1$s.
-        Sign in with %2$s to continue.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">You\'ve already used %1$s
-        to sign in. Enter your password for that account.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">You\'ve already used %1$s. Sign in with %2$s to continue.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">You\'ve already used %1$s to sign in. Enter your password for that account.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Signing in…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Trouble signing in?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Recover password</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Check your email</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Receive instructions to this email that explain how to
-        reset your password.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Receive instructions to this email that explain how to reset your password.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Send</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Follow the instructions sent to %1$s to recover your password.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Sending…</string>
diff --git a/auth/src/main/res/values-en-rZA/strings.xml b/auth/src/main/res/values-en-rZA/strings.xml
index 3f2ae53a8..202e97f50 100755
--- a/auth/src/main/res/values-en-rZA/strings.xml
+++ b/auth/src/main/res/values-en-rZA/strings.xml
@@ -1,5 +1,5 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Loading...</string>
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Loading…</string>
     <string name="sign_in_default" translation_description="Button text to sign in">Sign in</string>
     <string name="general_error" translation_description="Toast text flashing general error">An error has occurred.</string>
     <string name="idp_name_google">Google</string>
@@ -37,16 +37,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privacy Policy</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">You already have an account</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Welcome back!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">You\'ve already used %1$s.
-        Sign in with %2$s to continue.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">You\'ve already used %1$s
-        to sign in. Enter your password for that account.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">You\'ve already used %1$s. Sign in with %2$s to continue.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">You\'ve already used %1$s to sign in. Enter your password for that account.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Signing in…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Trouble signing in?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Recover password</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Check your email</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Receive instructions to this email that explain how to
-        reset your password.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Receive instructions to this email that explain how to reset your password.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Send</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Follow the instructions sent to %1$s to recover your password.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Sending…</string>
diff --git a/auth/src/main/res/values-es/strings.xml b/auth/src/main/res/values-es/strings.xml
index 1abd57123..f32cd3c9e 100755
--- a/auth/src/main/res/values-es/strings.xml
+++ b/auth/src/main/res/values-es/strings.xml
@@ -37,16 +37,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de Privacidad</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Ya tienes una cuenta</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">¡Hola de nuevo!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya has usado %1$s.
-        Para continuar, inicia sesión con %2$s.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya has usado %1$s
-        para iniciar sesión. Introduce la contraseña de esa cuenta.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ya has usado %1$s. Para continuar, inicia sesión con %2$s.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ya has usado %1$s para iniciar sesión. Introduce la contraseña de esa cuenta.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Iniciando sesión…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">¿No puedes iniciar sesión?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar contraseña</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Consulta tu correo electrónico</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones
-       sobre cómo cambiar la contraseña.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Recibe un correo electrónico con instrucciones sobre cómo cambiar la contraseña.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Enviar</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sigue las instrucciones que te hemos enviado a %1$s para recuperar la contraseña.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Enviando…</string>
diff --git a/auth/src/main/res/values-fa/strings.xml b/auth/src/main/res/values-fa/strings.xml
index 032648d8f..1d5f01fae 100755
--- a/auth/src/main/res/values-fa/strings.xml
+++ b/auth/src/main/res/values-fa/strings.xml
@@ -19,11 +19,11 @@
     <string name="required_field" translation_description="Inline error for required field">اینجا نباید خالی باشد.</string>
     <string name="invalid_email_address" translation_description="Inline error for invalid email address">آن آدرس رایانامه درست نیست</string>
     <string name="missing_email_address" translation_description="Inline error for empty email address in input field">برای ادامه، آدرس رایانامه‌تان را وارد کنید</string>
-    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">در حال بررسی حساب‌های موجود...</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">در حال بررسی حساب‌های موجود…</string>
     <string name="title_register_email" translation_description="Title for signup form">ثبت‌نام</string>
     <string name="name_hint" translation_description="Hint for last name input field">نام و نام خانوادگی</string>
     <string name="button_text_save" translation_description="Button text to save input form">ذخیره</string>
-    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">در حال ثبت‌نام...</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">در حال ثبت‌نام…</string>
     <plurals name="error_weak_password" translation_description="Inline error for weak password">
         <item quantity="one">گذرواژه به اندازه کافی قوی نیست. حداقل باید از %1$d نویسه و ترکیبی از حروف و اعداد استفاده شود</item>
         <item quantity="other">گذرواژه به اندازه کافی قوی نیست. حداقل باید از %1$d نویسه و ترکیبی از حروف و اعداد استفاده شود</item>
@@ -37,10 +37,8 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">«خط‌مشی حریم خصوصی»</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">از قبل حسابی دارید</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">باز هم خوش آمدید!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">قبلاً از %1$s استفاده کرده‌اید.
-      برای ادامه، با %2$s وارد سیستم شوید.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">قبلاً از %1$s برای ورود به سیستم
-      استفاده کرده‌اید. گذرواژه این حساب را وارد کنید.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">قبلاً از %1$s استفاده کرده‌اید. برای ادامه، با %2$s وارد سیستم شوید.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">قبلاً از %1$s برای ورود به سیستم استفاده کرده‌اید. گذرواژه این حساب را وارد کنید.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">درحال ورود به سیستم…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">مشکل در ورود به سیستم؟</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">بازیابی گذرواژه</string>
@@ -57,8 +55,8 @@
     <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">وارد کردن کد ۶ رقمی ارسال‌شده به</string>
     <string name="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="verify_your_phone_title" translation_description="Button text to complete phone number verification">تأیید شماره تلفن</string>
-    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">در حال تأیید...</string>
-    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">در حال بازیابی پیامک...</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">در حال تأیید…</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">در حال بازیابی پیامک…</string>
     <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">کد اشتباه است. دوباره امتحان کنید.</string>
     <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">تأیید</string>
     <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">از این شماره تلفن به دفعات زیاد استفاده شده است</string>
@@ -68,7 +66,7 @@
     <string name="done" translation_description="Progress dialog success transition once sms is sent">انجام شد</string>
     <string name="verified" translation_description="Progress dialog success transition when phone number was verified">تأیید شد!</string>
     <string name="code_sent" translation_description="Progress dialog success transition once sms is sent">کد ارسال شد!</string>
-    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">در حال ارسال مجدد...</string>
+    <string name="resending" translation_description="Progress dialog text when user clicks on resend sms">در حال ارسال مجدد…</string>
     <string name="resend_code" translation_description="Link text to resend verification sms">ارسال مجدد کد</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">تأیید شماره تلفن</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">ادامه</string>
diff --git a/auth/src/main/res/values-fi/strings.xml b/auth/src/main/res/values-fi/strings.xml
index b4e7ff348..beb7930b0 100755
--- a/auth/src/main/res/values-fi/strings.xml
+++ b/auth/src/main/res/values-fi/strings.xml
@@ -37,16 +37,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">tietosuojakäytännön</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Sinulla on jo tili.</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Tervetuloa takaisin!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Olet jo käyttänyt osoitetta %1$s.
-        Jatka kirjautumalla palvelun %2$s kautta.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Olet jo käyttänyt osoitetta %1$s
-        kirjautumiseen. Anna kyseisen tilin salasana.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Olet jo käyttänyt osoitetta %1$s. Jatka kirjautumalla palvelun %2$s kautta.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Olet jo käyttänyt osoitetta %1$s kirjautumiseen. Anna kyseisen tilin salasana.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Kirjaudutaan sisään…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Eikö kirjautuminen onnistu?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Palauta salasana</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Tarkista sähköpostisi</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Tilaa tähän sähköpostiin ohjeet, joissa neuvotaan, miten
-        voit nollata salasanan.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Tilaa tähän sähköpostiin ohjeet, joissa neuvotaan, miten voit nollata salasanan.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Lähetä</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Palauta salasana noudattamalla osoitteeseen %1$s lähetettyjä ohjeita.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Lähetetään…</string>
diff --git a/auth/src/main/res/values-fil/strings.xml b/auth/src/main/res/values-fil/strings.xml
index 22b39cdfb..06b7e0692 100755
--- a/auth/src/main/res/values-fil/strings.xml
+++ b/auth/src/main/res/values-fil/strings.xml
@@ -23,7 +23,7 @@
     <string name="title_register_email" translation_description="Title for signup form">Mag-sign up</string>
     <string name="name_hint" translation_description="Hint for last name input field">Pangalan at apelyido</string>
     <string name="button_text_save" translation_description="Button text to save input form">I-save</string>
-    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Nagsa-sign up...</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Nagsa-sign up…</string>
     <plurals name="error_weak_password" translation_description="Inline error for weak password">
         <item quantity="one">Hindi masyadong malakas ang password. Gumamit ng %1$d character man lang at kumbinasyon ng mga titik at mga numero</item>
         <item quantity="other">Hindi masyadong malakas ang password. Gumamit ng %1$d na character man lang at kumbinasyon ng mga titik at mga numero</item>
@@ -37,19 +37,16 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Patakaran sa Privacy</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Mayroon ka nang account</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Maligayang pagbabalik!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Nagamit mo na ang %1$s.
-        Mag-sign in gamit ang %2$s upang magpatuloy.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Nagamit mo na ang %1$s
-        upang mag-sign in. Ilagay ang iyong password para sa account na iyon.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Nagamit mo na ang %1$s.        Mag-sign in gamit ang %2$s upang magpatuloy.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Nagamit mo na ang %1$s        upang mag-sign in. Ilagay ang iyong password para sa account na iyon.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Nagsa-sign in…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Nagkaproblema sa pag-sign in?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">I-recover ang password</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Suriin ang iyong email</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Kumuha ng mga tagubilin na ipadala sa email na ito na magpapaliwanag kung paano 
-        i-reset ang iyong password.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Kumuha ng mga tagubilin na ipadala sa email na ito na magpapaliwanag kung paano  i-reset ang iyong password.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Ipadala</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sundin ang mga tagubilin na ipinadala sa %1$s upang ma-recover ang iyong password.</string>
-    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Ipinapadala...</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Ipinapadala…</string>
     <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Hindi tumutugma ang email address na iyon sa isang kasalukuyang account</string>
     <string name="accessibility_logo" translation_description="Content description for app logo">Logo ng app</string>
     <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Naka-sign in bilang %1$s</string>
diff --git a/auth/src/main/res/values-fr-rCH/strings.xml b/auth/src/main/res/values-fr-rCH/strings.xml
index 26135c87f..c6269e9e1 100755
--- a/auth/src/main/res/values-fr-rCH/strings.xml
+++ b/auth/src/main/res/values-fr-rCH/strings.xml
@@ -70,5 +70,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">Renvoyer le code</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Valider le numéro de téléphone</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuer</string>
-    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">En appuyant sur \"%1$s\", vous déclencherez peut-être l\'envoi d\'un SMS. Des frais de messages et de données peuvent être facturés.</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">En appuyant sur “%1$s”, vous déclencherez peut-être l\'envoi d\'un SMS. Des frais de messages et de données peuvent être facturés.</string>
 </resources>
diff --git a/auth/src/main/res/values-fr/strings.xml b/auth/src/main/res/values-fr/strings.xml
index 26135c87f..c6269e9e1 100755
--- a/auth/src/main/res/values-fr/strings.xml
+++ b/auth/src/main/res/values-fr/strings.xml
@@ -70,5 +70,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">Renvoyer le code</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Valider le numéro de téléphone</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuer</string>
-    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">En appuyant sur \"%1$s\", vous déclencherez peut-être l\'envoi d\'un SMS. Des frais de messages et de données peuvent être facturés.</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">En appuyant sur “%1$s”, vous déclencherez peut-être l\'envoi d\'un SMS. Des frais de messages et de données peuvent être facturés.</string>
 </resources>
diff --git a/auth/src/main/res/values-gsw/strings.xml b/auth/src/main/res/values-gsw/strings.xml
index 6f2c00ca2..46b133ecb 100755
--- a/auth/src/main/res/values-gsw/strings.xml
+++ b/auth/src/main/res/values-gsw/strings.xml
@@ -70,5 +70,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">Code erneut senden</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Telefonnummer bestätigen</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Weiter</string>
-    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Wenn sie auf \"%1$s\" tippen, erhalten Sie möglicherweise eine SMS. Es können Gebühren für SMS und Datenübertragung anfallen.</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Wenn sie auf “%1$s” tippen, erhalten Sie möglicherweise eine SMS. Es können Gebühren für SMS und Datenübertragung anfallen.</string>
 </resources>
diff --git a/auth/src/main/res/values-gu/strings.xml b/auth/src/main/res/values-gu/strings.xml
index d854bc111..d69319e1c 100755
--- a/auth/src/main/res/values-gu/strings.xml
+++ b/auth/src/main/res/values-gu/strings.xml
@@ -1,5 +1,5 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="progress_dialog_loading" translation_description="Loading text in dialog">લોડ કરી રહ્યું છે...</string>
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">લોડ કરી રહ્યું છે…</string>
     <string name="sign_in_default" translation_description="Button text to sign in">સાઇન ઇન કરો</string>
     <string name="general_error" translation_description="Toast text flashing general error">એક ભૂલ આવી છે.</string>
     <string name="idp_name_google">Google</string>
@@ -19,7 +19,7 @@
     <string name="required_field" translation_description="Inline error for required field">તમારે આ ફીલ્ડ ભરવું આવશ્યક છે.</string>
     <string name="invalid_email_address" translation_description="Inline error for invalid email address">તે ઇમેઇલ ઍડ્રેસ સાચું નથી</string>
     <string name="missing_email_address" translation_description="Inline error for empty email address in input field">આગળ વધવા માટે તમારું ઇમેઇલ ઍડ્રેસ દાખલ કરો</string>
-    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">વર્તમાન એકાઉન્ટ તપાસી રહ્યાં છીએ...</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">વર્તમાન એકાઉન્ટ તપાસી રહ્યાં છીએ…</string>
     <string name="title_register_email" translation_description="Title for signup form">સાઇન અપ</string>
     <string name="name_hint" translation_description="Hint for last name input field">નામ અને અટક</string>
     <string name="button_text_save" translation_description="Button text to save input form">સાચવો</string>
@@ -37,16 +37,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">ગોપનીયતા નીતિ</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">તમારી પાસે પહેલેથી જ એક એકાઉન્ટ છે</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">ફરી સ્વાગત છે!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">તમે પહેલાંથી જ %1$sનો ઉપયોગ કરી લીધો છે.
-        આગળ વધવા માટે %2$s વડે સાઇન ઇન કરો.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">તમે સાઇન ઇન કરવા માટે પહેલેથી %1$sનો
-        ઉપયોગ કરી લીધો છે. તે એકાઉન્ટ માટેનો તમારો પાસવર્ડ દાખલ કરો.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">તમે પહેલાંથી જ %1$sનો ઉપયોગ કરી લીધો છે. આગળ વધવા માટે %2$s વડે સાઇન ઇન કરો.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">તમે સાઇન ઇન કરવા માટે પહેલેથી %1$sનો ઉપયોગ કરી લીધો છે. તે એકાઉન્ટ માટેનો તમારો પાસવર્ડ દાખલ કરો.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">સાઇન ઇન કરી રહ્યાં છીએ…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">સાઇન ઇન કરવામાં સમસ્યા આવી રહી છે?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">પાસવર્ડ પુનઃપ્રાપ્ત કરો</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">તમારું ઇમેઇલ ઍડ્રેસ તપાસો</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">આ ઇમેઇલમાં મોકલવામાં આવેલ સૂચનાઓ મેળવો જે તમારો
-        પાસવર્ડ કેવી રીતે રીસેટ કરવો તે સમજાવે છે.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">આ ઇમેઇલમાં મોકલવામાં આવેલ સૂચનાઓ મેળવો જે તમારો પાસવર્ડ કેવી રીતે રીસેટ કરવો તે સમજાવે છે.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">મોકલો</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">તમારો પાસવર્ડ પુનઃપ્રાપ્ત કરવા માટે %1$s પર મોકલેલ સૂચનાઓનું પાલન કરો.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">મોકલી રહ્યાં છીએ…</string>
diff --git a/auth/src/main/res/values-hi/strings.xml b/auth/src/main/res/values-hi/strings.xml
index 4dfd35f34..cf80339d1 100755
--- a/auth/src/main/res/values-hi/strings.xml
+++ b/auth/src/main/res/values-hi/strings.xml
@@ -1,5 +1,5 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="progress_dialog_loading" translation_description="Loading text in dialog">लोड हो रहा है...</string>
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">लोड हो रहा है…</string>
     <string name="sign_in_default" translation_description="Button text to sign in">प्रवेश करें</string>
     <string name="general_error" translation_description="Toast text flashing general error">कोई गड़बड़ी हुई.</string>
     <string name="idp_name_google">Google</string>
@@ -37,11 +37,9 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">निजता नीति</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">आपके पास पहले से ही एक खाता है</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">आपका फिर से स्वागत है!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">आपने पहले ही %1$s का उपयोग कर लिया है.
- जारी रखने के लिए %2$s से प्रवेश करें.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">आपने पहले ही प्रवेश करने के लिए %1$s का उपयोग कर लिया है.
- उस खाते के लिए अपना पासवर्ड डालें.</string>
-    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">प्रवेश हो रहा है...</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">आपने पहले ही %1$s का उपयोग कर लिया है. जारी रखने के लिए %2$s से प्रवेश करें.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">आपने पहले ही प्रवेश करने के लिए %1$s का उपयोग कर लिया है. उस खाते के लिए अपना पासवर्ड डालें.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">प्रवेश हो रहा है…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">प्रवेश करने में समस्या?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">पासवर्ड फिर से पाएं</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">अपना ईमेल जांचें</string>
diff --git a/auth/src/main/res/values-hr/strings.xml b/auth/src/main/res/values-hr/strings.xml
index 5094806f1..42e47c947 100755
--- a/auth/src/main/res/values-hr/strings.xml
+++ b/auth/src/main/res/values-hr/strings.xml
@@ -19,11 +19,11 @@
     <string name="required_field" translation_description="Inline error for required field">Ne možete to ostaviti prazno.</string>
     <string name="invalid_email_address" translation_description="Inline error for invalid email address">Ta e-adresa nije točna</string>
     <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Unesite svoju e-adresu za nastavak</string>
-    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Traženje postojećih računa...</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Traženje postojećih računa…</string>
     <string name="title_register_email" translation_description="Title for signup form">Registracija</string>
     <string name="name_hint" translation_description="Hint for last name input field">Ime i prezime</string>
     <string name="button_text_save" translation_description="Button text to save input form">Spremi</string>
-    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registriranje....</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registriranje….</string>
     <plurals name="error_weak_password" translation_description="Inline error for weak password">
         <item quantity="one">Zaporka nije dovoljno jaka. Upotrijebite najmanje %1$d znak i koristite kombinaciju slova i znamenki.</item>
         <item quantity="few">Zaporka nije dovoljno jaka. Upotrijebite najmanje %1$d znaka i koristite kombinaciju slova i znamenki.</item>
@@ -38,16 +38,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Pravila o privatnosti</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Već imate račun</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Dobro došli natrag!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Već ste upotrijebili e-adresu %1$s.
-        Za nastavak se prijavite putem usluge %2$s.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Za prijavu ste već upotrijebili e-adresu %1$s.
-        Unesite zaporku za taj račun.</string>
-    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Prijava...</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Već ste upotrijebili e-adresu %1$s. Za nastavak se prijavite putem usluge %2$s.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Za prijavu ste već upotrijebili e-adresu %1$s. Unesite zaporku za taj račun.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Prijava…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Problem s prijavom?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Ponovno postavljanje zaporke</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Provjerite e-poštu</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Provjerite upute za ponovno postavljanje zaporke koje smo
-        poslali na vašu e-adresu.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Provjerite upute za ponovno postavljanje zaporke koje smo poslali na vašu e-adresu.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Pošalji</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Slijedite upute za ponovno postavljanje zaporke koje smo poslali na e-adresu %1$s.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Slanje…</string>
@@ -74,5 +71,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">Ponovo pošalji kôd</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Potvrda telefonskog broja</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Nastavi</string>
-    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Dodirivanje gumba \"%1$s\" može dovesti do slanja SMS poruke. Mogu se primijeniti naknade za slanje poruka i podatkovni promet.</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Dodirivanje gumba “%1$s” može dovesti do slanja SMS poruke. Mogu se primijeniti naknade za slanje poruka i podatkovni promet.</string>
 </resources>
diff --git a/auth/src/main/res/values-hu/strings.xml b/auth/src/main/res/values-hu/strings.xml
index 8b458aa34..86784f309 100755
--- a/auth/src/main/res/values-hu/strings.xml
+++ b/auth/src/main/res/values-hu/strings.xml
@@ -23,7 +23,7 @@
     <string name="title_register_email" translation_description="Title for signup form">Regisztráció</string>
     <string name="name_hint" translation_description="Hint for last name input field">Utónév és vezetéknév</string>
     <string name="button_text_save" translation_description="Button text to save input form">Mentés</string>
-    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Regisztráció...</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Regisztráció…</string>
     <plurals name="error_weak_password" translation_description="Inline error for weak password">
         <item quantity="one">A jelszó nem elég erős. Legalább %1$d karaktert használjon, amelyben betűk és számok is szerepeljenek.</item>
         <item quantity="other">A jelszó nem elég erős. Legalább %1$d karaktert használjon, amelyben betűk és számok is szerepeljenek.</item>
@@ -37,16 +37,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Adatvédelmi irányelvek</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Már rendelkezik fiókkal</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Örülünk, hogy visszatért!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Már használta a következő e-mail-címet: %1$s.
-        A folytatáshoz jelentkezzen be %2$s-fiókjával.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ezt az e-mail-fiókot (%1$s) már használta
-        bejelentkezésre. Adja meg a fiókhoz tartozó jelszót.</string>
-    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Bejelentkezés...</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Már használta a következő e-mail-címet: %1$s. A folytatáshoz jelentkezzen be %2$s-fiókjával.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ezt az e-mail-fiókot (%1$s) már használta bejelentkezésre. Adja meg a fiókhoz tartozó jelszót.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Bejelentkezés…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Problémái vannak a bejelentkezéssel?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Jelszó visszaállítása</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Ellenőrizze az e-mailjeit.</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Olvassa el az e-mailben elküldött utasításokat, amelyekből megtudhatja, hogyan
-        állíthatja vissza a jelszavát.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Olvassa el az e-mailben elküldött utasításokat, amelyekből megtudhatja, hogyan állíthatja vissza a jelszavát.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Küldés</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">A jelszó visszaállításához kövesse az ide (%1$s) elküldött utasításokat.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Küldés…</string>
@@ -58,7 +55,7 @@
     <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Adja meg a telefonszámra elküldött 6 számjegyű kódot</string>
     <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Kód újraküldése ennyi idő elteltével: 0:%02d</string>
     <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Telefonszám igazolása</string>
-    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Ellenőrzés...</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Ellenőrzés…</string>
     <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">SMS lekérése…</string>
     <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Hibás kód. Próbálja újra.</string>
     <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Rendben</string>
diff --git a/auth/src/main/res/values-in/strings.xml b/auth/src/main/res/values-in/strings.xml
index ad90d88f6..11b5dca17 100755
--- a/auth/src/main/res/values-in/strings.xml
+++ b/auth/src/main/res/values-in/strings.xml
@@ -37,19 +37,16 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Kebijakan Privasi</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Anda sudah memiliki akun</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Selamat datang kembali!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Anda telah menggunakan %1$s.
-        Login dengan %2$s untuk melanjutkan.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Anda telah menggunakan %1$s
-        untuk login. Masukkan sandi untuk akun tersebut.</string>
-    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Login...</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Anda telah menggunakan %1$s. Login dengan %2$s untuk melanjutkan.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Anda telah menggunakan %1$s untuk login. Masukkan sandi untuk akun tersebut.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Login…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Terjadi masalah saat login?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Pulihkan sandi</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Periksa email Anda</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Dapatkan petunjuk yang dikirimkan ke email ini yang menjelaskan cara
-        menyetel ulang sandi Anda.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Dapatkan petunjuk yang dikirimkan ke email ini yang menjelaskan cara menyetel ulang sandi Anda.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Kirim</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Ikuti petunjuk yang dikirimkan ke %1$s untuk memulihkan sandi Anda.</string>
-    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Mengirim...</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Mengirim…</string>
     <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Alamat email tidak cocok dengan akun yang ada</string>
     <string name="accessibility_logo" translation_description="Content description for app logo">Logo aplikasi</string>
     <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Login sebagai %1$s</string>
diff --git a/auth/src/main/res/values-it/strings.xml b/auth/src/main/res/values-it/strings.xml
index fcc788940..ea579a393 100755
--- a/auth/src/main/res/values-it/strings.xml
+++ b/auth/src/main/res/values-it/strings.xml
@@ -37,10 +37,8 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Norme sulla privacy</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Hai già un account</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Bentornato.</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Hai già utilizzato %1$s.
-        Accedi con %2$s per continuare.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Hai già utilizzato %1$s
-        per accedere. Inserisci la password di questo account.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Hai già utilizzato %1$s. Accedi con %2$s per continuare.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Hai già utilizzato %1$s per accedere. Inserisci la password di questo account.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Accesso in corso…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Problemi di accesso?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Recupera la password</string>
@@ -72,5 +70,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">Invia di nuovo il codice</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verifica numero di telefono</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continua</string>
-    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Se tocchi \"%1$s\", è possibile che venga inviato un SMS. Potrebbero essere applicate le tariffe per l\'invio dei messaggi e per il traffico dati.</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Se tocchi “%1$s”, è possibile che venga inviato un SMS. Potrebbero essere applicate le tariffe per l\'invio dei messaggi e per il traffico dati.</string>
 </resources>
diff --git a/auth/src/main/res/values-kn/strings.xml b/auth/src/main/res/values-kn/strings.xml
index c5bba2f91..1b7938810 100755
--- a/auth/src/main/res/values-kn/strings.xml
+++ b/auth/src/main/res/values-kn/strings.xml
@@ -19,11 +19,11 @@
     <string name="required_field" translation_description="Inline error for required field">ನೀವು ಇದನ್ನು ಖಾಲಿ ಬಿಡುವಂತಿಲ್ಲ.</string>
     <string name="invalid_email_address" translation_description="Inline error for invalid email address">ಆ ಇಮೇಲ್ ವಿಳಾಸ ಸರಿಯಾಗಿಲ್ಲ</string>
     <string name="missing_email_address" translation_description="Inline error for empty email address in input field">ಮುಂದುವರಿಸಲು ನಿಮ್ಮ ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಖಾತೆಗಳಿಗಾಗಿ ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ...</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಖಾತೆಗಳಿಗಾಗಿ ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ…</string>
     <string name="title_register_email" translation_description="Title for signup form">ಸೈನ್ ಅಪ್</string>
     <string name="name_hint" translation_description="Hint for last name input field">ಮೊದಲ ಮತ್ತು ಕೊನೆಯ ಹೆಸರು</string>
     <string name="button_text_save" translation_description="Button text to save input form">ಉಳಿಸಿ</string>
-    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">ಸೈನ್ ಅಪ್ ಮಾಡಲಾಗುತ್ತಿದೆ...</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">ಸೈನ್ ಅಪ್ ಮಾಡಲಾಗುತ್ತಿದೆ…</string>
     <plurals name="error_weak_password" translation_description="Inline error for weak password">
         <item quantity="one">ಪಾಸ್‍‌ವರ್ಡ್‌ ಸಾಕಷ್ಟು ಪ್ರಬಲವಾಗಿಲ್ಲ. ಕನಿಷ್ಠ %1$d ಅಕ್ಷರಗಳಿರಲಿ ಹಾಗೂ ಅದರಲ್ಲಿ ಅಕ್ಷರಗಳು ಮತ್ತು ಸಂಖ್ಯೆಗಳ ಮಿಕ್ಸ್‌ ಬಳಸಿ</item>
         <item quantity="other">ಪಾಸ್‍‌ವರ್ಡ್‌ ಸಾಕಷ್ಟು ಪ್ರಬಲವಾಗಿಲ್ಲ. ಕನಿಷ್ಠ %1$d ಅಕ್ಷರಗಳಿರಲಿ ಹಾಗೂ ಅದರಲ್ಲಿ ಅಕ್ಷರಗಳು ಮತ್ತು ಸಂಖ್ಯೆಗಳ ಮಿಕ್ಸ್‌ ಬಳಸಿ</item>
@@ -46,7 +46,7 @@
     <string name="password_recovery_body" translation_description="Password recovery message body">ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ಮರುಹೊಂದಿಸುವುದು ಹೇಗೆ ಎಂದು ತಿಳಿಸುವ ಸೂಚನೆಗಳನ್ನು ಈ ಇಮೇಲ್‌ ಮೂಲಕ ಪಡೆಯಿರಿ.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">ಕಳುಹಿಸಿ</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ಮರುಪಡೆಯಲು %1$s ಗೆ ಕಳುಹಿಸಲಾದ ಸೂಚನೆಗಳನ್ನು ಅನುಸರಿಸಿ.</string>
-    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ...</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ…</string>
     <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">ಆ ಇಮೇಲ್‌ ವಿಳಾಸವು ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಖಾತೆಗೆ ಹೊಂದಾಣಿಕೆಯಾಗುವುದಿಲ್ಲ</string>
     <string name="accessibility_logo" translation_description="Content description for app logo">ಅಪ್ಲಿಕೇಶನ್‌ ಲೋಗೊ</string>
     <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">ನೀವು %1$s ನಿಂದ ಸೈನ್ ಇನ್ ಮಾಡಿರುವಿರಿ</string>
@@ -55,7 +55,7 @@
     <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">ನಾವು ಕಳುಹಿಸಿರುವ 6 ಅಂಕಿಯ ಕೋಡ್‌ ನಮೂದಿಸಿ</string>
     <string name="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="verify_your_phone_title" translation_description="Button text to complete phone number verification">ನಿಮ್ಮ ಪೋನ್‌ ಸಂಖ್ಯೆಯನ್ನು ಪರಿಶೀಲಿಸಿ</string>
-    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ...</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ…</string>
     <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">ಎಸ್‌ಎಂಎಸ್‌ ಹಿಂಪಡೆಯಲಾಗುತ್ತಿದೆ…</string>
     <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">ಕೋಡ್ ತಪ್ಪಾಗಿದೆ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.</string>
     <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">ಸರಿ</string>
@@ -70,5 +70,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">ಕೋಡ್ ಪುನಃ ಕಳುಹಿಸಿ</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ಪರಿಶೀಲಿಸಿ</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">ಮುಂದುವರಿಸಿ</string>
-    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">\"%1$s\" ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡುವ ಮೂಲಕ, ಎಸ್‌ಎಂಎಸ್‌ ಅನ್ನು ಕಳುಹಿಸಬಹುದಾಗಿದೆ. ಸಂದೇಶ ಮತ್ತು ಡೇಟಾ ದರಗಳು ಅನ್ವಯಿಸಬಹುದು.</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">“%1$s” ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡುವ ಮೂಲಕ, ಎಸ್‌ಎಂಎಸ್‌ ಅನ್ನು ಕಳುಹಿಸಬಹುದಾಗಿದೆ. ಸಂದೇಶ ಮತ್ತು ಡೇಟಾ ದರಗಳು ಅನ್ವಯಿಸಬಹುದು.</string>
 </resources>
diff --git a/auth/src/main/res/values-ko/strings.xml b/auth/src/main/res/values-ko/strings.xml
index 821420db4..8ef2daebb 100755
--- a/auth/src/main/res/values-ko/strings.xml
+++ b/auth/src/main/res/values-ko/strings.xml
@@ -37,19 +37,16 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">개인정보처리방침</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">계정이 이미 있음</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">환영합니다.</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">%1$s을(를) 이미 사용하고 있습니다.
-        계속하려면 %2$s(으)로 로그인하세요.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">이미 %1$s을(를) 사용하여
-        로그인했습니다. 해당 계정의 비밀번호를 입력하세요.</string>
-    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">로그인 중...</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">%1$s을(를) 이미 사용하고 있습니다. 계속하려면 %2$s(으)로 로그인하세요.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">이미 %1$s을(를) 사용하여 로그인했습니다. 해당 계정의 비밀번호를 입력하세요.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">로그인 중…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">로그인하는 데 문제가 있나요?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">비밀번호 복구</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">이메일 확인</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">비밀번호 재설정 방법을 안내하는 이메일을
-        보내 드립니다.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">비밀번호 재설정 방법을 안내하는 이메일을 보내 드립니다.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">보내기</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">%1$s(으)로 발송된 이메일의 안내에 따라 비밀번호를 복구하세요.</string>
-    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">전송 중...</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">전송 중…</string>
     <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">이메일 주소가 기존 계정과 일치하지 않습니다.</string>
     <string name="accessibility_logo" translation_description="Content description for app logo">앱 로고</string>
     <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">%1$s(으)로 로그인됨</string>
diff --git a/auth/src/main/res/values-ln/strings.xml b/auth/src/main/res/values-ln/strings.xml
index 26135c87f..c6269e9e1 100755
--- a/auth/src/main/res/values-ln/strings.xml
+++ b/auth/src/main/res/values-ln/strings.xml
@@ -70,5 +70,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">Renvoyer le code</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Valider le numéro de téléphone</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuer</string>
-    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">En appuyant sur \"%1$s\", vous déclencherez peut-être l\'envoi d\'un SMS. Des frais de messages et de données peuvent être facturés.</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">En appuyant sur “%1$s”, vous déclencherez peut-être l\'envoi d\'un SMS. Des frais de messages et de données peuvent être facturés.</string>
 </resources>
diff --git a/auth/src/main/res/values-lt/strings.xml b/auth/src/main/res/values-lt/strings.xml
index 8609c543b..2e5a0c0bb 100755
--- a/auth/src/main/res/values-lt/strings.xml
+++ b/auth/src/main/res/values-lt/strings.xml
@@ -39,8 +39,7 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Privatumo politika</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Jūs jau turite paskyrą</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Sveiki sugrįžę!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Jau panaudojote %1$s.
-Jei norite tęsti, prisijunkite per „%2$s“.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Jau panaudojote %1$s.Jei norite tęsti, prisijunkite per „%2$s“.</string>
     <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Jūs jau prisijungėte naudodami %1$s. Įveskite tos paskyros slaptažodį.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Prisijungiama…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Kyla problemų prisijungiant?</string>
@@ -59,7 +58,7 @@ Jei norite tęsti, prisijunkite per „%2$s“.</string>
     <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Siųsti kodą iš naujo po 0:%02d</string>
     <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Patvirtinti telefono numerį</string>
     <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Patvirtinama…</string>
-    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Gaunama SMS...</string>
+    <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Gaunama SMS…</string>
     <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Klaidingas kodas. Bandykite dar kartą.</string>
     <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Gerai</string>
     <string name="error_too_many_attempts" translation_description="Error message when the phone number has been used too many times">Šis telefono numeris panaudotas per daug kartų</string>
diff --git a/auth/src/main/res/values-lv/strings.xml b/auth/src/main/res/values-lv/strings.xml
index bdc6238c0..91cec4d27 100755
--- a/auth/src/main/res/values-lv/strings.xml
+++ b/auth/src/main/res/values-lv/strings.xml
@@ -19,11 +19,11 @@
     <string name="required_field" translation_description="Inline error for required field">Šo laukumu nedrīkst atstāt tukšu.</string>
     <string name="invalid_email_address" translation_description="Inline error for invalid email address">Šī e-pasta adrese nav pareiza</string>
     <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Lai turpinātu, ievadiet e-pasta adresi</string>
-    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Tiek pārbaudīti esošie konti...</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Tiek pārbaudīti esošie konti…</string>
     <string name="title_register_email" translation_description="Title for signup form">Reģistrācija</string>
     <string name="name_hint" translation_description="Hint for last name input field">Vārds un uzvārds</string>
     <string name="button_text_save" translation_description="Button text to save input form">Saglabāt</string>
-    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Notiek reģistrācija...</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Notiek reģistrācija…</string>
     <plurals name="error_weak_password" translation_description="Inline error for weak password">
         <item quantity="zero">Parole nav pietiekami droša. Izmantojiet vismaz %1$d rakstzīmes un burtu un ciparu kombināciju</item>
         <item quantity="one">Parole nav pietiekami droša. Izmantojiet vismaz %1$d rakstzīmi un burtu un ciparu kombināciju</item>
@@ -38,16 +38,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Konfidencialitātes politika</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Jums jau ir konts</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Laipni lūdzam atpakaļ!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Esat jau izmantojis e-pasta adresi %1$s.
-        Pierakstieties pakalpojumā %2$s, lai turpinātu.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Esat jau izmantojis e-pasta adresi %1$s,
-        lai pierakstītos. Ievadiet šī konta paroli.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Esat jau izmantojis e-pasta adresi %1$s. Pierakstieties pakalpojumā %2$s, lai turpinātu.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Esat jau izmantojis e-pasta adresi %1$s, lai pierakstītos. Ievadiet šī konta paroli.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Notiek pierakstīšanās…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Vai jums ir problēmas ar pierakstīšanos?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Paroles atgūšana</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Pārbaudiet savu e-pastu</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Saņemiet uz šo e-pasta adresi nosūtītus norādījumus ar skaidrojumu,
-        kā atiestatīt paroli.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Saņemiet uz šo e-pasta adresi nosūtītus norādījumus ar skaidrojumu, kā atiestatīt paroli.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Sūtīt</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Izpildiet uz e-pasta adresi %1$s nosūtītos norādījumus, lai atgūtu paroli.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Notiek sūtīšana…</string>
@@ -59,7 +56,7 @@
     <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Ievadiet 6 ciparu kodu, ko nosūtījām</string>
     <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Vēlreiz nosūtīt kodu pēc 0:%02d</string>
     <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Verificēt tālruņa numuru</string>
-    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Notiek verifikācija...</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Notiek verifikācija…</string>
     <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Notiek īsziņas izgūšana…</string>
     <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Nepareizs kods. Mēģiniet vēlreiz.</string>
     <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Labi</string>
diff --git a/auth/src/main/res/values-mo/strings.xml b/auth/src/main/res/values-mo/strings.xml
index 83d44f16a..f1d846226 100755
--- a/auth/src/main/res/values-mo/strings.xml
+++ b/auth/src/main/res/values-mo/strings.xml
@@ -23,7 +23,7 @@
     <string name="title_register_email" translation_description="Title for signup form">Înscrieți-vă</string>
     <string name="name_hint" translation_description="Hint for last name input field">Prenume și nume de familie</string>
     <string name="button_text_save" translation_description="Button text to save input form">Salvați</string>
-    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Se creează un cont...</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Se creează un cont…</string>
     <plurals name="error_weak_password" translation_description="Inline error for weak password">
         <item quantity="one">Parola nu este suficient de puternică. Folosiți cel puțin %1$d caracter și o combinație de litere și cifre.</item>
         <item quantity="few">Parola nu este suficient de puternică. Folosiți cel puțin %1$d caractere și o combinație de litere și cifre.</item>
@@ -40,7 +40,7 @@
     <string name="welcome_back_email_header" translation_description="Message for returning users">Bine ați revenit!</string>
     <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ați folosit deja %1$s. Pentru a continua, conectați-vă cu %2$s.</string>
     <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ați folosit deja %1$s pentru a vă conecta. Introduceți parola acestui cont.</string>
-    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Se conectează...</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Se conectează…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Nu reușiți să vă conectați?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperați parola</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Verificați căsuța de e-mail</string>
@@ -56,7 +56,7 @@
     <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Introduceți codul din 6 cifre pe care l-am trimis la</string>
     <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Retrimiteți codul în 00:%02d</string>
     <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Confirmați numărul de telefon</string>
-    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Se confirmă...</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Se confirmă…</string>
     <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Se obține SMS-ul…</string>
     <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Cod greșit. Încercați din nou.</string>
     <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
diff --git a/auth/src/main/res/values-mr/strings.xml b/auth/src/main/res/values-mr/strings.xml
index b1d217141..96f97aa9f 100755
--- a/auth/src/main/res/values-mr/strings.xml
+++ b/auth/src/main/res/values-mr/strings.xml
@@ -1,5 +1,5 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="progress_dialog_loading" translation_description="Loading text in dialog">लोड करत आहे...</string>
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">लोड करत आहे…</string>
     <string name="sign_in_default" translation_description="Button text to sign in">साइन इन करा</string>
     <string name="general_error" translation_description="Toast text flashing general error">एक एरर आला आहे.</string>
     <string name="idp_name_google">Google</string>
@@ -19,7 +19,7 @@
     <string name="required_field" translation_description="Inline error for required field">तुम्ही हे रिक्त सोडू शकत नाही.</string>
     <string name="invalid_email_address" translation_description="Inline error for invalid email address">तो ईमेल अॅड्रेस चुकीचा आहे</string>
     <string name="missing_email_address" translation_description="Inline error for empty email address in input field">सुरू ठेवण्यासाठी तुमचा ईमेल अॅड्रेस टाका</string>
-    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">सध्याच्या खात्यांसाठी तपासत आहे...</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">सध्याच्या खात्यांसाठी तपासत आहे…</string>
     <string name="title_register_email" translation_description="Title for signup form">साइन अप करा</string>
     <string name="name_hint" translation_description="Hint for last name input field">नाव आणि आडनाव</string>
     <string name="button_text_save" translation_description="Button text to save input form">सेव्ह करा</string>
@@ -39,14 +39,14 @@
     <string name="welcome_back_email_header" translation_description="Message for returning users">पुन्हा एकदा स्वागत आहे!</string>
     <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">तुम्ही %1$s आधीच वापरला आहे. सुरू ठेवण्यासाठी %2$s ने साइन इन करा.</string>
     <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">तुम्ही %1$s आधीच वापरला आहे. साइन इन करण्यासाठी तुमचा त्या खात्याचा पासवर्ड टाका.</string>
-    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">साइन इन करत आहे...</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">साइन इन करत आहे…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">साइन इन करताना समस्या आली?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">पासवर्ड पुन्हा मिळवा</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">तुमचा ईमेल तपासा</string>
     <string name="password_recovery_body" translation_description="Password recovery message body">तुमचा पासवर्ड रीसेट कसा करावा यासंबंधित या ईमेलवर पाठवलेल्या सूचना मिळवा.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">पाठवा</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">तुमचा पासवर्ड परत मिळवण्यासाठी %1$sवर पाठवलेल्या सूचनांचे पालन करा.</string>
-    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">पाठवत आहे...</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">पाठवत आहे…</string>
     <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">तो ईमेल अॅड्रेस सध्याच्या खात्याशी जुळत नाही</string>
     <string name="accessibility_logo" translation_description="Content description for app logo">अ‍ॅप लोगो</string>
     <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">%1$s म्हणून साइन इन केले</string>
diff --git a/auth/src/main/res/values-ms/strings.xml b/auth/src/main/res/values-ms/strings.xml
index 91fec94e6..a1a63ff1f 100755
--- a/auth/src/main/res/values-ms/strings.xml
+++ b/auth/src/main/res/values-ms/strings.xml
@@ -1,5 +1,5 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Memuatkan...</string>
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Memuatkan…</string>
     <string name="sign_in_default" translation_description="Button text to sign in">Log masuk</string>
     <string name="general_error" translation_description="Toast text flashing general error">Ralat telah berlaku.</string>
     <string name="idp_name_google">Google</string>
@@ -39,14 +39,14 @@
     <string name="welcome_back_email_header" translation_description="Message for returning users">Selamat kembali!</string>
     <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Anda sudah menggunakan %1$s. Log masuk dengan %2$s untuk teruskan.</string>
     <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Anda sudah menggunakan %1$s untuk log masuk. Masukkan kata laluan anda untuk akaun tersebut.</string>
-    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Log masuk...</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Log masuk…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Menghadapi masalah log masuk?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Pulihkan kata laluan</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Semak e-mel anda</string>
     <string name="password_recovery_body" translation_description="Password recovery message body">Dapatkan arahan pada e-mel ini untuk mengetahui cara menetapkan semula kata laluan anda.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Hantar</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Ikut arahan yang dihantar ke %1$s untuk memulihkan kata laluan anda.</string>
-    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Menghantar...</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Menghantar…</string>
     <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Alamat e-mel tersebut tidak sepadan dengan akaun sedia ada</string>
     <string name="accessibility_logo" translation_description="Content description for app logo">Logo apl</string>
     <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Dilog masuk sebagai %1$s</string>
diff --git a/auth/src/main/res/values-nb/strings.xml b/auth/src/main/res/values-nb/strings.xml
index 82ce81bcd..abda7a311 100755
--- a/auth/src/main/res/values-nb/strings.xml
+++ b/auth/src/main/res/values-nb/strings.xml
@@ -37,16 +37,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Personvernregler</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Du har allerede en konto</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Velkommen tilbake!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Du har allerede brukt %1$s.
-        Logg på med %2$s for å fortsette.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Du har allerede brukt %1$s
-        for å logge på. Angi passordet ditt for denne kontoen.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Du har allerede brukt %1$s. Logg på med %2$s for å fortsette.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Du har allerede brukt %1$s for å logge på. Angi passordet ditt for denne kontoen.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Logger på …</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Har du problemer med å logge på?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Gjenopprett passordet</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Sjekk e-posten din</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Få instruksjoner sendt til denne e-postadressen for hvordan du
-        tilbakestiller passordet ditt.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Få instruksjoner sendt til denne e-postadressen for hvordan du tilbakestiller passordet ditt.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Send</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Følg veiledningen som er sendt til %1$s, for å gjenopprette passordet ditt.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Sender …</string>
diff --git a/auth/src/main/res/values-nl/strings.xml b/auth/src/main/res/values-nl/strings.xml
index 375f45d14..2eeeafbf3 100755
--- a/auth/src/main/res/values-nl/strings.xml
+++ b/auth/src/main/res/values-nl/strings.xml
@@ -70,5 +70,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">Code opnieuw verzenden</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Telefoonnummer verifiëren</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Doorgaan</string>
-    <string name="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="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>
 </resources>
diff --git a/auth/src/main/res/values-no/strings.xml b/auth/src/main/res/values-no/strings.xml
index 82ce81bcd..abda7a311 100755
--- a/auth/src/main/res/values-no/strings.xml
+++ b/auth/src/main/res/values-no/strings.xml
@@ -37,16 +37,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Personvernregler</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Du har allerede en konto</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Velkommen tilbake!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Du har allerede brukt %1$s.
-        Logg på med %2$s for å fortsette.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Du har allerede brukt %1$s
-        for å logge på. Angi passordet ditt for denne kontoen.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Du har allerede brukt %1$s. Logg på med %2$s for å fortsette.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Du har allerede brukt %1$s for å logge på. Angi passordet ditt for denne kontoen.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Logger på …</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Har du problemer med å logge på?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Gjenopprett passordet</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Sjekk e-posten din</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Få instruksjoner sendt til denne e-postadressen for hvordan du
-        tilbakestiller passordet ditt.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Få instruksjoner sendt til denne e-postadressen for hvordan du tilbakestiller passordet ditt.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Send</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Følg veiledningen som er sendt til %1$s, for å gjenopprette passordet ditt.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Sender …</string>
diff --git a/auth/src/main/res/values-pl/strings.xml b/auth/src/main/res/values-pl/strings.xml
index 24b5d92b4..d6d875074 100755
--- a/auth/src/main/res/values-pl/strings.xml
+++ b/auth/src/main/res/values-pl/strings.xml
@@ -19,11 +19,11 @@
     <string name="required_field" translation_description="Inline error for required field">Nie możesz zostawić tego pola pustego.</string>
     <string name="invalid_email_address" translation_description="Inline error for invalid email address">Nieprawidłowy adres e-mail</string>
     <string name="missing_email_address" translation_description="Inline error for empty email address in input field">Aby kontynuować, wpisz adres e-mail</string>
-    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Szukam istniejących kont...</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Szukam istniejących kont…</string>
     <string name="title_register_email" translation_description="Title for signup form">Rejestracja</string>
     <string name="name_hint" translation_description="Hint for last name input field">Imię i nazwisko</string>
     <string name="button_text_save" translation_description="Button text to save input form">Zapisz</string>
-    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Rejestruję...</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Rejestruję…</string>
     <plurals name="error_weak_password" translation_description="Inline error for weak password">
         <item quantity="one">Hasło jest za słabe. Powinno mieć przynajmniej %1$d znak i być kombinacją liter i cyfr.</item>
         <item quantity="few">Hasło jest za słabe. Powinno mieć przynajmniej %1$d znaki i być kombinacją liter i cyfr.</item>
diff --git a/auth/src/main/res/values-pt-rBR/strings.xml b/auth/src/main/res/values-pt-rBR/strings.xml
index f941886be..0874ed00e 100755
--- a/auth/src/main/res/values-pt-rBR/strings.xml
+++ b/auth/src/main/res/values-pt-rBR/strings.xml
@@ -23,23 +23,23 @@
     <string name="title_register_email" translation_description="Title for signup form">Inscrever-se</string>
     <string name="name_hint" translation_description="Hint for last name input field">Nome e sobrenome</string>
     <string name="button_text_save" translation_description="Button text to save input form">Salvar</string>
-    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Concluindo sua inscrição...</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Concluindo sua inscrição…</string>
     <plurals name="error_weak_password" translation_description="Inline error for weak password">
         <item quantity="one">A senha não é forte o suficiente. Use pelo menos %1$d caractere e combine letras e números.</item>
         <item quantity="other">A senha não é forte o suficiente. Use pelo menos %1$d caracteres e combine letras e números.</item>
     </plurals>
     <string name="email_account_creation_error" translation_description="Inline error for signup failure">Falha no registro da conta do e-mail</string>
     <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Já existe uma conta com esse endereço de e-mail.</string>
-    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Ao tocar em \"%1$s\", você indica que está de acordo com os %2$s e a %3$s.</string>
-    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Ao tocar em \"%1$s\", você indica que está de acordo com os %2$s.</string>
-    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Ao tocar em \"%1$s\", você indica que está de acordo com a %2$s.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Ao tocar em “%1$s”, você indica que está de acordo com os %2$s e a %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Ao tocar em “%1$s”, você indica que está de acordo com os %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Ao tocar em “%1$s”, você indica que está de acordo com a %2$s.</string>
     <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Termos de Serviço</string>
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidade</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Você já tem uma conta</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">É bom ver você novamente!</string>
     <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Você já usou o e-mail %1$s. Faça login com o %2$s para continuar.</string>
     <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Você já usou o e-mail %1$s para fazer login. Insira a senha dessa conta.</string>
-    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Fazendo login...</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Fazendo login…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Problemas com login?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar a senha</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Verifique seu e-mail</string>
@@ -55,7 +55,7 @@
     <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Insira o código de 6 dígitos enviado para</string>
     <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Reenviar código em 0:%02d</string>
     <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Confirmar seu número de telefone</string>
-    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando...</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
     <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
     <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorreto. Tente novamente.</string>
     <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Ok</string>
@@ -70,5 +70,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Confirmar número de telefone</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
-    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Você poderá receber um SMS ao tocar em \"%1$s\". Tarifas de mensagens e dados podem ser cobradas.</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Você poderá receber um SMS ao tocar em “%1$s”. Tarifas de mensagens e dados podem ser cobradas.</string>
 </resources>
diff --git a/auth/src/main/res/values-pt-rPT/strings.xml b/auth/src/main/res/values-pt-rPT/strings.xml
index 06cef3d5a..1f8147868 100755
--- a/auth/src/main/res/values-pt-rPT/strings.xml
+++ b/auth/src/main/res/values-pt-rPT/strings.xml
@@ -23,7 +23,7 @@
     <string name="title_register_email" translation_description="Title for signup form">Inscrever-se</string>
     <string name="name_hint" translation_description="Hint for last name input field">Nome próprio e apelido</string>
     <string name="button_text_save" translation_description="Button text to save input form">Guardar</string>
-    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">A realizar a inscrição...</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">A realizar a inscrição…</string>
     <plurals name="error_weak_password" translation_description="Inline error for weak password">
         <item quantity="one">A palavra-passe não é suficientemente forte. Utilize, pelo menos, %1$d caracteres e uma combinação de letras e números</item>
         <item quantity="other">A palavra-passe não é suficientemente forte. Utilize, pelo menos, %1$d caracteres e uma combinação de letras e números</item>
@@ -55,7 +55,7 @@
     <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Introduza o código de 6 dígitos que enviámos para</string>
     <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Reenviar código em 0:%02d</string>
     <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Validar o número de telefone</string>
-    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">A verificar...</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">A verificar…</string>
     <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">A obter SMS…</string>
     <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código errado. Tente novamente.</string>
     <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
@@ -70,5 +70,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Validar número de telefone</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
-    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Ao tocar em \"%1$s\", pode gerar o envio de uma SMS. Podem aplicar-se tarifas de mensagens e dados.</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Ao tocar em “%1$s”, pode gerar o envio de uma SMS. Podem aplicar-se tarifas de mensagens e dados.</string>
 </resources>
diff --git a/auth/src/main/res/values-pt/strings.xml b/auth/src/main/res/values-pt/strings.xml
index f941886be..0874ed00e 100755
--- a/auth/src/main/res/values-pt/strings.xml
+++ b/auth/src/main/res/values-pt/strings.xml
@@ -23,23 +23,23 @@
     <string name="title_register_email" translation_description="Title for signup form">Inscrever-se</string>
     <string name="name_hint" translation_description="Hint for last name input field">Nome e sobrenome</string>
     <string name="button_text_save" translation_description="Button text to save input form">Salvar</string>
-    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Concluindo sua inscrição...</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Concluindo sua inscrição…</string>
     <plurals name="error_weak_password" translation_description="Inline error for weak password">
         <item quantity="one">A senha não é forte o suficiente. Use pelo menos %1$d caractere e combine letras e números.</item>
         <item quantity="other">A senha não é forte o suficiente. Use pelo menos %1$d caracteres e combine letras e números.</item>
     </plurals>
     <string name="email_account_creation_error" translation_description="Inline error for signup failure">Falha no registro da conta do e-mail</string>
     <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Já existe uma conta com esse endereço de e-mail.</string>
-    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Ao tocar em \"%1$s\", você indica que está de acordo com os %2$s e a %3$s.</string>
-    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Ao tocar em \"%1$s\", você indica que está de acordo com os %2$s.</string>
-    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Ao tocar em \"%1$s\", você indica que está de acordo com a %2$s.</string>
+    <string name="create_account_preamble_tos_and_pp" translation_description="Text shown when creating an account with both terms of service and privacy policy.">Ao tocar em “%1$s”, você indica que está de acordo com os %2$s e a %3$s.</string>
+    <string name="create_account_preamble_tos_only" translation_description="Text shown when creating an account with only terms of service">Ao tocar em “%1$s”, você indica que está de acordo com os %2$s.</string>
+    <string name="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Ao tocar em “%1$s”, você indica que está de acordo com a %2$s.</string>
     <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Termos de Serviço</string>
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Política de privacidade</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Você já tem uma conta</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">É bom ver você novamente!</string>
     <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Você já usou o e-mail %1$s. Faça login com o %2$s para continuar.</string>
     <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Você já usou o e-mail %1$s para fazer login. Insira a senha dessa conta.</string>
-    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Fazendo login...</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Fazendo login…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Problemas com login?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperar a senha</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Verifique seu e-mail</string>
@@ -55,7 +55,7 @@
     <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Insira o código de 6 dígitos enviado para</string>
     <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Reenviar código em 0:%02d</string>
     <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Confirmar seu número de telefone</string>
-    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando...</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Verificando…</string>
     <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Recuperando SMS…</string>
     <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Código incorreto. Tente novamente.</string>
     <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Ok</string>
@@ -70,5 +70,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">Reenviar código</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Confirmar número de telefone</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continuar</string>
-    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Você poderá receber um SMS ao tocar em \"%1$s\". Tarifas de mensagens e dados podem ser cobradas.</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Você poderá receber um SMS ao tocar em “%1$s”. Tarifas de mensagens e dados podem ser cobradas.</string>
 </resources>
diff --git a/auth/src/main/res/values-ro/strings.xml b/auth/src/main/res/values-ro/strings.xml
index 83d44f16a..f1d846226 100755
--- a/auth/src/main/res/values-ro/strings.xml
+++ b/auth/src/main/res/values-ro/strings.xml
@@ -23,7 +23,7 @@
     <string name="title_register_email" translation_description="Title for signup form">Înscrieți-vă</string>
     <string name="name_hint" translation_description="Hint for last name input field">Prenume și nume de familie</string>
     <string name="button_text_save" translation_description="Button text to save input form">Salvați</string>
-    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Se creează un cont...</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Se creează un cont…</string>
     <plurals name="error_weak_password" translation_description="Inline error for weak password">
         <item quantity="one">Parola nu este suficient de puternică. Folosiți cel puțin %1$d caracter și o combinație de litere și cifre.</item>
         <item quantity="few">Parola nu este suficient de puternică. Folosiți cel puțin %1$d caractere și o combinație de litere și cifre.</item>
@@ -40,7 +40,7 @@
     <string name="welcome_back_email_header" translation_description="Message for returning users">Bine ați revenit!</string>
     <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ați folosit deja %1$s. Pentru a continua, conectați-vă cu %2$s.</string>
     <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ați folosit deja %1$s pentru a vă conecta. Introduceți parola acestui cont.</string>
-    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Se conectează...</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Se conectează…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Nu reușiți să vă conectați?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Recuperați parola</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Verificați căsuța de e-mail</string>
@@ -56,7 +56,7 @@
     <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Introduceți codul din 6 cifre pe care l-am trimis la</string>
     <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Retrimiteți codul în 00:%02d</string>
     <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Confirmați numărul de telefon</string>
-    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Se confirmă...</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Se confirmă…</string>
     <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Se obține SMS-ul…</string>
     <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Cod greșit. Încercați din nou.</string>
     <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
diff --git a/auth/src/main/res/values-ru/strings.xml b/auth/src/main/res/values-ru/strings.xml
index 443ab99c0..177168b06 100755
--- a/auth/src/main/res/values-ru/strings.xml
+++ b/auth/src/main/res/values-ru/strings.xml
@@ -32,9 +32,9 @@
     </plurals>
     <string name="email_account_creation_error" translation_description="Inline error for signup failure">Не удалось зарегистрировать аккаунт</string>
     <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Аккаунт с таким адресом электронной почты уже существует.</string>
-    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Нажимая кнопку \"%1$s\", вы принимаете %2$s.</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Нажимая кнопку “%1$s”, вы принимаете %2$s.</string>
     <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Условия использования</string>
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Политику конфиденциальности</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">У вас уже есть аккаунт</string>
@@ -48,7 +48,7 @@
     <string name="password_recovery_body" translation_description="Password recovery message body">На этот адрес будет отправлено письмо с инструкциями по сбросу пароля.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Отправить</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">На адрес %1$s отправлено письмо с инструкциями по сбросу пароля.</string>
-    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Отправка...</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Отправка…</string>
     <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Нет аккаунта с таким адресом электронной почты.</string>
     <string name="accessibility_logo" translation_description="Content description for app logo">Логотип приложения</string>
     <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Вы вошли как %1$s</string>
@@ -72,5 +72,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">Отправить код ещё раз</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Подтвердить номер телефона</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Продолжить</string>
-    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Нажимая кнопку \"%1$s\", вы соглашаетесь получить SMS. За его отправку и обмен данными может взиматься плата.</string>
+    <string name="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-sk/strings.xml b/auth/src/main/res/values-sk/strings.xml
index 79138bf3f..66e4649e1 100755
--- a/auth/src/main/res/values-sk/strings.xml
+++ b/auth/src/main/res/values-sk/strings.xml
@@ -23,7 +23,7 @@
     <string name="title_register_email" translation_description="Title for signup form">Registrovať sa</string>
     <string name="name_hint" translation_description="Hint for last name input field">Krstné meno a priezvisko</string>
     <string name="button_text_save" translation_description="Button text to save input form">Uložiť</string>
-    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Prebieha registrácia...</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Prebieha registrácia…</string>
     <plurals name="error_weak_password" translation_description="Inline error for weak password">
         <item quantity="one">Heslo nie je dostatočne silné. Použite aspoň %1$d znak a kombináciu písmen a čísel</item>
         <item quantity="few">Heslo nie je dostatočne silné. Použite aspoň %1$d znaky a kombináciu písmen a čísel</item>
@@ -39,16 +39,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Pravidlá ochrany súkromia</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Už máte účet</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Vitajte späť!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Už ste použili adresu %1$s.
-        Ak chcete pokračovať, prihláste sa pomocou účtu %2$s.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Na prihlásenie ste už použili adresu %1$s.
-        Zadajte svoje heslo pre daný účet.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Už ste použili adresu %1$s. Ak chcete pokračovať, prihláste sa pomocou účtu %2$s.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Na prihlásenie ste už použili adresu %1$s. Zadajte svoje heslo pre daný účet.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Prihlasovanie…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Máte problémy s prihlásením?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Obnovenie hesla</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Skontrolujte si e-mail</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Nechajte si na tento e-mail poslať pokyny s vysvetlením, ako
-        obnoviť svoje heslo.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Nechajte si na tento e-mail poslať pokyny s vysvetlením, ako obnoviť svoje heslo.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Odoslať</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Obnovte si heslo podľa pokynov odoslaných na adresu %1$s.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Odosiela sa…</string>
@@ -60,7 +57,7 @@
     <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Zadajte 6-ciferný kód, ktorý sme odoslali na adresu</string>
     <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Kód sa znova odošle o 0:%02d</string>
     <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Overiť telefónne číslo</string>
-    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Overuje sa...</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Overuje sa…</string>
     <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Načítava sa SMS…</string>
     <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Nesprávny kód. Skúste to znova.</string>
     <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">OK</string>
diff --git a/auth/src/main/res/values-sl/strings.xml b/auth/src/main/res/values-sl/strings.xml
index 648d3bfba..17d4249e2 100755
--- a/auth/src/main/res/values-sl/strings.xml
+++ b/auth/src/main/res/values-sl/strings.xml
@@ -1,5 +1,5 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Nalaganje ...</string>
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Nalaganje …</string>
     <string name="sign_in_default" translation_description="Button text to sign in">Prijava</string>
     <string name="general_error" translation_description="Toast text flashing general error">Prišlo je do napake.</string>
     <string name="idp_name_google">Google</string>
@@ -23,7 +23,7 @@
     <string name="title_register_email" translation_description="Title for signup form">Registrirajte se</string>
     <string name="name_hint" translation_description="Hint for last name input field">Ime in priimek</string>
     <string name="button_text_save" translation_description="Button text to save input form">Shrani</string>
-    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registriranje ...</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Registriranje …</string>
     <plurals name="error_weak_password" translation_description="Inline error for weak password">
         <item quantity="one">Geslo ni dovolj zapleteno. Uporabite vsaj %1$d znak in kombinacijo črk ter številk.</item>
         <item quantity="two">Geslo ni dovolj zapleteno. Uporabite vsaj %1$d znaka in kombinacijo črk ter številk.</item>
@@ -39,19 +39,16 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Pravilnik o zasebnosti</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Račun že imate</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Dobrodošli nazaj!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">E-poštni naslov %1$s ste že uporabili.
-        Če želite nadaljevati, se prijavite z računom za %2$s.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">E-poštni naslov %1$s ste že uporabili
-        za prijavo. Vnesite geslo za ta račun.</string>
-    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Prijavljanje ...</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">E-poštni naslov %1$s ste že uporabili. Če želite nadaljevati, se prijavite z računom za %2$s.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">E-poštni naslov %1$s ste že uporabili za prijavo. Vnesite geslo za ta račun.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Prijavljanje …</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Ali imate težave pri prijavi?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Obnovitev gesla</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Preverite e-pošto</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Na ta e-poštni naslov vam bomo poslali navodila za
-        ponastavitev gesla.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Na ta e-poštni naslov vam bomo poslali navodila za ponastavitev gesla.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Pošlji</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Če želite obnoviti geslo, upoštevajte navodila, poslana na naslov %1$s.</string>
-    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Pošiljanje ...</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Pošiljanje …</string>
     <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">E-poštni naslov se ne ujema z obstoječim računom</string>
     <string name="accessibility_logo" translation_description="Content description for app logo">Logotip aplikacije</string>
     <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Prijavljeni ste kot %1$s</string>
@@ -60,7 +57,7 @@
     <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Vnesite 6-mestno kodo, ki smo jo poslali na številko</string>
     <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">Ponovno pošlji kodo čez 0:%02d</string>
     <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Preverjanje telefonske številke</string>
-    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Preverjanje ...</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Preverjanje …</string>
     <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">Pridobivanje sporočila SMS …</string>
     <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Napačna koda. Poskusite znova.</string>
     <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">V redu</string>
diff --git a/auth/src/main/res/values-sr/strings.xml b/auth/src/main/res/values-sr/strings.xml
index 7fef2046a..93a1ccb74 100755
--- a/auth/src/main/res/values-sr/strings.xml
+++ b/auth/src/main/res/values-sr/strings.xml
@@ -38,10 +38,8 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Политику приватности</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Већ имате налог</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Добро дошли поново!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Већ сте користили адресу %1$s.
-        Пријавите се преко %2$s-а да бисте наставили.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Већ сте користили адресу %1$s
-        за пријављивање. Унесите лозинку за тај налог.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Већ сте користили адресу %1$s. Пријавите се преко %2$s-а да бисте наставили.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Већ сте користили адресу %1$s за пријављивање. Унесите лозинку за тај налог.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Пријављивање…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Имате проблема при пријављивању?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Повратите лозинку</string>
diff --git a/auth/src/main/res/values-sv/strings.xml b/auth/src/main/res/values-sv/strings.xml
index 843c956bb..dd39e888f 100755
--- a/auth/src/main/res/values-sv/strings.xml
+++ b/auth/src/main/res/values-sv/strings.xml
@@ -37,17 +37,16 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Sekretesspolicy</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Du har redan ett konto</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Välkommen tillbaka!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Du har redan använt %1$s.
-        Logga in med %2$s om du vill fortsätta.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Du har redan använt %1$s. Logga in med %2$s om du vill fortsätta.</string>
     <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Du har redan loggat in med %1$s. Ange lösenordet för det kontot.</string>
-    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Loggar in...</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Loggar in…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Har du problem med att logga in?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Återställa lösenord</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Kolla dina e-postmeddelanden</string>
     <string name="password_recovery_body" translation_description="Password recovery message body">Få ett e-postmeddelande med anvisningar för hur du återställer lösenordet.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Skicka</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Följ anvisningarna som har skickats till %1$s för att återställa ditt lösenord.</string>
-    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Skickar...</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Skickar…</string>
     <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">E-postadressen matchar inget befintligt konto</string>
     <string name="accessibility_logo" translation_description="Content description for app logo">Appens logotyp</string>
     <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Inloggad som %1$s</string>
diff --git a/auth/src/main/res/values-ta/strings.xml b/auth/src/main/res/values-ta/strings.xml
index 12d0498eb..1bdde9eba 100755
--- a/auth/src/main/res/values-ta/strings.xml
+++ b/auth/src/main/res/values-ta/strings.xml
@@ -37,16 +37,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">தனியுரிமைக் கொள்கை</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">ஏற்கனவே உங்களிடம் கணக்கு உள்ளது</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">மீண்டும் வரவேற்கிறோம்!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">ஏற்கனவே %1$sஐப் பயன்படுத்தியுள்ளீர்கள்.
-        தொடர, %2$s மூலம் உள்நுழையவும்.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">ஏற்கனவே %1$sஐப் பயன்படுத்தி
-        உள்நுழைந்திருக்கிறீர்கள். அந்தக் கணக்கிற்கான கடவுச்சொல்லை உள்ளிடவும்.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">ஏற்கனவே %1$sஐப் பயன்படுத்தியுள்ளீர்கள். தொடர, %2$s மூலம் உள்நுழையவும்.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">ஏற்கனவே %1$sஐப் பயன்படுத்தி உள்நுழைந்திருக்கிறீர்கள். அந்தக் கணக்கிற்கான கடவுச்சொல்லை உள்ளிடவும்.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">உள்நுழைகிறீர்கள்…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">உள்நுழைவதில் சிக்கலா?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">கடவுச்சொல்லை மீட்டெடு</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">உங்கள் மின்னஞ்சலைப் பார்க்கவும்</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">கடவுச்சொல்லை மீட்டமைப்பது தொடர்பான வழிமுறைகளை இந்த மின்னஞ்சலில்
-        பார்க்கவும்.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">கடவுச்சொல்லை மீட்டமைப்பது தொடர்பான வழிமுறைகளை இந்த மின்னஞ்சலில் பார்க்கவும்.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">அனுப்பு</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">கடவுச்சொல்லை மீட்டெடுக்க, %1$sக்கு அனுப்பிய வழிமுறைகளைப் பின்பற்றவும்.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">அனுப்புகிறது…</string>
diff --git a/auth/src/main/res/values-th/strings.xml b/auth/src/main/res/values-th/strings.xml
index 1e839ae6b..b8ce9df55 100755
--- a/auth/src/main/res/values-th/strings.xml
+++ b/auth/src/main/res/values-th/strings.xml
@@ -70,5 +70,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">ส่งรหัสอีกครั้ง</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">ยืนยันหมายเลขโทรศัพท์</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">ต่อไป</string>
-    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">เมื่อคุณแตะ \"%1$s\" ระบบจะส่ง SMS ให้คุณ อาจมีค่าบริการรับส่งข้อความและค่าบริการอินเทอร์เน็ต</string>
+    <string name="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-tl/strings.xml b/auth/src/main/res/values-tl/strings.xml
index 22b39cdfb..06b7e0692 100755
--- a/auth/src/main/res/values-tl/strings.xml
+++ b/auth/src/main/res/values-tl/strings.xml
@@ -23,7 +23,7 @@
     <string name="title_register_email" translation_description="Title for signup form">Mag-sign up</string>
     <string name="name_hint" translation_description="Hint for last name input field">Pangalan at apelyido</string>
     <string name="button_text_save" translation_description="Button text to save input form">I-save</string>
-    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Nagsa-sign up...</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Nagsa-sign up…</string>
     <plurals name="error_weak_password" translation_description="Inline error for weak password">
         <item quantity="one">Hindi masyadong malakas ang password. Gumamit ng %1$d character man lang at kumbinasyon ng mga titik at mga numero</item>
         <item quantity="other">Hindi masyadong malakas ang password. Gumamit ng %1$d na character man lang at kumbinasyon ng mga titik at mga numero</item>
@@ -37,19 +37,16 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Patakaran sa Privacy</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Mayroon ka nang account</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Maligayang pagbabalik!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Nagamit mo na ang %1$s.
-        Mag-sign in gamit ang %2$s upang magpatuloy.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Nagamit mo na ang %1$s
-        upang mag-sign in. Ilagay ang iyong password para sa account na iyon.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Nagamit mo na ang %1$s.        Mag-sign in gamit ang %2$s upang magpatuloy.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Nagamit mo na ang %1$s        upang mag-sign in. Ilagay ang iyong password para sa account na iyon.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Nagsa-sign in…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Nagkaproblema sa pag-sign in?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">I-recover ang password</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Suriin ang iyong email</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Kumuha ng mga tagubilin na ipadala sa email na ito na magpapaliwanag kung paano 
-        i-reset ang iyong password.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Kumuha ng mga tagubilin na ipadala sa email na ito na magpapaliwanag kung paano  i-reset ang iyong password.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Ipadala</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Sundin ang mga tagubilin na ipinadala sa %1$s upang ma-recover ang iyong password.</string>
-    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Ipinapadala...</string>
+    <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Ipinapadala…</string>
     <string name="error_email_does_not_exist" translation_description="Inline error when user attempt signin with invalid account">Hindi tumutugma ang email address na iyon sa isang kasalukuyang account</string>
     <string name="accessibility_logo" translation_description="Content description for app logo">Logo ng app</string>
     <string name="signed_in_with_specific_account" translation_description="Post signin message showing method of authentication">Naka-sign in bilang %1$s</string>
diff --git a/auth/src/main/res/values-tr/strings.xml b/auth/src/main/res/values-tr/strings.xml
index cd3d5177c..8a43bad90 100755
--- a/auth/src/main/res/values-tr/strings.xml
+++ b/auth/src/main/res/values-tr/strings.xml
@@ -19,11 +19,11 @@
     <string name="required_field" translation_description="Inline error for required field">Bunu boş bırakamazsınız.</string>
     <string name="invalid_email_address" translation_description="Inline error for invalid email address">E-posta adresi doğru değil</string>
     <string name="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="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Mevcut hesaplar kontrol ediliyor...</string>
+    <string name="progress_dialog_checking_accounts" translation_description="Progress dialog text while checking for existing accounts">Mevcut hesaplar kontrol ediliyor…</string>
     <string name="title_register_email" translation_description="Title for signup form">Kaydol</string>
     <string name="name_hint" translation_description="Hint for last name input field">Ad ve Soyadı</string>
     <string name="button_text_save" translation_description="Button text to save input form">Kaydet</string>
-    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Kaydolunuyor...</string>
+    <string name="progress_dialog_signing_up" translation_description="Dialog text while waiting for server's signup response">Kaydolunuyor…</string>
     <plurals name="error_weak_password" translation_description="Inline error for weak password">
         <item quantity="one">Şifre yeterince güçlü değil. En az %1$d karakter kullanın ve hem harf hem de rakam ekleyin</item>
         <item quantity="other">Şifre yeterince güçlü değil. En az %1$d karakter kullanın ve hem harf hem de rakam ekleyin</item>
@@ -39,7 +39,7 @@
     <string name="welcome_back_email_header" translation_description="Message for returning users">Tekrar hoş geldiniz!</string>
     <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">%1$s adresini zaten kullandınız. Devam etmek için %2$s ile oturum açın.</string>
     <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">%1$s adresini oturum açmak için zaten kullandınız. Bu hesap için şifrenizi girin.</string>
-    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Oturum açılıyor...</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Oturum açılıyor…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Oturum açılamıyor mu?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Şifreyi kurtarın</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">E-postanızı kontrol edin</string>
@@ -55,7 +55,7 @@
     <string name="enter_confirmation_code" translation_description="Phone number verification code entry form title">Şu telefon numarasına gönderdiğimiz 6 haneli kodu girin:</string>
     <string name="resend_code_in" translation_description="Countdown timer text that the user needs to wait for before attempting to resend verification sms">0:%02d içinde kodu yeniden gönder</string>
     <string name="verify_your_phone_title" translation_description="Button text to complete phone number verification">Telefon numaranızı doğrulayın</string>
-    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Doğrulanıyor...</string>
+    <string name="verifying" translation_description="Progress dialog text while phone number is being verified">Doğrulanıyor…</string>
     <string name="retrieving_sms" translation_description="Progress dialog text when sms is being retrieved before auto-submit">SMS alınıyor…</string>
     <string name="incorrect_code_dialog_body" translation_description="Inline error when incorrect sms verification code is being used to verify">Yanlış kod. Tekrar deneyin.</string>
     <string name="incorrect_code_dialog_positive_button_text" translation_description="Text to dismiss error alert dialog">Tamam</string>
@@ -70,5 +70,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">Kodu Yeniden Gönder</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Telefon Numarasını Doğrula</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Devam</string>
-    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">\"%1$s\" öğesine dokunarak SMS gönderilebilir. Mesaj ve veri ücretleri uygulanabilir.</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">“%1$s” öğesine dokunarak SMS gönderilebilir. Mesaj ve veri ücretleri uygulanabilir.</string>
 </resources>
diff --git a/auth/src/main/res/values-uk/strings.xml b/auth/src/main/res/values-uk/strings.xml
index 233f90e7f..27c4ca0ad 100755
--- a/auth/src/main/res/values-uk/strings.xml
+++ b/auth/src/main/res/values-uk/strings.xml
@@ -32,23 +32,20 @@
     </plurals>
     <string name="email_account_creation_error" translation_description="Inline error for signup failure">Не вдалося зареєструвати обліковий запис електронної пошти</string>
     <string name="error_user_collision" translation_description="Inline error when user signs up using an existing email account">Обліковий запис із такою електронною адресою вже існує.</string>
-    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Торкаючись кнопки \"%1$s\", ви приймаєте %2$s.</string>
+    <string name="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="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="create_account_preamble_pp_only" translation_description="Text shown when creating an account with only privacy policy">Торкаючись кнопки “%1$s”, ви приймаєте %2$s.</string>
     <string name="terms_of_service" translation_description="Link text to web url containing the app's terms of service">Умови використання</string>
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Політику конфіденційності</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">У вас уже є обліковий запис</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">З поверненням!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ви вже використовували електронну адресу %1$s.
-        Щоб продовжити, увійдіть в обліковий запис %2$s.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ви вже використовували електронну адресу %1$s
-        для входу. Введіть пароль для цього облікового запису.</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Ви вже використовували електронну адресу %1$s. Щоб продовжити, увійдіть в обліковий запис %2$s.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Ви вже використовували електронну адресу %1$s для входу. Введіть пароль для цього облікового запису.</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Виконується вхід…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Не вдається ввійти?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Відновити пароль</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Перевірте свою електронну пошту</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">На цю електронну адресу надійдуть інструкції,
-        як скинути пароль.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">На цю електронну адресу надійдуть інструкції, як скинути пароль.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Надіслати</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Виконайте інструкції з відновлення пароля, надіслані на адресу %1$s.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Надсилання…</string>
@@ -75,5 +72,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">Повторно надіслати код</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Підтвердити номер телефону</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Продовжити</string>
-    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Коли ви торкнетесь опції \"%1$s\", вам може надійти SMS-повідомлення. За SMS і використання трафіку може стягуватися плата.</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">Коли ви торкнетесь опції “%1$s”, вам може надійти SMS-повідомлення. За SMS і використання трафіку може стягуватися плата.</string>
 </resources>
diff --git a/auth/src/main/res/values-ur/strings.xml b/auth/src/main/res/values-ur/strings.xml
index 8dcd2cb0a..8f0de3275 100755
--- a/auth/src/main/res/values-ur/strings.xml
+++ b/auth/src/main/res/values-ur/strings.xml
@@ -37,16 +37,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">رازداری کی پالیسی</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">آپ کے پاس پہلے سے ہی ایک اکاؤنٹ موجود ہے</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">واپسی پر خوش آمدید!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">آپ نے پہلے ہی %1$s استعمال کر لیا ہے۔
-        جاری رکھنے کے لیے %2$s کے ساتھ سائن ان کریں۔</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">آپ نے پہلے ہی %1$s استعمال کر لیا ہے
-        سائن کرنے کے لیے۔ اس کاؤنٹ کے لیے اپنا پاس ورڈ درج کریں۔</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">آپ نے پہلے ہی %1$s استعمال کر لیا ہے۔ جاری رکھنے کے لیے %2$s کے ساتھ سائن ان کریں۔</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">آپ نے پہلے ہی %1$s استعمال کر لیا ہے سائن کرنے کے لیے۔ اس کاؤنٹ کے لیے اپنا پاس ورڈ درج کریں۔</string>
     <string name="progress_dialog_signing_in" translation_description="Progress dialog text">سائن ان ہو رہا ہے…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">سائن ان کرنے میں دشواری؟</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">پاس ورڈ بازیافت کریں</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">اپنا ای میل چیک کریں</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">اس ای میل پر بھیجی گئی وہ ہدایات حاصل کریں جن میں اس بات کی وضاحت ہے کہ کیسے
-        اپنا پاس ورڈ دوبارہ ترتیب دیں۔</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">اس ای میل پر بھیجی گئی وہ ہدایات حاصل کریں جن میں اس بات کی وضاحت ہے کہ کیسے اپنا پاس ورڈ دوبارہ ترتیب دیں۔</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">بھیجیں</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">اپنے پاس ورڈ کو بازیافت کرنے کے لیے %1$s پر بھیجی گئی ہدایات کی پیروی کریں۔</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">بھیجا جا رہا ہے…</string>
@@ -73,5 +70,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">کوڈ دوبارہ بھیجیں</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">فون نمبر کی توثیق کریں</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">جاری رکھیں</string>
-    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">\"%1$s\" کو تھپتھپانے پر ایک SMS بھیجا جا سکتا ہے۔ پیغام اور ڈیٹا نرخ لاگو ہو سکتے ہیں۔</string>
+    <string name="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-vi/strings.xml b/auth/src/main/res/values-vi/strings.xml
index 9e94263c8..bb18f6210 100755
--- a/auth/src/main/res/values-vi/strings.xml
+++ b/auth/src/main/res/values-vi/strings.xml
@@ -1,5 +1,5 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Đang tải...</string>
+    <string name="progress_dialog_loading" translation_description="Loading text in dialog">Đang tải…</string>
     <string name="sign_in_default" translation_description="Button text to sign in">Đăng nhập</string>
     <string name="general_error" translation_description="Toast text flashing general error">Đã xảy ra lỗi.</string>
     <string name="idp_name_google">Google</string>
@@ -37,16 +37,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">Chính sách bảo mật</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">Bạn đã có tài khoản</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">Chào mừng bạn quay trở lại!</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Bạn đã sử dụng %1$s.
-        Đăng nhập bằng %2$s để tiếp tục.</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Bạn đã sử dụng %1$s
-        để đăng nhập. Hãy nhập mật khẩu của bạn cho tài khoản đó.</string>
-    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Đang đăng nhập...</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">Bạn đã sử dụng %1$s. Đăng nhập bằng %2$s để tiếp tục.</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">Bạn đã sử dụng %1$s để đăng nhập. Hãy nhập mật khẩu của bạn cho tài khoản đó.</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">Đang đăng nhập…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">Bạn gặp sự cố khi đăng nhập?</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">Khôi phục mật khẩu</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">Kiểm tra email của bạn</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">Xem hướng dẫn gửi tới email này có giải thích cách
-        đặt lại mật khẩu của bạn.</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">Xem hướng dẫn gửi tới email này có giải thích cách đặt lại mật khẩu của bạn.</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">Gửi</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">Làm theo hướng dẫn gửi tới %1$s để khôi phục mật khẩu của bạn.</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">Đang gửi…</string>
diff --git a/auth/src/main/res/values-zh-rHK/strings.xml b/auth/src/main/res/values-zh-rHK/strings.xml
index b5d7aaa29..25f367188 100755
--- a/auth/src/main/res/values-zh-rHK/strings.xml
+++ b/auth/src/main/res/values-zh-rHK/strings.xml
@@ -37,16 +37,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">隱私權政策</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">您已經有帳戶</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">歡迎回來！</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">目前您用於登入的帳戶是 %1$s。
-        如要繼續，請使用 %2$s 帳戶登入。</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">您已使用 %1$s
-        登入。請輸入這個帳戶的密碼。</string>
-    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">登入中...</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">目前您用於登入的帳戶是 %1$s。 如要繼續，請使用 %2$s 帳戶登入。</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">您已使用 %1$s 登入。請輸入這個帳戶的密碼。</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">登入中…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">無法登入嗎？</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">重新取得密碼</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">請查看您的電子郵件信箱</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">這個電子郵件會收到重設密碼的
-        操作說明。</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">這個電子郵件會收到重設密碼的 操作說明。</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">傳送</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">請依照傳送至 %1$s 的操作說明，重新取得密碼。</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">傳送中…</string>
diff --git a/auth/src/main/res/values-zh-rTW/strings.xml b/auth/src/main/res/values-zh-rTW/strings.xml
index b5d7aaa29..25f367188 100755
--- a/auth/src/main/res/values-zh-rTW/strings.xml
+++ b/auth/src/main/res/values-zh-rTW/strings.xml
@@ -37,16 +37,13 @@
     <string name="privacy_policy" translation_description="Link text to web url containing the app's privacy policy">隱私權政策</string>
     <string name="welcome_back_idp_header" translation_description="Inline subtitle to users whose signup was interrupted since an existing account was detected">您已經有帳戶</string>
     <string name="welcome_back_email_header" translation_description="Message for returning users">歡迎回來！</string>
-    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">目前您用於登入的帳戶是 %1$s。
-        如要繼續，請使用 %2$s 帳戶登入。</string>
-    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">您已使用 %1$s
-        登入。請輸入這個帳戶的密碼。</string>
-    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">登入中...</string>
+    <string name="welcome_back_idp_prompt" translation_description="Message to users that need to signin using existing IDP accounts">目前您用於登入的帳戶是 %1$s。 如要繼續，請使用 %2$s 帳戶登入。</string>
+    <string name="welcome_back_password_prompt_body" translation_description="Message to users that need to signin using existing email accounts">您已使用 %1$s 登入。請輸入這個帳戶的密碼。</string>
+    <string name="progress_dialog_signing_in" translation_description="Progress dialog text">登入中…</string>
     <string name="trouble_signing_in" translation_description="Link leading to forgot password flow">無法登入嗎？</string>
     <string name="title_recover_password_activity" translation_description="Recover password screen title">重新取得密碼</string>
     <string name="title_confirm_recover_password" translation_description="Password recovery confirmation message">請查看您的電子郵件信箱</string>
-    <string name="password_recovery_body" translation_description="Password recovery message body">這個電子郵件會收到重設密碼的
-        操作說明。</string>
+    <string name="password_recovery_body" translation_description="Password recovery message body">這個電子郵件會收到重設密碼的 操作說明。</string>
     <string name="button_text_send" translation_description="Button text to send recovery email">傳送</string>
     <string name="confirm_recovery_body" translation_description="Alert dialog displayed after password recovery email is sent">請依照傳送至 %1$s 的操作說明，重新取得密碼。</string>
     <string name="progress_dialog_sending" translation_description="Progress dialog while password recovery email is being sent">傳送中…</string>
diff --git a/auth/src/main/res/values/strings.xml b/auth/src/main/res/values/strings.xml
index 02a4c9e2a..8cca945ac 100644
--- a/auth/src/main/res/values/strings.xml
+++ b/auth/src/main/res/values/strings.xml
@@ -99,5 +99,5 @@
     <string name="resend_code" translation_description="Link text to resend verification sms">Resend Code</string>
     <string name="verify_phone_number" translation_description="Button text to submit confirmation code and complete phone verification">Verify Phone Number</string>
     <string name="continue_phone_login" translation_description="Button text to submit phone number and send sms">Continue</string>
-    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">By tapping &#8220;%1$s&#8220;, an SMS may be sent. Message &amp; data rates may apply.</string>
+    <string name="sms_terms_of_service" translation_description="Fine print warning displayed below Verify Phone Number button">By tapping “%1$s”, an SMS may be sent. Message &amp; data rates may apply.</string>
 </resources>
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index a9983db53..69c101251 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -2,7 +2,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.firebase.ui">
 
-    <application android:supportsRtl="true"/>
     <uses-permission android:name="android.permission.INTERNET" />
 
+    <application android:supportsRtl="true" />
+
 </manifest>
diff --git a/scripts/translations/base_string_script.py b/scripts/translations/base_string_script.py
index 867e8360a..99c7190d5 100644
--- a/scripts/translations/base_string_script.py
+++ b/scripts/translations/base_string_script.py
@@ -10,8 +10,8 @@
 
 class BaseStringScript:
 
-  def ProcessTag(self, lines):
-    return lines
+  def ProcessTag(self, line):
+    return line
 
   def ProcessFile(self, file_name):
     lines = []
@@ -41,4 +41,3 @@ def ProcessFile(self, file_name):
 
     with open(file_name, 'w') as myfile:
       myfile.write('\n'.join(lines))
-
diff --git a/scripts/translations/clean_up_translations.sh b/scripts/translations/clean_up_translations.sh
index 9fd340b1c..b4a15ecc9 100755
--- a/scripts/translations/clean_up_translations.sh
+++ b/scripts/translations/clean_up_translations.sh
@@ -26,4 +26,5 @@ do
 
     # Remove non-translatable strings
     python $DIR/remove_non_translatable.py $file
+    python $DIR/fix_typography.py $file
 done
diff --git a/scripts/translations/fix_typography.py b/scripts/translations/fix_typography.py
new file mode 100644
index 000000000..0453c91f8
--- /dev/null
+++ b/scripts/translations/fix_typography.py
@@ -0,0 +1,39 @@
+# coding=UTF-8
+
+import sys
+
+from base_string_script import BaseStringScript
+
+BAD_ELLIPSIS = "..."
+GOOD_ELLIPSIS = "…"
+
+BAD_DOUBLE_QUOTE = "\\\"%1$s\\\""
+GOOD_DOUBLE_QUOTE = "“%1$s”"
+
+
+class FixTypographyScript(BaseStringScript):
+    def ProcessTag(self, oldLine):
+        lineString = ''.join(oldLine) \
+            .replace(BAD_ELLIPSIS, GOOD_ELLIPSIS) \
+            .replace(BAD_DOUBLE_QUOTE, GOOD_DOUBLE_QUOTE)
+        newLine = lineString.split("(?!^)")
+
+        minimizedWhitespaceLine = []
+        for idx, char in enumerate(''.join(newLine)):
+            if len(minimizedWhitespaceLine) < 1:
+                minimizedWhitespaceLine.append(char)
+                continue
+
+            # Skip the char if we're adding whitespace in the middle of a string tag
+            if minimizedWhitespaceLine[-1] == " " and char == " " and "<" in minimizedWhitespaceLine:
+                pass
+            else:
+                minimizedWhitespaceLine.append(char)
+
+        return ''.join(minimizedWhitespaceLine).split("(?!^)")
+
+
+# Process all files
+for file_name in sys.argv[1:]:
+    rnts = FixTypographyScript()
+    rnts.ProcessFile(file_name)
diff --git a/scripts/translations/remove_non_translatable.py b/scripts/translations/remove_non_translatable.py
index bcfb05c5a..b3b8519ce 100644
--- a/scripts/translations/remove_non_translatable.py
+++ b/scripts/translations/remove_non_translatable.py
@@ -10,13 +10,13 @@
 
 class RemoveNonTranslatableScript(BaseStringScript):
 
-  def ProcessTag(self, lines):
-    if NON_TRANSLATABLE in '\n'.join(lines):
+  def ProcessTag(self, line):
+    if NON_TRANSLATABLE in '\n'.join(line):
       return []
     else:
-      return lines
+      return line
 
 # Process all files
 for file_name in sys.argv[1:]:
   rnts = RemoveNonTranslatableScript()
-  rnts.ProcessFile(file_name)
\ No newline at end of file
+  rnts.ProcessFile(file_name)
diff --git a/scripts/translations/remove_string.py b/scripts/translations/remove_string.py
index b411a75b6..505c41cac 100644
--- a/scripts/translations/remove_string.py
+++ b/scripts/translations/remove_string.py
@@ -22,14 +22,13 @@
 # Remove any tags with the wrong name
 class RemoveStringScript(BaseStringScript):
 
-  def ProcessTag(self, lines):
-    if QUERY in '\n'.join(lines):
+  def ProcessTag(self, line):
+    if QUERY in '\n'.join(line):
       return []
     else:
-      return lines
+      return line
 
 # Process all files
 for file_name in FILES:
   rss = RemoveStringScript()
   rss.ProcessFile(file_name)
-

From 48f017a85d2a965eebfaa17d5ec3b01a8613452a Mon Sep 17 00:00:00 2001
From: Sam Stern <samstern@google.com>
Date: Mon, 17 Jul 2017 17:06:01 -0400
Subject: [PATCH 14/14] Version 2.1.0 (#804)

Change-Id: Ie26d2cc58ec698471f589f6ac044ee4241c3539d
---
 README.md        | 11 ++++++-----
 auth/README.md   | 22 +++++++++++++++++++++-
 constants.gradle |  4 ++--
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 98a233ff5..bfdc65dc8 100644
--- a/README.md
+++ b/README.md
@@ -39,16 +39,16 @@ libraries.
 ```groovy
 dependencies {
     // FirebaseUI Database only
-    compile 'com.firebaseui:firebase-ui-database:2.0.1'
+    compile 'com.firebaseui:firebase-ui-database:2.1.0'
 
     // FirebaseUI Auth only
-    compile 'com.firebaseui:firebase-ui-auth:2.0.1'
+    compile 'com.firebaseui:firebase-ui-auth:2.1.0'
 
     // FirebaseUI Storage only
-    compile 'com.firebaseui:firebase-ui-storage:2.0.1'
+    compile 'com.firebaseui:firebase-ui-storage:2.1.0'
 
     // Single target that includes all FirebaseUI libraries above
-    compile 'com.firebaseui:firebase-ui:2.0.1'
+    compile 'com.firebaseui:firebase-ui:2.1.0'
 }
 ```
 
@@ -63,7 +63,7 @@ After the project is synchronized, we're ready to start using Firebase functiona
 If you are using an old version of FirebaseUI and upgrading, please see the appropriate
 migration guide:
 
-  * [Upgrade from 1.2.0 to 2.0.x](./docs/upgrade-to-2.0.md)
+  * [Upgrade from 1.2.0 to 2.x.x](./docs/upgrade-to-2.0.md)
 
 ## Dependencies
 
@@ -91,6 +91,7 @@ For convenience, here are some recent examples:
 
 | FirebaseUI Version | Firebase/Play Services Version |
 |--------------------|--------------------------------|
+| 2.1.0              | 11.0.2                         |
 | 2.0.1              | 11.0.1                         |
 | 1.2.0              | 10.2.0                         |
 | 1.1.1              | 10.0.0 or 10.0.1               |
diff --git a/auth/README.md b/auth/README.md
index cd05331eb..f9843296f 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:2.0.1'
+    compile 'com.firebaseui:firebase-ui-auth:2.1.0'
     
     // Required only if Facebook login support is required
     compile('com.facebook.android:facebook-android-sdk:4.22.1')
@@ -56,6 +56,26 @@ dependencies {
 }
 ```
 
+As of version `2.1.0` FirebaseUI includes translations for all string resources. In order to
+ensure that you only get the translations relevant to your application, we recommend changing the
+`resConfigs` of your application module:
+
+```groovy
+android {
+  
+  // ...
+  
+  defaultConfig {
+     // ...
+     resConfigs "auto"
+  }
+  
+}
+```
+
+See the [Android documentation](https://developer.android.com/studio/build/shrink-code.html#unused-alt-resources)
+for more information.
+
 ### Identity provider configuration
 
 In order to use either Google, Facebook or Twitter accounts with your app, ensure that
diff --git a/constants.gradle b/constants.gradle
index 7e9a3781c..9fcbaeaad 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -1,7 +1,7 @@
 project.ext {
     submodules = ['database', 'auth', 'storage']
     group = 'com.firebaseui'
-    version = '2.0.1'
+    version = '2.1.0'
     pomdesc = 'Firebase UI Android'
 
     compileSdk = 25
@@ -10,6 +10,6 @@ project.ext {
 
     buildTools = '25.0.3' // Remember to also update in .travis.yml
 
-    firebaseVersion = '11.0.1'
+    firebaseVersion = '11.0.2'
     supportLibraryVersion = '25.4.0'
 }