diff --git a/Auth/FirebaseAuthUI/FUIAuth.m b/Auth/FirebaseAuthUI/FUIAuth.m
index 0c30de74593..f4203ffbbb1 100644
--- a/Auth/FirebaseAuthUI/FUIAuth.m
+++ b/Auth/FirebaseAuthUI/FUIAuth.m
@@ -124,14 +124,20 @@ - (BOOL)handleOpenURL:(NSURL *)URL
 }
 
 - (UINavigationController *)authViewController {
-  UIViewController *controller;
+  static UINavigationController *authViewController;
 
-  if ([self.delegate respondsToSelector:@selector(authPickerViewControllerForAuthUI:)]) {
-    controller = [self.delegate authPickerViewControllerForAuthUI:self];
-  } else {
-    controller = [[FUIAuthPickerViewController alloc] initWithAuthUI:self];
-  }
-  return [[UINavigationController alloc] initWithRootViewController:controller];
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    UIViewController *controller;
+    if ([self.delegate respondsToSelector:@selector(authPickerViewControllerForAuthUI:)]) {
+      controller = [self.delegate authPickerViewControllerForAuthUI:self];
+    } else {
+      controller = [[FUIAuthPickerViewController alloc] initWithAuthUI:self];
+    }
+    authViewController = [[UINavigationController alloc] initWithRootViewController:controller];
+  });
+
+  return authViewController;
 }
 
 - (BOOL)signOutWithError:(NSError *_Nullable *_Nullable)error {
diff --git a/Auth/FirebaseAuthUI/FUIAuthBaseViewController.m b/Auth/FirebaseAuthUI/FUIAuthBaseViewController.m
index 2981adf9eb6..b99d9658a4c 100644
--- a/Auth/FirebaseAuthUI/FUIAuthBaseViewController.m
+++ b/Auth/FirebaseAuthUI/FUIAuthBaseViewController.m
@@ -218,59 +218,76 @@ - (void)showAlertWithMessage:(NSString *)message {
   [[self class] showAlertWithMessage:message presentingViewController:self];
 }
 
++ (void)showAlertWithMessage:(NSString *)message {
+  [[self class] showAlertWithMessage:message presentingViewController:nil];
+}
+
 + (void)showAlertWithMessage:(NSString *)message
-    presentingViewController:(UIViewController *)presentingViewController {
-  [[self class] showAlertWithTitle:nil
-                           message:message
-                       actionTitle:FUILocalizedString(kStr_OK)
+    presentingViewController:(nullable UIViewController *)presentingViewController {
+  [[self class] showAlertWithTitle:message
+                           message:nil
           presentingViewController:presentingViewController];
 }
 
 + (void)showAlertWithTitle:(nullable NSString *)title
-                     message:(NSString *)message
-                 actionTitle:(NSString *)actionTitle
-    presentingViewController:(UIViewController *)presentingViewController {
-  UIAlertController *alertController =
-      [UIAlertController alertControllerWithTitle:title
-                                          message:message
-                                   preferredStyle:UIAlertControllerStyleAlert];
-  UIAlertAction *okAction =
-      [UIAlertAction actionWithTitle:actionTitle
-                               style:UIAlertActionStyleDefault
-                             handler:nil];
-  [alertController addAction:okAction];
-  [presentingViewController presentViewController:alertController animated:YES completion:nil];
+                   message:(nullable NSString *)message
+  presentingViewController:(nullable UIViewController *)presentingViewController {
+  [[self class] showAlertWithTitle:title
+                           message:message
+                       actionTitle:nil
+                     actionHandler:nil
+                      dismissTitle:FUILocalizedString(kStr_OK)
+                    dismissHandler:nil
+          presentingViewController:presentingViewController];
 }
 
 + (void)showAlertWithTitle:(nullable NSString *)title
-                   message:(NSString *)message
-               actionTitle:(NSString *)actionTitle
-  presentingViewController:(UIViewController *)presentingViewController
-             actionHandler:(FUIAuthAlertActionHandler)actionHandler
-             cancelHandler:(FUIAuthAlertActionHandler)cancelHandler {
+                   message:(nullable NSString *)message
+               actionTitle:(nullable NSString *)actionTitle
+             actionHandler:(nullable FUIAuthAlertActionHandler)actionHandler
+              dismissTitle:(nullable NSString *)dismissTitle
+            dismissHandler:(nullable FUIAuthAlertActionHandler)dismissHandler
+  presentingViewController:(nullable UIViewController *)presentingViewController {
   UIAlertController *alertController =
       [UIAlertController alertControllerWithTitle:title
                                           message:message
                                    preferredStyle:UIAlertControllerStyleAlert];
-  UIAlertAction *okAction =
-      [UIAlertAction actionWithTitle:actionTitle
-                               style:UIAlertActionStyleDefault
-                             handler:^(UIAlertAction *_Nonnull action) {
-        if (actionHandler) {
-          actionHandler();
-        }
-      }];
-  [alertController addAction:okAction];
-  UIAlertAction *cancelAction =
-      [UIAlertAction actionWithTitle:FUILocalizedString(kStr_Cancel)
-                               style:UIAlertActionStyleCancel
+
+  if (actionTitle) {
+    UIAlertAction *action =
+        [UIAlertAction actionWithTitle:actionTitle
+                                 style:UIAlertActionStyleDefault
+                               handler:^(UIAlertAction *_Nonnull action) {
+                                 if (actionHandler) {
+                                   actionHandler();
+                                 }
+                               }];
+    [alertController addAction:action];
+  }
+
+  if (dismissTitle) {
+    UIAlertAction *dismissAction =
+        [UIAlertAction actionWithTitle:dismissTitle
+                                 style:UIAlertActionStyleCancel
                                handler:^(UIAlertAction * _Nonnull action) {
-        if (cancelHandler) {
-          cancelHandler();
-        }
-      }];
-  [alertController addAction:cancelAction];
-  [presentingViewController presentViewController:alertController animated:YES completion:nil];
+                                 if (dismissHandler) {
+                                   dismissHandler();
+                                 }
+                               }];
+    [alertController addAction:dismissAction];
+  }
+
+  if (presentingViewController) {
+    [presentingViewController presentViewController:alertController animated:YES completion:nil];
+  } else {
+    UIViewController *viewController = [[UIViewController alloc] init];
+    viewController.view.backgroundColor = UIColor.clearColor;
+    UIWindow *window = [[UIWindow alloc] initWithFrame:UIScreen.mainScreen.bounds];
+    window.rootViewController = viewController;
+    window.windowLevel = UIWindowLevelAlert + 1;
+    [window makeKeyAndVisible];
+    [viewController presentViewController:alertController animated:YES completion:nil];
+  }
 }
 
 + (void)showSignInAlertWithEmail:(NSString *)email
diff --git a/Auth/FirebaseAuthUI/FUIAuthBaseViewController_Internal.h b/Auth/FirebaseAuthUI/FUIAuthBaseViewController_Internal.h
index 58eb776c480..fa5b505f34d 100644
--- a/Auth/FirebaseAuthUI/FUIAuthBaseViewController_Internal.h
+++ b/Auth/FirebaseAuthUI/FUIAuthBaseViewController_Internal.h
@@ -38,57 +38,51 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)showAlertWithMessage:(NSString *)message;
 
+/** @fn showAlertWithMessage:
+    @brief Displays an alert view with given title and message on top of the current view
+        controller.
+    @param message The message of the alert.
+ */
++ (void)showAlertWithMessage:(NSString *)message;
+
 /** @fn showAlertWithMessage:presentingViewController:
- @brief Displays an alert view with given title and message on top of the
- specified view controller.
- @param message The message of the alert.
- @param presentingViewController The controller which shows alert.
+    @brief Displays an alert view with given title and message on top of the current view
+        controller.
+    @param message The message of the alert.
+    @param presentingViewController The controller which shows alert.
  */
 + (void)showAlertWithMessage:(NSString *)message
-    presentingViewController:(UIViewController *)presentingViewController;
+    presentingViewController:(nullable UIViewController *)presentingViewController;
 
-/** @fn showAlertWithTitle:message:actionTitle:presentingViewController:
-    @brief Displays an alert view with given title, message and action title  on top of the
+/** @fn showAlertWithTitle:message:
+    @brief Displays an alert view with given title, message and action title on top of the
         specified view controller.
     @param title The title of the alert.
     @param message The message of the alert.
-    @param actionTitle The title of the action button.
     @param presentingViewController The controller which shows alert.
- */
+*/
 + (void)showAlertWithTitle:(nullable NSString *)title
-                     message:(NSString *)message
-                 actionTitle:(NSString *)actionTitle
-    presentingViewController:(UIViewController *)presentingViewController;
+                   message:(nullable NSString *)message
+  presentingViewController:(nullable UIViewController *)presentingViewController;
 
-/** @fn showAlertWithTitle:message:actionTitle:presentingViewController:
-    @brief Displays an alert view with given title, message and action title  on top of the
+/** @fn showAlertWithTitle:message:actionTitle:actionHandler:dismissTitle:dismissHandler:
+    @brief Displays an alert view with given title, message and action title on top of the
         specified view controller.
     @param title The title of the alert.
     @param message The message of the alert.
     @param actionTitle The title of the action button.
     @param actionHandler The block to execute if the action button is tapped.
-    @param cancelHandler The block to execute if the cancel button is tapped.
+    @param dismissTitle The title of the dismiss button.
+    @param dismissHandler The block to execute if the cancel button is tapped.
     @param presentingViewController The controller which shows alert.
- */
+*/
 + (void)showAlertWithTitle:(nullable NSString *)title
-                   message:(NSString *)message
-               actionTitle:(NSString *)actionTitle
-  presentingViewController:(UIViewController *)presentingViewController
-             actionHandler:(FUIAuthAlertActionHandler)actionHandler
-             cancelHandler:(FUIAuthAlertActionHandler)cancelHandler;
-
-/** @fn showSignInAlertWithEmail:provider:handler:
-    @brief Displays an alert to conform with user whether she wants to proceed with the provider.
-    @param email The email address to sign in with.
-    @param provider The identity provider to sign in with.
-    @param signinHandler Handler for the sign in action of the alert.
-    @param cancelHandler Handler for the cancel action of the alert.
- */
-+ (void)showSignInAlertWithEmail:(NSString *)email
-                        provider:(id<FUIAuthProvider>)provider
-        presentingViewController:(UIViewController *)presentingViewController
-                   signinHandler:(FUIAuthAlertActionHandler)signinHandler
-                   cancelHandler:(FUIAuthAlertActionHandler)cancelHandler;
+                   message:(nullable NSString *)message
+               actionTitle:(nullable NSString *)actionTitle
+             actionHandler:(nullable FUIAuthAlertActionHandler)actionHandler
+              dismissTitle:(nullable NSString *)dismissTitle
+            dismissHandler:(nullable FUIAuthAlertActionHandler)dismissHandler
+  presentingViewController:(nullable UIViewController *)presentingViewController;
 
 /** @fn showSignInAlertWithEmail:providerShortName:providerSignInLabel:handler:
     @brief Displays an alert to conform with user whether she wants to proceed with the provider.
diff --git a/Auth/FirebaseAuthUI/FUIAuthStrings.h b/Auth/FirebaseAuthUI/FUIAuthStrings.h
index 4f381cd5382..3ddd4790c50 100644
--- a/Auth/FirebaseAuthUI/FUIAuthStrings.h
+++ b/Auth/FirebaseAuthUI/FUIAuthStrings.h
@@ -34,8 +34,10 @@ extern NSString *const kStr_Cancel;
 extern NSString *const kStr_CannotAuthenticateError;
 extern NSString *const kStr_ChoosePassword;
 extern NSString *const kStr_Close;
+extern NSString *const kStr_ConfirmEmail;
 extern NSString *const kStr_Email;
 extern NSString *const kStr_EmailAlreadyInUseError;
+extern NSString *const kStr_EmailSentConfirmationMessage;
 extern NSString *const kStr_EnterYourEmail;
 extern NSString *const kStr_EnterYourPassword;
 extern NSString *const kStr_Error;
@@ -56,12 +58,17 @@ extern NSString *const kStr_PasswordVerificationMessage;
 extern NSString *const kStr_ProviderUsedPreviouslyMessage;
 extern NSString *const kStr_Save;
 extern NSString *const kStr_Send;
+extern NSString *const kStr_Resend;
+extern NSString *const kStr_SignedIn;
 extern NSString *const kStr_SignInTitle;
 extern NSString *const kStr_SignInTooManyTimesError;
 extern NSString *const kStr_SignInWithEmail;
+extern NSString *const kStr_SignInEmailSent;
 extern NSString *const kStr_SignUpTitle;
 extern NSString *const kStr_SignUpTooManyTimesError;
 extern NSString *const kStr_TermsOfService;
+extern NSString *const kStr_TroubleGettingEmailTitle;
+extern NSString *const kStr_TroubleGettingEmailMessage;
 extern NSString *const kStr_PrivacyPolicy;
 extern NSString *const kStr_TermsOfServiceMessage;
 extern NSString *const kStr_UserNotFoundError;
diff --git a/Auth/FirebaseAuthUI/FUIAuthStrings.m b/Auth/FirebaseAuthUI/FUIAuthStrings.m
index df66feaf6dd..88d550b28b8 100644
--- a/Auth/FirebaseAuthUI/FUIAuthStrings.m
+++ b/Auth/FirebaseAuthUI/FUIAuthStrings.m
@@ -40,8 +40,10 @@
 NSString *const kStr_CannotAuthenticateError = @"CannotAuthenticateError";
 NSString *const kStr_ChoosePassword = @"ChoosePassword";
 NSString *const kStr_Close = @"Close";
+NSString *const kStr_ConfirmEmail = @"ConfirmEmail";
 NSString *const kStr_Email = @"Email";
 NSString *const kStr_EmailAlreadyInUseError = @"EmailAlreadyInUseError";
+NSString *const kStr_EmailSentConfirmationMessage = @"EmailSentConfirmationMessage";
 NSString *const kStr_EnterYourEmail = @"EnterYourEmail";
 NSString *const kStr_EnterYourPassword = @"EnterYourPassword";
 NSString *const kStr_Error = @"Error";
@@ -62,12 +64,17 @@
 NSString *const kStr_ProviderUsedPreviouslyMessage = @"ProviderUsedPreviouslyMessage";
 NSString *const kStr_Save = @"Save";
 NSString *const kStr_Send = @"Send";
+NSString *const kStr_Resend = @"Resend";
+NSString *const kStr_SignedIn = @"SignedIn";
 NSString *const kStr_SignInTitle = @"SignInTitle";
 NSString *const kStr_SignInTooManyTimesError = @"SignInTooManyTimesError";
 NSString *const kStr_SignInWithEmail = @"SignInWithEmail";
+NSString *const kStr_SignInEmailSent = @"SignInEmailSent";
 NSString *const kStr_SignUpTitle = @"SignUpTitle";
 NSString *const kStr_SignUpTooManyTimesError = @"SignUpTooManyTimesError";
 NSString *const kStr_TermsOfService = @"TermsOfService";
+NSString *const kStr_TroubleGettingEmailTitle = @"TroubleGettingEmailTitle";
+NSString *const kStr_TroubleGettingEmailMessage = @"TroubleGettingEmailMessage";
 NSString *const kStr_PrivacyPolicy = @"PrivacyPolicy";
 NSString *const kStr_TermsOfServiceMessage = @"TermsOfServiceMessage";
 NSString *const kStr_UserNotFoundError = @"UserNotFoundError";
diff --git a/Auth/FirebaseAuthUI/Strings/ar.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/ar.lproj/FirebaseAuthUI.strings
index 4d618d9912a..86c2a466b22 100644
--- a/Auth/FirebaseAuthUI/Strings/ar.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/ar.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "حفظ";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "إرسال";
 
+/* Resend button title. */
+"Resend" = "إعادة إرسال الرسالة";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "البريد الإلكتروني";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "اختيار كلمة المرور";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "هل تواجه مشكلة في تسجيل الدخول؟";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "تأكيد عنوان البريد الإلكتروني";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "تمّ تسجيل الدخول.";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "هل تواجه مشكلة في استلام الرسائل الإلكترونية؟";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "يمكنك تجربة الحلول الشائعة التالية: \n - التأكّد ممّا إذا تمّ وضع علامة على الرسالة الإلكترونية بأنها \"غير مرغوب فيها\" أو نقلها تلقائيًا إلى مجلّد آخر\n - التحقّق من اتصال الإنترنت\n - التأكّد من كتابة عنوان البريد الإلكتروني بالشكل الصحيح\n - التأكّد من توفّر مساحة فارغة في البريد الوارد أو من عدم حدوث أي مشاكل أخرى في إعدادات البريد الوارد\n إذا لم تنجح الخطوات أعلاه، يمكنك إعادة إرسال الرسالة الإلكترونية. ستؤدي هذه الخطوة إلى إلغاء الرابط المضمّن في الرسالة السابقة.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "تمّ إرسال رسالة إلكترونية لتسجيل الدخول تتضمّن تعليمات إضافية إلى %@. يُرجى التحقق من بريدك الإلكتروني لإكمال عملية تسجيل الدخول.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "تمّ إرسال رسالة إلكترونية لتسجيل الدخول";
diff --git a/Auth/FirebaseAuthUI/Strings/bg.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/bg.lproj/FirebaseAuthUI.strings
index d075259576c..7ab6fe66789 100644
--- a/Auth/FirebaseAuthUI/Strings/bg.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/bg.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Запазване";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Изпращане";
 
+/* Resend button title. */
+"Resend" = "Повторно изпращане";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Имейл";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Изберете парола";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Имате проблем при влизането?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Потвърждаване на имейл адреса";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Влязохте в профила!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Имате проблеми с получаването на имейла?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Изпробвайте следните често използвани решения: \n – Проверете дали имейлът не е обозначен и филтриран като спам.\n – Проверете връзката си с интернет.\n – Проверете дали имейлът е изписан правилно.\n – Проверете дали в пощенската ви кутия има достатъчно пространство, или не е налице друг проблем с настройките й.\n Ако стъпките по-горе не разрешат проблема, можете отново да изпратите имейла. Имайте предвид, че това ще деактивира връзката в предходното съобщение.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Изпратихме имейл до %@ за вход в профила с допълнителни инструкции. Проверете входящата си поща, за да завършите процеса.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Изпратен е имейл за вход в профила";
diff --git a/Auth/FirebaseAuthUI/Strings/bn.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/bn.lproj/FirebaseAuthUI.strings
index e0352f4f48e..58426fe0413 100644
--- a/Auth/FirebaseAuthUI/Strings/bn.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/bn.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "সেভ করুন";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "পাঠান";
 
+/* Resend button title. */
+"Resend" = "আবার পাঠান";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "ইমেল";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "পাসওয়ার্ড বেছে নিন";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "সাইন-ইন করতে সমস্যা হচ্ছে?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "ইমেল আইডি কনফার্ম করুন";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "সাইন-ইন করা হয়েছে!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "ইমেল পেতে সমস্যা হচ্ছে?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "এই সাধারণ সমাধানগুলি ব্যবহার করে দেখুন: \n - ইমেলটি স্প্যাম অথবা ফিল্টার হিসেবে চিহ্নিত করা হয়েছে কিনা তা দেখুন।\n - ইন্টারনেট কানেকশন পরীক্ষা করে দেখুন।\n - ইমেলের সঠিক বানান লিখেছেন কিনা তা দেখুন।\n - আপনার ইনবক্সের স্পেস শেষ হয়ে গেছে কিনা বা ইনবক্সের সেটিংস সংক্রান্ত অন্যান্য সমস্যাগুলি একবার দেখে নিন।\n উপরের পদক্ষেপগুলি যদি কাজ না করে তাহলে আপনি ইমেলটি আবার পাঠাতে পারেন। মনে রাখবেন এটি করলে পুরনো ইমেলের লিঙ্কটি আর কাজ করবে না।";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "অতিরিক্ত নির্দেশাবলী সহ সাইন-ইন করার একটি ইমেল %@-এ পাঠানো হয়েছে। সাইন-ইন করার জন্য আপনার ইমেল দেখুন।";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "সাইন-ইন করার ইমেল পাঠানো হয়েছে";
diff --git a/Auth/FirebaseAuthUI/Strings/ca.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/ca.lproj/FirebaseAuthUI.strings
index 15e8a304fec..667de8a3649 100644
--- a/Auth/FirebaseAuthUI/Strings/ca.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/ca.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Desa";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Envia";
 
+/* Resend button title. */
+"Resend" = "Torna a enviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Adreça electrònica";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Tria una contrasenya";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "No pots iniciar la sessió?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirma l'adreça electrònica";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "S'ha iniciat la sessió";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Tens problemes per rebre correus electrònics?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prova aquestes solucions habituals: \n - Comprova si el correu electrònic s'ha marcat com a correu brossa o s'ha filtrat.\n - Comprova la connexió a Internet.\n - Comprova que hagis escrit correctament la teva adreça electrònica.\n - Comprova que tinguis espai a la safata d'entrada i altres problemes relacionats amb la configuració de la safata d'entrada.\n - Si els passos anteriors no t'han servit d'ajuda, pots tornar a enviar el correu electrònic. Tingues en compte que l'enllaç del correu anterior es desactivarà.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "S'ha enviat un correu electrònic d'inici de sessió amb més instruccions a %@. Comprova si l'has rebut per completar l'inici de sessió.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "S'ha enviat el correu electrònic d'inici de sessió";
diff --git a/Auth/FirebaseAuthUI/Strings/cs.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/cs.lproj/FirebaseAuthUI.strings
index 408838b253e..0b6964b5909 100644
--- a/Auth/FirebaseAuthUI/Strings/cs.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/cs.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Uložit";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Odeslat";
 
+/* Resend button title. */
+"Resend" = "Odeslat znovu";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "E-mail";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Zvolte heslo.";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Máte potíže s přihlášením?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Potvrzení·e-mailu";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Jste přihlášeni!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Nepřišly vám e-maily?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Vyzkoušejte tato běžná řešení: \n – Zkontrolujte, jestli e-mail nebyl označen jako spam nebo nebyl odstraněn jiným filtrem.\n – Zkontrolujte připojení k internetu.\n – Zkontrolujte, zda jste adresu e-mailu napsali správně.\n – Zkontrolujte, jestli nemáte plnou schránku příchozích správ nebo nedošlo k nějakému jiného problému se schránkou.\n Pokud žádné z uvedených řešení nepomohlo, můžete si e-mail nechat zaslat znovu. Odkaz v prvním e-mailu pak bude deaktivován.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Na adresu %@ byl odeslán přihlašovací e-mail s dalšími pokyny. Dokončete přihlášení podle instrukcí v e-mailu.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Přihlašovací e-mail odeslán";
diff --git a/Auth/FirebaseAuthUI/Strings/da.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/da.lproj/FirebaseAuthUI.strings
index 2854f4e949d..58bab951dfa 100644
--- a/Auth/FirebaseAuthUI/Strings/da.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/da.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Gem";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Send";
 
+/* Resend button title. */
+"Resend" = "Send igen";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Mail";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Vælg adgangskode";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Har du problemer med at logge ind?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Bekræft mailadresse";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Du er logget ind";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Har du problemer med at modtage mails?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prøv disse almindelige løsninger: \n - Tjek, om mailen er blevet markeret som spam eller filtreret fra.\n - Tjek din internetforbindelse.\n - Sørg for, at du ikke har stavet din mailadresse forkert.\n - Sørg for, at din indbakke ikke er løbet tør for plads, og at du ikke har andre problemer med indbakken.\n Hvis ovenstående vejledning ikke løste problemet, kan du sende mailen igen. Bemærk, at dette vil deaktivere linket i den gamle mail.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Der er blevet sendt en loginmail med yderligere vejledning til %@. Tjek din mail for at fuldføre loginprocessen.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Loginmailen blev sendt";
diff --git a/Auth/FirebaseAuthUI/Strings/de-AT.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/de-AT.lproj/FirebaseAuthUI.strings
index 4993f463afe..3ad463985c6 100644
--- a/Auth/FirebaseAuthUI/Strings/de-AT.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/de-AT.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Speichern";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Senden";
 
+/* Resend button title. */
+"Resend" = "Erneut senden";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "E-Mail-Adresse";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Passwort auswählen";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Probleme bei der Anmeldung?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "E-Mail-Adresse bestätigen";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Angemeldet.";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Probleme beim Empfangen von E-Mails?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Versuchen Sie Folgendes: \n – Überprüfen Sie, ob die E-Mail als Spam markiert oder herausgefiltert wurde.\n – Überprüfen Sie Ihre Internetverbindung.\n – Überprüfen Sie die Schreibweise Ihrer E-Mail-Adresse.\n – Überprüfen Sie den Speicherplatz und weitere Einstellungen Ihres Posteingangs, die Probleme bereiten könnten.\n Sollte das Problem nach Ausführung der obigen Schritte weiterhin bestehen, können Sie sich die Anmelde-E-Mail noch einmal zusenden lassen. Hinweis: Der Link in der vorhergehenden E-Mail ist dann nicht mehr gültig.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Wir haben eine Anmelde-E-Mail mit zusätzlichen Informationen an %@ gesendet. Bitte öffnen Sie die E-Mail, um die Anmeldung abzuschließen.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Anmelde-E-Mail gesendet";
diff --git a/Auth/FirebaseAuthUI/Strings/de-CH.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/de-CH.lproj/FirebaseAuthUI.strings
index 7d7a26d7283..f10c99900a6 100644
--- a/Auth/FirebaseAuthUI/Strings/de-CH.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/de-CH.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Speichern";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Senden";
 
+/* Resend button title. */
+"Resend" = "Erneut senden";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "E-Mail-Adresse";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Passwort auswählen";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Probleme bei der Anmeldung?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "E-Mail-Adresse bestätigen";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Angemeldet.";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Probleme beim Empfangen von E-Mails?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Versuchen Sie Folgendes: \n – Überprüfen Sie, ob die E-Mail als Spam markiert oder herausgefiltert wurde.\n – Überprüfen Sie Ihre Internetverbindung.\n – Überprüfen Sie die Schreibweise Ihrer E-Mail-Adresse.\n – Überprüfen Sie den Speicherplatz und weitere Einstellungen Ihres Posteingangs, die Probleme bereiten könnten.\n Sollte das Problem nach Ausführung der obigen Schritte weiterhin bestehen, können Sie sich die Anmelde-E-Mail noch einmal zusenden lassen. Hinweis: Der Link in der vorhergehenden E-Mail ist dann nicht mehr gültig.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Wir haben eine Anmelde-E-Mail mit zusätzlichen Informationen an %@ gesendet. Bitte öffnen Sie die E-Mail, um die Anmeldung abzuschliessen.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Anmelde-E-Mail gesendet";
diff --git a/Auth/FirebaseAuthUI/Strings/de.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/de.lproj/FirebaseAuthUI.strings
index 4993f463afe..3ad463985c6 100644
--- a/Auth/FirebaseAuthUI/Strings/de.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/de.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Speichern";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Senden";
 
+/* Resend button title. */
+"Resend" = "Erneut senden";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "E-Mail-Adresse";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Passwort auswählen";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Probleme bei der Anmeldung?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "E-Mail-Adresse bestätigen";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Angemeldet.";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Probleme beim Empfangen von E-Mails?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Versuchen Sie Folgendes: \n – Überprüfen Sie, ob die E-Mail als Spam markiert oder herausgefiltert wurde.\n – Überprüfen Sie Ihre Internetverbindung.\n – Überprüfen Sie die Schreibweise Ihrer E-Mail-Adresse.\n – Überprüfen Sie den Speicherplatz und weitere Einstellungen Ihres Posteingangs, die Probleme bereiten könnten.\n Sollte das Problem nach Ausführung der obigen Schritte weiterhin bestehen, können Sie sich die Anmelde-E-Mail noch einmal zusenden lassen. Hinweis: Der Link in der vorhergehenden E-Mail ist dann nicht mehr gültig.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Wir haben eine Anmelde-E-Mail mit zusätzlichen Informationen an %@ gesendet. Bitte öffnen Sie die E-Mail, um die Anmeldung abzuschließen.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Anmelde-E-Mail gesendet";
diff --git a/Auth/FirebaseAuthUI/Strings/el.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/el.lproj/FirebaseAuthUI.strings
index 1fbc777dc54..7cee33c237b 100644
--- a/Auth/FirebaseAuthUI/Strings/el.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/el.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Αποθήκευση";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Αποστολή";
 
+/* Resend button title. */
+"Resend" = "Επανάληψη αποστολής";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Ηλεκτρονικό ταχυδρομείο";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Επιλέξτε κωδικό πρόσβασης";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Πρόβλημα σύνδεσης;";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Επιβεβαίωση διεύθυνσης ηλεκτρονικού ταχυδρομείου";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Συνδέθηκε!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Αντιμετωπίζετε πρόβλημα με τη λήψη των μηνυμάτων ηλεκτρονικού ταχυδρομείου;";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Δοκιμάστε αυτές τις συνήθεις λύσεις: \n - Ελέγξτε αν το μήνυμα ηλεκτρονικού ταχυδρομείου επισημάνθηκε ως ανεπιθύμητο ή έχει φιλτραριστεί.\n - Ελέγξτε τη σύνδεσή σας στο διαδίκτυο.\n - Βεβαιωθείτε ότι δεν έχετε γράψει λάθος τη διεύθυνση ηλεκτρονικού ταχυδρομείου.\n - Βεβαιωθείτε ότι δεν έχει γεμίσει ο χώρος εισερχομένων ή ότι δεν υπάρχουν άλλα προβλήματα που σχετίζονται με τις ρυθμίσεις εισερχομένων.\n Αν τα παραπάνω βήματα δεν λειτούργησαν, μπορείτε να στείλετε ξανά το μήνυμα ηλεκτρονικού ταχυδρομείου. Έχετε υπόψη ότι με αυτήν την ενέργεια, ο σύνδεσμος στο παλιότερο μήνυμα ηλεκτρονικού ταχυδρομείου θα απενεργοποιηθεί.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Ένα μήνυμα ηλεκτρονικού ταχυδρομείου σύνδεσης με πρόσθετες οδηγίες στάλθηκε στη διεύθυνση %@. Ελέγξτε τη διεύθυνση ηλεκτρονικού ταχυδρομείου για να ολοκληρώσετε τη σύνδεση.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Το μήνυμα ηλεκτρονικού ταχυδρομείου σύνδεσης στάλθηκε";
diff --git a/Auth/FirebaseAuthUI/Strings/en-AU.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/en-AU.lproj/FirebaseAuthUI.strings
index d8ebd248d9e..d1c7a39cfe8 100644
--- a/Auth/FirebaseAuthUI/Strings/en-AU.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/en-AU.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Save";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Send";
 
+/* Resend button title. */
+"Resend" = "Resend";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Email";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Choose password";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Trouble signing in?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirm email";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Signed in!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Trouble getting emails?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Try these common fixes: \n – Check whether the email was marked as spam or filtered.\n – Check your internet connection.\n – Check that you did not misspell your email.\n – Check that your inbox space is not running out, or for other inbox settings-related issues.\n If the steps above didn't work, you can resend the email. Note that this will deactivate the link in the older email.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "A sign-in email with additional instructions was sent to %@. Check your email to complete sign-in.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Sign-in email sent";
diff --git a/Auth/FirebaseAuthUI/Strings/en-CA.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/en-CA.lproj/FirebaseAuthUI.strings
index d8ebd248d9e..d1c7a39cfe8 100644
--- a/Auth/FirebaseAuthUI/Strings/en-CA.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/en-CA.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Save";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Send";
 
+/* Resend button title. */
+"Resend" = "Resend";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Email";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Choose password";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Trouble signing in?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirm email";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Signed in!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Trouble getting emails?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Try these common fixes: \n – Check whether the email was marked as spam or filtered.\n – Check your internet connection.\n – Check that you did not misspell your email.\n – Check that your inbox space is not running out, or for other inbox settings-related issues.\n If the steps above didn't work, you can resend the email. Note that this will deactivate the link in the older email.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "A sign-in email with additional instructions was sent to %@. Check your email to complete sign-in.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Sign-in email sent";
diff --git a/Auth/FirebaseAuthUI/Strings/en-GB.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/en-GB.lproj/FirebaseAuthUI.strings
index d8ebd248d9e..d1c7a39cfe8 100644
--- a/Auth/FirebaseAuthUI/Strings/en-GB.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/en-GB.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Save";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Send";
 
+/* Resend button title. */
+"Resend" = "Resend";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Email";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Choose password";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Trouble signing in?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirm email";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Signed in!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Trouble getting emails?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Try these common fixes: \n – Check whether the email was marked as spam or filtered.\n – Check your internet connection.\n – Check that you did not misspell your email.\n – Check that your inbox space is not running out, or for other inbox settings-related issues.\n If the steps above didn't work, you can resend the email. Note that this will deactivate the link in the older email.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "A sign-in email with additional instructions was sent to %@. Check your email to complete sign-in.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Sign-in email sent";
diff --git a/Auth/FirebaseAuthUI/Strings/en-IE.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/en-IE.lproj/FirebaseAuthUI.strings
index d8ebd248d9e..d1c7a39cfe8 100644
--- a/Auth/FirebaseAuthUI/Strings/en-IE.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/en-IE.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Save";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Send";
 
+/* Resend button title. */
+"Resend" = "Resend";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Email";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Choose password";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Trouble signing in?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirm email";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Signed in!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Trouble getting emails?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Try these common fixes: \n – Check whether the email was marked as spam or filtered.\n – Check your internet connection.\n – Check that you did not misspell your email.\n – Check that your inbox space is not running out, or for other inbox settings-related issues.\n If the steps above didn't work, you can resend the email. Note that this will deactivate the link in the older email.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "A sign-in email with additional instructions was sent to %@. Check your email to complete sign-in.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Sign-in email sent";
diff --git a/Auth/FirebaseAuthUI/Strings/en-IN.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/en-IN.lproj/FirebaseAuthUI.strings
index d8ebd248d9e..d1c7a39cfe8 100644
--- a/Auth/FirebaseAuthUI/Strings/en-IN.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/en-IN.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Save";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Send";
 
+/* Resend button title. */
+"Resend" = "Resend";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Email";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Choose password";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Trouble signing in?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirm email";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Signed in!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Trouble getting emails?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Try these common fixes: \n – Check whether the email was marked as spam or filtered.\n – Check your internet connection.\n – Check that you did not misspell your email.\n – Check that your inbox space is not running out, or for other inbox settings-related issues.\n If the steps above didn't work, you can resend the email. Note that this will deactivate the link in the older email.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "A sign-in email with additional instructions was sent to %@. Check your email to complete sign-in.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Sign-in email sent";
diff --git a/Auth/FirebaseAuthUI/Strings/en-SG.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/en-SG.lproj/FirebaseAuthUI.strings
index d8ebd248d9e..d1c7a39cfe8 100644
--- a/Auth/FirebaseAuthUI/Strings/en-SG.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/en-SG.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Save";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Send";
 
+/* Resend button title. */
+"Resend" = "Resend";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Email";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Choose password";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Trouble signing in?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirm email";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Signed in!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Trouble getting emails?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Try these common fixes: \n – Check whether the email was marked as spam or filtered.\n – Check your internet connection.\n – Check that you did not misspell your email.\n – Check that your inbox space is not running out, or for other inbox settings-related issues.\n If the steps above didn't work, you can resend the email. Note that this will deactivate the link in the older email.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "A sign-in email with additional instructions was sent to %@. Check your email to complete sign-in.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Sign-in email sent";
diff --git a/Auth/FirebaseAuthUI/Strings/en-ZA.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/en-ZA.lproj/FirebaseAuthUI.strings
index d8ebd248d9e..d1c7a39cfe8 100644
--- a/Auth/FirebaseAuthUI/Strings/en-ZA.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/en-ZA.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Save";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Send";
 
+/* Resend button title. */
+"Resend" = "Resend";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Email";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Choose password";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Trouble signing in?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirm email";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Signed in!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Trouble getting emails?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Try these common fixes: \n – Check whether the email was marked as spam or filtered.\n – Check your internet connection.\n – Check that you did not misspell your email.\n – Check that your inbox space is not running out, or for other inbox settings-related issues.\n If the steps above didn't work, you can resend the email. Note that this will deactivate the link in the older email.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "A sign-in email with additional instructions was sent to %@. Check your email to complete sign-in.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Sign-in email sent";
diff --git a/Auth/FirebaseAuthUI/Strings/en.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/en.lproj/FirebaseAuthUI.strings
index 58d8082627b..c774559dd1d 100644
--- a/Auth/FirebaseAuthUI/Strings/en.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/en.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Save";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Send";
 
+/* Resend button title. */
+"Resend" = "Resend";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Email";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Choose password";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Trouble signing in?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirm Email";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Signed in!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Trouble getting emails?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Try these common fixes: \n - Check if the email was marked as spam or filtered.\n - Check your internet connection.\n - Check that you did not misspell your email.\n - Check that your inbox space is not running out or other inbox settings related issues.\n If the steps above didn't work, you can resend the email. Note that this will deactivate the link in the older email.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "A sign-in email with additional instrucitons was sent to %@. Check your email to complete sign-in.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Sign-in email Sent";
diff --git a/Auth/FirebaseAuthUI/Strings/es-419.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/es-419.lproj/FirebaseAuthUI.strings
index 818a871ba94..29b572876da 100644
--- a/Auth/FirebaseAuthUI/Strings/es-419.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/es-419.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Correo electrónico";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Elegir contraseña";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "¿Tienes problemas para acceder?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmar correo electrónico";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Accediste";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "¿Tienes problemas para recibir correos electrónicos?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prueba estas soluciones comunes: \n- Verifica si el correo electrónico se marcó como spam o se filtró.\n- Comprueba tu conexión a Internet.\n- Verifica que escribiste bien tu correo electrónico.\n- Verifica que tu bandeja de entrada no esté llena o revisa cualquier otro problema relacionado con la configuración de la bandeja de entrada.\nSi los pasos anteriores no funcionaron, reenvía el correo electrónico. Ten en cuenta que esta acción desactivará el vínculo en el correo electrónico anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Se envió un correo electrónico de acceso con instrucciones adicionales a %@. Revisa tu bandeja de entrada para completar el proceso.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Se envió el correo electrónico de acceso";
diff --git a/Auth/FirebaseAuthUI/Strings/es-AR.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/es-AR.lproj/FirebaseAuthUI.strings
index 818a871ba94..29b572876da 100644
--- a/Auth/FirebaseAuthUI/Strings/es-AR.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/es-AR.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Correo electrónico";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Elegir contraseña";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "¿Tienes problemas para acceder?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmar correo electrónico";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Accediste";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "¿Tienes problemas para recibir correos electrónicos?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prueba estas soluciones comunes: \n- Verifica si el correo electrónico se marcó como spam o se filtró.\n- Comprueba tu conexión a Internet.\n- Verifica que escribiste bien tu correo electrónico.\n- Verifica que tu bandeja de entrada no esté llena o revisa cualquier otro problema relacionado con la configuración de la bandeja de entrada.\nSi los pasos anteriores no funcionaron, reenvía el correo electrónico. Ten en cuenta que esta acción desactivará el vínculo en el correo electrónico anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Se envió un correo electrónico de acceso con instrucciones adicionales a %@. Revisa tu bandeja de entrada para completar el proceso.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Se envió el correo electrónico de acceso";
diff --git a/Auth/FirebaseAuthUI/Strings/es-BO.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/es-BO.lproj/FirebaseAuthUI.strings
index 818a871ba94..29b572876da 100644
--- a/Auth/FirebaseAuthUI/Strings/es-BO.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/es-BO.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Correo electrónico";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Elegir contraseña";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "¿Tienes problemas para acceder?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmar correo electrónico";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Accediste";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "¿Tienes problemas para recibir correos electrónicos?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prueba estas soluciones comunes: \n- Verifica si el correo electrónico se marcó como spam o se filtró.\n- Comprueba tu conexión a Internet.\n- Verifica que escribiste bien tu correo electrónico.\n- Verifica que tu bandeja de entrada no esté llena o revisa cualquier otro problema relacionado con la configuración de la bandeja de entrada.\nSi los pasos anteriores no funcionaron, reenvía el correo electrónico. Ten en cuenta que esta acción desactivará el vínculo en el correo electrónico anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Se envió un correo electrónico de acceso con instrucciones adicionales a %@. Revisa tu bandeja de entrada para completar el proceso.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Se envió el correo electrónico de acceso";
diff --git a/Auth/FirebaseAuthUI/Strings/es-CL.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/es-CL.lproj/FirebaseAuthUI.strings
index 818a871ba94..29b572876da 100644
--- a/Auth/FirebaseAuthUI/Strings/es-CL.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/es-CL.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Correo electrónico";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Elegir contraseña";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "¿Tienes problemas para acceder?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmar correo electrónico";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Accediste";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "¿Tienes problemas para recibir correos electrónicos?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prueba estas soluciones comunes: \n- Verifica si el correo electrónico se marcó como spam o se filtró.\n- Comprueba tu conexión a Internet.\n- Verifica que escribiste bien tu correo electrónico.\n- Verifica que tu bandeja de entrada no esté llena o revisa cualquier otro problema relacionado con la configuración de la bandeja de entrada.\nSi los pasos anteriores no funcionaron, reenvía el correo electrónico. Ten en cuenta que esta acción desactivará el vínculo en el correo electrónico anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Se envió un correo electrónico de acceso con instrucciones adicionales a %@. Revisa tu bandeja de entrada para completar el proceso.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Se envió el correo electrónico de acceso";
diff --git a/Auth/FirebaseAuthUI/Strings/es-CO.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/es-CO.lproj/FirebaseAuthUI.strings
index 818a871ba94..29b572876da 100644
--- a/Auth/FirebaseAuthUI/Strings/es-CO.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/es-CO.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Correo electrónico";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Elegir contraseña";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "¿Tienes problemas para acceder?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmar correo electrónico";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Accediste";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "¿Tienes problemas para recibir correos electrónicos?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prueba estas soluciones comunes: \n- Verifica si el correo electrónico se marcó como spam o se filtró.\n- Comprueba tu conexión a Internet.\n- Verifica que escribiste bien tu correo electrónico.\n- Verifica que tu bandeja de entrada no esté llena o revisa cualquier otro problema relacionado con la configuración de la bandeja de entrada.\nSi los pasos anteriores no funcionaron, reenvía el correo electrónico. Ten en cuenta que esta acción desactivará el vínculo en el correo electrónico anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Se envió un correo electrónico de acceso con instrucciones adicionales a %@. Revisa tu bandeja de entrada para completar el proceso.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Se envió el correo electrónico de acceso";
diff --git a/Auth/FirebaseAuthUI/Strings/es-CR.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/es-CR.lproj/FirebaseAuthUI.strings
index 818a871ba94..29b572876da 100644
--- a/Auth/FirebaseAuthUI/Strings/es-CR.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/es-CR.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Correo electrónico";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Elegir contraseña";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "¿Tienes problemas para acceder?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmar correo electrónico";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Accediste";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "¿Tienes problemas para recibir correos electrónicos?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prueba estas soluciones comunes: \n- Verifica si el correo electrónico se marcó como spam o se filtró.\n- Comprueba tu conexión a Internet.\n- Verifica que escribiste bien tu correo electrónico.\n- Verifica que tu bandeja de entrada no esté llena o revisa cualquier otro problema relacionado con la configuración de la bandeja de entrada.\nSi los pasos anteriores no funcionaron, reenvía el correo electrónico. Ten en cuenta que esta acción desactivará el vínculo en el correo electrónico anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Se envió un correo electrónico de acceso con instrucciones adicionales a %@. Revisa tu bandeja de entrada para completar el proceso.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Se envió el correo electrónico de acceso";
diff --git a/Auth/FirebaseAuthUI/Strings/es-DO.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/es-DO.lproj/FirebaseAuthUI.strings
index 818a871ba94..29b572876da 100644
--- a/Auth/FirebaseAuthUI/Strings/es-DO.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/es-DO.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Correo electrónico";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Elegir contraseña";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "¿Tienes problemas para acceder?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmar correo electrónico";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Accediste";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "¿Tienes problemas para recibir correos electrónicos?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prueba estas soluciones comunes: \n- Verifica si el correo electrónico se marcó como spam o se filtró.\n- Comprueba tu conexión a Internet.\n- Verifica que escribiste bien tu correo electrónico.\n- Verifica que tu bandeja de entrada no esté llena o revisa cualquier otro problema relacionado con la configuración de la bandeja de entrada.\nSi los pasos anteriores no funcionaron, reenvía el correo electrónico. Ten en cuenta que esta acción desactivará el vínculo en el correo electrónico anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Se envió un correo electrónico de acceso con instrucciones adicionales a %@. Revisa tu bandeja de entrada para completar el proceso.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Se envió el correo electrónico de acceso";
diff --git a/Auth/FirebaseAuthUI/Strings/es-EC.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/es-EC.lproj/FirebaseAuthUI.strings
index 818a871ba94..29b572876da 100644
--- a/Auth/FirebaseAuthUI/Strings/es-EC.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/es-EC.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Correo electrónico";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Elegir contraseña";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "¿Tienes problemas para acceder?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmar correo electrónico";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Accediste";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "¿Tienes problemas para recibir correos electrónicos?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prueba estas soluciones comunes: \n- Verifica si el correo electrónico se marcó como spam o se filtró.\n- Comprueba tu conexión a Internet.\n- Verifica que escribiste bien tu correo electrónico.\n- Verifica que tu bandeja de entrada no esté llena o revisa cualquier otro problema relacionado con la configuración de la bandeja de entrada.\nSi los pasos anteriores no funcionaron, reenvía el correo electrónico. Ten en cuenta que esta acción desactivará el vínculo en el correo electrónico anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Se envió un correo electrónico de acceso con instrucciones adicionales a %@. Revisa tu bandeja de entrada para completar el proceso.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Se envió el correo electrónico de acceso";
diff --git a/Auth/FirebaseAuthUI/Strings/es-GT.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/es-GT.lproj/FirebaseAuthUI.strings
index 818a871ba94..29b572876da 100644
--- a/Auth/FirebaseAuthUI/Strings/es-GT.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/es-GT.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Correo electrónico";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Elegir contraseña";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "¿Tienes problemas para acceder?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmar correo electrónico";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Accediste";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "¿Tienes problemas para recibir correos electrónicos?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prueba estas soluciones comunes: \n- Verifica si el correo electrónico se marcó como spam o se filtró.\n- Comprueba tu conexión a Internet.\n- Verifica que escribiste bien tu correo electrónico.\n- Verifica que tu bandeja de entrada no esté llena o revisa cualquier otro problema relacionado con la configuración de la bandeja de entrada.\nSi los pasos anteriores no funcionaron, reenvía el correo electrónico. Ten en cuenta que esta acción desactivará el vínculo en el correo electrónico anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Se envió un correo electrónico de acceso con instrucciones adicionales a %@. Revisa tu bandeja de entrada para completar el proceso.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Se envió el correo electrónico de acceso";
diff --git a/Auth/FirebaseAuthUI/Strings/es-HN.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/es-HN.lproj/FirebaseAuthUI.strings
index 818a871ba94..29b572876da 100644
--- a/Auth/FirebaseAuthUI/Strings/es-HN.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/es-HN.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Correo electrónico";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Elegir contraseña";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "¿Tienes problemas para acceder?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmar correo electrónico";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Accediste";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "¿Tienes problemas para recibir correos electrónicos?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prueba estas soluciones comunes: \n- Verifica si el correo electrónico se marcó como spam o se filtró.\n- Comprueba tu conexión a Internet.\n- Verifica que escribiste bien tu correo electrónico.\n- Verifica que tu bandeja de entrada no esté llena o revisa cualquier otro problema relacionado con la configuración de la bandeja de entrada.\nSi los pasos anteriores no funcionaron, reenvía el correo electrónico. Ten en cuenta que esta acción desactivará el vínculo en el correo electrónico anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Se envió un correo electrónico de acceso con instrucciones adicionales a %@. Revisa tu bandeja de entrada para completar el proceso.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Se envió el correo electrónico de acceso";
diff --git a/Auth/FirebaseAuthUI/Strings/es-MX.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/es-MX.lproj/FirebaseAuthUI.strings
index 818a871ba94..29b572876da 100644
--- a/Auth/FirebaseAuthUI/Strings/es-MX.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/es-MX.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Correo electrónico";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Elegir contraseña";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "¿Tienes problemas para acceder?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmar correo electrónico";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Accediste";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "¿Tienes problemas para recibir correos electrónicos?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prueba estas soluciones comunes: \n- Verifica si el correo electrónico se marcó como spam o se filtró.\n- Comprueba tu conexión a Internet.\n- Verifica que escribiste bien tu correo electrónico.\n- Verifica que tu bandeja de entrada no esté llena o revisa cualquier otro problema relacionado con la configuración de la bandeja de entrada.\nSi los pasos anteriores no funcionaron, reenvía el correo electrónico. Ten en cuenta que esta acción desactivará el vínculo en el correo electrónico anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Se envió un correo electrónico de acceso con instrucciones adicionales a %@. Revisa tu bandeja de entrada para completar el proceso.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Se envió el correo electrónico de acceso";
diff --git a/Auth/FirebaseAuthUI/Strings/es-NI.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/es-NI.lproj/FirebaseAuthUI.strings
index 818a871ba94..29b572876da 100644
--- a/Auth/FirebaseAuthUI/Strings/es-NI.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/es-NI.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Correo electrónico";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Elegir contraseña";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "¿Tienes problemas para acceder?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmar correo electrónico";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Accediste";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "¿Tienes problemas para recibir correos electrónicos?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prueba estas soluciones comunes: \n- Verifica si el correo electrónico se marcó como spam o se filtró.\n- Comprueba tu conexión a Internet.\n- Verifica que escribiste bien tu correo electrónico.\n- Verifica que tu bandeja de entrada no esté llena o revisa cualquier otro problema relacionado con la configuración de la bandeja de entrada.\nSi los pasos anteriores no funcionaron, reenvía el correo electrónico. Ten en cuenta que esta acción desactivará el vínculo en el correo electrónico anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Se envió un correo electrónico de acceso con instrucciones adicionales a %@. Revisa tu bandeja de entrada para completar el proceso.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Se envió el correo electrónico de acceso";
diff --git a/Auth/FirebaseAuthUI/Strings/es-PA.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/es-PA.lproj/FirebaseAuthUI.strings
index 818a871ba94..29b572876da 100644
--- a/Auth/FirebaseAuthUI/Strings/es-PA.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/es-PA.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Correo electrónico";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Elegir contraseña";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "¿Tienes problemas para acceder?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmar correo electrónico";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Accediste";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "¿Tienes problemas para recibir correos electrónicos?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prueba estas soluciones comunes: \n- Verifica si el correo electrónico se marcó como spam o se filtró.\n- Comprueba tu conexión a Internet.\n- Verifica que escribiste bien tu correo electrónico.\n- Verifica que tu bandeja de entrada no esté llena o revisa cualquier otro problema relacionado con la configuración de la bandeja de entrada.\nSi los pasos anteriores no funcionaron, reenvía el correo electrónico. Ten en cuenta que esta acción desactivará el vínculo en el correo electrónico anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Se envió un correo electrónico de acceso con instrucciones adicionales a %@. Revisa tu bandeja de entrada para completar el proceso.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Se envió el correo electrónico de acceso";
diff --git a/Auth/FirebaseAuthUI/Strings/es-PE.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/es-PE.lproj/FirebaseAuthUI.strings
index 818a871ba94..29b572876da 100644
--- a/Auth/FirebaseAuthUI/Strings/es-PE.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/es-PE.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Correo electrónico";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Elegir contraseña";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "¿Tienes problemas para acceder?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmar correo electrónico";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Accediste";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "¿Tienes problemas para recibir correos electrónicos?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prueba estas soluciones comunes: \n- Verifica si el correo electrónico se marcó como spam o se filtró.\n- Comprueba tu conexión a Internet.\n- Verifica que escribiste bien tu correo electrónico.\n- Verifica que tu bandeja de entrada no esté llena o revisa cualquier otro problema relacionado con la configuración de la bandeja de entrada.\nSi los pasos anteriores no funcionaron, reenvía el correo electrónico. Ten en cuenta que esta acción desactivará el vínculo en el correo electrónico anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Se envió un correo electrónico de acceso con instrucciones adicionales a %@. Revisa tu bandeja de entrada para completar el proceso.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Se envió el correo electrónico de acceso";
diff --git a/Auth/FirebaseAuthUI/Strings/es-PR.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/es-PR.lproj/FirebaseAuthUI.strings
index 818a871ba94..29b572876da 100644
--- a/Auth/FirebaseAuthUI/Strings/es-PR.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/es-PR.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Correo electrónico";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Elegir contraseña";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "¿Tienes problemas para acceder?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmar correo electrónico";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Accediste";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "¿Tienes problemas para recibir correos electrónicos?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prueba estas soluciones comunes: \n- Verifica si el correo electrónico se marcó como spam o se filtró.\n- Comprueba tu conexión a Internet.\n- Verifica que escribiste bien tu correo electrónico.\n- Verifica que tu bandeja de entrada no esté llena o revisa cualquier otro problema relacionado con la configuración de la bandeja de entrada.\nSi los pasos anteriores no funcionaron, reenvía el correo electrónico. Ten en cuenta que esta acción desactivará el vínculo en el correo electrónico anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Se envió un correo electrónico de acceso con instrucciones adicionales a %@. Revisa tu bandeja de entrada para completar el proceso.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Se envió el correo electrónico de acceso";
diff --git a/Auth/FirebaseAuthUI/Strings/es-PY.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/es-PY.lproj/FirebaseAuthUI.strings
index 818a871ba94..29b572876da 100644
--- a/Auth/FirebaseAuthUI/Strings/es-PY.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/es-PY.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Correo electrónico";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Elegir contraseña";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "¿Tienes problemas para acceder?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmar correo electrónico";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Accediste";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "¿Tienes problemas para recibir correos electrónicos?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prueba estas soluciones comunes: \n- Verifica si el correo electrónico se marcó como spam o se filtró.\n- Comprueba tu conexión a Internet.\n- Verifica que escribiste bien tu correo electrónico.\n- Verifica que tu bandeja de entrada no esté llena o revisa cualquier otro problema relacionado con la configuración de la bandeja de entrada.\nSi los pasos anteriores no funcionaron, reenvía el correo electrónico. Ten en cuenta que esta acción desactivará el vínculo en el correo electrónico anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Se envió un correo electrónico de acceso con instrucciones adicionales a %@. Revisa tu bandeja de entrada para completar el proceso.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Se envió el correo electrónico de acceso";
diff --git a/Auth/FirebaseAuthUI/Strings/es-SV.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/es-SV.lproj/FirebaseAuthUI.strings
index 818a871ba94..29b572876da 100644
--- a/Auth/FirebaseAuthUI/Strings/es-SV.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/es-SV.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Correo electrónico";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Elegir contraseña";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "¿Tienes problemas para acceder?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmar correo electrónico";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Accediste";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "¿Tienes problemas para recibir correos electrónicos?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prueba estas soluciones comunes: \n- Verifica si el correo electrónico se marcó como spam o se filtró.\n- Comprueba tu conexión a Internet.\n- Verifica que escribiste bien tu correo electrónico.\n- Verifica que tu bandeja de entrada no esté llena o revisa cualquier otro problema relacionado con la configuración de la bandeja de entrada.\nSi los pasos anteriores no funcionaron, reenvía el correo electrónico. Ten en cuenta que esta acción desactivará el vínculo en el correo electrónico anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Se envió un correo electrónico de acceso con instrucciones adicionales a %@. Revisa tu bandeja de entrada para completar el proceso.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Se envió el correo electrónico de acceso";
diff --git a/Auth/FirebaseAuthUI/Strings/es-US.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/es-US.lproj/FirebaseAuthUI.strings
index 818a871ba94..29b572876da 100644
--- a/Auth/FirebaseAuthUI/Strings/es-US.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/es-US.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Correo electrónico";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Elegir contraseña";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "¿Tienes problemas para acceder?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmar correo electrónico";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Accediste";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "¿Tienes problemas para recibir correos electrónicos?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prueba estas soluciones comunes: \n- Verifica si el correo electrónico se marcó como spam o se filtró.\n- Comprueba tu conexión a Internet.\n- Verifica que escribiste bien tu correo electrónico.\n- Verifica que tu bandeja de entrada no esté llena o revisa cualquier otro problema relacionado con la configuración de la bandeja de entrada.\nSi los pasos anteriores no funcionaron, reenvía el correo electrónico. Ten en cuenta que esta acción desactivará el vínculo en el correo electrónico anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Se envió un correo electrónico de acceso con instrucciones adicionales a %@. Revisa tu bandeja de entrada para completar el proceso.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Se envió el correo electrónico de acceso";
diff --git a/Auth/FirebaseAuthUI/Strings/es-UY.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/es-UY.lproj/FirebaseAuthUI.strings
index 818a871ba94..29b572876da 100644
--- a/Auth/FirebaseAuthUI/Strings/es-UY.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/es-UY.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Correo electrónico";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Elegir contraseña";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "¿Tienes problemas para acceder?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmar correo electrónico";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Accediste";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "¿Tienes problemas para recibir correos electrónicos?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prueba estas soluciones comunes: \n- Verifica si el correo electrónico se marcó como spam o se filtró.\n- Comprueba tu conexión a Internet.\n- Verifica que escribiste bien tu correo electrónico.\n- Verifica que tu bandeja de entrada no esté llena o revisa cualquier otro problema relacionado con la configuración de la bandeja de entrada.\nSi los pasos anteriores no funcionaron, reenvía el correo electrónico. Ten en cuenta que esta acción desactivará el vínculo en el correo electrónico anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Se envió un correo electrónico de acceso con instrucciones adicionales a %@. Revisa tu bandeja de entrada para completar el proceso.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Se envió el correo electrónico de acceso";
diff --git a/Auth/FirebaseAuthUI/Strings/es-VE.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/es-VE.lproj/FirebaseAuthUI.strings
index 818a871ba94..29b572876da 100644
--- a/Auth/FirebaseAuthUI/Strings/es-VE.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/es-VE.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Correo electrónico";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Elegir contraseña";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "¿Tienes problemas para acceder?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmar correo electrónico";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Accediste";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "¿Tienes problemas para recibir correos electrónicos?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prueba estas soluciones comunes: \n- Verifica si el correo electrónico se marcó como spam o se filtró.\n- Comprueba tu conexión a Internet.\n- Verifica que escribiste bien tu correo electrónico.\n- Verifica que tu bandeja de entrada no esté llena o revisa cualquier otro problema relacionado con la configuración de la bandeja de entrada.\nSi los pasos anteriores no funcionaron, reenvía el correo electrónico. Ten en cuenta que esta acción desactivará el vínculo en el correo electrónico anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Se envió un correo electrónico de acceso con instrucciones adicionales a %@. Revisa tu bandeja de entrada para completar el proceso.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Se envió el correo electrónico de acceso";
diff --git a/Auth/FirebaseAuthUI/Strings/es.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/es.lproj/FirebaseAuthUI.strings
index 67a01267b9e..848ae18acf9 100644
--- a/Auth/FirebaseAuthUI/Strings/es.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/es.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Correo electrónico";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Elige una contraseña";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "¿No puedes iniciar sesión?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmar la dirección de correo electrónico";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Has iniciado sesión.";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "¿No puedes recibir los correos electrónicos?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prueba las soluciones más habituales: \n. Asegúrate de que el correo electrónico no se ha filtrado ni marcado como spam.\n. Comprueba tu conexión a Internet.\n. Asegúrate de que has escrito bien tu dirección de correo electrónico.\n. Comprueba que no te estés quedando sin espacio en la bandeja de entrada y que no haya ningún problema con su configuración.\n. Si no se ha resuelto el problema con los pasos mencionados, puedes volver a enviar el correo electrónico. Si lo haces, se desactivará el enlace del mensaje de correo anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Se ha enviado un correo electrónico de inicio de sesión con más instrucciones a %@. Consulta tu bandeja de entrada para completar el inicio de sesión.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Correo electrónico de inicio de sesión enviado";
diff --git a/Auth/FirebaseAuthUI/Strings/fa.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/fa.lproj/FirebaseAuthUI.strings
index b679c0361cb..e4132c862e1 100644
--- a/Auth/FirebaseAuthUI/Strings/fa.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/fa.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "ذخیره";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "ارسال";
 
+/* Resend button title. */
+"Resend" = "ارسال مجدد";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "ایمیل ";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "گذرواژه انتخاب کنید";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "مشکلی در ورود به سیستم دارید؟";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "تأیید ایمیل";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "به سیستم وارد شدید!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "در دریافت ایمیل مشکل دارید؟";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "این رفع اشکال‌های رایج را امتحان کنید: \n - ببینید ایمیل به‌عنوان هرزنامه یا فیلترشده مشخص نشده باشد.\n - اتصال اینترنتتان را بررسی کنید.\n - مطمئن شوید املای ایمیلتان را درست وارد کرده باشید.\n - مطمئن شوید فضای صندوق ورودی‌تان روبه‌اتمام نباشد یا مشکل دیگری در تنظیمات صندوق ورودی وجود نداشته باشد.\n اگر اقدامات بالا به رفع مشکل کمک نکرد، می‌توانید ایمیل را مجدداً ارسال کنید. توجه کنید که با این کار، پیوند موجود در ایمیل قبلی غیرفعال می‌شود.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "ایمیل ورود به سیستم، حاوی دستورالعمل‌های بیشتر، به %@ ارسال شد. برای تکمیل ورود به سیستم، ایمیلتان را بررسی کنید.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "ایمیل ورود به سیستم ارسال شد";
diff --git a/Auth/FirebaseAuthUI/Strings/fi.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/fi.lproj/FirebaseAuthUI.strings
index 3a7baa16e77..6349b4db30a 100644
--- a/Auth/FirebaseAuthUI/Strings/fi.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/fi.lproj/FirebaseAuthUI.strings
@@ -104,9 +104,12 @@
 /* Save button title. */
 "Save" = "Tallenna";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Lähetä";
 
+/* Resend button title. */
+"Resend" = "Lähetä uudelleen";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Sähköposti";
 
@@ -245,5 +248,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Valitse salasana";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Eikö kirjautuminen onnistu?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Vahvista sähköposti";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Kirjauduttu";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Ongelmia sähköpostiviestien saamisessa?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Kokeile näitä yleisiä ratkaisuja: \n – Tarkista, merkittiinkö viesti roskapostiksi tai suodatettiinko se.\n – Tarkista internetyhteytesi.\n – Tarkista, että kirjoitit sähköpostiosoitteesi oikein.\n – Tarkista, ettei postilaatikkosi tila ole loppumassa tai ettei postilaatikon asetuksissa ole muita ongelmia.\n – Jos edellä olevista ratkaisuista ei ollut apua, voit lähettää viestin uudelleen. Huomaa, että tällöin aiemmassa viestissä oleva linkki poistetaan käytöstä.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Lisäohjeita sisältävä kirjautumisviesti lähetettiin osoitteeseen %@. Tarkista sähköpostisi kirjautumisen suorittamiseksi loppuun.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Kirjautumisviesti lähetetty";
diff --git a/Auth/FirebaseAuthUI/Strings/fil.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/fil.lproj/FirebaseAuthUI.strings
index cd29c3b09d7..dde53552e5c 100644
--- a/Auth/FirebaseAuthUI/Strings/fil.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/fil.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "I-save";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Ipadala";
 
+/* Resend button title. */
+"Resend" = "Muling Ipadala";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Email";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Pumili ng password";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Nagkaproblema sa pag-sign in?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Kumpirmahin ang Email";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Naka-sign in!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Nagkakaproblema sa pagtanggap ng mga email?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Subukan ang mga karaniwang pag-aayos na ito: \n - Tingnan kung minarkahan ang email bilang spam o na-filter.\n - Tingnan ang iyong koneksyon sa internet.\n - Tiyakin na hindi ka nagkamali sa pagbaybay ng iyong email.\n - Tingnan kung hindi pa nauubusan ng espasyo ang iyong inbox o may iba pang isyu na may kinalaman sa mga setting ng inbox.\n Kung hindi umubra ang mga hakbang sa itaas, maaari mong ipadala muli ang email. Tandaan na hindi nito ide-deactivate ang link sa lumang email.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Nagpadala ng email sa pag-sign in na may mga karagdagang tagubilin sa %@. Tingnan ang iyong email para makumpleto ang pag-sign in.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Naipadala na ang email sa pag-sign in";
diff --git a/Auth/FirebaseAuthUI/Strings/fr-CH.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/fr-CH.lproj/FirebaseAuthUI.strings
index f33d8ea0197..16bbcd32fbc 100644
--- a/Auth/FirebaseAuthUI/Strings/fr-CH.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/fr-CH.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Enregistrer";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Envoyer";
 
+/* Resend button title. */
+"Resend" = "Renvoyer";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Adresse e-mail";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Choisissez un mot de passe";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Vous ne parvenez pas à vous connecter ?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmez votre adresse e-mail";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Connecté";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Vous n'avez pas reçu l'e-mail ?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Essayez les solutions courantes suivantes : \n - Vérifiez que l'e-mail n'a pas été filtré ni marqué comme spam.\n - Vérifiez votre connexion Internet.\n - Vérifiez que votre adresse e-mail est correcte.\n - Vérifiez que votre boîte de réception n'est pas pleine et que les paramètres sont correctement définis.\n Si les étapes décrites ci-dessus n'ont pas résolu le problème, vous pouvez renvoyer l'e-mail. Sachez que le lien du premier e-mail sera alors désactivé.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Un e-mail de connexion avec des instructions supplémentaires a été envoyé à %@. Consultez cet e-mail pour vous connecter.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "E-mail de connexion envoyé";
diff --git a/Auth/FirebaseAuthUI/Strings/fr.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/fr.lproj/FirebaseAuthUI.strings
index f33d8ea0197..16bbcd32fbc 100644
--- a/Auth/FirebaseAuthUI/Strings/fr.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/fr.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Enregistrer";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Envoyer";
 
+/* Resend button title. */
+"Resend" = "Renvoyer";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Adresse e-mail";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Choisissez un mot de passe";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Vous ne parvenez pas à vous connecter ?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmez votre adresse e-mail";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Connecté";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Vous n'avez pas reçu l'e-mail ?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Essayez les solutions courantes suivantes : \n - Vérifiez que l'e-mail n'a pas été filtré ni marqué comme spam.\n - Vérifiez votre connexion Internet.\n - Vérifiez que votre adresse e-mail est correcte.\n - Vérifiez que votre boîte de réception n'est pas pleine et que les paramètres sont correctement définis.\n Si les étapes décrites ci-dessus n'ont pas résolu le problème, vous pouvez renvoyer l'e-mail. Sachez que le lien du premier e-mail sera alors désactivé.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Un e-mail de connexion avec des instructions supplémentaires a été envoyé à %@. Consultez cet e-mail pour vous connecter.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "E-mail de connexion envoyé";
diff --git a/Auth/FirebaseAuthUI/Strings/gsw.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/gsw.lproj/FirebaseAuthUI.strings
index 4993f463afe..3ad463985c6 100644
--- a/Auth/FirebaseAuthUI/Strings/gsw.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/gsw.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Speichern";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Senden";
 
+/* Resend button title. */
+"Resend" = "Erneut senden";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "E-Mail-Adresse";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Passwort auswählen";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Probleme bei der Anmeldung?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "E-Mail-Adresse bestätigen";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Angemeldet.";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Probleme beim Empfangen von E-Mails?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Versuchen Sie Folgendes: \n – Überprüfen Sie, ob die E-Mail als Spam markiert oder herausgefiltert wurde.\n – Überprüfen Sie Ihre Internetverbindung.\n – Überprüfen Sie die Schreibweise Ihrer E-Mail-Adresse.\n – Überprüfen Sie den Speicherplatz und weitere Einstellungen Ihres Posteingangs, die Probleme bereiten könnten.\n Sollte das Problem nach Ausführung der obigen Schritte weiterhin bestehen, können Sie sich die Anmelde-E-Mail noch einmal zusenden lassen. Hinweis: Der Link in der vorhergehenden E-Mail ist dann nicht mehr gültig.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Wir haben eine Anmelde-E-Mail mit zusätzlichen Informationen an %@ gesendet. Bitte öffnen Sie die E-Mail, um die Anmeldung abzuschließen.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Anmelde-E-Mail gesendet";
diff --git a/Auth/FirebaseAuthUI/Strings/gu.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/gu.lproj/FirebaseAuthUI.strings
index 116146ad90c..8e439e75c25 100644
--- a/Auth/FirebaseAuthUI/Strings/gu.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/gu.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "સાચવો";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "મોકલો";
 
+/* Resend button title. */
+"Resend" = "ફરી મોકલો";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "ઇમેઇલ";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "પાસવર્ડ પસંદ કરો";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "સાઇન ઇન કરવામાં સમસ્યા આવી રહી છે?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "ઇમેઇલ કન્ફર્મ કરો";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "સાઇન ઇન કર્યું!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "ઇમેઇલ મેળવવામાં મુશ્કેલી આવે છે?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "આ સામાન્ય ઉકેલોને અજમાવી જુઓ: \n - તે ઇમેઇલ સ્પામ કે ફિલ્ટર કરેલ તરીકે ચિહ્નિત કર્યો હતો.કે કેમ તે ચેક કરો.\n - તમારું ઇન્ટરનેટ કનેક્શન ચેક કરો.\n - તમે તમારા ઇમેઇલની જોડણીમાં ભૂલ ન કરી હોવાનું ચેક કરો.\n - તમારી ઇનબૉક્સ સ્પેસ ભરાઈ ન ગઈ હોવાનું અથવા ઇનબૉક્સ સેટિંગ સંબંધિત અન્ય સમસ્યા ન હોવાનું.ચેક કરો.\n જો ઉપરોક્ત પગલાં કામ ન કરે, તો તમે ઇમેઇલ ફરીથી મોકલી શકો છો. નોંધ લેશો કે આને કારણે જૂના ઇમેઇલમાં રહેલી લિંક નિષ્ક્રિય થશે.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "વધારાની સૂચનાઓ ધરાવતો સાઇન-ઇન ઇમેઇલ %@ પર મોકલ્યો હતો. સાઇન-ઇન પૂર્ણ કરવા માટે તમારો ઇમેઇલ ચેક કરો.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "સાઇન ઇન ઇમેઇલ મોકલ્યો";
diff --git a/Auth/FirebaseAuthUI/Strings/he.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/he.lproj/FirebaseAuthUI.strings
index 22cf974dac0..a7085089f97 100644
--- a/Auth/FirebaseAuthUI/Strings/he.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/he.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "שמור";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "שליחה";
 
+/* Resend button title. */
+"Resend" = "שליחה מחדש";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "אימייל";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "בחר סיסמה";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "לא מצליח להיכנס?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "אישור כתובת האימייל";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "בוצעה כניסה!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "נתקלת בבעיה בקבלת אימיילים?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "מומלץ לנסות את הפתרונות הבאים: \n - יש לבדוק אם האימייל סומן כספאם או סונן.\n - יש לבדוק את החיבור לאינטרנט.\n - יש לוודא שכתובת האימייל אויתה כהלכה.\n - יש לוודא שהשטח הפנוי בתיבת הדואר הנכנס אינו עומד להסתיים, או לבדוק בעיות אחרות שקשורות להגדרות של תיבת הדואר הנכנס.\n אם הבעיה נמשכת לאחר ביצוע השלבים המפורטים למעלה, אפשר לשלוח מחדש את האימייל. לתשומת ליבך: שליחת האימייל מחדש תשבית את הקישור באימייל הקודם.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "אימייל לכניסה לחשבון עם הוראות נוספות נשלח אל %@. יש לבדוק את תיבת הדואר הנכנס כדי להשלים את תהליך הכניסה.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "נשלח אימייל לכניסה לחשבון";
diff --git a/Auth/FirebaseAuthUI/Strings/hi.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/hi.lproj/FirebaseAuthUI.strings
index f8c9b366133..06be9b3a368 100644
--- a/Auth/FirebaseAuthUI/Strings/hi.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/hi.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "सहेजें";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "भेजें";
 
+/* Resend button title. */
+"Resend" = "फिर से भेजें";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "ईमेल";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "पासवर्ड चुनें";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "प्रवेश करने में समस्या?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "ईमेल की पुष्टि करें";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "साइन-इन हैं!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "क्या ईमेल मिलने में दिक्कत हो रही है?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "समस्या सुलझाने के ये सामान्य तरीके आज़माकर देखें: \n - देख लें कि ईमेल स्पैम फ़ोल्डर में तो नहीं चला गया या फ़िल्टर तो नहीं हो गया.\n - देख लें कि आपका इंटरनेट कनेक्शन चालू है या नहींं.\n - देख लें कि आपने ईमेल पते की वर्तनी (स्पेलिंग) गलत तो नहीं लिखी है.\n - देख लें कि आपका इनबॉक्स भर तो नहीं गया या इनबॉक्स सेटिंग से जुड़ी दूसरी समस्याएं तो नहीं हैं.\n अगर ऊपर दिए गए सुझावों से काम नहीं बनता है, तो आप फिर से ईमेल भेज सकते हैं. ध्यान दें कि ऐसा करने से पुराने ईमेल में भेजा गया लिंक काम करना बंद कर देगा.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "ज़्यादा निर्देशों वाला एक साइन-इन ईमेल %@ पर भेजा गया है. साइन-इन पूरा करने के लिए अपना ईमेल देखें.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "साइन-इन करने के लिंक वाला ईमेल भेज दिया गया";
diff --git a/Auth/FirebaseAuthUI/Strings/hr.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/hr.lproj/FirebaseAuthUI.strings
index fc924450c26..d386c7bc288 100644
--- a/Auth/FirebaseAuthUI/Strings/hr.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/hr.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Spremi";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Pošalji";
 
+/* Resend button title. */
+"Resend" = "Pošalji ponovo";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "E-adresa";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Odaberite zaporku";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Problem s prijavom?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Potvrdite e-adresu";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Prijavljeni ste!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Ne dobivate e-poruke?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Isprobajte ova uobičajena rješenja: \n - Provjerite je li e-poruka filtrirana ili označena kao neželjena pošta.\n - Provjerite internetsku vezu.\n - Provjerite jeste li točno napisali e-adresu.\n - Provjerite ima li dovoljno prostora u vašem pretincu pristigle pošte ili je došlo do drugih problema povezanih s postavkama pretinca pristigle pošte.\n Ako se problem ne riješi pomoću koraka iznad, možete ponovo poslati e-poruku. Time će se deaktivirati veza u prethodnoj e-poruci.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "E-poruka za prijavu s dodatnim uputama poslana je na adresu %@. Provjerite e-poštu da biste dovršili prijavu.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "E-poruka za prijavu poslana";
diff --git a/Auth/FirebaseAuthUI/Strings/hu.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/hu.lproj/FirebaseAuthUI.strings
index 5aaeb2e20b2..8ba2d81f738 100644
--- a/Auth/FirebaseAuthUI/Strings/hu.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/hu.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Mentés";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Küldés";
 
+/* Resend button title. */
+"Resend" = "Újraküldés";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "E-mail";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Válasszon jelszót";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Problémái vannak a bejelentkezéssel?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "E-mail megerősítése";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Sikeres bejelentkezés!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Gondja van az e-mailek fogadásával?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Próbálja ki ezeket az általános problémamegoldó lépéseket: \n – Nézze meg, hogy nem került-e az e-mail a spameket tartalmazó mappába, vagy nem szűrte-e ki a levelezőrendszer.\n – Ellenőrizze az internetkapcsolatot.\n – Ellenőrizze, hogy helyesen adta-e meg az e-mail-címét.\n – Ellenőrizze, hogy a beérkező leveleket tartalmazó mappa nem telt-e meg, vagy nincs-e más, a mappával kapcsolatos probléma.\n Ha a fenti lépések nem végrehajtása nem járt eredménnyel, küldje el újra az e-mailt. Ne feledje, hogy ezzel deaktiválja az előző e-mailben szereplő linket.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "A további utasításokat tartalmazó bejelentkezési e-mailt elküldtük ide: %@. A bejelentkezés befejezéséhez keresse meg az e-mailjei között.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Elküldtük a bejelentkezési e-mailt";
diff --git a/Auth/FirebaseAuthUI/Strings/id.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/id.lproj/FirebaseAuthUI.strings
index ef25006b349..c8b3e145b35 100644
--- a/Auth/FirebaseAuthUI/Strings/id.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/id.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Simpan";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Kirim";
 
+/* Resend button title. */
+"Resend" = "Kirim ulang";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Email";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Pilih sandi";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Terjadi masalah saat login?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Konfirmasi Email";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Telah login";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Ada masalah dalam mendapatkan email?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Cobalah perbaikan umum berikut: \n - Periksa apakah email ditandai sebagai spam atau difilter.\n - Periksa koneksi internet Anda.\n - Pastikan Anda tidak salah mengeja email Anda.\n - Pastikan masih ada ruang di kotak masuk Anda, atau periksa masalah terkait setelan kotak masuk lainnya.\n Jika langkah-langkah di atas tidak memecahkan masalah, Anda dapat mengirim ulang email tersebut. Perlu diperhatikan bahwa tindakan ini akan menonaktifkan link di email lama.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Email login dengan petunjuk tambahan telah dikirim ke %@. Buka email Anda untuk menyelesaikan proses login.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Email Login Terkirim";
diff --git a/Auth/FirebaseAuthUI/Strings/it.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/it.lproj/FirebaseAuthUI.strings
index 9f78ed07bf2..069a96cb4ea 100644
--- a/Auth/FirebaseAuthUI/Strings/it.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/it.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Salva";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Invia";
 
+/* Resend button title. */
+"Resend" = "Invia di nuovo";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Email";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Scegli password";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Problemi di accesso?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Conferma email";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Accesso eseguito";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Non ricevi l'email?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prova le seguenti soluzioni comuni: \n - Verifica se l'email è stata contrassegnata come spam o è stata filtrata.\n - Controlla la connessione Internet.\n - Verifica di aver digitato correttamente l'indirizzo email.\n - Verifica che vi sia ancora spazio disponibile nella Posta in arrivo o che non vi siano altri problemi legati alle impostazioni della Posta in arrivo.\n Se le procedure descritte sopra non hanno risolto il problema, puoi inviare nuovamente l'email. Tieni presente che questo disattiverà il link contenuto nell'email precedente.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Un'email di accesso con ulteriori istruzioni è stata inviata all'indirizzo %@. Controlla la tua casella di posta per completare l'accesso.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Email di accesso inviata";
diff --git a/Auth/FirebaseAuthUI/Strings/ja.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/ja.lproj/FirebaseAuthUI.strings
index 9a8f8b0fbc9..94eec9d8ab5 100644
--- a/Auth/FirebaseAuthUI/Strings/ja.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/ja.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "保存";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "送信";
 
+/* Resend button title. */
+"Resend" = "再送信";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "メール";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "パスワードを設定";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "ログインできない場合";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "メールの確認";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "ログインしました";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "メールが受信できない場合";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "以下の一般的な解決方法をお試しください。\n - メールがスパムに分類されたりフィルタされたりしていないか確認する。\n - インターネットの接続を確認する。\n - メールアドレスのスペルに誤りがないか確認する。\n - 受信トレイの容量不足や、設定関連のその他の問題がないか確認する。\n 上記の手順で解決しなかった場合はメールを再送信できます。メールを再送信すると、前回のメールに記載されたリンクは無効になります。";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "詳細な手順を記載したログインメールを %@ に送信しました。メールを確認してログインを完了してください。";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "ログインメールを送信しました";
diff --git a/Auth/FirebaseAuthUI/Strings/kn.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/kn.lproj/FirebaseAuthUI.strings
index c514498e326..cd6787fb09d 100644
--- a/Auth/FirebaseAuthUI/Strings/kn.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/kn.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "ಉಳಿಸಿ";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "ಕಳುಹಿಸಿ";
 
+/* Resend button title. */
+"Resend" = "ಪುನಃಕಳುಹಿಸಿ";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "ಇಮೇಲ್";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ಆರಿಸಿ";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "ಸೈನ್ ಇನ್ ಮಾಡುವಲ್ಲಿ ಸಮಸ್ಯೆ ಇದೆಯೇ?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "ಇಮೇಲ್ ಅನ್ನು ದೃಢೀಕರಿಸಿ";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "ಸೈನ್ ಇನ್ ಆಗಿದೆ!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "ಇಮೇಲ್‌ಗಳನ್ನು ಪಡೆಯುವಲ್ಲಿ ಸಮಸ್ಯೆ ಉಂಟಾಗುತ್ತಿದೆಯೇ?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "ಈ ಸಾಮಾನ್ಯ ಪರಿಹಾರಗಳನ್ನು ಪ್ರಯತ್ನಿಸಿ: \n - ಇಮೇಲ್ ಅನ್ನು ಸ್ಪ್ಯಾಮ್ ಎಂದು ಗುರುತು ಮಾಡಲಾಗಿದೆಯೇ ಅಥವಾ ಫಿಲ್ಟರ್ ಮಾಡಲಾಗಿದೆಯೇ ಎಂದು ಪರಿಶೀಲಿಸಿ.\n - ನಿಮ್ಮ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಪರಿಶೀಲಿಸಿ.\n - ನಿಮ್ಮ ಇಮೇಲ್‌ನ ಕಾಗುಣಿತವನ್ನು ಸರಿಯಾಗಿ ನಮೂದಿಸಿರುವಿರಾ ಎಂಬುದನ್ನು ಪರಿಶೀಲಿಸಿ.\n - ನಿಮ್ಮ ಇನ್‌ಬಾಕ್ಸ್ ಸಂಗ್ರಹಣೆಯು ಭರ್ತಿಯಾಗದಿರುವುದನ್ನು ಅಥವಾ ಇತರ ಇನ್‌ಬಾಕ್ಸ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಸಂಬಂಧಿಸಿದ ಸಮಸ್ಯೆಗಳನ್ನು ಪರಿಶೀಲಿಸಿ.\n ಮೇಲಿನ ಹಂತಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸದಿದ್ದಲ್ಲಿ, ನೀವು ಇಮೇಲ್ ಅನ್ನು ಪುನಃ ಕಳುಹಿಸಬಹುದು. ಇದು ಹಳೆಯ ಇಮೇಲ್‌ನಲ್ಲಿರುವ ಲಿಂಕ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ ಎಂಬುದನ್ನು ಗಮನಿಸಿ.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "%@ ಇಮೇಲ್‌ಗೆ ಹೆಚ್ಚುವರಿ ಸೂಚನೆಗಳನ್ನು ಹೊಂದಿರುವ ಸೈನ್-ಇನ್ ಇಮೇಲ್ ಅನ್ನು ಕಳುಹಿಸಲಾಗಿದೆ. ಸೈನ್-ಇನ್ ಪೂರ್ಣಗೊಳಿಸಲು ನಿಮ್ಮ ಇಮೇಲ್ ಅನ್ನು ಪರಿಶೀಲಿಸಿ.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "ಸೈನ್-ಇನ್ ಇಮೇಲ್ ಕಳುಹಿಸಲಾಗಿದೆ";
diff --git a/Auth/FirebaseAuthUI/Strings/ko.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/ko.lproj/FirebaseAuthUI.strings
index c20f4f7c295..2fe62e7dc88 100644
--- a/Auth/FirebaseAuthUI/Strings/ko.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/ko.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "저장";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "보내기";
 
+/* Resend button title. */
+"Resend" = "다시 보내기";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "이메일";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "비밀번호 선택";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "로그인하는 데 문제가 있나요?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "이메일 확인";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "로그인 완료";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "이메일을 받는 데 문제가 있나요?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "다음의 일반적인 해결방법을 시도해 보세요. \n - 이메일이 스팸으로 표시되었거나 필터링되었는지 확인합니다.\n - 인터넷 연결을 확인합니다.\n - 이메일을 잘못 입력하지 않았는지 확인합니다.\n - 받은편지함 용량이 다 찼거나 받은편지함 설정과 관련된 문제가 있는 것이 아닌지 확인합니다.\n 위의 단계로 문제가 해결되지 않으면 이메일을 다시 전송하실 수 있습니다. 이 경우 이전 이메일의 링크는 비활성화됩니다.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "추가 안내가 포함된 로그인 이메일이 %@(으)로 전송되었습니다. 이메일을 확인하여 로그인을 완료하세요.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "로그인 이메일 전송됨";
diff --git a/Auth/FirebaseAuthUI/Strings/ln.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/ln.lproj/FirebaseAuthUI.strings
index f33d8ea0197..16bbcd32fbc 100644
--- a/Auth/FirebaseAuthUI/Strings/ln.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/ln.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Enregistrer";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Envoyer";
 
+/* Resend button title. */
+"Resend" = "Renvoyer";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Adresse e-mail";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Choisissez un mot de passe";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Vous ne parvenez pas à vous connecter ?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmez votre adresse e-mail";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Connecté";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Vous n'avez pas reçu l'e-mail ?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Essayez les solutions courantes suivantes : \n - Vérifiez que l'e-mail n'a pas été filtré ni marqué comme spam.\n - Vérifiez votre connexion Internet.\n - Vérifiez que votre adresse e-mail est correcte.\n - Vérifiez que votre boîte de réception n'est pas pleine et que les paramètres sont correctement définis.\n Si les étapes décrites ci-dessus n'ont pas résolu le problème, vous pouvez renvoyer l'e-mail. Sachez que le lien du premier e-mail sera alors désactivé.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Un e-mail de connexion avec des instructions supplémentaires a été envoyé à %@. Consultez cet e-mail pour vous connecter.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "E-mail de connexion envoyé";
diff --git a/Auth/FirebaseAuthUI/Strings/lt.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/lt.lproj/FirebaseAuthUI.strings
index f6ec83eb904..0724a9fbf52 100644
--- a/Auth/FirebaseAuthUI/Strings/lt.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/lt.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Išsaugoti";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Siųsti";
 
+/* Resend button title. */
+"Resend" = "Siųsti iš naujo";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "El. paštas";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Pasirinkite slaptažodį";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Kyla problemų prisijungiant?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Patvirtinkite el. paštą";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Prisijungta.";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Negaunate el. laiškų?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Išbandykite šiuos dažnai kylančių problemų sprendimo būdus: \n – patikrinkite, ar el. laiškas nebuvo pažymėtas kaip šlamštas arba filtruotas;\n – patikrinkite interneto ryšį;\n – patikrinkite, ar nurodėte tikslų el. pašto adresą;\n – patikrinkite, ar gautiesiems skirta saugyklos vieta nepasibaigė arba kitas su gautųjų nustatymais susijusias problemas.\n Jei ankstesni veiksmai nebuvo naudingi, galite iš naujo išsiųsti el. laišką. Atkreipkite dėmesį, kad šiuo veiksmu bus išaktyvinta ankstesniame el. laiške pateikta nuoroda.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Prisijungimo el. laiškas su papildomomis instrukcijomis išsiųstas adresu %@. Patikrinkite el. paštą, kad užbaigtumėte prisijungimą.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Prisijungimo el. laiškas išsiųstas";
diff --git a/Auth/FirebaseAuthUI/Strings/lv.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/lv.lproj/FirebaseAuthUI.strings
index e12c7f3fff5..98cf5141702 100644
--- a/Auth/FirebaseAuthUI/Strings/lv.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/lv.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Saglabāt";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Sūtīt";
 
+/* Resend button title. */
+"Resend" = "Sūtīt vēlreiz";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "E-pasts";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Izvēlieties paroli";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Vai jums ir problēmas ar pierakstīšanos?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Apstipriniet e-pasta adresi";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Esat pierakstījies.";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Vai jums ir problēmas ar e-pasta ziņojumu saņemšanu?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Izmēģiniet tālāk norādītās tipiskās problēmu novēršanas iespējas. \n - Pārbaudiet, vai e-pasta ziņojums nav atzīmēts kā mēstule vai nav filtrēts.\n - Pārbaudiet interneta savienojumu.\n - Pārbaudiet, vai e-pasta adrese ir pareizi uzrakstīta.\n - Pārbaudiet, vai jūsu iesūtnes krātuve nav beigusies vai nav citu ar iesūtnes iestatījumiem saistītu problēmu.\n Ja iepriekš minētās darbības nepalīdzēja, varat atkārtoti nosūtīt e-pasta ziņojumu. Ņemiet vērā: tiks deaktivizēta saite no iepriekšējā e-pasta ziņojuma.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Pierakstīšanās e-pasta ziņojums ar papildu norādījumiem tika nosūtīts uz e-pasta adresi %@. Pārbaudiet savu e-pastu, lai pabeigtu pierakstīšanos.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Pierakstīšanās e-pasta ziņojums ir nosūtīts";
diff --git a/Auth/FirebaseAuthUI/Strings/mr.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/mr.lproj/FirebaseAuthUI.strings
index b17d77db761..48d9ff2e352 100644
--- a/Auth/FirebaseAuthUI/Strings/mr.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/mr.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "सेव्ह करा";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "पाठवा";
 
+/* Resend button title. */
+"Resend" = "पुन्हा पाठवा";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "ईमेल";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "पासवर्ड निवडा";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "साइन इन करताना समस्या येत आहे का?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "ईमेलची खात्री करा";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "साइन इन केले!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "ईमेल मिळवण्यात समस्या येत आहे?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "ही सामान्य निराकरणे करून पाहा: \n- ईमेलला स्पॅम किंवा फिल्टर केलेला म्हणून चिन्हाकिंत केला असल्यास तपासा.\n - तुमचे इंटरनेट कनेक्शन तपासा.\n - तुम्ही तुमच्या ईमेलचे चुकीचे शब्दलेखन केले आहे का ते तपासा.\n - तुमच्या इनबॉक्सची जागा संपली आहे का किंवा अन्य इनबॉक्स सेटिंग्ज संबंधित समस्या आहेत का हे तपासा.\n वरील पायर्‍या वापरून उपयोग झाला नसल्यास, तुम्ही ईमेल पुन्हा पाठवू शकता. लक्षात ठेवा की, यामुळे जुन्या ईमेलमधील लिंक निष्क्रिय केली जाईल.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "अतिरिक्त सूचना असलेला साइन इन ईमेल %@ ला पाठवला होता. साइन इन पूर्ण करण्यासाठी तुमचा ईमेल तपासा.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "साइन इन ईमेल पाठवला";
diff --git a/Auth/FirebaseAuthUI/Strings/ms.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/ms.lproj/FirebaseAuthUI.strings
index 1353e8f61f9..82bac0ba26d 100644
--- a/Auth/FirebaseAuthUI/Strings/ms.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/ms.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Simpan";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Hantar";
 
+/* Resend button title. */
+"Resend" = "Hantar semula";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "E-mel";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Pilih kata laluan";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Menghadapi masalah log masuk?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Sahkan E-mel";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Dilog masuk!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Tidak menerima e-mel?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Cuba pembetulan lazim berikut: \n - Pastikan e-mel tidak ditandakan sebagai spam atau ditapis.\n - Semak sambungan Internet anda.\n - Pastikan e-mel anda dieja dengan betul.\n - Pastikan peti masuk anda tidak kehabisan ruang dan tiada isu berkaitan tetapan peti masuk.\n Jika langkah di atas tidak boleh menyelesaikan isu tersebut, anda boleh menghantar semula e-mel. Sila ambil perhatian bahawa tindakan ini akan menyahaktifkan pautan dalam e-mel sebelumnya.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "E-mel log masuk yang mengandungi arahan tambahan telah dihantar ke %@. Semak e-mel anda untuk melengkapkan log masuk.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "E-mel log masuk Dihantar";
diff --git a/Auth/FirebaseAuthUI/Strings/nb.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/nb.lproj/FirebaseAuthUI.strings
index a776371cad5..662b6f7404c 100644
--- a/Auth/FirebaseAuthUI/Strings/nb.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/nb.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Lagre";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Send";
 
+/* Resend button title. */
+"Resend" = "Send på nytt";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "E-post";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Velg passord";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Har du problemer med å logge på?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Bekreft e-postadressen";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Pålogget.";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Problemer med å motta e-post?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prøv disse vanlige løsningene: \n — Sjekk om e-posten ble merket som søppelpost eller filtrert bort.\n — Sjekk internettilkoblingen din.\n — Kontrollér at du ikke har skrevet e-postadressen din feil.\n — Kontrollér at innboksen din ikke er full, og se etter andre problemer knyttet til innboksinnstillingene.\n — Hvis trinnene ovenfor ikke bidro til å løse problemet, kan du sende e-posten på nytt. Vær oppmerksom på at dette deaktiverer linken i den forrige e-posten.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "En påloggings-e-post med ytterligere instruksjoner er sendt til %@. Sjekk e-posten din for å fullføre påloggingen.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Påloggings-e-post er sendt";
diff --git a/Auth/FirebaseAuthUI/Strings/nl.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/nl.lproj/FirebaseAuthUI.strings
index 6160355ef63..873a407db3e 100644
--- a/Auth/FirebaseAuthUI/Strings/nl.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/nl.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Opslaan";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Verzenden";
 
+/* Resend button title. */
+"Resend" = "Opnieuw verzenden";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "E-mail";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Wachtwoord kiezen";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Problemen met inloggen?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "E-mailadres bevestigen";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Ingelogd";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Ontvangt u e-mails niet?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Probeer deze algemene oplossingen: \n - Controleer of de e-mail als spam is gemarkeerd of is weggefilterd.\n - Controleer uw internetverbinding.\n - Controleer of u uw e-mailadres juist heeft gespeld.\n - Controleer of er voldoende ruimte in uw inbox is en of er geen andere problemen met inboxinstellingen zijn.\n Als de bovenstaande stappen geen uitkomst bieden, kunt u de e-mail opnieuw verzenden. Hiermee wordt de link in de eerdere e-mail gedeactiveerd.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Er is een inlogmail met aanvullende instructies verzonden naar %@. Controleer uw inbox om het inlogproces te voltooien.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Inlogmail verzonden";
diff --git a/Auth/FirebaseAuthUI/Strings/nn-NO.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/nn-NO.lproj/FirebaseAuthUI.strings
index a776371cad5..662b6f7404c 100644
--- a/Auth/FirebaseAuthUI/Strings/nn-NO.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/nn-NO.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Lagre";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Send";
 
+/* Resend button title. */
+"Resend" = "Send på nytt";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "E-post";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Velg passord";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Har du problemer med å logge på?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Bekreft e-postadressen";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Pålogget.";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Problemer med å motta e-post?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prøv disse vanlige løsningene: \n — Sjekk om e-posten ble merket som søppelpost eller filtrert bort.\n — Sjekk internettilkoblingen din.\n — Kontrollér at du ikke har skrevet e-postadressen din feil.\n — Kontrollér at innboksen din ikke er full, og se etter andre problemer knyttet til innboksinnstillingene.\n — Hvis trinnene ovenfor ikke bidro til å løse problemet, kan du sende e-posten på nytt. Vær oppmerksom på at dette deaktiverer linken i den forrige e-posten.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "En påloggings-e-post med ytterligere instruksjoner er sendt til %@. Sjekk e-posten din for å fullføre påloggingen.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Påloggings-e-post er sendt";
diff --git a/Auth/FirebaseAuthUI/Strings/pl.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/pl.lproj/FirebaseAuthUI.strings
index 5790b618a3e..be8d11d8be9 100644
--- a/Auth/FirebaseAuthUI/Strings/pl.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/pl.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Zapisz";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Wyślij";
 
+/* Resend button title. */
+"Resend" = "Wyślij ponownie";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Adres e-mail";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Wybierz hasło";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Masz problem z zalogowaniem się?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Potwierdź adres e-mail";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Zalogowano";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "E-maile nie dotarły?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Wypróbuj standardowe rozwiązania: \n – Sprawdź, czy e-mail nie został oznaczony jako spam lub objęty którymś z filtrów.\n – Sprawdź połączenie z internetem.\n – Sprawdź, czy adres e-mail jest wpisany poprawnie.\n – Sprawdź, czy nie kończy się miejsce w skrzynce odbiorczej oraz czy nie ma innych problemów z ustawieniami skrzynki.\n Jeżeli wykonanie powyższych czynności nie dało żadnych rezultatów, możesz wysłać e-maila jeszcze raz. Link wysłany w poprzedniej wiadomości przestanie być aktywny.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Na adres %@ wysłaliśmy e-maila umożliwiającego zalogowanie się z dodatkowymi instrukcjami. Sprawdź pocztę, by się zalogować.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "E-mail umożliwiający zalogowanie się został wysłany";
diff --git a/Auth/FirebaseAuthUI/Strings/pt-BR.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/pt-BR.lproj/FirebaseAuthUI.strings
index bbe6905da75..2bcf9700747 100644
--- a/Auth/FirebaseAuthUI/Strings/pt-BR.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/pt-BR.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Salvar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "E-mail";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Escolha a senha";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Problemas para fazer login?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirme o e-mail";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Conectado!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Está com problemas para receber e-mails?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Tente estas soluções comuns: \n - Verifique se o e-mail foi filtrado ou marcado como spam.\n - Verifique sua conexão com a Internet.\n - Verifique se você digitou seu e-mail corretamente.\n - Verifique se você ainda tem espaço na sua caixa de entrada, além de outros problemas relacionados à configuração.\n Se as etapas acima não funcionarem, tente enviar o e-mail novamente. Observe que isso desativará o link no e-mail antigo.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Um e-mail de login com mais instruções foi enviado para %@. Verifique sua caixa de entrada para concluir o login.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "E-mail de login enviado";
diff --git a/Auth/FirebaseAuthUI/Strings/pt-PT.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/pt-PT.lproj/FirebaseAuthUI.strings
index 75cd9bb140f..ea1c3244bd9 100644
--- a/Auth/FirebaseAuthUI/Strings/pt-PT.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/pt-PT.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Guardar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Email";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Escolha uma palavra-passe";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Está com problemas ao iniciar sessão?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirme o email";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Com sessão iniciada!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Está com problemas para receber emails?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Experimente estas correções comuns: \n – Verifique se o email foi assinalado como spam ou filtrado.\n – Verifique a ligação à Internet.\n – Certifique-se de que não introduziu o email incorretamente.\n – Certifique-se de que a sua caixa de entrada não está a ficar sem espaço disponível nem está com outros problemas relacionados com as definições da caixa de entrada.\n Se os passos acima não resolverem o problema, pode reenviar o email. Tenha em atenção que esta ação desativa o link no email mais antigo.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Enviámos um email de início de sessão com instruções adicionais para %@. Consulte o seu email para concluir o início de sessão.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Email de início de sessão enviado.";
diff --git a/Auth/FirebaseAuthUI/Strings/pt.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/pt.lproj/FirebaseAuthUI.strings
index bbe6905da75..2bcf9700747 100644
--- a/Auth/FirebaseAuthUI/Strings/pt.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/pt.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Salvar";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Enviar";
 
+/* Resend button title. */
+"Resend" = "Reenviar";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "E-mail";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Escolha a senha";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Problemas para fazer login?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirme o e-mail";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Conectado!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Está com problemas para receber e-mails?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Tente estas soluções comuns: \n - Verifique se o e-mail foi filtrado ou marcado como spam.\n - Verifique sua conexão com a Internet.\n - Verifique se você digitou seu e-mail corretamente.\n - Verifique se você ainda tem espaço na sua caixa de entrada, além de outros problemas relacionados à configuração.\n Se as etapas acima não funcionarem, tente enviar o e-mail novamente. Observe que isso desativará o link no e-mail antigo.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Um e-mail de login com mais instruções foi enviado para %@. Verifique sua caixa de entrada para concluir o login.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "E-mail de login enviado";
diff --git a/Auth/FirebaseAuthUI/Strings/ro.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/ro.lproj/FirebaseAuthUI.strings
index c48f02c3e0a..efb9e8eba20 100644
--- a/Auth/FirebaseAuthUI/Strings/ro.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/ro.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Salvați";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Trimiteți";
 
+/* Resend button title. */
+"Resend" = "Retrimiteți";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Adresă de e-mail";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Alegeți o parolă";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Nu reușiți să vă conectați?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Confirmați adresa de e-mail";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Conectat(ă)!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Nu primiți e-mailuri?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Încercați aceste soluții frecvent folosite: \n - verificați dacă e-mailul a fost marcat ca spam sau filtrat;\n - verificați conexiunea la internet;\n - verificați dacă ați scris corect adresa de e-mail;\n - verificați dacă aveți spațiu în căsuța de e-mail sau dacă există alte probleme legate de setările căsuței de e-mail.\n Dacă pașii de mai sus nu funcționează, puteți să trimiteți din nou e-mailul. Rețineți că va fi dezactivat linkul din e-mailul anterior.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Un e-mail de conectare cu instrucțiuni suplimentare a fost trimis la %@. Verificați-vă căsuța de e-mail pentru a finaliza conectarea.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "A fost trimis e-mailul de conectare";
diff --git a/Auth/FirebaseAuthUI/Strings/ru.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/ru.lproj/FirebaseAuthUI.strings
index 1faa2f2839f..5a85070c7a2 100644
--- a/Auth/FirebaseAuthUI/Strings/ru.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/ru.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Сохранить";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Отправить";
 
+/* Resend button title. */
+"Resend" = "Отправить ещё раз";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Адрес электронной почты";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Выберите пароль";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Не удается войти в аккаунт?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Подтвердите адрес электронной почты";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Вход выполнен";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Не получили письмо?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Вот что можно сделать: \n – Поищите письмо в папке со спамом или отфильтрованными сообщениями.\n – Проверьте подключение к Интернету.\n – Убедитесь, что правильно указали свой адрес электронной почты.\n – Проверьте настройки папки со входящими сообщениям и посмотрите, достаточно ли в ней места.\n Если найти письмо не удалось, мы можем отправить его ещё раз. В таком случае ссылка из предыдущего сообщения станет недействительна.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "На адрес электронной почты %@ отправлено письмо с информацией о том, как войти в аккаунт. Изучите его и выполните инструкции.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Письмо отправлено.";
diff --git a/Auth/FirebaseAuthUI/Strings/sk.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/sk.lproj/FirebaseAuthUI.strings
index 75dd617422f..da3c9cc17f4 100644
--- a/Auth/FirebaseAuthUI/Strings/sk.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/sk.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Uložiť";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Odoslať";
 
+/* Resend button title. */
+"Resend" = "Odoslať znova";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "E-mail";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Zvoľte si heslo";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Máte problémy s prihlásením?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Potvrdenie e‑mailovej adresy";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Prihlásili ste sa.";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Máte problémy s prijímaním e‑mailov?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Vyskúšajte tieto bežné riešenia: \n – Skontrolujte, či bol e‑mail označený ako spam alebo či bol odfiltrovaný.\n – Skontrolujte internetové pripojenie.\n – Skontrolujte, či ste správne napísali svoju e‑mailovú adresu.\n – Skontrolujte, či máte v doručenej pošte dostatok miesta alebo či nemáte iné problémy súvisiace s nastaveniami doručenej pošty.\n Ak kroky uvedené vyššie nepomohli, môžete si e‑mail nechať poslať znova. Upozorňujeme, že sa tým deaktivuje odkaz v staršom e‑maile.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Prihlasovací e‑mail s ďalšími pokynmi bol odoslaný na adresu %@. Pozrite si poštu a dokončite prihlásenie.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Prihlasovací e‑mail bol odoslaný";
diff --git a/Auth/FirebaseAuthUI/Strings/sl.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/sl.lproj/FirebaseAuthUI.strings
index efe63163545..5509a558492 100644
--- a/Auth/FirebaseAuthUI/Strings/sl.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/sl.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Shrani";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Pošlji";
 
+/* Resend button title. */
+"Resend" = "Pošlji znova";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "E-pošta";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Izberite geslo";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Ali imate težave pri prijavi?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Potrditev e-poštnega naslova";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Prijavljeni ste.";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Niste prejeli e-poštnega sporočila?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Poskusite te splošne rešitve: \n – Preverite, ali je bilo e-poštno sporočilo označeno kot vsiljena pošta ali filtrirano.\n – Preverite internetno povezavo.\n – Preverite, ali je e-poštni naslov pravilno zapisan.\n – Zagotovite, da imate v nabiralniku dovolj prostora oziroma da ni prišlo do drugih težav, povezanih z nastavitvami nabiralnika.\n – Če z zgornjimi koraki ne odpravite težave, lahko znova pošljete e-poštno sporočilo. Upoštevajte, da boste s tem onemogočili povezavo v prejšnjem e-poštnem sporočilu.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "E-poštno sporočilo za prijavo z dodatnimi navodili je bilo poslano na %@. Preverite e-pošto in dokončajte prijavo.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "E-poštno sporočilo za prijavo je bilo poslano";
diff --git a/Auth/FirebaseAuthUI/Strings/sr-Latn.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/sr-Latn.lproj/FirebaseAuthUI.strings
index f3dea182a64..fd9a4ecf2ff 100644
--- a/Auth/FirebaseAuthUI/Strings/sr-Latn.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/sr-Latn.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Sačuvaj";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Pošalji";
 
+/* Resend button title. */
+"Resend" = "Ponovo pošalji";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Imejl";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Izaberite lozinku";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Imate problema pri prijavljivanju?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Potvrdite imejl adresu";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Prijavljeni ste!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Imate problema sa prijemom imejla?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Probajte ova uobičajena rešenja: \n– Proverite da li je imejl filtriran ili obeležen kao nepoželjan.\n – Proverite internet vezu.\n – Proverite da li ste tačno upisali imejl adresu.\n – Proverite da niste ostali bez prostora u prijemnom sandučetu, odnosno da nema drugih problema sa prijemnim sandučetom.\n Ako navedene mere ne urode plodom, možete ponovo da pošaljete imejl. Imajte u vidu da ćete time deaktivirati link u starijem imejlu.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Imejl za prijavljivanje sa dodatnim uputstvima je poslat na %@. Proverite imejl da biste dovršili prijavljivanje.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Poslali smo vam imejl za prijavljivanje";
diff --git a/Auth/FirebaseAuthUI/Strings/sr.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/sr.lproj/FirebaseAuthUI.strings
index 282f1e53ff5..34f17afbcff 100644
--- a/Auth/FirebaseAuthUI/Strings/sr.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/sr.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Сачувај";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Пошаљи";
 
+/* Resend button title. */
+"Resend" = "Поново пошаљи";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Имејл";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Изаберите лозинку";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Имате проблема при пријављивању?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Потврдите имејл адресу";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Пријављени сте!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Имате проблема са пријемом имејла?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Пробајте ова уобичајена решења: \n– Проверите да ли је имејл филтриран или обележен као непожељан.\n – Проверите интернет везу.\n – Проверите да ли сте тачно уписали имејл адресу.\n – Проверите да нисте остали без простора у пријемном сандучету, односно да нема других проблема са пријемним сандучетом.\n Ако наведене мере не уроде плодом, можете поново да пошаљете имејл. Имајте у виду да ћете тиме деактивирати линк у старијем имејлу.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Имејл за пријављивање са додатним упутствима је послат на %@. Проверите имејл да бисте довршили пријављивање.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Послали смо вам имејл за пријављивање";
diff --git a/Auth/FirebaseAuthUI/Strings/sv.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/sv.lproj/FirebaseAuthUI.strings
index b225ed554fc..a6bebc81b03 100644
--- a/Auth/FirebaseAuthUI/Strings/sv.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/sv.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Spara";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Skicka";
 
+/* Resend button title. */
+"Resend" = "Skicka igen";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "E-post";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Välj lösenord";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Har du problem med att logga in?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Bekräfta e-post";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Inloggad!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Får du inte e-postmeddelanden?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Prova dessa vanliga lösningar: \n – Kontrollera om meddelandet hamnade bland skräpposten eller filtrerades.\n – Kontrollera internetanslutningen.\n – Kontrollera att du inte stavade e-postadressen fel.\n – Kontrollera att du inte har ont om utrymme i inkorgen eller andra inkorgsrelaterade problem.\n Om ovanstående lösningar inte fungerar kan du testa att skicka meddelandet igen. Länken i det gamla meddelandet inaktiveras om du gör det.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Ett inloggningsmeddelande med instruktioner skickades till %@. Kontrollera din e-post för att slutföra inloggningen.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Inloggningsmeddelande skickat";
diff --git a/Auth/FirebaseAuthUI/Strings/ta.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/ta.lproj/FirebaseAuthUI.strings
index ab1e30d8ca3..eeebad5c3c3 100644
--- a/Auth/FirebaseAuthUI/Strings/ta.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/ta.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "சேமி";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "அனுப்பு";
 
+/* Resend button title. */
+"Resend" = "மீண்டும் அனுப்பு";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "மின்னஞ்சல்";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "கடவுச்சொல்லைத் தேர்வு செய்யவும்";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "உள்நுழைவதில் சிக்கலா?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "மின்னஞ்சலை உறுதிப்படுத்தவும்";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "உள்நுழைந்துவிட்டீர்கள்!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "மின்னஞ்சல்களைப் பெறுவதில் சிக்கல் உள்ளதா?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "இந்தப் பொதுவான திருத்தங்களை முயலவும்: \n - மின்னஞ்சல் ஸ்பேமாகக் குறிக்கப்பட்டுள்ளதா அல்லது வடிகட்டப்பட்டுள்ளதா எனப் பார்க்கவும்.\n - இணைய இணைப்பைச் சரிபார்க்கவும்.\n - உங்கள் மின்னஞ்சல் முகவரியில் எழுத்துப்பிழை இல்லை என்பதை உறுதிப்படுத்திக் கொள்ளவும்.\n - இன்பாக்ஸில் போதுமான இடமுள்ளதா என்பதையும், மற்ற இன்பாக்ஸ் அமைப்புகளுடன் தொடர்புடைய சிக்கல்களையும் சரிபார்க்கவும்.\n மேலேயுள்ளவற்றை முயன்றும் பலனளிக்கவில்லை எனில், நீங்கள் மீண்டும் மின்னஞ்சல் அனுப்பலாம். இது முந்தைய மின்னஞ்சலில் உள்ள இணைப்பை முடக்கிவிடும் என்பதை நினைவில் கொள்ளவும்.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "கூடுதல் வழிமுறைகளுடன் கூடிய உள்நுழைவு மின்னஞ்சல் %@ என்பதற்கு அனுப்பப்பட்டது. உள்நுழைவை நிறைவு செய்ய, உங்கள் மின்னஞ்சலைப் பார்க்கவும்.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "உள்நுழைவு மின்னஞ்சல் அனுப்பப்பட்டது";
diff --git a/Auth/FirebaseAuthUI/Strings/th.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/th.lproj/FirebaseAuthUI.strings
index 4b268b60626..ad6e9889dbb 100644
--- a/Auth/FirebaseAuthUI/Strings/th.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/th.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "บันทึก";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "ส่ง";
 
+/* Resend button title. */
+"Resend" = "ส่งซ้ำ";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "อีเมล";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "ตั้งรหัสผ่าน";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "หากพบปัญหาในการลงชื่อเช้าใช้";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "ยืนยันอีเมล";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "ลงชื่อเข้าใช้แล้ว";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "มีปัญหาในการรับอีเมลใช่ไหม";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "ลองใช้วิธีแก้ไขทั่วไปเหล่านี้ \n - ตรวจสอบว่าอีเมลดังกล่าวมีการทำเครื่องหมายว่าเป็นสแปมหรือผ่านการกรอง\n - ตรวจสอบการเชื่อมต่ออินเทอร์เน็ต\n - ตรวจสอบว่าสะกดชื่ออีเมลถูกต้องแล้ว\n - ตรวจสอบว่ายังมีพื้นที่เหลือในกล่องจดหมายหรือไม่มีปัญหาอื่นๆ ที่เกี่ยวข้องกับการตั้งค่ากล่องจดหมาย\n คุณอาจส่งอีเมลอีกครั้งได้ หากขั้นตอนข้างต้นไม่ช่วยแก้ไขปัญหา โปรดทราบว่าการกระทำดังกล่าวจะเป็นการปิดใช้งานลิงก์ในอีเมลเก่า";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "ระบบได้ส่งอีเมลลงชื่อเข้าใช้พร้อมวิธีการเพิ่มเติมไปยัง %@ แล้ว โปรดตรวจสอบอีเมลเพื่อลงชื่อเข้าใช้";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "ส่งอีเมลลงชื่อเข้าใช้แล้ว";
diff --git a/Auth/FirebaseAuthUI/Strings/tr.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/tr.lproj/FirebaseAuthUI.strings
index 43391a0b3c0..dc2df607b0f 100644
--- a/Auth/FirebaseAuthUI/Strings/tr.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/tr.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Kaydet";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Gönder";
 
+/* Resend button title. */
+"Resend" = "Tekrar gönder";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "E-posta";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Şifre seçin";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Oturum açılamıyor mu?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "E-posta Adresini Onaylayın";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Oturum açıldı!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "E-postaları almayla ilgili sorun mu yaşıyorsunuz?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Şu sık başvurulan düzeltme yöntemlerini deneyin: \n - E-postanın spam olarak işaretlenme veya filtrelenme durumunu kontrol edin.\n - İnternet bağlantınızı kontrol edin.\n - E-postanızda yazım hatası bulunmadığından emin olun.\n - Gelen kutunuzdaki boş alanın azalıp azalmadığını ve gelen kutusu ayarlarıyla ilgili başka bir sorun olup olmadığını kontrol edin.\n Yukarıdaki adımlar işe yaramazsa e-postayı yeniden gönderebilirsiniz. Bu işlemin eski e-postadaki bağlantıyı devre dışı bırakacağını göz önünde bulundurun.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "%@ adresine ek talimatlar içeren bir oturum açma e-postası gönderildi. Oturum açma işlemini tamamlamak için e-postanızı kontrol edin.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Oturum açma e-postası gönderildi";
diff --git a/Auth/FirebaseAuthUI/Strings/uk.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/uk.lproj/FirebaseAuthUI.strings
index d6b03c0c6ca..7950eacd484 100644
--- a/Auth/FirebaseAuthUI/Strings/uk.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/uk.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Зберегти";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Надіслати";
 
+/* Resend button title. */
+"Resend" = "Надіслати ще раз";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Електронна адреса";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Виберіть пароль";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Не вдається ввійти?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Підтвердьте електронну адресу";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Ви ввійшли";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Ви не отримуєте електронні листи?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Щоб вирішити проблему, скористайтеся порадами нижче. \n – Перевірте: можливо, електронний лист позначено як спам або відфільтровано.\n – Перевірте інтернет-з’єднання.\n – Переконайтеся, що ви правильно вказали електронну адресу.\n – Перевірте доступний обсяг пам’яті для папки \"Вхідні\" й інші можливі проблеми з налаштуваннями.\n – Якщо поради вище не допоможуть, надішліть електронний лист повторно. Зверніть увагу, що після цього посилання в давнішому електронному листі стане недійсним.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Посилання для входу та додаткові вказівки надіслано на адресу %@. Дотримуйтеся їх, щоб увійти в обліковий запис.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Електронну адресу для входу надіслано";
diff --git a/Auth/FirebaseAuthUI/Strings/ur.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/ur.lproj/FirebaseAuthUI.strings
index 21806660190..1e94ae6b921 100644
--- a/Auth/FirebaseAuthUI/Strings/ur.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/ur.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "محفوظ کریں";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "بھیجیں";
 
+/* Resend button title. */
+"Resend" = "دوبارہ بھیجیں";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "ای میل";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "پاس ورڈ منتخب کریں";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "سائن ان کرنے میں دشواری؟";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "ای میل کی تصدیق کریں";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "سائن ان ہو گیا!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "ای میلز حاصل کرنے میں دشواری پیش آ رہی ہے؟";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "یہ عام اصلاحات آزمائیں: \n - چیک کریں کہ آیا ای میل سپام یا فلٹر شدہ کے طور پر نشان زد کی گئی ہے۔\n - اپنا انٹرنیٹ کنکشن چیک کریں۔\n - چیک کریں کہ آپ نے اپنی ای میل کے ہجے میں غلطی تو نہیں کی ہے۔\n - چیک کریں کہ آپ کی ان باکس اسپیس ختم تو نہیں ہوگئی ہے یا دیگر ان باکس کی ترتیبات سے متعلق مسائل چیک کریں۔\n اگر مندرجہ بالا مراحل کام نہ کریں تو آپ ای میل دوبارہ بھیج سکتے ہیں۔ نوٹ کریں کہ اس سے پرانی ای میل میں موجود لنک غیر فعال ہو جائے گا۔";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "ایک سائن ان ای میل اضافی ہدایات کے ساتھ %@ کو بھیج دی گئی ہے۔ سائن ان مکمل کرنے کے لیے اپنی ای میل چیک کریں۔";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "سائن ان ای میل بھیج دی گئی";
diff --git a/Auth/FirebaseAuthUI/Strings/vi.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/vi.lproj/FirebaseAuthUI.strings
index 6d130d8521b..9328159cb32 100644
--- a/Auth/FirebaseAuthUI/Strings/vi.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/vi.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "Lưu";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "Gửi";
 
+/* Resend button title. */
+"Resend" = "Gửi lại";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "Email";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "Chọn mật khẩu";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "Bạn gặp sự cố khi đăng nhập?";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "Xác nhận email";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "Đã đăng nhập!";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "Bạn gặp vấn đề khi nhận email?";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "Hãy thử các cách khắc phục vấn đề phổ biến sau: \n - Kiểm tra xem email có bị đánh dấu là spam hay đã được lọc.\n - Kiểm tra kết nối Internet của bạn.\n - Kiểm tra để đảm bảo bạn không viết sai chính tả tên email.\n - Kiểm tra để đảm bảo dung lượng bộ nhớ hộp thư đến của bạn chưa hết hoặc không có vấn đề khác liên quan đến tùy chọn cài đặt hộp thư đến.\n Nếu các bước trên không hiệu quả, bạn có thể gửi lại email. Vui lòng lưu ý rằng thao tác này sẽ hủy kích hoạt đường dẫn liên kết trong email cũ.";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "Email đăng nhập có hướng dẫn bổ sung đã gửi tới %@. Hãy tìm email này trong hộp thư của bạn để hoàn tất đăng nhập.";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "Đã gửi email đăng nhập";
diff --git a/Auth/FirebaseAuthUI/Strings/zh-Hans.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/zh-Hans.lproj/FirebaseAuthUI.strings
index c943fe3c6aa..4a21d4d2655 100644
--- a/Auth/FirebaseAuthUI/Strings/zh-Hans.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/zh-Hans.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "保存";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "发送";
 
+/* Resend button title. */
+"Resend" = "重新发送";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "电子邮件";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "选择密码";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "登录时遇到问题？";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "确认电子邮件地址";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "已登录！";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "无法收到电子邮件？";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "尝试以下常见解决方法：\n - 检查电子邮件是否被标记为垃圾邮件或被过滤。\n - 检查互联网连接。\n - 确保没有写错电子邮件地址。\n - 确保收件箱空间充足，且不存在其他与收件箱设置有关的问题。\n 如果上述步骤未能帮助您解决问题，您可以重新发送电子邮件。请注意，重新发送后上一封电子邮件中的链接将失效。";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "系统已将含附加说明的登录电子邮件发送至 %@。请查收电子邮件以完成登录。";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "已发送登录电子邮件";
diff --git a/Auth/FirebaseAuthUI/Strings/zh-Hant-TW.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/zh-Hant-TW.lproj/FirebaseAuthUI.strings
index 43f757eea90..b46d7784533 100644
--- a/Auth/FirebaseAuthUI/Strings/zh-Hant-TW.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/zh-Hant-TW.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "儲存";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "傳送";
 
+/* Resend button title. */
+"Resend" = "重新傳送";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "電子郵件";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "選擇密碼";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "無法登入嗎？";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "確認電子郵件地址";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "登入成功！";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "沒收到電子郵件嗎？";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "請試試這些常見的解決方式：\n - 檢查電子郵件是否被標示為垃圾郵件或遭系統篩除。\n - 檢查您的網際網路連線。\n - 檢查電子郵件地址是否拼錯。\n - 確認收件匣的儲存空間是否足夠，或檢查與收件匣設定相關的其他問題。\n 如果上述步驟全部無效，建議您重新傳送電子郵件。請注意，這個動作會使先前郵件中的連結失效。";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "系統已將登入電子郵件傳送至 %@，其中包含額外的操作說明。請查看您的電子郵件以完成登入程序。";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "已寄出登入電子郵件";
diff --git a/Auth/FirebaseAuthUI/Strings/zh-Hant.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/zh-Hant.lproj/FirebaseAuthUI.strings
index 43f757eea90..b46d7784533 100644
--- a/Auth/FirebaseAuthUI/Strings/zh-Hant.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/zh-Hant.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "儲存";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "傳送";
 
+/* Resend button title. */
+"Resend" = "重新傳送";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "電子郵件";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "選擇密碼";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "無法登入嗎？";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "確認電子郵件地址";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "登入成功！";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "沒收到電子郵件嗎？";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "請試試這些常見的解決方式：\n - 檢查電子郵件是否被標示為垃圾郵件或遭系統篩除。\n - 檢查您的網際網路連線。\n - 檢查電子郵件地址是否拼錯。\n - 確認收件匣的儲存空間是否足夠，或檢查與收件匣設定相關的其他問題。\n 如果上述步驟全部無效，建議您重新傳送電子郵件。請注意，這個動作會使先前郵件中的連結失效。";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "系統已將登入電子郵件傳送至 %@，其中包含額外的操作說明。請查看您的電子郵件以完成登入程序。";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "已寄出登入電子郵件";
diff --git a/Auth/FirebaseAuthUI/Strings/zh.lproj/FirebaseAuthUI.strings b/Auth/FirebaseAuthUI/Strings/zh.lproj/FirebaseAuthUI.strings
index c943fe3c6aa..4a21d4d2655 100644
--- a/Auth/FirebaseAuthUI/Strings/zh.lproj/FirebaseAuthUI.strings
+++ b/Auth/FirebaseAuthUI/Strings/zh.lproj/FirebaseAuthUI.strings
@@ -103,9 +103,12 @@
 /* Save button title. */
 "Save" = "保存";
 
-/* Save button title. */
+/* Send button title. */
 "Send" = "发送";
 
+/* Resend button title. */
+"Resend" = "重新发送";
+
 /* Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars. */
 "Email" = "电子邮件";
 
@@ -244,5 +247,23 @@
 /* Placeholder of secret input cell when user changes password. */
 "PlaceholderChosePassword" = "选择密码";
 
-/* The title of forgot password button. */
+/* Title of forgot password button. */
 "ForgotPasswordTitle" = "登录时遇到问题？";
+
+/* Title of confirm email label. */
+"ConfirmEmail" = "确认电子邮件地址";
+
+/* Title of successfully signed in label. */
+"SignedIn" = "已登录！";
+
+/* Title used in trouble getting email alert view. */
+"TroubleGettingEmailTitle" = "无法收到电子邮件？";
+
+/* Alert message displayed when user having trouble getting email. */
+"TroubleGettingEmailMessage" = "尝试以下常见解决方法：\n - 检查电子邮件是否被标记为垃圾邮件或被过滤。\n - 检查互联网连接。\n - 确保没有写错电子邮件地址。\n - 确保收件箱空间充足，且不存在其他与收件箱设置有关的问题。\n 如果上述步骤未能帮助您解决问题，您可以重新发送电子邮件。请注意，重新发送后上一封电子邮件中的链接将失效。";
+
+/* Message displayed after email is sent. The placeholder is the email address that the email is sent to. */
+"EmailSentConfirmationMessage" = "系统已将含附加说明的登录电子邮件发送至 %@。请查收电子邮件以完成登录。";
+
+/* Message displayed after the email of sign-in link is sent. */
+"SignInEmailSent" = "已发送登录电子邮件";
diff --git a/EmailAuth/FirebaseEmailAuthUI/FUIConfirmEmailViewController.h b/EmailAuth/FirebaseEmailAuthUI/FUIConfirmEmailViewController.h
new file mode 100644
index 00000000000..f366a5ce8b6
--- /dev/null
+++ b/EmailAuth/FirebaseEmailAuthUI/FUIConfirmEmailViewController.h
@@ -0,0 +1,44 @@
+//
+//  Copyright (c) 2018 Google Inc.
+//
+//  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.
+//
+
+#import <UIKit/UIKit.h>
+
+#import "FUIAuthBaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/** @class FUIConfirmEmailViewController
+    @brief The view controller that asks for user's email address.
+ */
+@interface FUIConfirmEmailViewController : FUIAuthBaseViewController
+
+/** @fn onNext:
+    @brief Should be called when user entered email. Triggers email verification before
+        pushing new controller
+    @param emailText Email value entered by user.
+ */
+- (void)onNext:(NSString *)emailText;
+
+/** @fn didChangeEmail:
+    @brief Update UI control state according to the email provided. Should be called after any
+        change of email.
+    @param emailText Email value entered by user.
+ */
+- (void)didChangeEmail:(NSString *)emailText;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/EmailAuth/FirebaseEmailAuthUI/FUIConfirmEmailViewController.m b/EmailAuth/FirebaseEmailAuthUI/FUIConfirmEmailViewController.m
new file mode 100755
index 00000000000..d58f40804fd
--- /dev/null
+++ b/EmailAuth/FirebaseEmailAuthUI/FUIConfirmEmailViewController.m
@@ -0,0 +1,302 @@
+//
+//  Copyright (c) 2018 Google Inc.
+//
+//  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.
+//
+
+#import "FUIConfirmEmailViewController.h"
+
+#import <FirebaseAuth/FirebaseAuth.h>
+#import "FUIAuth_Internal.h"
+#import "FUIAuthBaseViewController_Internal.h"
+#import "FUIAuthProvider.h"
+#import "FUIAuthStrings.h"
+#import "FUIAuthTableViewCell.h"
+#import "FUIAuthUtils.h"
+#import "FUIEmailAuth.h"
+#import "FUIEmailAuth_Internal.h"
+#import "FUIEmailAuthStrings.h"
+#import "FUIPasswordSignInViewController.h"
+#import "FUIPasswordSignUpViewController.h"
+#import "FUIPrivacyAndTermsOfServiceView.h"
+
+/** @var kCellReuseIdentifier
+    @brief The reuse identifier for table view cell.
+ */
+static NSString *const kCellReuseIdentifier = @"cellReuseIdentifier";
+
+/** @var kAppIDCodingKey
+    @brief The key used to encode the app ID for NSCoding.
+ */
+static NSString *const kAppIDCodingKey = @"appID";
+
+/** @var kAuthUICodingKey
+    @brief The key used to encode @c FUIAuth instance for NSCoding.
+ */
+static NSString *const kAuthUICodingKey = @"authUI";
+
+/** @var kEmailCellAccessibilityID
+    @brief The Accessibility Identifier for the @c email sign in cell.
+ */
+static NSString *const kEmailCellAccessibilityID = @"EmailCellAccessibilityID";
+
+/** @var kNextButtonAccessibilityID
+    @brief The Accessibility Identifier for the @c next button.
+ */
+static NSString *const kNextButtonAccessibilityID = @"NextButtonAccessibilityID";
+
+@interface FUIConfirmEmailViewController () <UITableViewDataSource, UITextFieldDelegate>
+
+/** @property emailField
+    @brief The @c UITextField that user enters email address into.
+ */
+@property (nonatomic) UITextField *emailField;
+
+/** @property tableView
+    @brief The @c UITableView used to store all UI elements.
+ */
+@property (nonatomic, weak) IBOutlet UITableView *tableView;
+
+/** @property termsOfServiceView
+    @brief The @c Text view which displays Terms of Service.
+ */
+@property (nonatomic, weak) IBOutlet FUIPrivacyAndTermsOfServiceView *termsOfServiceView;
+
+@end
+
+@implementation FUIConfirmEmailViewController
+
+- (instancetype)initWithAuthUI:(FUIAuth *)authUI {
+  return [self initWithNibName:NSStringFromClass([self class])
+                        bundle:[FUIAuthUtils bundleNamed:FUIEmailAuthBundleName]
+                        authUI:authUI];
+}
+
+- (instancetype)initWithNibName:(NSString *)nibNameOrNil
+                         bundle:(NSBundle *)nibBundleOrNil
+                         authUI:(FUIAuth *)authUI {
+  self = [super initWithNibName:nibNameOrNil
+                         bundle:nibBundleOrNil
+                         authUI:authUI];
+  if (self) {
+    self.title = FUILocalizedString(kStr_ConfirmEmail);
+  }
+  return self;
+}
+
+- (void)viewDidLoad {
+  [super viewDidLoad];
+
+  UIBarButtonItem *nextButtonItem =
+      [FUIAuthBaseViewController barItemWithTitle:FUILocalizedString(kStr_Next)
+                                           target:self
+                                           action:@selector(next)];
+  nextButtonItem.accessibilityIdentifier = kNextButtonAccessibilityID;
+  self.navigationItem.rightBarButtonItem = nextButtonItem;
+  self.termsOfServiceView.authUI = self.authUI;
+  [self.termsOfServiceView useFullMessage];
+
+  [self enableDynamicCellHeightForTableView:self.tableView];
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+  [super viewWillAppear:animated];
+
+  if (self.navigationController.viewControllers.firstObject == self) {
+    if (!self.authUI.shouldHideCancelButton) {
+      UIBarButtonItem *cancelBarButton =
+      [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel
+                                                    target:self
+                                                    action:@selector(cancelAuthorization)];
+      self.navigationItem.leftBarButtonItem = cancelBarButton;
+    }
+    self.navigationItem.backBarButtonItem =
+        [[UIBarButtonItem alloc] initWithTitle:FUILocalizedString(kStr_Back)
+                                         style:UIBarButtonItemStylePlain
+                                        target:nil
+                                        action:nil];
+  }
+}
+
+#pragma mark - Actions
+
+- (void)next {
+  [self onNext:self.emailField.text];
+}
+
+- (void)onNext:(NSString *)emailText {
+  FUIEmailAuth *emailAuth = [self.authUI providerWithID:FIREmailAuthProviderID];
+
+  if (![[self class] isValidEmail:emailText]) {
+    [self showAlertWithMessage:FUILocalizedString(kStr_InvalidEmailError)];
+    return;
+  }
+
+  [self incrementActivity];
+  FIRAuthCredential *credential =
+      [FIREmailAuthProvider credentialWithEmail:emailText link:emailAuth.emailLink];
+
+  void (^completeSignInBlock)(FIRAuthDataResult *, NSError *) = ^(FIRAuthDataResult *authResult,
+                                                                  NSError *error) {
+    [self decrementActivity];
+
+    if (error) {
+      switch (error.code) {
+        case FIRAuthErrorCodeWrongPassword:
+          [self showAlertWithMessage:FUILocalizedString(kStr_WrongPasswordError)];
+          return;
+        case FIRAuthErrorCodeUserNotFound:
+          [self showAlertWithMessage:FUILocalizedString(kStr_UserNotFoundError)];
+          return;
+        case FIRAuthErrorCodeUserDisabled:
+          [self showAlertWithMessage:FUILocalizedString(kStr_AccountDisabledError)];
+          return;
+        case FIRAuthErrorCodeTooManyRequests:
+          [self showAlertWithMessage:FUILocalizedString(kStr_SignInTooManyTimesError)];
+          return;
+        default:
+          [self showAlertWithMessage:error.description];
+          return;
+      }
+    }
+
+    [[self class] showAlertWithTitle:FUILocalizedString(kStr_SignedIn)
+                             message:nil
+                         actionTitle:nil
+                       actionHandler:nil
+                        dismissTitle:@"OK"
+                      dismissHandler:^{
+                        [self.navigationController dismissViewControllerAnimated:YES completion:^{
+                          [self.authUI invokeResultCallbackWithAuthDataResult:authResult URL:nil error:error];
+                        }];
+                      }
+            presentingViewController:self];
+  };
+
+  [self.auth signInAndRetrieveDataWithCredential:credential completion:completeSignInBlock];
+}
+
+- (void)textFieldDidChange {
+  [self didChangeEmail:self.emailField.text];
+}
+
+- (void)didChangeEmail:(NSString *)emailText {
+  self.navigationItem.rightBarButtonItem.enabled = (emailText.length > 0);
+}
+
+#pragma mark - UITableViewDataSource
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+  return 1;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView
+         cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+  FUIAuthTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellReuseIdentifier];
+  if (!cell) {
+    UINib *cellNib = [UINib nibWithNibName:NSStringFromClass([FUIAuthTableViewCell class])
+                                    bundle:[FUIAuthUtils bundleNamed:FUIAuthBundleName]];
+    [tableView registerNib:cellNib forCellReuseIdentifier:kCellReuseIdentifier];
+    cell = [tableView dequeueReusableCellWithIdentifier:kCellReuseIdentifier];
+  }
+  cell.label.text = FUILocalizedString(kStr_Email);
+  cell.textField.placeholder = FUILocalizedString(kStr_ConfirmEmail);
+  cell.textField.delegate = self;
+  cell.accessibilityIdentifier = kEmailCellAccessibilityID;
+  self.emailField = cell.textField;
+  cell.textField.secureTextEntry = NO;
+  cell.textField.autocorrectionType = UITextAutocorrectionTypeNo;
+  cell.textField.autocapitalizationType = UITextAutocapitalizationTypeNone;
+  cell.textField.returnKeyType = UIReturnKeyNext;
+  cell.textField.keyboardType = UIKeyboardTypeEmailAddress;
+  if (@available(iOS 11.0, *)) {
+    cell.textField.textContentType = UITextContentTypeUsername;
+  }
+  [cell.textField addTarget:self
+                     action:@selector(textFieldDidChange)
+           forControlEvents:UIControlEventEditingChanged];
+  [self didChangeEmail:self.emailField.text];
+  return cell;
+}
+
+- (nullable id<FUIAuthProvider>)bestProviderFromProviderIDs:(NSArray<NSString *> *)providerIDs {
+  NSArray<id<FUIAuthProvider>> *providers = self.authUI.providers;
+  for (NSString *providerID in providerIDs) {
+    for (id<FUIAuthProvider> provider in providers) {
+      if ([providerID isEqual:provider.providerID]) {
+        return provider;
+      }
+    }
+  }
+  return nil;
+}
+
+#pragma mark - UITextFieldDelegate
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+  if (textField == self.emailField) {
+    [self onNext:self.emailField.text];
+  }
+  return NO;
+}
+
+#pragma mark - Utilities
+
+/** @fn signInWithProvider:email:
+    @brief Actually kicks off sign in with the provider.
+    @param provider The identity provider to sign in with.
+    @param email The email address of the user.
+ */
+- (void)signInWithProvider:(id<FUIAuthProvider>)provider email:(NSString *)email {
+  [self incrementActivity];
+
+  // Sign out first to make sure sign in starts with a clean state.
+  [provider signOut];
+  [provider signInWithDefaultValue:email
+          presentingViewController:self
+                        completion:^(FIRAuthCredential * _Nullable credential,
+                                     NSError * _Nullable error,
+                                     FIRAuthResultCallback  _Nullable result,
+                                     NSDictionary<NSString *,id> * _Nullable userInfo) {
+    if (error) {
+      [self decrementActivity];
+      if (result) {
+        result(nil, error);
+      }
+
+      [self dismissNavigationControllerAnimated:YES completion:^{
+        [self.authUI invokeResultCallbackWithAuthDataResult:nil URL:nil error:error];
+      }];
+      return;
+    }
+
+    [self.auth signInAndRetrieveDataWithCredential:credential
+                                        completion:^(FIRAuthDataResult *_Nullable authResult,
+                                                     NSError *_Nullable error) {
+        [self decrementActivity];
+        if (result) {
+          result(authResult.user, error);
+        }
+
+        if (error) {
+          [self.authUI invokeResultCallbackWithAuthDataResult:nil URL:nil error:error];
+        } else {
+          [self dismissNavigationControllerAnimated:YES completion:^{
+            [self.authUI invokeResultCallbackWithAuthDataResult:authResult URL:nil error:error];
+          }];
+        }
+      }];
+    }];
+}
+
+@end
diff --git a/EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth.h b/EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth.h
index 0ff13dd298e..c04ee3408b2 100644
--- a/EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth.h
+++ b/EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth.h
@@ -31,13 +31,17 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface FUIEmailAuth : NSObject <FUIAuthProvider>
 
+/** @property emailLink.
+ @brief The link for email link sign in.
+ */
+@property(nonatomic, strong, readwrite, nullable) NSString *emailLink;
+
 - (instancetype)initAuthAuthUI:(FUIAuth *)authUI
                   signInMethod:(NSString *)signInMethod
                forceSameDevice:(BOOL)forceSameDevice
          allowNewEmailAccounts:(BOOL)allowNewEmailAccounts
              actionCodeSetting:(FIRActionCodeSettings *)actionCodeSettings;
 
-
 /** @property signInMethod.
     @brief Defines the sign in method for FIREmailAuthProvider.
            This can be one of the following string constants:
diff --git a/EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth.m b/EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth.m
index 92d14c9c094..4f0aaa27b03 100644
--- a/EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth.m
+++ b/EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth.m
@@ -20,18 +20,21 @@
 #import <FirebaseCore/FIROptions.h>
 #import <FirebaseAuth/FIRAuth.h>
 #import <FirebaseAuth/FirebaseAuth.h>
+#import <GoogleUtilities/GULUserDefaults.h>
 #import "FUIAuth.h"
 #import "FUIAuth_Internal.h"
 #import "FUIAuthStrings.h"
 #import "FUIAuthUtils.h"
 #import "FUIAuthErrorUtils.h"
+#import "FUIAuthBaseViewController.h"
+#import "FUIAuthBaseViewController_Internal.h"
+#import "FUIConfirmEmailViewController.h"
 #import "FUIEmailAuthStrings.h"
+#import "FUIEmailAuth_Internal.h"
 #import "FUIEmailEntryViewController.h"
 #import "FUIPasswordSignInViewController_Internal.h"
 #import "FUIPasswordVerificationViewController.h"
 #import "FUIPasswordSignInViewController.h"
-#import "FUIAuthBaseViewController.h"
-#import "FUIAuthBaseViewController_Internal.h"
 
 /** @var kErrorUserInfoEmailKey
     @brief The key for the email address in the userinfo dictionary of a sign in error.
@@ -43,6 +46,16 @@
  */
 static NSString *const kEmailButtonAccessibilityID = @"EmailButtonAccessibilityID";
 
+/** @var kEmailLinkSignInEmailKey
+    @brief The key of the email which request email link sign in.
+ */
+static NSString *const kEmailLinkSignInEmailKey = @"FIRAuthEmailLinkSignInEmail";
+
+/** @var kEmailLinkSignInLinkingCredentialKey
+ @brief The key of the auth credential to be linked.
+ */
+static NSString *const kEmailLinkSignInLinkingCredentialKey = @"FIRAuthEmailLinkSignInLinkingCredential";
+
 @interface FUIEmailAuth () <FUIEmailAuthProvider>
 /** @property authUI.
     @brief The @c FUIAuth instance of the application.
@@ -190,10 +203,253 @@ - (void)signInWithDefaultValue:(nullable NSString *)defaultValue
 }
 
 - (void)signOut {
+
 }
 
 - (BOOL)handleOpenURL:(NSURL *)URL sourceApplication:(nullable NSString *)sourceApplication {
-  return NO;
+  self.emailLink = URL.absoluteString;
+  
+  // Retrieve continueUrl from URL
+  NSURLComponents *urlComponents = [NSURLComponents componentsWithString:URL.absoluteString];
+  NSString *continueURLString;
+  for (NSURLQueryItem *queryItem in urlComponents.queryItems) {
+    if ([queryItem.name isEqualToString:@"continueUrl"]) {
+      continueURLString = queryItem.value;
+    }
+  }
+  if (!continueURLString) {
+    [FUIAuthBaseViewController showAlertWithMessage:@"Invalid link! Missing continue URL."];
+  }
+
+  // Retrieve url parameters from continueUrl
+  NSMutableDictionary *urlParameterDict= [NSMutableDictionary dictionary];
+  NSURLComponents *continueURLComponents = [NSURLComponents componentsWithString:continueURLString];
+  for (NSURLQueryItem *queryItem in continueURLComponents.queryItems) {
+    urlParameterDict[queryItem.name] = queryItem.value;
+  }
+  // Retrieve parameters from local storage
+  NSMutableDictionary *localParameterDict = [NSMutableDictionary dictionary];
+  localParameterDict[kEmailLinkSignInEmailKey] = [GULUserDefaults.standardUserDefaults
+                                                  stringForKey:kEmailLinkSignInEmailKey];
+  localParameterDict[@"ui_sid"] = [GULUserDefaults.standardUserDefaults stringForKey:@"ui_sid"];
+
+  // Handling flows
+  NSString *urlSessionID = urlParameterDict[@"ui_sid"];
+  NSString *localSessionID = localParameterDict[@"ui_sid"];
+  BOOL sameDevice = urlSessionID && localSessionID && [urlSessionID isEqualToString:localSessionID];
+
+  if (sameDevice) {
+    // Same device
+    if (urlParameterDict[@"ui_pid"]) {
+      // Unverified provider linking
+      [self handleUnverifiedProviderLinking:urlParameterDict[@"ui_pid"]
+                                      email:localParameterDict[kEmailLinkSignInEmailKey]];
+    } else if (urlParameterDict[@"ui_auid"]) {
+      // Anonymous upgrade
+      [self handleAnonymousUpgrade:urlParameterDict[@"ui_auid"]
+                             email:localParameterDict[kEmailLinkSignInEmailKey]];
+    } else {
+      // Normal email link sign in
+      [self handleEmaiLinkSignIn:localParameterDict[kEmailLinkSignInEmailKey]];
+    }
+  } else {
+    // Different device
+    if ([urlParameterDict[@"ui_sd"] isEqualToString:@"1"]) {
+      // Force same device enabled
+      [self handleDifferentDevice];
+    } else {
+      // Force same device not enabled
+      [self handleConfirmEmail];
+    }
+  }
+
+  return YES;
+}
+
+- (void)handleUnverifiedProviderLinking:(NSString *)providerID
+                                  email:(NSString *)email {
+  if ([providerID isEqualToString:FIRFacebookAuthProviderID]) {
+    NSData *unverifiedProviderCredentialData = [GULUserDefaults.standardUserDefaults
+                                                objectForKey:kEmailLinkSignInLinkingCredentialKey];
+    FIRAuthCredential *unverifiedProviderCredential =
+        [NSKeyedUnarchiver unarchiveObjectWithData:unverifiedProviderCredentialData];
+
+    FIRAuthCredential *emailLinkCredential =
+    [FIREmailAuthProvider credentialWithEmail:email link:self.emailLink];
+
+    void (^completeSignInBlock)(FIRAuthDataResult *, NSError *) = ^(FIRAuthDataResult *authResult,
+                                                                    NSError *error) {
+      if (error) {
+        switch (error.code) {
+          case FIRAuthErrorCodeWrongPassword:
+            [FUIAuthBaseViewController showAlertWithMessage:FUILocalizedString(kStr_WrongPasswordError)];
+            return;
+          case FIRAuthErrorCodeUserNotFound:
+            [FUIAuthBaseViewController showAlertWithMessage:FUILocalizedString(kStr_UserNotFoundError)];
+            return;
+          case FIRAuthErrorCodeUserDisabled:
+            [FUIAuthBaseViewController showAlertWithMessage:FUILocalizedString(kStr_AccountDisabledError)];
+            return;
+          case FIRAuthErrorCodeTooManyRequests:
+            [FUIAuthBaseViewController showAlertWithMessage:FUILocalizedString(kStr_SignInTooManyTimesError)];
+            return;
+        }
+      }
+
+      void (^dismissHandler)(void) = ^() {
+        UINavigationController *authViewController = [self.authUI authViewController];
+        if (!(authViewController.isViewLoaded && authViewController.view.window)) {
+          [authViewController.navigationController dismissViewControllerAnimated:YES completion:nil];
+        }
+        [self.authUI invokeResultCallbackWithAuthDataResult:authResult URL:nil error:error];
+      };
+
+      [FUIAuthBaseViewController showAlertWithTitle:FUILocalizedString(kStr_SignedIn)
+                                            message:nil
+                                        actionTitle:nil
+                                      actionHandler:nil
+                                       dismissTitle:@"OK"
+                                     dismissHandler:dismissHandler
+                           presentingViewController:nil];
+    };
+
+    [self.authUI.auth signInAndRetrieveDataWithCredential:emailLinkCredential
+                                               completion:^(FIRAuthDataResult * _Nullable authResult, NSError * _Nullable error) {
+      if (error) {
+        [FUIAuthBaseViewController showAlertWithMessage:error.description];
+        return;
+      }
+
+      [authResult.user linkAndRetrieveDataWithCredential:unverifiedProviderCredential completion:completeSignInBlock];
+    }];
+  }
+}
+
+- (void)handleAnonymousUpgrade:(NSString *)anonymousUserID email:(NSString *)email {
+  // Check for the presence of an anonymous user and whether automatic upgrade is enabled.
+  if (self.authUI.auth.currentUser.isAnonymous &&
+      self.authUI.shouldAutoUpgradeAnonymousUsers &&
+      [anonymousUserID isEqualToString:self.authUI.auth.currentUser.uid]) {
+
+    FIRAuthCredential *credential =
+        [FIREmailAuthProvider credentialWithEmail:email link:self.emailLink];
+
+    void (^completeSignInBlock)(FIRAuthDataResult *, NSError *) = ^(FIRAuthDataResult *authResult,
+                                                                    NSError *error) {
+      if (error) {
+        switch (error.code) {
+          case FIRAuthErrorCodeWrongPassword:
+            [FUIAuthBaseViewController showAlertWithMessage:FUILocalizedString(kStr_WrongPasswordError)];
+            return;
+          case FIRAuthErrorCodeUserNotFound:
+            [FUIAuthBaseViewController showAlertWithMessage:FUILocalizedString(kStr_UserNotFoundError)];
+            return;
+          case FIRAuthErrorCodeUserDisabled:
+            [FUIAuthBaseViewController showAlertWithMessage:FUILocalizedString(kStr_AccountDisabledError)];
+            return;
+          case FIRAuthErrorCodeTooManyRequests:
+            [FUIAuthBaseViewController showAlertWithMessage:FUILocalizedString(kStr_SignInTooManyTimesError)];
+            return;
+        }
+      }
+      [FUIAuthBaseViewController showAlertWithMessage:FUILocalizedString(kStr_SignedIn)];
+    };
+
+    [self.authUI.auth.currentUser
+     linkAndRetrieveDataWithCredential:credential
+     completion:^(FIRAuthDataResult *_Nullable authResult,
+                  NSError *_Nullable error) {
+       if (error) {
+         if (error.code == FIRAuthErrorCodeEmailAlreadyInUse) {
+           NSDictionary *userInfo = @{ FUIAuthCredentialKey : credential };
+           NSError *mergeError = [FUIAuthErrorUtils mergeConflictErrorWithUserInfo:userInfo
+                                                                   underlyingError:error];
+           completeSignInBlock(nil, mergeError);
+           return;
+         }
+         completeSignInBlock(nil, error);
+         return;
+       }
+       completeSignInBlock(authResult, nil);
+     }];
+  } else {
+    [self handleDifferentDevice];
+  }
+}
+
+- (void)handleEmaiLinkSignIn:(NSString *)email {
+  FIRAuthCredential *credential =
+  [FIREmailAuthProvider credentialWithEmail:email link:self.emailLink];
+
+  void (^completeSignInBlock)(FIRAuthDataResult *, NSError *) = ^(FIRAuthDataResult *authResult,
+                                                                  NSError *error) {
+    if (error) {
+      switch (error.code) {
+        case FIRAuthErrorCodeWrongPassword:
+          [FUIAuthBaseViewController showAlertWithMessage:FUILocalizedString(kStr_WrongPasswordError)];
+          return;
+        case FIRAuthErrorCodeUserNotFound:
+          [FUIAuthBaseViewController showAlertWithMessage:FUILocalizedString(kStr_UserNotFoundError)];
+          return;
+        case FIRAuthErrorCodeUserDisabled:
+          [FUIAuthBaseViewController showAlertWithMessage:FUILocalizedString(kStr_AccountDisabledError)];
+          return;
+        case FIRAuthErrorCodeTooManyRequests:
+          [FUIAuthBaseViewController showAlertWithMessage:FUILocalizedString(kStr_SignInTooManyTimesError)];
+          return;
+      }
+    }
+
+    void (^dismissHandler)(void) = ^() {
+      UINavigationController *authViewController = [self.authUI authViewController];
+      if (!(authViewController.isViewLoaded && authViewController.view.window)) {
+        [authViewController.navigationController dismissViewControllerAnimated:YES completion:nil];
+      }
+      [self.authUI invokeResultCallbackWithAuthDataResult:authResult URL:nil error:error];
+    };
+
+    [FUIAuthBaseViewController showAlertWithTitle:FUILocalizedString(kStr_SignedIn)
+                                          message:nil
+                                      actionTitle:nil
+                                    actionHandler:nil
+                                     dismissTitle:FUILocalizedString(kStr_OK)
+                                   dismissHandler:dismissHandler
+                         presentingViewController:nil];
+  };
+
+  [self.authUI.auth signInAndRetrieveDataWithCredential:credential completion:completeSignInBlock];
+}
+
+- (void)handleDifferentDevice {
+  UINavigationController *authViewController = [self.authUI authViewController];
+  void (^completion)(void) = ^(){
+    [FUIAuthBaseViewController showAlertWithTitle:@"New Device detected"
+                                          message:@"Try opening the link using the same "
+                                                  "device where you started the sign-in process"
+                         presentingViewController:authViewController];
+  };
+
+  if (!(authViewController.isViewLoaded && authViewController.view.window)) {
+    [UIApplication.sharedApplication.keyWindow.rootViewController
+       presentViewController:authViewController animated:YES completion:completion];
+  } else {
+    completion();
+  }
+}
+
+- (void)handleConfirmEmail {
+  UINavigationController *authViewController = [self.authUI authViewController];
+  void (^completion)(void) = ^(){
+    UIViewController *controller = [[FUIConfirmEmailViewController alloc] initWithAuthUI:self.authUI];
+    [authViewController pushViewController:controller animated:YES];
+  };
+
+  if (!(authViewController.isViewLoaded && authViewController.view.window)) {
+    [UIApplication.sharedApplication.keyWindow.rootViewController
+     presentViewController:authViewController animated:YES completion:completion];
+  } else {
+    completion();
+  }
 }
 
 /** @fn callbackWithCredential:error:
@@ -318,17 +574,18 @@ - (void)signInWithEmailHint:(NSString *)emailHint
                 [FUIAuthBaseViewController showAlertWithTitle:title
                                                       message:message
                                                   actionTitle:@"Continue"
-                                     presentingViewController:presentingViewController
                                                 actionHandler:^{
                   if (completion) {
                     completion(authResult, nil, credential);
                   }
                 }
-                                                cancelHandler:^{
+                                                 dismissTitle:@"Cancel"
+                                               dismissHandler:^{
                   if (completion) {
                     completion(nil, error, credential);
                   }
-                }];
+                }
+                                     presentingViewController:presentingViewController];
               }
               if (completion) {
                 completion(authResult, error, credential);
@@ -351,9 +608,9 @@ - (void)handleAccountLinkingForEmail:(NSString *)email
             presentingViewController:(UIViewController *)presentingViewController
                         signInResult:(_Nullable FIRAuthResultCallback)result {
   id<FUIAuthDelegate> delegate = self.authUI.delegate;
-  [self.authUI.auth fetchProvidersForEmail:email
-                         completion:^(NSArray<NSString *> *_Nullable providers,
-                                      NSError *_Nullable error) {
+  [self.authUI.auth fetchSignInMethodsForEmail:email
+                                    completion:^(NSArray<NSString *> *_Nullable providers,
+                                                 NSError *_Nullable error) {
     if (result) {
       result(nil, error);
     }
@@ -400,6 +657,58 @@ - (void)handleAccountLinkingForEmail:(NSString *)email
       }
       return;
     }
+
+    if ([bestProviderID isEqual:FIREmailLinkAuthSignInMethod]) {
+      NSString *providerName;
+      if ([newCredential.provider isEqualToString:FIRFacebookAuthProviderID]) {
+        providerName = @"Facebook";
+      } else if ([newCredential.provider isEqualToString:FIRTwitterAuthProviderID]) {
+        providerName = @"Twitter";
+      } else if ([newCredential.provider isEqualToString:FIRGitHubAuthProviderID]) {
+        providerName = @"Github";
+      }
+      NSString *message = [NSString stringWithFormat:
+          @"You already have an account\n \n You've already used %@. You "
+          "can connect your %@ account with %@ by signing in with Email "
+          "link below. \n \n For this flow to successfully connect your "
+          "account with this email, you have to open the link on the same "
+          "device or browser.", email, providerName, email];
+      void (^actionHandler)(void) = ^() {
+        [self generateURLParametersAndLocalCache:email
+                                 linkingProvider:newCredential.provider];
+
+        NSData *data = [NSKeyedArchiver archivedDataWithRootObject:newCredential];
+        [GULUserDefaults.standardUserDefaults setObject:data forKey:kEmailLinkSignInLinkingCredentialKey];
+
+        void (^completion)(NSError * _Nullable error) = ^(NSError * _Nullable error){
+          if (error) {
+            [FUIAuthBaseViewController showAlertWithMessage:error.description];
+          } else {
+            NSString *signInMessage = [NSString stringWithFormat:
+                                       @"A sign-in email with additional instrucitons was sent to %@. Check your "
+                                       "email to complete sign-in.", email];
+            [FUIAuthBaseViewController
+             showAlertWithTitle:@"Sign-in email sent"
+             message:signInMessage
+             presentingViewController:nil];
+          }
+        };
+        [self.authUI.auth sendSignInLinkToEmail:email
+                             actionCodeSettings:self.actionCodeSettings
+                                     completion:completion];
+      };
+
+      [FUIAuthBaseViewController
+          showAlertWithTitle:@"Sign in"
+                     message:message
+                 actionTitle:@"Sign in"
+               actionHandler:actionHandler
+                dismissTitle:nil
+              dismissHandler:nil
+    presentingViewController:nil];
+      return;
+    }
+
     id<FUIAuthProvider> bestProvider = [self.authUI providerWithID:bestProviderID];
     if (!bestProvider) {
       // Unsupported provider.
@@ -467,6 +776,46 @@ - (void)handleAccountLinkingForEmail:(NSString *)email
 
 #pragma mark - Private
 
+- (void)generateURLParametersAndLocalCache:(NSString *)email linkingProvider:(NSString *)linkingProvider {
+  NSURL *url = self.actionCodeSettings.URL;
+  NSURLComponents *urlComponents = [NSURLComponents componentsWithString:url.absoluteString];
+  NSMutableArray<NSURLQueryItem *> *urlQuertItems = [NSMutableArray array];
+
+  [GULUserDefaults.standardUserDefaults setObject:email forKey:kEmailLinkSignInEmailKey];
+
+  if (self.authUI.auth.currentUser.isAnonymous && self.authUI.shouldAutoUpgradeAnonymousUsers) {
+    NSString *auid = self.authUI.auth.currentUser.uid;
+
+    NSURLQueryItem *anonymousUserIDQueryItem =
+        [NSURLQueryItem queryItemWithName:@"ui_auid" value:auid];
+    [urlQuertItems addObject:anonymousUserIDQueryItem];
+  }
+
+  NSInteger ui_sid = arc4random_uniform(999999999);
+  NSString *sidString = [NSString stringWithFormat:@"%ld", (long)ui_sid];
+  [GULUserDefaults.standardUserDefaults setObject:sidString forKey:@"ui_sid"];
+
+  NSURLQueryItem *sessionIDQueryItem =
+      [NSURLQueryItem queryItemWithName:@"ui_sid" value:sidString];
+  [urlQuertItems addObject:sessionIDQueryItem];
+
+  NSString *sameDeviceValueString;
+  if (self.forceSameDevice) {
+    sameDeviceValueString = @"1";
+  } else {
+    sameDeviceValueString = @"0";
+  }
+  NSURLQueryItem *sameDeviceQueryItem = [NSURLQueryItem queryItemWithName:@"ui_sd" value:sameDeviceValueString];
+  [urlQuertItems addObject:sameDeviceQueryItem];
+
+  if (linkingProvider) {
+    NSURLQueryItem *providerIDQueryItem = [NSURLQueryItem queryItemWithName:@"ui_pid" value:linkingProvider];
+    [urlQuertItems addObject:providerIDQueryItem];
+  }
+
+  urlComponents.queryItems = urlQuertItems;
+  self.actionCodeSettings.URL = urlComponents.URL;
+}
 
 - (nullable NSString *)authProviderFromProviders:(NSArray <NSString *> *) providers {
   NSSet *providerSet =
diff --git a/EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth_Internal.h b/EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth_Internal.h
index 75f28e7e4aa..7892d066c33 100644
--- a/EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth_Internal.h
+++ b/EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth_Internal.h
@@ -42,6 +42,14 @@ NS_ASSUME_NONNULL_BEGIN
 + (UIAlertController *)alertControllerForError:(NSError *)error
                                  actionHandler:(nullable FUIAuthAlertActionHandler)actionHandler;
 
+/** @fn generateURLParametersAndLocalCache:linkingProvider:
+    @brief Generate the parameters before sending out the email link. Append the parameters to
+        continue url and store them locally.
+    @param email The email that requested the email sign in link.
+    @param linkingProvider The id of the auth provider to be linked, if any.
+ */
+- (void)generateURLParametersAndLocalCache:(NSString *)email linkingProvider:(nullable NSString *)linkingProvider;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/EmailAuth/FirebaseEmailAuthUI/FUIEmailEntryViewController.m b/EmailAuth/FirebaseEmailAuthUI/FUIEmailEntryViewController.m
index b7a5fd497be..b3faceceb95 100755
--- a/EmailAuth/FirebaseEmailAuthUI/FUIEmailEntryViewController.m
+++ b/EmailAuth/FirebaseEmailAuthUI/FUIEmailEntryViewController.m
@@ -24,6 +24,7 @@
 #import "FUIAuthUtils.h"
 #import "FUIAuth_Internal.h"
 #import "FUIEmailAuth.h"
+#import "FUIEmailAuth_Internal.h"
 #import "FUIEmailAuthStrings.h"
 #import "FUIPasswordSignInViewController.h"
 #import "FUIPasswordSignUpViewController.h"
@@ -145,9 +146,9 @@ - (void)onNext:(NSString *)emailText {
 
   [self incrementActivity];
 
-  [self.auth fetchProvidersForEmail:emailText
-                         completion:^(NSArray<NSString *> *_Nullable providers,
-                                      NSError *_Nullable error) {
+  [self.auth fetchSignInMethodsForEmail:emailText
+                             completion:^(NSArray<NSString *> *_Nullable providers,
+                                          NSError *_Nullable error) {
     [self decrementActivity];
 
     if (error) {
@@ -183,6 +184,8 @@ - (void)onNext:(NSString *)emailText {
                                                                        email:emailText];
       }
       [self pushViewController:controller];
+    } else if ([emailAuth.signInMethod isEqualToString:FIREmailLinkAuthSignInMethod]) {
+      [self sendSignInLinkToEmail:emailText];
     } else {
       if (providers.count) {
         // There's some unsupported providers, surface the error to the user.
@@ -196,10 +199,10 @@ - (void)onNext:(NSString *)emailText {
                                                                    email:emailText];
           } else {
             controller = [[FUIPasswordSignUpViewController alloc] initWithAuthUI:self.authUI
-                                                                         email:emailText];
+                                                                           email:emailText];
           }
         } else {
-            [self showAlertWithMessage:FUILocalizedString(kStr_UserNotFoundError)];
+          [self showAlertWithMessage:FUILocalizedString(kStr_UserNotFoundError)];
         }
         [self pushViewController:controller];
       }
@@ -207,6 +210,53 @@ - (void)onNext:(NSString *)emailText {
   }];
 }
 
+- (void)sendSignInLinkToEmail:(NSString*)email {
+  if (![[self class] isValidEmail:email]) {
+    [self showAlertWithMessage:FUILocalizedString(kStr_InvalidEmailError)];
+    return;
+  }
+
+  [self incrementActivity];
+  FUIEmailAuth *emailAuth = [self.authUI providerWithID:FIREmailAuthProviderID];
+  [emailAuth generateURLParametersAndLocalCache:email linkingProvider:nil];
+  [self.auth sendSignInLinkToEmail:email
+                actionCodeSettings:emailAuth.actionCodeSettings
+                        completion:^(NSError * _Nullable error) {
+    [self decrementActivity];
+
+    if (error) {
+      [FUIAuthBaseViewController showAlertWithTitle:FUILocalizedString(kStr_Error)
+                                            message:error.description
+                           presentingViewController:self];
+    } else {
+      NSString *successMessage =
+          [NSString stringWithFormat: FUILocalizedString(kStr_EmailSentConfirmationMessage), email];
+      [FUIAuthBaseViewController showAlertWithTitle:FUILocalizedString(kStr_SignInEmailSent)
+                                            message:successMessage
+                                        actionTitle:FUILocalizedString(kStr_TroubleGettingEmailTitle)
+                                      actionHandler:^{
+                                        [FUIAuthBaseViewController
+                                           showAlertWithTitle:FUILocalizedString(kStr_TroubleGettingEmailTitle)
+                                                      message:FUILocalizedString(kStr_TroubleGettingEmailMessage)
+                                                  actionTitle:FUILocalizedString(kStr_Resend)
+                                                actionHandler:^{
+                                                  [self sendSignInLinkToEmail:email];
+                                                } dismissTitle:FUILocalizedString(kStr_Back)
+                                               dismissHandler:^{
+                                                 [self.navigationController popToRootViewControllerAnimated:YES];
+                                               }
+                                     presentingViewController:self];
+                                      }
+                                       dismissTitle:FUILocalizedString(kStr_Back)
+                                     dismissHandler:^{
+                                       [self.navigationController dismissViewControllerAnimated:YES
+                                                                                     completion:nil];
+                                     }
+                           presentingViewController:self];
+    }
+  }];
+}
+
 - (void)textFieldDidChange {
   [self didChangeEmail:_emailField.text];
 }
diff --git a/EmailAuth/FirebaseEmailAuthUI/Resources/FUIConfirmEmailViewController.xib b/EmailAuth/FirebaseEmailAuthUI/Resources/FUIConfirmEmailViewController.xib
new file mode 100644
index 00000000000..3656d78bcb6
--- /dev/null
+++ b/EmailAuth/FirebaseEmailAuthUI/Resources/FUIConfirmEmailViewController.xib
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="FUIConfirmEmailViewController">
+            <connections>
+                <outlet property="_tableView" destination="sqQ-Fo-hB1" id="5Ek-qF-gTL"/>
+                <outlet property="_termsOfServiceView" destination="9ea-qX-Sdg" id="T20-ZO-fz9"/>
+                <outlet property="view" destination="bth-CL-c9r" id="F2l-k9-ffn"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="bth-CL-c9r">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <subviews>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="sqQ-Fo-hB1">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                    <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+                    <view key="tableFooterView" contentMode="scaleToFill" id="zAD-Xd-4qt">
+                        <rect key="frame" x="0.0" y="896.5" width="375" height="100"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" text="Terms of Service" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9ea-qX-Sdg" customClass="FUIPrivacyAndTermsOfServiceView">
+                                <rect key="frame" x="10" y="0.0" width="355" height="100"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.28999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                            </textView>
+                        </subviews>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="9ea-qX-Sdg" secondAttribute="trailing" constant="10" id="XIO-RK-VZ7"/>
+                            <constraint firstItem="9ea-qX-Sdg" firstAttribute="top" secondItem="zAD-Xd-4qt" secondAttribute="top" id="b5A-Zf-YCc"/>
+                            <constraint firstAttribute="bottom" secondItem="9ea-qX-Sdg" secondAttribute="bottom" id="iuk-lu-1BT"/>
+                            <constraint firstItem="9ea-qX-Sdg" firstAttribute="leading" secondItem="zAD-Xd-4qt" secondAttribute="leading" constant="10" id="lMZ-cS-2hg"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="dataSource" destination="-1" id="Sw5-oz-cWe"/>
+                        <outlet property="delegate" destination="-1" id="xr0-I0-wCb"/>
+                    </connections>
+                </tableView>
+            </subviews>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="sqQ-Fo-hB1" secondAttribute="trailing" id="5Me-cs-Zxv"/>
+                <constraint firstItem="sqQ-Fo-hB1" firstAttribute="top" secondItem="bth-CL-c9r" secondAttribute="top" id="OYw-Zf-Kez"/>
+                <constraint firstAttribute="bottom" secondItem="sqQ-Fo-hB1" secondAttribute="bottom" id="c4f-G4-8CC"/>
+                <constraint firstItem="sqQ-Fo-hB1" firstAttribute="leading" secondItem="bth-CL-c9r" secondAttribute="leading" id="y2b-6O-eFn"/>
+            </constraints>
+        </view>
+    </objects>
+</document>
diff --git a/FirebaseUI.podspec b/FirebaseUI.podspec
index 3a1cde3f860..f49c2b9a6ca 100644
--- a/FirebaseUI.podspec
+++ b/FirebaseUI.podspec
@@ -65,6 +65,7 @@ Pod::Spec.new do |s|
                                 'Auth/FirebaseAuthUI/FUIAuthTableHeaderView.h']
     auth.source_files = ['Auth/FirebaseAuthUI/**/*.{h,m}', 'Auth/FirebaseAuthUI/*.{h,m}']
     auth.dependency 'Firebase/Auth', '~> 5.0'
+    auth.dependency 'GoogleUtilities/UserDefaults'
     auth.resource_bundle = {
       'FirebaseAuthUI' => ['Auth/FirebaseAuthUI/**/*.{xib,png,lproj}']
     }
@@ -85,6 +86,7 @@ Pod::Spec.new do |s|
   s.subspec 'Email' do |email|
     email.platform = :ios, '8.0'
     email.public_header_files = ['EmailAuth/FirebaseEmailAuthUI/FirebaseEmailAuthUI.h',
+                                 'EmailAuth/FirebaseEmailAuthUI/FUIConfirmEmailViewController.h',
                                  'EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth.h',
                                  'EmailAuth/FirebaseEmailAuthUI/FUIEmailEntryViewController.h',
                                  'EmailAuth/FirebaseEmailAuthUI/FUIPasswordRecoveryViewController.h',
diff --git a/samples/objc/FirebaseUI-demo-objc.xcodeproj/project.pbxproj b/samples/objc/FirebaseUI-demo-objc.xcodeproj/project.pbxproj
index 3dfcd7074e2..c3d223b2b4c 100644
--- a/samples/objc/FirebaseUI-demo-objc.xcodeproj/project.pbxproj
+++ b/samples/objc/FirebaseUI-demo-objc.xcodeproj/project.pbxproj
@@ -7,9 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		30F4BF54EE12864D4736A543 /* Pods_FirebaseUI_demo_objc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E1F0647ED72E1944D5093F26 /* Pods_FirebaseUI_demo_objc.framework */; };
 		8D7D5DC11D9D9536006C1857 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8D7D5DC01D9D9536006C1857 /* GoogleService-Info.plist */; };
 		8D7F86B51D9DAA0100C2A122 /* FUIStorageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D7F86B41D9DAA0100C2A122 /* FUIStorageViewController.m */; };
-		C30AEB081ED610740084E328 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = C30AEB051ED610740084E328 /* LaunchScreen.xib */; };
 		C30AEB0A1ED610740084E328 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C30AEB071ED610740084E328 /* Main.storyboard */; };
 		C30AEB0B1ED610780084E328 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = C30AEB0D1ED610780084E328 /* Localizable.strings */; };
 		C329B1B21DAD6E5100059A13 /* FUICustomEmailEntryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C329B1B01DAD6E5100059A13 /* FUICustomEmailEntryViewController.m */; };
@@ -39,10 +39,11 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		447E47F0117B4B0D38E8BEA4 /* Pods-FirebaseUI-demo-objc.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseUI-demo-objc.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc.debug.xcconfig"; sourceTree = "<group>"; };
+		49D17C9DB3A73DA28CD278F8 /* Pods-FirebaseUI-demo-objc.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseUI-demo-objc.release.xcconfig"; path = "Pods/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc.release.xcconfig"; sourceTree = "<group>"; };
 		8D7D5DC01D9D9536006C1857 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		8D7F86B31D9DAA0100C2A122 /* FUIStorageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FUIStorageViewController.h; path = Storage/FUIStorageViewController.h; sourceTree = "<group>"; };
 		8D7F86B41D9DAA0100C2A122 /* FUIStorageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FUIStorageViewController.m; path = Storage/FUIStorageViewController.m; sourceTree = "<group>"; };
-		C30AEB051ED610740084E328 /* LaunchScreen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = "<group>"; };
 		C30AEB071ED610740084E328 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
 		C30AEB0C1ED610780084E328 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		C30AEB291ED611460084E328 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -170,6 +171,7 @@
 		D81A05F71B86A78700498183 /* FUIAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUIAppDelegate.h; sourceTree = "<group>"; };
 		D81A05F81B86A78700498183 /* FUIAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUIAppDelegate.m; sourceTree = "<group>"; };
 		D81A06001B86A78700498183 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
+		E1F0647ED72E1944D5093F26 /* Pods_FirebaseUI_demo_objc.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseUI_demo_objc.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -177,12 +179,30 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				30F4BF54EE12864D4736A543 /* Pods_FirebaseUI_demo_objc.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		36225AE34F458032FC0875EA /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				447E47F0117B4B0D38E8BEA4 /* Pods-FirebaseUI-demo-objc.debug.xcconfig */,
+				49D17C9DB3A73DA28CD278F8 /* Pods-FirebaseUI-demo-objc.release.xcconfig */,
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
+		7AE7C5711B7CDE50600DD3CF /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				E1F0647ED72E1944D5093F26 /* Pods_FirebaseUI_demo_objc.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		8D7D5DC51D9DA075006C1857 /* Storage */ = {
 			isa = PBXGroup;
 			children = (
@@ -195,7 +215,6 @@
 		C30AEB041ED610740084E328 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				C30AEB051ED610740084E328 /* LaunchScreen.xib */,
 				C30AEB0D1ED610780084E328 /* Localizable.strings */,
 				C30AEB071ED610740084E328 /* Main.storyboard */,
 			);
@@ -263,6 +282,8 @@
 				8D7D5DC01D9D9536006C1857 /* GoogleService-Info.plist */,
 				D81A05F21B86A78700498183 /* FirebaseUI-demo-objc */,
 				D81A05F11B86A78700498183 /* Products */,
+				36225AE34F458032FC0875EA /* Pods */,
+				7AE7C5711B7CDE50600DD3CF /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -308,9 +329,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = D81A06131B86A78700498183 /* Build configuration list for PBXNativeTarget "FirebaseUI-demo-objc" */;
 			buildPhases = (
+				47A5047D079D61E7CA4D1070 /* [CP] Check Pods Manifest.lock */,
 				D81A05EC1B86A78700498183 /* Sources */,
 				D81A05ED1B86A78700498183 /* Frameworks */,
 				D81A05EE1B86A78700498183 /* Resources */,
+				764743426E199C2BB4B704D5 /* [CP] Embed Pods Frameworks */,
+				F0E50C15F4811C4AB11ABA2E /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -449,7 +473,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C30AEB081ED610740084E328 /* LaunchScreen.xib in Resources */,
 				C3A8B7C21DAF073400CDF0ED /* FUICustomPasswordSignInViewController.xib in Resources */,
 				C30AEB0B1ED610780084E328 /* Localizable.strings in Resources */,
 				C30AEB0A1ED610740084E328 /* Main.storyboard in Resources */,
@@ -466,6 +489,121 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		47A5047D079D61E7CA4D1070 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-FirebaseUI-demo-objc-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		764743426E199C2BB4B704D5 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/Bolts/Bolts.framework",
+				"${BUILT_PRODUCTS_DIR}/BoringSSL/openssl.framework",
+				"${BUILT_PRODUCTS_DIR}/FBSDKCoreKit/FBSDKCoreKit.framework",
+				"${BUILT_PRODUCTS_DIR}/FBSDKLoginKit/FBSDKLoginKit.framework",
+				"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework",
+				"${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework",
+				"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
+				"${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework",
+				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
+				"${PODS_ROOT}/TwitterCore/iOS/TwitterCore.framework",
+				"${PODS_ROOT}/TwitterKit/iOS/TwitterKit.framework",
+				"${BUILT_PRODUCTS_DIR}/gRPC-C++/grpcpp.framework",
+				"${BUILT_PRODUCTS_DIR}/gRPC-Core/grpc.framework",
+				"${BUILT_PRODUCTS_DIR}/leveldb-library/leveldb.framework",
+				"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Bolts.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKCoreKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKLoginKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TwitterCore.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TwitterKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpcpp.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpc.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/leveldb.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		F0E50C15F4811C4AB11ABA2E /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseFirestore/gRPCCertificates-Firestore.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseAnonymousAuthUI.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseAuthUI.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseEmailAuthUI.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseFacebookAuthUI.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseGoogleAuthUI.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebasePhoneAuthUI.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseTwitterAuthUI.bundle",
+				"${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle",
+				"${PODS_ROOT}/TwitterKit/iOS/TwitterKit.framework/TwitterKitResources.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/gRPCCertificates-Firestore.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseAnonymousAuthUI.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseAuthUI.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseEmailAuthUI.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseFacebookAuthUI.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseGoogleAuthUI.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebasePhoneAuthUI.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseTwitterAuthUI.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TwitterKitResources.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FirebaseUI-demo-objc/Pods-FirebaseUI-demo-objc-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		D81A05EC1B86A78700498183 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -693,6 +831,7 @@
 		};
 		D81A06141B86A78700498183 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 447E47F0117B4B0D38E8BEA4 /* Pods-FirebaseUI-demo-objc.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "FirebaseUI-demo-objc/FirebaseUI-demo-objc.entitlements";
@@ -726,6 +865,7 @@
 		};
 		D81A06151B86A78700498183 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 49D17C9DB3A73DA28CD278F8 /* Pods-FirebaseUI-demo-objc.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "FirebaseUI-demo-objc/FirebaseUI-demo-objc.entitlements";
diff --git a/samples/objc/FirebaseUI-demo-objc/FUIAppDelegate.m b/samples/objc/FirebaseUI-demo-objc/FUIAppDelegate.m
index 16f3dac98c9..78b0e72e120 100644
--- a/samples/objc/FirebaseUI-demo-objc/FUIAppDelegate.m
+++ b/samples/objc/FirebaseUI-demo-objc/FUIAppDelegate.m
@@ -27,7 +27,8 @@
 
 @implementation FUIAppDelegate
 
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+- (BOOL)application:(UIApplication *)application
+didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
   if (kTwitterConsumerKey.length && kTwitterConsumerSecret.length) {
     [[TWTRTwitter sharedInstance] startWithConsumerKey:kTwitterConsumerKey
                                         consumerSecret:kTwitterConsumerSecret];
@@ -38,15 +39,41 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   return YES;
 }
 
-- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString*, id> *)options {
+- (BOOL)application:(UIApplication *)app
+            openURL:(NSURL *)url
+            options:(NSDictionary<NSString*, id> *)options {
   NSString *sourceApplication = options[UIApplicationOpenURLOptionsSourceApplicationKey];
   return [self handleOpenUrl:url sourceApplication:sourceApplication];
 }
 
-- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(nullable NSString *)sourceApplication annotation:(id)annotation {
+- (BOOL)application:(UIApplication *)application
+            openURL:(NSURL *)url
+  sourceApplication:(nullable NSString *)sourceApplication
+         annotation:(id)annotation {
   return [self handleOpenUrl:url sourceApplication:sourceApplication];
 }
 
+- (BOOL)application:(UIApplication *)application
+continueUserActivity:(nonnull NSUserActivity *)userActivity
+ restorationHandler:
+#if defined(__IPHONE_12_0) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_12_0)
+  (nonnull void (^)(NSArray<id<UIUserActivityRestoring>> *_Nullable))restorationHandler {
+#else
+  (nonnull void (^)(NSArray *_Nullable))restorationHandler {
+#endif  // __IPHONE_12_0
+    BOOL handled = [[FIRDynamicLinks dynamicLinks]
+                    handleUniversalLink:userActivity.webpageURL
+                    completion:^(FIRDynamicLink * _Nullable dynamicLink,
+                                 NSError * _Nullable error) {
+                      if (error) {
+                        NSLog(@"%@", error.description);
+                      } else {
+                        [self handleOpenUrl:dynamicLink.url sourceApplication:nil];
+                      }
+                    }];
+    return handled;
+  }
+
 - (BOOL)handleOpenUrl:(NSURL *)url sourceApplication:(nullable NSString *)sourceApplication {
   if ([FUIAuth.defaultAuthUI handleOpenURL:url sourceApplication:sourceApplication]) {
     return YES;
diff --git a/samples/objc/FirebaseUI-demo-objc/FirebaseUI-demo-objc.entitlements b/samples/objc/FirebaseUI-demo-objc/FirebaseUI-demo-objc.entitlements
index 903def2af53..4b42ea10f48 100644
--- a/samples/objc/FirebaseUI-demo-objc/FirebaseUI-demo-objc.entitlements
+++ b/samples/objc/FirebaseUI-demo-objc/FirebaseUI-demo-objc.entitlements
@@ -4,5 +4,10 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:fex9s.app.goo.gl</string>
+		<string>applinks:fbsaupgraded.page.link</string>
+	</array>
 </dict>
 </plist>
diff --git a/samples/objc/FirebaseUI-demo-objc/Info.plist b/samples/objc/FirebaseUI-demo-objc/Info.plist
index 7133ca1a3d8..675cf9acde9 100644
--- a/samples/objc/FirebaseUI-demo-objc/Info.plist
+++ b/samples/objc/FirebaseUI-demo-objc/Info.plist
@@ -27,7 +27,7 @@
 			<string></string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>REVERSED_CLIENT_ID</string>
+				<string>com.googleusercontent.apps.1085102361755-k242p3jluflir9qcf222uo0mf1q9vfri</string>
 			</array>
 		</dict>
 		<dict>
@@ -37,7 +37,7 @@
 			<string></string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>fb{your-app-id}</string>
+				<string>fb452491954956225</string>
 			</array>
 		</dict>
 		<dict>
@@ -54,9 +54,9 @@
 	<key>CFBundleVersion</key>
 	<string>1.0.0.4</string>
 	<key>FacebookAppID</key>
-	<string>{your-app-id}</string>
+	<string>452491954956225</string>
 	<key>FacebookDisplayName</key>
-	<string>{your-app-name}</string>
+	<string>Facebook App</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>fbapi</string>
@@ -71,7 +71,7 @@
 		<string>remote-notification</string>
 	</array>
 	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
+	<string>Main</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
diff --git a/samples/objc/FirebaseUI-demo-objc/Resources/LaunchScreen.xib b/samples/objc/FirebaseUI-demo-objc/Resources/LaunchScreen.xib
deleted file mode 100644
index 5fc24aab2f2..00000000000
--- a/samples/objc/FirebaseUI-demo-objc/Resources/LaunchScreen.xib
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015 Firebase, Inc. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <nil key="highlightedColor"/>
-                </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FirebaseUI-demo-objc" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
-                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <nil key="highlightedColor"/>
-                </label>
-            </subviews>
-            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-            <constraints>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
-                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
-                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
-                <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
-                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
-            </constraints>
-            <nil key="simulatedStatusBarMetrics"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <point key="canvasLocation" x="548" y="455"/>
-        </view>
-    </objects>
-</document>
diff --git a/samples/objc/FirebaseUI-demo-objc/Resources/Main.storyboard b/samples/objc/FirebaseUI-demo-objc/Resources/Main.storyboard
index 5a5c338da6c..36702cf8de4 100644
--- a/samples/objc/FirebaseUI-demo-objc/Resources/Main.storyboard
+++ b/samples/objc/FirebaseUI-demo-objc/Resources/Main.storyboard
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="7RW-VL-qNI">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="7RW-VL-qNI">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -163,13 +162,13 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Custom Authorization UI" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="YxK-c8-9q7">
-                                                    <rect key="frame" x="31" y="12" width="539" height="20"/>
+                                                    <rect key="frame" x="27" y="12" width="322" height="20"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="JZd-6c-Soe">
-                                                    <rect key="frame" x="521" y="6" width="51" height="31"/>
+                                                    <rect key="frame" x="300" y="6.5" width="51" height="31"/>
                                                     <connections>
                                                         <action selector="onAuthUIDelegateChanged:" destination="CNE-cz-Qwp" eventType="valueChanged" id="KtF-5y-VCY"/>
                                                     </connections>
@@ -192,13 +191,13 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Custom Scopes" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="T07-wL-pGr">
-                                                    <rect key="frame" x="31" y="12" width="539" height="20"/>
+                                                    <rect key="frame" x="27" y="12" width="322" height="20"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="9Ma-Mx-g56">
-                                                    <rect key="frame" x="521" y="6" width="51" height="31"/>
+                                                    <rect key="frame" x="300" y="6.5" width="51" height="31"/>
                                                 </switch>
                                             </subviews>
                                             <constraints>
@@ -228,6 +227,20 @@
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
+                                                <label opaque="NO" userInteractionEnabled="NO" alpha="0.80000000000000004" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Link" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ig5-8M-jHk">
+                                                    <rect key="frame" x="244" y="10.5" width="48" height="21"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LiB-gr-jDR">
+                                                    <rect key="frame" x="300" y="5.5" width="49" height="31"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <connections>
+                                                        <action selector="onEmailSwitchValueChanged:" destination="CNE-cz-Qwp" eventType="valueChanged" id="9Er-fB-rWV"/>
+                                                    </connections>
+                                                </switch>
                                             </subviews>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -456,6 +469,8 @@
                         <outlet property="cellSignIn" destination="ORf-bf-Sq2" id="5Lp-Ik-8fw"/>
                         <outlet property="cellUID" destination="EWm-GE-IZV" id="eTu-Vt-UCP"/>
                         <outlet property="customScopeSwitch" destination="9Ma-Mx-g56" id="Scy-Do-CrR"/>
+                        <outlet property="emailLabel" destination="ig5-8M-jHk" id="a2T-8z-dxJ"/>
+                        <outlet property="emailSwitch" destination="LiB-gr-jDR" id="I2g-oL-ZRC"/>
                     </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="1w1-3x-wCC" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -475,20 +490,20 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="gPR-lg-zcg">
-                                <rect key="frame" x="0.0" y="0.0" width="600" height="554"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="621"/>
                             </imageView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jIg-6e-k6g">
-                                <rect key="frame" x="0.0" y="554" width="600" height="46"/>
+                                <rect key="frame" x="0.0" y="621" width="375" height="46"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="T3i-kj-emg">
-                                        <rect key="frame" x="558" y="8" width="34" height="30"/>
+                                        <rect key="frame" x="333" y="8" width="34" height="30"/>
                                         <state key="normal" title="Load"/>
                                         <connections>
                                             <action selector="loadButtonPressed:" destination="Ne3-90-zlK" eventType="touchUpInside" id="FBE-qc-8PX"/>
                                         </connections>
                                     </button>
                                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="path/to/image.jpg" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="S2u-gw-VSI">
-                                        <rect key="frame" x="8" y="8" width="542" height="30"/>
+                                        <rect key="frame" x="8" y="8" width="317" height="30"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                         <textInputTraits key="textInputTraits"/>
                                     </textField>
diff --git a/samples/objc/FirebaseUI-demo-objc/Samples/Auth/FUIAuthViewController.h b/samples/objc/FirebaseUI-demo-objc/Samples/Auth/FUIAuthViewController.h
index 5837dc46abe..d133f4201e3 100644
--- a/samples/objc/FirebaseUI-demo-objc/Samples/Auth/FUIAuthViewController.h
+++ b/samples/objc/FirebaseUI-demo-objc/Samples/Auth/FUIAuthViewController.h
@@ -20,6 +20,4 @@
 
 @interface FUIAuthViewController : UITableViewController
 
-+ (NSArray *)getAllIDPs;
-
 @end
diff --git a/samples/objc/FirebaseUI-demo-objc/Samples/Auth/FUIAuthViewController.m b/samples/objc/FirebaseUI-demo-objc/Samples/Auth/FUIAuthViewController.m
index a26d4067a37..ee63c328594 100644
--- a/samples/objc/FirebaseUI-demo-objc/Samples/Auth/FUIAuthViewController.m
+++ b/samples/objc/FirebaseUI-demo-objc/Samples/Auth/FUIAuthViewController.m
@@ -53,6 +53,8 @@ @interface FUIAuthViewController () <FUIAuthDelegate>
 @property (weak, nonatomic) IBOutlet UITableViewCell *cellSignIn;
 @property (weak, nonatomic) IBOutlet UITableViewCell *cellName;
 @property (weak, nonatomic) IBOutlet UITableViewCell *cellEmail;
+@property (weak, nonatomic) IBOutlet UISwitch *emailSwitch;
+@property (weak, nonatomic) IBOutlet UILabel *emailLabel;
 @property (weak, nonatomic) IBOutlet UITableViewCell *cellUID;
 @property (weak, nonatomic) IBOutlet UITableViewCell *anonymousSignIn;
 @property (weak, nonatomic) IBOutlet UIBarButtonItem *buttonAuthorization;
@@ -263,6 +265,14 @@ - (IBAction)onAuthorization:(id)sender {
   }
 }
 
+- (IBAction)onEmailSwitchValueChanged:(UISwitch *)sender {
+  if (sender.isOn) {
+    self.emailLabel.text = @"Password";
+  } else {
+    self.emailLabel.text = @"Link";
+  }
+}
+
 #pragma mark - FUIAuthDelegate methods
 
 // this method is called only when FUIAuthViewController is delgate of AuthUI
@@ -344,23 +354,15 @@ - (void)showAlertWithTitlte:(NSString *)title message:(NSString *)message {
 
 }
 
-+ (NSArray *)getAllIDPs {
-  NSArray<NSIndexPath *> *selectedRows = @[
-    [NSIndexPath indexPathForRow:kIDPEmail inSection:kSectionsProviders],
-    [NSIndexPath indexPathForRow:kIDPGoogle inSection:kSectionsProviders],
-    [NSIndexPath indexPathForRow:kIDPFacebook inSection:kSectionsProviders],
-    [NSIndexPath indexPathForRow:kIDPTwitter inSection:kSectionsProviders],
-    [NSIndexPath indexPathForRow:kIDPPhone inSection:kSectionsProviders],
-    [NSIndexPath indexPathForRow:kIDPAnonymous inSection:kSectionsProviders]
-  ];
-  return [self getListOfIDPs:selectedRows useCustomScopes:NO];
-}
-
 - (NSArray *)getListOfIDPs {
-  return [[self class] getListOfIDPs:[self.tableView indexPathsForSelectedRows] useCustomScopes:_customScopeSwitch.isOn];
+  return [[self class] getListOfIDPs:[self.tableView indexPathsForSelectedRows]
+                     useCustomScopes:_customScopeSwitch.isOn
+                        useEmailLink:_emailSwitch.isOn];
 }
 
-+ (NSArray *)getListOfIDPs:(NSArray<NSIndexPath *> *)selectedRows useCustomScopes:(BOOL)useCustomScopes {
++ (NSArray *)getListOfIDPs:(NSArray<NSIndexPath *> *)selectedRows
+           useCustomScopes:(BOOL)useCustomScopes
+              useEmailLink:(BOOL)useEmaiLink {
   NSMutableArray *providers = [NSMutableArray new];
 
   for (NSIndexPath *indexPath in selectedRows) {
@@ -368,7 +370,23 @@ + (NSArray *)getListOfIDPs:(NSArray<NSIndexPath *> *)selectedRows useCustomScope
       id<FUIAuthProvider> provider;
       switch (indexPath.row) {
         case kIDPEmail:
-          provider = [[FUIEmailAuth alloc] init];
+          if (useEmaiLink) {
+            // ActionCodeSettings for email link sign-in.
+            FIRActionCodeSettings *actionCodeSettings = [[FIRActionCodeSettings alloc] init];
+            actionCodeSettings.URL = [NSURL URLWithString:@"https://fb-sa-1211.appspot.com"];
+            actionCodeSettings.handleCodeInApp = YES;
+            [actionCodeSettings setAndroidPackageName:@"com.firebase.uidemo"
+                                installIfNotAvailable:NO
+                                       minimumVersion:@"12"];
+
+            provider = [[FUIEmailAuth alloc] initAuthAuthUI:[FUIAuth defaultAuthUI]
+                                               signInMethod:FIREmailLinkAuthSignInMethod
+                                            forceSameDevice:NO
+                                      allowNewEmailAccounts:YES
+                                          actionCodeSetting:actionCodeSettings];
+          } else {
+            provider = [[FUIEmailAuth alloc] init];
+          }
           break;
         case kIDPGoogle:
           provider = useCustomScopes ? [[FUIGoogleAuth alloc] initWithScopes:@[kGoogleUserInfoEmailScope,
@@ -379,8 +397,8 @@ + (NSArray *)getListOfIDPs:(NSArray<NSIndexPath *> *)selectedRows useCustomScope
           break;
         case kIDPFacebook:
           provider = useCustomScopes ? [[FUIFacebookAuth alloc] initWithPermissions:@[@"email",
-                                                                                        @"user_friends",
-                                                                                        @"ads_read"]]
+                                                                                      @"user_friends",
+                                                                                      @"ads_read"]]
                                      :[[FUIFacebookAuth alloc] init];
           break;
         case kIDPTwitter:
diff --git a/samples/objc/Podfile b/samples/objc/Podfile
index 2fe125b0e28..1987c0f2923 100644
--- a/samples/objc/Podfile
+++ b/samples/objc/Podfile
@@ -4,5 +4,5 @@ target 'FirebaseUI-demo-objc' do
   use_frameworks!
 
   pod 'FirebaseUI', :path => '../../'
-
+  pod 'Firebase/DynamicLinks'
 end