diff --git a/libraries/session/src/main/java/androidx/media3/session/LegacyConversions.java b/libraries/session/src/main/java/androidx/media3/session/LegacyConversions.java
index a621f6eb17..7f4de3b6bd 100644
--- a/libraries/session/src/main/java/androidx/media3/session/LegacyConversions.java
+++ b/libraries/session/src/main/java/androidx/media3/session/LegacyConversions.java
@@ -57,6 +57,7 @@ import android.os.Bundle;
 import android.os.SystemClock;
 import android.text.TextUtils;
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import androidx.media3.common.AdPlaybackState;
 import androidx.media3.common.AudioAttributes;
 import androidx.media3.common.C;
@@ -170,21 +171,87 @@ import java.util.concurrent.TimeoutException;
         playbackStateCompatExtras != null ? playbackStateCompatExtras : Bundle.EMPTY);
   }
 
-  /** Converts {@link PlaybackStateCompat} to {@link SessionError}. */
+  /**
+   * Converts {@link PlaybackStateCompat} to {@link SessionError}.
+   *
+   * @param playbackStateCompat The {@link PlaybackStateCompat} to convert.
+   * @param context The context to read string resources to be used as fallback error messages.
+   * @return The {@link SessionError}.
+   */
   @Nullable
   public static SessionError convertToSessionError(
-      @Nullable PlaybackStateCompat playbackStateCompat) {
-    if (playbackStateCompat == null
-        || playbackStateCompat.getState() == PlaybackStateCompat.STATE_ERROR
-        || playbackStateCompat.getErrorCode() == PlaybackStateCompat.ERROR_CODE_UNKNOWN_ERROR
-        || playbackStateCompat.getErrorMessage() == null) {
+      @Nullable PlaybackStateCompat playbackStateCompat, Context context) {
+    if (playbackStateCompat == null) {
       return null;
     }
-    @Nullable Bundle playbackStateCompatExtras = playbackStateCompat.getExtras();
+    return convertToSessionError(
+        playbackStateCompat.getState(),
+        playbackStateCompat.getErrorCode(),
+        playbackStateCompat.getErrorMessage(),
+        playbackStateCompat.getExtras(),
+        context);
+  }
+
+  @VisibleForTesting
+  @Nullable
+  /* package */ static SessionError convertToSessionError(
+      @PlaybackStateCompat.State int state,
+      @PlaybackStateCompat.ErrorCode int errorCode,
+      @Nullable CharSequence errorMessage,
+      @Nullable Bundle extras,
+      Context context) {
+    if (state == PlaybackStateCompat.STATE_ERROR
+        || errorCode == PlaybackStateCompat.ERROR_CODE_UNKNOWN_ERROR) {
+      return null;
+    }
+    int sessionErrorCode = convertToSessionErrorCode(errorCode);
     return new SessionError(
-        convertToSessionErrorCode(playbackStateCompat.getErrorCode()),
-        checkNotNull(playbackStateCompat.getErrorMessage()).toString(),
-        playbackStateCompatExtras != null ? playbackStateCompatExtras : Bundle.EMPTY);
+        sessionErrorCode,
+        errorMessage != null
+            ? errorMessage.toString()
+            : getSessionErrorMessage(sessionErrorCode, context),
+        extras != null ? extras : Bundle.EMPTY);
+  }
+
+  private static String getSessionErrorMessage(
+      @SessionError.Code int sessionErrorCode, Context context) {
+    switch (sessionErrorCode) {
+      case SessionError.INFO_CANCELLED:
+        return context.getString(R.string.error_message_info_cancelled);
+      case SessionError.ERROR_BAD_VALUE:
+        return context.getString(R.string.error_message_bad_value);
+      case SessionError.ERROR_INVALID_STATE:
+        return context.getString(R.string.error_message_invalid_state);
+      case SessionError.ERROR_IO:
+        return context.getString(R.string.error_message_io);
+      case SessionError.ERROR_NOT_SUPPORTED:
+        return context.getString(R.string.error_message_not_supported);
+      case SessionError.ERROR_PERMISSION_DENIED:
+        return context.getString(R.string.error_message_permission_denied);
+      case SessionError.ERROR_SESSION_AUTHENTICATION_EXPIRED:
+        return context.getString(R.string.error_message_authentication_expired);
+      case SessionError.ERROR_SESSION_CONTENT_ALREADY_PLAYING:
+        return context.getString(R.string.error_message_content_already_playing);
+      case SessionError.ERROR_SESSION_CONCURRENT_STREAM_LIMIT:
+        return context.getString(R.string.error_message_concurrent_stream_limit);
+      case SessionError.ERROR_SESSION_DISCONNECTED:
+        return context.getString(R.string.error_message_disconnected);
+      case SessionError.ERROR_SESSION_END_OF_PLAYLIST:
+        return context.getString(R.string.error_message_end_of_playlist);
+      case SessionError.ERROR_SESSION_NOT_AVAILABLE_IN_REGION:
+        return context.getString(R.string.error_message_not_available_in_region);
+      case SessionError.ERROR_SESSION_PARENTAL_CONTROL_RESTRICTED:
+        return context.getString(R.string.error_message_parental_control_restricted);
+      case SessionError.ERROR_SESSION_PREMIUM_ACCOUNT_REQUIRED:
+        return context.getString(R.string.error_message_premium_account_required);
+      case SessionError.ERROR_SESSION_SETUP_REQUIRED:
+        return context.getString(R.string.error_message_setup_required);
+      case SessionError.ERROR_SESSION_SKIP_LIMIT_REACHED:
+        return context.getString(R.string.error_message_skip_limit_reached);
+      case SessionError.ERROR_UNKNOWN: // fall through
+      default:
+        return context.getString(R.string.error_message_fallback);
+    }
   }
 
   private static @SessionError.Code int convertToSessionErrorCode(
diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplLegacy.java b/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplLegacy.java
index 775e811442..66cde26b68 100644
--- a/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplLegacy.java
+++ b/libraries/session/src/main/java/androidx/media3/session/MediaControllerImplLegacy.java
@@ -1555,7 +1555,8 @@ import org.checkerframework.checker.initialization.qual.UnderInitialization;
             controllerCompat.isSessionReady(),
             controllerCompat.getRatingType(),
             getInstance().getTimeDiffMs(),
-            getRoutingControllerId(controllerCompat));
+            getRoutingControllerId(controllerCompat),
+            context);
     Pair<@NullableType Integer, @NullableType Integer> reasons =
         calculateDiscontinuityAndTransitionReason(
             legacyPlayerInfo,
@@ -1958,7 +1959,8 @@ import org.checkerframework.checker.initialization.qual.UnderInitialization;
       boolean isSessionReady,
       @RatingCompat.Style int ratingType,
       long timeDiffMs,
-      @Nullable String routingControllerId) {
+      @Nullable String routingControllerId,
+      Context context) {
     QueueTimeline currentTimeline;
     MediaMetadata mediaMetadata;
     int currentMediaItemIndex;
@@ -2076,7 +2078,7 @@ import org.checkerframework.checker.initialization.qual.UnderInitialization;
     PlaybackException playerError =
         LegacyConversions.convertToPlaybackException(newLegacyPlayerInfo.playbackStateCompat);
     SessionError sessionError =
-        LegacyConversions.convertToSessionError(newLegacyPlayerInfo.playbackStateCompat);
+        LegacyConversions.convertToSessionError(newLegacyPlayerInfo.playbackStateCompat, context);
 
     long currentPositionMs =
         LegacyConversions.convertToCurrentPositionMs(
diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaLibrarySessionImpl.java b/libraries/session/src/main/java/androidx/media3/session/MediaLibrarySessionImpl.java
index e70fb69537..c0f99e3135 100644
--- a/libraries/session/src/main/java/androidx/media3/session/MediaLibrarySessionImpl.java
+++ b/libraries/session/src/main/java/androidx/media3/session/MediaLibrarySessionImpl.java
@@ -400,7 +400,7 @@ import java.util.concurrent.Future;
       playerWrapper.setLegacyError(
           /* isFatal= */ true,
           ERROR_CODE_AUTHENTICATION_EXPIRED_COMPAT,
-          getContext().getString(R.string.authentication_required),
+          getContext().getString(R.string.error_message_authentication_expired),
           bundle);
       return true;
     }
diff --git a/libraries/session/src/main/res/values-af/strings.xml b/libraries/session/src/main/res/values-af/strings.xml
index e27eb97f8c..3ebf771793 100755
--- a/libraries/session/src/main/res/values-af/strings.xml
+++ b/libraries/session/src/main/res/values-af/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Soek tot by volgende item</string>
   <string name="media3_controls_seek_back_description">Soek agtertoe</string>
   <string name="media3_controls_seek_forward_description">Soek vorentoe</string>
-  <string name="authentication_required">Stawing word vereis</string>
-  <string name="legacy_error_message_fallback">Geen foutboodskap verskaf nie</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-am/strings.xml b/libraries/session/src/main/res/values-am/strings.xml
index 830c5a0598..a42646b50c 100755
--- a/libraries/session/src/main/res/values-am/strings.xml
+++ b/libraries/session/src/main/res/values-am/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">ወደ ቀጣዩ ንጥል ፈልግ</string>
   <string name="media3_controls_seek_back_description">ወደኋላ ፈልግ</string>
   <string name="media3_controls_seek_forward_description">ወደፊት ፈልግ</string>
-  <string name="authentication_required">ማረጋገጥ ያስፈልጋል</string>
-  <string name="legacy_error_message_fallback">ምንም የስህተት መልዕክት አልቀረበም</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ar/strings.xml b/libraries/session/src/main/res/values-ar/strings.xml
index dd50a34d64..4096bbb956 100755
--- a/libraries/session/src/main/res/values-ar/strings.xml
+++ b/libraries/session/src/main/res/values-ar/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">تقديم إلى العنصر التالي</string>
   <string name="media3_controls_seek_back_description">ترجيع</string>
   <string name="media3_controls_seek_forward_description">تقديم</string>
-  <string name="authentication_required">المصادقة مطلوبة</string>
-  <string name="legacy_error_message_fallback">لا تتوفّر رسالة خطأ</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-az/strings.xml b/libraries/session/src/main/res/values-az/strings.xml
index 39da25051c..e1b05b7ceb 100755
--- a/libraries/session/src/main/res/values-az/strings.xml
+++ b/libraries/session/src/main/res/values-az/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Növbəti elementə keçin</string>
   <string name="media3_controls_seek_back_description">Geri keçin</string>
   <string name="media3_controls_seek_forward_description">İrəli keçin</string>
-  <string name="authentication_required">Doğrulanma tələb olunur</string>
-  <string name="legacy_error_message_fallback">Xəta mesajı təqdim edilməyib</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-b+sr+Latn/strings.xml b/libraries/session/src/main/res/values-b+sr+Latn/strings.xml
index cb48ace2ab..e1b42850e7 100755
--- a/libraries/session/src/main/res/values-b+sr+Latn/strings.xml
+++ b/libraries/session/src/main/res/values-b+sr+Latn/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Premotaj na sledeću stavku</string>
   <string name="media3_controls_seek_back_description">Premotaj unazad</string>
   <string name="media3_controls_seek_forward_description">Premotaj unapred</string>
-  <string name="authentication_required">Potrebna je potvrda identiteta</string>
-  <string name="legacy_error_message_fallback">Nije navedena poruka o grešci</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-be/strings.xml b/libraries/session/src/main/res/values-be/strings.xml
index 4fe2c80114..48ad6d8d9d 100755
--- a/libraries/session/src/main/res/values-be/strings.xml
+++ b/libraries/session/src/main/res/values-be/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Перайсці да наступнага элемента</string>
   <string name="media3_controls_seek_back_description">Перайсці назад</string>
   <string name="media3_controls_seek_forward_description">Перайсці ўперад</string>
-  <string name="authentication_required">Патрабуецца аўтэнтыфікацыя</string>
-  <string name="legacy_error_message_fallback">Паведамленне пра памылку адсутнічае</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-bg/strings.xml b/libraries/session/src/main/res/values-bg/strings.xml
index 997f2d292f..c4726f6dec 100755
--- a/libraries/session/src/main/res/values-bg/strings.xml
+++ b/libraries/session/src/main/res/values-bg/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Придвижване към следващия елемент</string>
   <string name="media3_controls_seek_back_description">Придвижване назад</string>
   <string name="media3_controls_seek_forward_description">Придвижване напред</string>
-  <string name="authentication_required">Изисква се удостоверяване</string>
-  <string name="legacy_error_message_fallback">Не е посочено съобщение за грешка</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-bn/strings.xml b/libraries/session/src/main/res/values-bn/strings.xml
index 06680c97b6..3b67201dc1 100755
--- a/libraries/session/src/main/res/values-bn/strings.xml
+++ b/libraries/session/src/main/res/values-bn/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">পরের আইটেমে যান</string>
   <string name="media3_controls_seek_back_description">ফিরে যাওয়ার বোতাম</string>
   <string name="media3_controls_seek_forward_description">এগিয়ে যান</string>
-  <string name="authentication_required">যাচাইকরণ প্রয়োজন</string>
-  <string name="legacy_error_message_fallback">কোনও সমস্যার মেসেজ দেওয়া হয়নি</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-bs/strings.xml b/libraries/session/src/main/res/values-bs/strings.xml
index 2455e8fd5f..7afc3ff503 100755
--- a/libraries/session/src/main/res/values-bs/strings.xml
+++ b/libraries/session/src/main/res/values-bs/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Pomicanje na sljedeću stavku</string>
   <string name="media3_controls_seek_back_description">Pomicanje nazad</string>
   <string name="media3_controls_seek_forward_description">Pomicanje naprijed</string>
-  <string name="authentication_required">Potrebna je autentifikacija</string>
-  <string name="legacy_error_message_fallback">Nije navedena poruka o grešci</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ca/strings.xml b/libraries/session/src/main/res/values-ca/strings.xml
index e2cc200367..3208cadbd0 100755
--- a/libraries/session/src/main/res/values-ca/strings.xml
+++ b/libraries/session/src/main/res/values-ca/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Ves a l\'element següent</string>
   <string name="media3_controls_seek_back_description">Retrocedeix</string>
   <string name="media3_controls_seek_forward_description">Avança</string>
-  <string name="authentication_required">Autenticació obligatòria</string>
-  <string name="legacy_error_message_fallback">No s\'ha proporcionat cap missatge d\'error</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-cs/strings.xml b/libraries/session/src/main/res/values-cs/strings.xml
index 341c3fffb0..e365f50492 100755
--- a/libraries/session/src/main/res/values-cs/strings.xml
+++ b/libraries/session/src/main/res/values-cs/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Posunout na další položku</string>
   <string name="media3_controls_seek_back_description">Posunout zpět</string>
   <string name="media3_controls_seek_forward_description">Posunout vpřed</string>
-  <string name="authentication_required">Je vyžadováno ověření</string>
-  <string name="legacy_error_message_fallback">Nebyla poskytnuta žádná chybová zpráva</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-da/strings.xml b/libraries/session/src/main/res/values-da/strings.xml
index a8424943cf..86b6f1291c 100755
--- a/libraries/session/src/main/res/values-da/strings.xml
+++ b/libraries/session/src/main/res/values-da/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Hop til næste element</string>
   <string name="media3_controls_seek_back_description">Hop tilbage</string>
   <string name="media3_controls_seek_forward_description">Hop frem</string>
-  <string name="authentication_required">Godkendelse er påkrævet</string>
-  <string name="legacy_error_message_fallback">Der er ingen fejlmeddelelse</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-de/strings.xml b/libraries/session/src/main/res/values-de/strings.xml
index 515df696fe..ae3b4a7a41 100755
--- a/libraries/session/src/main/res/values-de/strings.xml
+++ b/libraries/session/src/main/res/values-de/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Zum nächsten Element</string>
   <string name="media3_controls_seek_back_description">Zurückspulen</string>
   <string name="media3_controls_seek_forward_description">Vorspulen</string>
-  <string name="authentication_required">Authentifizierung erforderlich</string>
-  <string name="legacy_error_message_fallback">Keine Fehlermeldung verfügbar</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-el/strings.xml b/libraries/session/src/main/res/values-el/strings.xml
index cebc57cf1f..b010ab4a03 100755
--- a/libraries/session/src/main/res/values-el/strings.xml
+++ b/libraries/session/src/main/res/values-el/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Αναζήτηση προς επόμενο στοιχείο</string>
   <string name="media3_controls_seek_back_description">Αναζήτηση προς τα πίσω</string>
   <string name="media3_controls_seek_forward_description">Αναζήτηση προς τα εμπρός</string>
-  <string name="authentication_required">Απαιτείται έλεγχος ταυτότητας</string>
-  <string name="legacy_error_message_fallback">Δεν παρέχεται μήνυμα σφάλματος</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-en-rAU/strings.xml b/libraries/session/src/main/res/values-en-rAU/strings.xml
index 486b197a85..f4d59b6408 100755
--- a/libraries/session/src/main/res/values-en-rAU/strings.xml
+++ b/libraries/session/src/main/res/values-en-rAU/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Forward to next item</string>
   <string name="media3_controls_seek_back_description">Rewind</string>
   <string name="media3_controls_seek_forward_description">Fast forward</string>
-  <string name="authentication_required">Authentication required</string>
-  <string name="legacy_error_message_fallback">No error message provided</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-en-rGB/strings.xml b/libraries/session/src/main/res/values-en-rGB/strings.xml
index 486b197a85..f4d59b6408 100755
--- a/libraries/session/src/main/res/values-en-rGB/strings.xml
+++ b/libraries/session/src/main/res/values-en-rGB/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Forward to next item</string>
   <string name="media3_controls_seek_back_description">Rewind</string>
   <string name="media3_controls_seek_forward_description">Fast forward</string>
-  <string name="authentication_required">Authentication required</string>
-  <string name="legacy_error_message_fallback">No error message provided</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-en-rIN/strings.xml b/libraries/session/src/main/res/values-en-rIN/strings.xml
index 486b197a85..f4d59b6408 100755
--- a/libraries/session/src/main/res/values-en-rIN/strings.xml
+++ b/libraries/session/src/main/res/values-en-rIN/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Forward to next item</string>
   <string name="media3_controls_seek_back_description">Rewind</string>
   <string name="media3_controls_seek_forward_description">Fast forward</string>
-  <string name="authentication_required">Authentication required</string>
-  <string name="legacy_error_message_fallback">No error message provided</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-es-rUS/strings.xml b/libraries/session/src/main/res/values-es-rUS/strings.xml
index 70e84efe3a..0eb79572c3 100755
--- a/libraries/session/src/main/res/values-es-rUS/strings.xml
+++ b/libraries/session/src/main/res/values-es-rUS/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Saltar al siguiente elemento</string>
   <string name="media3_controls_seek_back_description">Retroceder</string>
   <string name="media3_controls_seek_forward_description">Avanzar</string>
-  <string name="authentication_required">Se requiere autenticación</string>
-  <string name="legacy_error_message_fallback">No se proporcionan mensajes de error</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-es/strings.xml b/libraries/session/src/main/res/values-es/strings.xml
index d8940dfac6..04b2519ff3 100755
--- a/libraries/session/src/main/res/values-es/strings.xml
+++ b/libraries/session/src/main/res/values-es/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Ir al elemento siguiente</string>
   <string name="media3_controls_seek_back_description">Volver</string>
   <string name="media3_controls_seek_forward_description">Avanzar</string>
-  <string name="authentication_required">Autenticación obligatoria</string>
-  <string name="legacy_error_message_fallback">No se ha proporcionado un mensaje de error</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-et/strings.xml b/libraries/session/src/main/res/values-et/strings.xml
index eddd2459c8..2b02c4e569 100755
--- a/libraries/session/src/main/res/values-et/strings.xml
+++ b/libraries/session/src/main/res/values-et/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Järgmise üksuse juurde liikumine</string>
   <string name="media3_controls_seek_back_description">Tagasikerimine</string>
   <string name="media3_controls_seek_forward_description">Edasikerimine</string>
-  <string name="authentication_required">Vajalik on autentimine</string>
-  <string name="legacy_error_message_fallback">Veateadet pole esitatud</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-eu/strings.xml b/libraries/session/src/main/res/values-eu/strings.xml
index 44641ca639..3d640a1ced 100755
--- a/libraries/session/src/main/res/values-eu/strings.xml
+++ b/libraries/session/src/main/res/values-eu/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Joan hurrengo elementura</string>
   <string name="media3_controls_seek_back_description">Atzeratu</string>
   <string name="media3_controls_seek_forward_description">Aurreratu</string>
-  <string name="authentication_required">Autentifikazioa behar da</string>
-  <string name="legacy_error_message_fallback">Ez da errore-mezurik zehaztu</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-fa/strings.xml b/libraries/session/src/main/res/values-fa/strings.xml
index 3c5ee683e2..5d75c08452 100755
--- a/libraries/session/src/main/res/values-fa/strings.xml
+++ b/libraries/session/src/main/res/values-fa/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">رفتن به مورد بعدی</string>
   <string name="media3_controls_seek_back_description">رفتن به عقب</string>
   <string name="media3_controls_seek_forward_description">رفتن به جلو</string>
-  <string name="authentication_required">اصالت‌سنجی لازم است</string>
-  <string name="legacy_error_message_fallback">پیام خطایی ارائه نشده است</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-fi/strings.xml b/libraries/session/src/main/res/values-fi/strings.xml
index e89254b289..677787c6d5 100755
--- a/libraries/session/src/main/res/values-fi/strings.xml
+++ b/libraries/session/src/main/res/values-fi/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Siirry seuraavaan</string>
   <string name="media3_controls_seek_back_description">Siirry taaksepäin</string>
   <string name="media3_controls_seek_forward_description">Siirry eteenpäin</string>
-  <string name="authentication_required">Todennus vaaditaan</string>
-  <string name="legacy_error_message_fallback">Ei virheviestiä</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-fr-rCA/strings.xml b/libraries/session/src/main/res/values-fr-rCA/strings.xml
index cbf3e9ff6f..7918abae96 100755
--- a/libraries/session/src/main/res/values-fr-rCA/strings.xml
+++ b/libraries/session/src/main/res/values-fr-rCA/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Rechercher vers l\'élément suivant</string>
   <string name="media3_controls_seek_back_description">Rechercher vers l\'arrière</string>
   <string name="media3_controls_seek_forward_description">Rechercher vers l\'avant</string>
-  <string name="authentication_required">Authentification requise</string>
-  <string name="legacy_error_message_fallback">Aucun message d\'erreur fourni</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-fr/strings.xml b/libraries/session/src/main/res/values-fr/strings.xml
index 065c9763d6..ea51b6e7db 100755
--- a/libraries/session/src/main/res/values-fr/strings.xml
+++ b/libraries/session/src/main/res/values-fr/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Accéder à l\'élément suivant</string>
   <string name="media3_controls_seek_back_description">Revenir en arrière</string>
   <string name="media3_controls_seek_forward_description">Avancer</string>
-  <string name="authentication_required">Authentification requise</string>
-  <string name="legacy_error_message_fallback">Aucun message d\'erreur fourni</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-gl/strings.xml b/libraries/session/src/main/res/values-gl/strings.xml
index 28d0d10528..8bffbf5215 100755
--- a/libraries/session/src/main/res/values-gl/strings.xml
+++ b/libraries/session/src/main/res/values-gl/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Avanzar ao elemento seguinte</string>
   <string name="media3_controls_seek_back_description">Retroceder</string>
   <string name="media3_controls_seek_forward_description">Avanzar</string>
-  <string name="authentication_required">Requírese autenticación</string>
-  <string name="legacy_error_message_fallback">Non se proporcionou ningunha mensaxe de erro</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-gu/strings.xml b/libraries/session/src/main/res/values-gu/strings.xml
index 69d9548490..bbf32707e3 100755
--- a/libraries/session/src/main/res/values-gu/strings.xml
+++ b/libraries/session/src/main/res/values-gu/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">આગલી આઇટમ શોધો</string>
   <string name="media3_controls_seek_back_description">પાછળ લઈ જાઓ</string>
   <string name="media3_controls_seek_forward_description">આગળ લઈ જાઓ</string>
-  <string name="authentication_required">પ્રમાણીકરણ આવશ્યક છે</string>
-  <string name="legacy_error_message_fallback">ભૂલનો કોઈ મેસેજ આપવામાં આવ્યો નથી</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-hi/strings.xml b/libraries/session/src/main/res/values-hi/strings.xml
index 00213cd9f0..730db81e2d 100755
--- a/libraries/session/src/main/res/values-hi/strings.xml
+++ b/libraries/session/src/main/res/values-hi/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">अगले आइटम पर जाएं</string>
   <string name="media3_controls_seek_back_description">वापस जाएं</string>
   <string name="media3_controls_seek_forward_description">आगे बढ़ाएं</string>
-  <string name="authentication_required">पुष्टि करना ज़रूरी है</string>
-  <string name="legacy_error_message_fallback">गड़बड़ी का कोई मैसेज नहीं मिला</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-hr/strings.xml b/libraries/session/src/main/res/values-hr/strings.xml
index 4ddffd5c6a..f6d2b7e8a1 100755
--- a/libraries/session/src/main/res/values-hr/strings.xml
+++ b/libraries/session/src/main/res/values-hr/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Idi na sljedeću stavku</string>
   <string name="media3_controls_seek_back_description">Skok unatrag</string>
   <string name="media3_controls_seek_forward_description">Skok prema naprijed</string>
-  <string name="authentication_required">Potrebna je autentifikacija</string>
-  <string name="legacy_error_message_fallback">Nema poruke o pogrešci</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-hu/strings.xml b/libraries/session/src/main/res/values-hu/strings.xml
index f4962d6774..b192b1f15f 100755
--- a/libraries/session/src/main/res/values-hu/strings.xml
+++ b/libraries/session/src/main/res/values-hu/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Ugrás a következő elemre</string>
   <string name="media3_controls_seek_back_description">Ugrás vissza</string>
   <string name="media3_controls_seek_forward_description">Ugrás előre</string>
-  <string name="authentication_required">Hitelesítés szükséges</string>
-  <string name="legacy_error_message_fallback">Nem jelent meg hibaüzenet</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-hy/strings.xml b/libraries/session/src/main/res/values-hy/strings.xml
index 465c28a943..1f501741eb 100755
--- a/libraries/session/src/main/res/values-hy/strings.xml
+++ b/libraries/session/src/main/res/values-hy/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Անցնել հաջորդ տարրին</string>
   <string name="media3_controls_seek_back_description">Հետ գնալ</string>
   <string name="media3_controls_seek_forward_description">Առաջ գնալ</string>
-  <string name="authentication_required">Պահանջվում է նույնականացում</string>
-  <string name="legacy_error_message_fallback">Սխալի հաղորդագրություն տրամադրված չէ</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-in/strings.xml b/libraries/session/src/main/res/values-in/strings.xml
index 6581bb1727..5d8a22386e 100755
--- a/libraries/session/src/main/res/values-in/strings.xml
+++ b/libraries/session/src/main/res/values-in/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Cari item berikutnya</string>
   <string name="media3_controls_seek_back_description">Mundur</string>
   <string name="media3_controls_seek_forward_description">Maju</string>
-  <string name="authentication_required">Perlu autentikasi</string>
-  <string name="legacy_error_message_fallback">Tidak ada pesan error yang disediakan</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-is/strings.xml b/libraries/session/src/main/res/values-is/strings.xml
index e58c362016..285d311056 100755
--- a/libraries/session/src/main/res/values-is/strings.xml
+++ b/libraries/session/src/main/res/values-is/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Spóla að næsta atriði</string>
   <string name="media3_controls_seek_back_description">Spóla til baka</string>
   <string name="media3_controls_seek_forward_description">Spóla áfram</string>
-  <string name="authentication_required">Auðkenningar krafist</string>
-  <string name="legacy_error_message_fallback">Engin villuboð veitt</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-it/strings.xml b/libraries/session/src/main/res/values-it/strings.xml
index 0d0cfa3784..94ba4bd483 100755
--- a/libraries/session/src/main/res/values-it/strings.xml
+++ b/libraries/session/src/main/res/values-it/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Vai all\'elemento successivo</string>
   <string name="media3_controls_seek_back_description">Vai indietro</string>
   <string name="media3_controls_seek_forward_description">Vai avanti</string>
-  <string name="authentication_required">Autenticazione richiesta</string>
-  <string name="legacy_error_message_fallback">Nessun messaggio di errore fornito</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-iw/strings.xml b/libraries/session/src/main/res/values-iw/strings.xml
index 6b618fc2d0..df6dc5f78e 100755
--- a/libraries/session/src/main/res/values-iw/strings.xml
+++ b/libraries/session/src/main/res/values-iw/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">דילוג לפריט הבא</string>
   <string name="media3_controls_seek_back_description">דילוג אחורה</string>
   <string name="media3_controls_seek_forward_description">דילוג קדימה</string>
-  <string name="authentication_required">נדרש אימות</string>
-  <string name="legacy_error_message_fallback">לא התקבלה הודעת שגיאה</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ja/strings.xml b/libraries/session/src/main/res/values-ja/strings.xml
index 25300f1a8b..95391928d1 100755
--- a/libraries/session/src/main/res/values-ja/strings.xml
+++ b/libraries/session/src/main/res/values-ja/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">次のアイテムに移動</string>
   <string name="media3_controls_seek_back_description">巻き戻し</string>
   <string name="media3_controls_seek_forward_description">早送り</string>
-  <string name="authentication_required">認証が必要です</string>
-  <string name="legacy_error_message_fallback">エラー メッセージはありません</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ka/strings.xml b/libraries/session/src/main/res/values-ka/strings.xml
index 30eeb91b3c..d0e53d8bc4 100755
--- a/libraries/session/src/main/res/values-ka/strings.xml
+++ b/libraries/session/src/main/res/values-ka/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">შემდეგ ერთეულზე გადახვევა</string>
   <string name="media3_controls_seek_back_description">უკან გადახვევა</string>
   <string name="media3_controls_seek_forward_description">წინ გადახვევა</string>
-  <string name="authentication_required">საჭიროა ავტორიზაცია</string>
-  <string name="legacy_error_message_fallback">შეცდომის შეტყობინება არ არის მოწოდებული</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-kk/strings.xml b/libraries/session/src/main/res/values-kk/strings.xml
index 68ec6c3b91..adda2ef675 100755
--- a/libraries/session/src/main/res/values-kk/strings.xml
+++ b/libraries/session/src/main/res/values-kk/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Келесі контентке өту</string>
   <string name="media3_controls_seek_back_description">Артқа айналдыру</string>
   <string name="media3_controls_seek_forward_description">Алға айналдыру</string>
-  <string name="authentication_required">Аутентификация қажет</string>
-  <string name="legacy_error_message_fallback">Қате туралы хабар жоқ</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-km/strings.xml b/libraries/session/src/main/res/values-km/strings.xml
index f81185c906..d14ea36f3b 100755
--- a/libraries/session/src/main/res/values-km/strings.xml
+++ b/libraries/session/src/main/res/values-km/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">ទៅកាន់ធាតុបន្ទាប់</string>
   <string name="media3_controls_seek_back_description">ថយក្រោយ</string>
   <string name="media3_controls_seek_forward_description">រំលង​​ទៅ​មុខ</string>
-  <string name="authentication_required">តម្រូវឱ្យ​មាន​ការផ្ទៀងផ្ទាត់</string>
-  <string name="legacy_error_message_fallback">មិនបានផ្ដល់សារបញ្ហាទេ</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-kn/strings.xml b/libraries/session/src/main/res/values-kn/strings.xml
index 3801df95c8..379fd8387b 100755
--- a/libraries/session/src/main/res/values-kn/strings.xml
+++ b/libraries/session/src/main/res/values-kn/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">ಮುಂದಿನ ಐಟಂಗೆ ಸೀಕ್ ಮಾಡಿ</string>
   <string name="media3_controls_seek_back_description">ಹಿಂದಕ್ಕೆ ಸೀಕ್ ಮಾಡಿ</string>
   <string name="media3_controls_seek_forward_description">ಮುಂದಕ್ಕೆ ಸೀಕ್ ಮಾಡಿ</string>
-  <string name="authentication_required">ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ</string>
-  <string name="legacy_error_message_fallback">ಯಾವುದೇ ದೋಷ ಸಂದೇಶ ಕಂಡುಬಂದಿಲ್ಲ</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ko/strings.xml b/libraries/session/src/main/res/values-ko/strings.xml
index 319ae9cd9c..806f7e72b9 100755
--- a/libraries/session/src/main/res/values-ko/strings.xml
+++ b/libraries/session/src/main/res/values-ko/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">다음 항목 찾기</string>
   <string name="media3_controls_seek_back_description">뒤로 탐색</string>
   <string name="media3_controls_seek_forward_description">앞으로 탐색</string>
-  <string name="authentication_required">인증 필요</string>
-  <string name="legacy_error_message_fallback">제공된 오류 메시지 없음</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ky/strings.xml b/libraries/session/src/main/res/values-ky/strings.xml
index 904fb15d20..cdee03893c 100755
--- a/libraries/session/src/main/res/values-ky/strings.xml
+++ b/libraries/session/src/main/res/values-ky/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Кийинки нерсеге өтүү</string>
   <string name="media3_controls_seek_back_description">Артка түрдүрүү</string>
   <string name="media3_controls_seek_forward_description">Алдыга түрдүрүү</string>
-  <string name="authentication_required">Аныктыгын текшерүү талап кылынат</string>
-  <string name="legacy_error_message_fallback">Ката жөнүндө билдирүү берилген жок</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-lo/strings.xml b/libraries/session/src/main/res/values-lo/strings.xml
index db24f49e16..a174a96028 100755
--- a/libraries/session/src/main/res/values-lo/strings.xml
+++ b/libraries/session/src/main/res/values-lo/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">ເລື່ອນໄປຫາລາຍການຕໍ່ໄປ</string>
   <string name="media3_controls_seek_back_description">ເລື່ອນກັບຫຼັງ</string>
   <string name="media3_controls_seek_forward_description">ເລື່ອນໄປໜ້າ</string>
-  <string name="authentication_required">ຕ້ອງມີການພິສູດຢືນຢັນ</string>
-  <string name="legacy_error_message_fallback">ບໍ່ໄດ້ລະບຸຂໍ້ຄວາມສະແດງຂໍ້ຜິດພາດ</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-lt/strings.xml b/libraries/session/src/main/res/values-lt/strings.xml
index 08cf786a33..843ceadd09 100755
--- a/libraries/session/src/main/res/values-lt/strings.xml
+++ b/libraries/session/src/main/res/values-lt/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Prasukti į kitą elementą</string>
   <string name="media3_controls_seek_back_description">Prasukti atgal</string>
   <string name="media3_controls_seek_forward_description">Prasukti pirmyn</string>
-  <string name="authentication_required">Būtina nustatyti tapatybę</string>
-  <string name="legacy_error_message_fallback">Nepateiktas joks klaidos pranešimas</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-lv/strings.xml b/libraries/session/src/main/res/values-lv/strings.xml
index 5c70e4bd5c..3229fa74b3 100755
--- a/libraries/session/src/main/res/values-lv/strings.xml
+++ b/libraries/session/src/main/res/values-lv/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Pāriet uz nākamo vienumu</string>
   <string name="media3_controls_seek_back_description">Pāriet atpakaļ</string>
   <string name="media3_controls_seek_forward_description">Pāriet uz priekšu</string>
-  <string name="authentication_required">Nepieciešama autentificēšana</string>
-  <string name="legacy_error_message_fallback">Kļūdas ziņojums nav norādīts</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-mk/strings.xml b/libraries/session/src/main/res/values-mk/strings.xml
index 31f1c563ee..39ffd274a8 100755
--- a/libraries/session/src/main/res/values-mk/strings.xml
+++ b/libraries/session/src/main/res/values-mk/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Премотај на следната ставка</string>
   <string name="media3_controls_seek_back_description">Премотај наназад</string>
   <string name="media3_controls_seek_forward_description">Премотај нанапред</string>
-  <string name="authentication_required">Потребна е проверка</string>
-  <string name="legacy_error_message_fallback">Нема порака за грешка</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ml/strings.xml b/libraries/session/src/main/res/values-ml/strings.xml
index fbc8f7bf16..5610826669 100755
--- a/libraries/session/src/main/res/values-ml/strings.xml
+++ b/libraries/session/src/main/res/values-ml/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">അടുത്ത ഇനത്തിലേക്ക് നീക്കുക</string>
   <string name="media3_controls_seek_back_description">പിന്നോട്ട് നീക്കുക</string>
   <string name="media3_controls_seek_forward_description">മുന്നോട്ട് നീക്കുക</string>
-  <string name="authentication_required">പരിശോധിച്ചുറപ്പിക്കേണ്ടതുണ്ട്</string>
-  <string name="legacy_error_message_fallback">പിശക് സന്ദേശമൊന്നും നൽകിയില്ല</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-mn/strings.xml b/libraries/session/src/main/res/values-mn/strings.xml
index 02618fae2b..9637cef0d5 100755
--- a/libraries/session/src/main/res/values-mn/strings.xml
+++ b/libraries/session/src/main/res/values-mn/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Дараагийн зүйл рүү гүйлгэх</string>
   <string name="media3_controls_seek_back_description">Буцаан гүйлгэх</string>
   <string name="media3_controls_seek_forward_description">Урагшлуулах</string>
-  <string name="authentication_required">Баталгаажуулалт шаардлагатай</string>
-  <string name="legacy_error_message_fallback">Ямар ч алдааны мессеж өгөөгүй</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-mr/strings.xml b/libraries/session/src/main/res/values-mr/strings.xml
index 62ae8970dd..1b802ea42a 100755
--- a/libraries/session/src/main/res/values-mr/strings.xml
+++ b/libraries/session/src/main/res/values-mr/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">पुढील आयटमवर जा</string>
   <string name="media3_controls_seek_back_description">मागे जा</string>
   <string name="media3_controls_seek_forward_description">पुढे जा</string>
-  <string name="authentication_required">ऑथेंटिकेशन आवश्यक आहे</string>
-  <string name="legacy_error_message_fallback">कोणताही एरर मेसेज दिलेला नाही</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ms/strings.xml b/libraries/session/src/main/res/values-ms/strings.xml
index 12c798c2a4..1405e466ca 100755
--- a/libraries/session/src/main/res/values-ms/strings.xml
+++ b/libraries/session/src/main/res/values-ms/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Cari sehingga item seterusnya</string>
   <string name="media3_controls_seek_back_description">Mandir</string>
   <string name="media3_controls_seek_forward_description">Mundar</string>
-  <string name="authentication_required">Pengesahan diperlukan</string>
-  <string name="legacy_error_message_fallback">Tiada mesej ralat diberikan</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-my/strings.xml b/libraries/session/src/main/res/values-my/strings.xml
index 31867aa093..9dc9103f32 100755
--- a/libraries/session/src/main/res/values-my/strings.xml
+++ b/libraries/session/src/main/res/values-my/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">ရှေ့တစ်ခုသို့ ရစ်ရန်</string>
   <string name="media3_controls_seek_back_description">နောက်သို့ ရစ်ရန်</string>
   <string name="media3_controls_seek_forward_description">ရှေ့သို့ ရစ်ရန်</string>
-  <string name="authentication_required">အထောက်အထားစိစစ်ခြင်း လိုအပ်သည်</string>
-  <string name="legacy_error_message_fallback">မှားယွင်းကြောင်း မက်ဆေ့ဂျ် မပါဝင်ပါ</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-nb/strings.xml b/libraries/session/src/main/res/values-nb/strings.xml
index 85e08be3d4..4bd0d337b6 100755
--- a/libraries/session/src/main/res/values-nb/strings.xml
+++ b/libraries/session/src/main/res/values-nb/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Hopp til det neste elementet</string>
   <string name="media3_controls_seek_back_description">Hopp bakover</string>
   <string name="media3_controls_seek_forward_description">Hopp fremover</string>
-  <string name="authentication_required">Autentisering kreves</string>
-  <string name="legacy_error_message_fallback">Ingen feilmelding er oppgitt</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ne/strings.xml b/libraries/session/src/main/res/values-ne/strings.xml
index 434edb3a47..61f3001c0c 100755
--- a/libraries/session/src/main/res/values-ne/strings.xml
+++ b/libraries/session/src/main/res/values-ne/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">अर्को वस्तुमा जानुहोस्</string>
   <string name="media3_controls_seek_back_description">पछाडि जानुहोस्</string>
   <string name="media3_controls_seek_forward_description">अगाडि जानुहोस्</string>
-  <string name="authentication_required">पुष्टि गर्नु पर्ने हुन्छ</string>
-  <string name="legacy_error_message_fallback">त्रुटिसम्बन्धी कुनै पनि म्यासेज दिइएको छैन</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-nl/strings.xml b/libraries/session/src/main/res/values-nl/strings.xml
index 2cfca98593..2aef484ac0 100755
--- a/libraries/session/src/main/res/values-nl/strings.xml
+++ b/libraries/session/src/main/res/values-nl/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Naar volgende item springen</string>
   <string name="media3_controls_seek_back_description">Achteruit springen</string>
   <string name="media3_controls_seek_forward_description">Vooruit springen</string>
-  <string name="authentication_required">Verificatie vereist</string>
-  <string name="legacy_error_message_fallback">Geen foutbericht beschikbaar</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-pa/strings.xml b/libraries/session/src/main/res/values-pa/strings.xml
index c24583f0c1..6f876e4720 100755
--- a/libraries/session/src/main/res/values-pa/strings.xml
+++ b/libraries/session/src/main/res/values-pa/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">ਅਗਲੀ ਆਈਟਮ \'ਤੇ ਜਾਓ</string>
   <string name="media3_controls_seek_back_description">ਪਿੱਛੇ ਲਿਜਾਓ</string>
   <string name="media3_controls_seek_forward_description">ਅੱਗੇ ਵਧਾਓ</string>
-  <string name="authentication_required">ਪ੍ਰਮਾਣੀਕਰਨ ਲੋੜੀਂਦਾ ਹੈ</string>
-  <string name="legacy_error_message_fallback">ਕੋਈ ਗੜਬੜ-ਸੁਨੇਹਾ ਮੁਹੱਈਆ ਨਹੀਂ ਕਰਵਾਇਆ ਗਿਆ</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-pl/strings.xml b/libraries/session/src/main/res/values-pl/strings.xml
index 74331b5f07..35f3be38a5 100755
--- a/libraries/session/src/main/res/values-pl/strings.xml
+++ b/libraries/session/src/main/res/values-pl/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Przewiń do następnego elementu</string>
   <string name="media3_controls_seek_back_description">Przewiń do tyłu</string>
   <string name="media3_controls_seek_forward_description">Przewiń do przodu</string>
-  <string name="authentication_required">Wymagane uwierzytelnienie</string>
-  <string name="legacy_error_message_fallback">Brak komunikatu o błędzie</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-pt-rPT/strings.xml b/libraries/session/src/main/res/values-pt-rPT/strings.xml
index d7eb74ee01..b3331c5c2f 100755
--- a/libraries/session/src/main/res/values-pt-rPT/strings.xml
+++ b/libraries/session/src/main/res/values-pt-rPT/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Avançar para o item seguinte</string>
   <string name="media3_controls_seek_back_description">Anterior</string>
   <string name="media3_controls_seek_forward_description">Avançar</string>
-  <string name="authentication_required">Autenticação necessária</string>
-  <string name="legacy_error_message_fallback">Nenhuma mensagem de erro apresentada</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-pt/strings.xml b/libraries/session/src/main/res/values-pt/strings.xml
index 8f26137c9d..a9552bcb13 100755
--- a/libraries/session/src/main/res/values-pt/strings.xml
+++ b/libraries/session/src/main/res/values-pt/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Ir para o próximo item</string>
   <string name="media3_controls_seek_back_description">Retroceder</string>
   <string name="media3_controls_seek_forward_description">Avançar</string>
-  <string name="authentication_required">Autenticação necessária</string>
-  <string name="legacy_error_message_fallback">Nenhuma mensagem de erro disponível</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ro/strings.xml b/libraries/session/src/main/res/values-ro/strings.xml
index 8aef9b2619..1aae5e2351 100755
--- a/libraries/session/src/main/res/values-ro/strings.xml
+++ b/libraries/session/src/main/res/values-ro/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Treci la elementul următor</string>
   <string name="media3_controls_seek_back_description">Derulează înapoi</string>
   <string name="media3_controls_seek_forward_description">Derulează înainte</string>
-  <string name="authentication_required">Autentificarea este obligatorie</string>
-  <string name="legacy_error_message_fallback">Nu s-a afișat niciun mesaj de eroare</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ru/strings.xml b/libraries/session/src/main/res/values-ru/strings.xml
index 33d761480c..bf0cad213b 100755
--- a/libraries/session/src/main/res/values-ru/strings.xml
+++ b/libraries/session/src/main/res/values-ru/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">К следующему файлу</string>
   <string name="media3_controls_seek_back_description">Перемотать назад</string>
   <string name="media3_controls_seek_forward_description">Перемотать вперед</string>
-  <string name="authentication_required">Требуется аутентификация</string>
-  <string name="legacy_error_message_fallback">Нет описания ошибки</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-si/strings.xml b/libraries/session/src/main/res/values-si/strings.xml
index 6c81c1d507..8183514571 100755
--- a/libraries/session/src/main/res/values-si/strings.xml
+++ b/libraries/session/src/main/res/values-si/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">ඊළඟ අයිතමය වෙත අන්වේෂණය</string>
   <string name="media3_controls_seek_back_description">ආපස්සට අන්වේෂණය</string>
   <string name="media3_controls_seek_forward_description">ඉදිරියට අන්වේෂණය</string>
-  <string name="authentication_required">සත්‍යාපනය අවශ්‍යයි</string>
-  <string name="legacy_error_message_fallback">කිසිම දෝෂ පණිවුඩයක් නොදෙන ලදි</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-sk/strings.xml b/libraries/session/src/main/res/values-sk/strings.xml
index 749f28e562..177b702917 100755
--- a/libraries/session/src/main/res/values-sk/strings.xml
+++ b/libraries/session/src/main/res/values-sk/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Hľadať v ďalšej položke</string>
   <string name="media3_controls_seek_back_description">Hľadať smerom dozadu</string>
   <string name="media3_controls_seek_forward_description">Hľadať smerom dopredu</string>
-  <string name="authentication_required">Vyžaduje sa overenie</string>
-  <string name="legacy_error_message_fallback">Nebolo poskytnuté žiadne chybové hlásenie</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-sl/strings.xml b/libraries/session/src/main/res/values-sl/strings.xml
index ecafe79dfa..4eca00394a 100755
--- a/libraries/session/src/main/res/values-sl/strings.xml
+++ b/libraries/session/src/main/res/values-sl/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Premakni na naslednji element</string>
   <string name="media3_controls_seek_back_description">Premakni nazaj</string>
   <string name="media3_controls_seek_forward_description">Premakni naprej</string>
-  <string name="authentication_required">Zahtevano je preverjanje pristnosti</string>
-  <string name="legacy_error_message_fallback">Sporočilo o napaki ni na voljo</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-sq/strings.xml b/libraries/session/src/main/res/values-sq/strings.xml
index daabd71790..e937123bd1 100755
--- a/libraries/session/src/main/res/values-sq/strings.xml
+++ b/libraries/session/src/main/res/values-sq/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Kërko te artikulli tjetër</string>
   <string name="media3_controls_seek_back_description">Kërko prapa</string>
   <string name="media3_controls_seek_forward_description">Kërko përpara</string>
-  <string name="authentication_required">Kërkohet vërtetimi</string>
-  <string name="legacy_error_message_fallback">Nuk u dha mesazh gabimi</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-sr/strings.xml b/libraries/session/src/main/res/values-sr/strings.xml
index 84fb41ea5f..aa988b68e7 100755
--- a/libraries/session/src/main/res/values-sr/strings.xml
+++ b/libraries/session/src/main/res/values-sr/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Премотај на следећу ставку</string>
   <string name="media3_controls_seek_back_description">Премотај уназад</string>
   <string name="media3_controls_seek_forward_description">Премотај унапред</string>
-  <string name="authentication_required">Потребна је потврда идентитета</string>
-  <string name="legacy_error_message_fallback">Није наведена порука о грешци</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-sv/strings.xml b/libraries/session/src/main/res/values-sv/strings.xml
index b37531535a..a9c2bb6e47 100755
--- a/libraries/session/src/main/res/values-sv/strings.xml
+++ b/libraries/session/src/main/res/values-sv/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Hoppa till nästa objekt</string>
   <string name="media3_controls_seek_back_description">Hoppa bakåt</string>
   <string name="media3_controls_seek_forward_description">Hoppa framåt</string>
-  <string name="authentication_required">Autentisering krävs</string>
-  <string name="legacy_error_message_fallback">Inget felmeddelande tillhandahålls</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-sw/strings.xml b/libraries/session/src/main/res/values-sw/strings.xml
index 7f71bb0600..dc76e1bfe7 100755
--- a/libraries/session/src/main/res/values-sw/strings.xml
+++ b/libraries/session/src/main/res/values-sw/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Nenda kwenye maudhui yanayofuata</string>
   <string name="media3_controls_seek_back_description">Sogeza nyuma</string>
   <string name="media3_controls_seek_forward_description">Sogeza mbele</string>
-  <string name="authentication_required">Uthibitishaji unahitajika</string>
-  <string name="legacy_error_message_fallback">Hakuna ujumbe kuhusu hitilafu uliotolewa</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ta/strings.xml b/libraries/session/src/main/res/values-ta/strings.xml
index 29755041e7..bf2883337c 100755
--- a/libraries/session/src/main/res/values-ta/strings.xml
+++ b/libraries/session/src/main/res/values-ta/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">அடுத்ததற்குச் செல்லும்</string>
   <string name="media3_controls_seek_back_description">பின்செல்லும்</string>
   <string name="media3_controls_seek_forward_description">முன்செல்லும்</string>
-  <string name="authentication_required">அங்கீகாரம் தேவை</string>
-  <string name="legacy_error_message_fallback">பிழைச் செய்தி எதுவும் வழங்கப்படவில்லை</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-te/strings.xml b/libraries/session/src/main/res/values-te/strings.xml
index 25abec533f..814dc76ad2 100755
--- a/libraries/session/src/main/res/values-te/strings.xml
+++ b/libraries/session/src/main/res/values-te/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">తర్వాతి ఐటెమ్‌కు దాటవేయండి</string>
   <string name="media3_controls_seek_back_description">వెనుకకు దాటవేయండి</string>
   <string name="media3_controls_seek_forward_description">ముందుకు ఫార్వర్డ్ చేయండి</string>
-  <string name="authentication_required">ప్రామాణీకరణ అవసరం</string>
-  <string name="legacy_error_message_fallback">ఎర్రర్ మెసేజ్ అందించబడలేదు</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-th/strings.xml b/libraries/session/src/main/res/values-th/strings.xml
index 9a86f7d07e..27e3bba47d 100755
--- a/libraries/session/src/main/res/values-th/strings.xml
+++ b/libraries/session/src/main/res/values-th/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">กรอไปยังรายการถัดไป</string>
   <string name="media3_controls_seek_back_description">กรอกลับ</string>
   <string name="media3_controls_seek_forward_description">กรอไปข้างหน้า</string>
-  <string name="authentication_required">ต้องมีการตรวจสอบสิทธิ์</string>
-  <string name="legacy_error_message_fallback">ไม่มีข้อความแสดงข้อผิดพลาด</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-tl/strings.xml b/libraries/session/src/main/res/values-tl/strings.xml
index e6168a07be..395f43a9f2 100755
--- a/libraries/session/src/main/res/values-tl/strings.xml
+++ b/libraries/session/src/main/res/values-tl/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Mag-seek sa susunod na item</string>
   <string name="media3_controls_seek_back_description">Mag-seek pabalik</string>
   <string name="media3_controls_seek_forward_description">Mag-seek pasulong</string>
-  <string name="authentication_required">Kinakailangan ang pag-authenticate</string>
-  <string name="legacy_error_message_fallback">Walang ibinigay na mensahe ng error</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-tr/strings.xml b/libraries/session/src/main/res/values-tr/strings.xml
index c79bed59d2..65f0bf8daa 100755
--- a/libraries/session/src/main/res/values-tr/strings.xml
+++ b/libraries/session/src/main/res/values-tr/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Sonraki öğeye sar</string>
   <string name="media3_controls_seek_back_description">Geri sar</string>
   <string name="media3_controls_seek_forward_description">İleri sar</string>
-  <string name="authentication_required">Kimlik doğrulama gerekiyor</string>
-  <string name="legacy_error_message_fallback">Herhangi bir hata mesajı sağlanmadı</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-uk/strings.xml b/libraries/session/src/main/res/values-uk/strings.xml
index 90e89462c3..a66ce2b2c1 100755
--- a/libraries/session/src/main/res/values-uk/strings.xml
+++ b/libraries/session/src/main/res/values-uk/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Перейти до наступного об’єкта</string>
   <string name="media3_controls_seek_back_description">Перемотати назад</string>
   <string name="media3_controls_seek_forward_description">Перемотати вперед</string>
-  <string name="authentication_required">Потрібна автентифікація</string>
-  <string name="legacy_error_message_fallback">Немає повідомлення про помилку</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-ur/strings.xml b/libraries/session/src/main/res/values-ur/strings.xml
index 4f03aca38c..b2956bf4ab 100755
--- a/libraries/session/src/main/res/values-ur/strings.xml
+++ b/libraries/session/src/main/res/values-ur/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">اگلے آئٹم پر جائیں</string>
   <string name="media3_controls_seek_back_description">واپس جائیں</string>
   <string name="media3_controls_seek_forward_description">آگے جائیں</string>
-  <string name="authentication_required">توثیق مطلوب ہے</string>
-  <string name="legacy_error_message_fallback">خرابی کا کوئی پیغام فراہم نہیں کیا گیا</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-uz/strings.xml b/libraries/session/src/main/res/values-uz/strings.xml
index 886be216d9..1fe52c1da9 100755
--- a/libraries/session/src/main/res/values-uz/strings.xml
+++ b/libraries/session/src/main/res/values-uz/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Keyingi trekka oʻtish</string>
   <string name="media3_controls_seek_back_description">Orqaga surish</string>
   <string name="media3_controls_seek_forward_description">Oldinga surish</string>
-  <string name="authentication_required">Haqiqiylikni tekshirish talab etiladi</string>
-  <string name="legacy_error_message_fallback">Xatolik xabari taqdim qilinmagan</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-vi/strings.xml b/libraries/session/src/main/res/values-vi/strings.xml
index cc006e94e0..e575a7a31e 100755
--- a/libraries/session/src/main/res/values-vi/strings.xml
+++ b/libraries/session/src/main/res/values-vi/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Tua đến mục tiếp theo</string>
   <string name="media3_controls_seek_back_description">Tua lại</string>
   <string name="media3_controls_seek_forward_description">Tua đi</string>
-  <string name="authentication_required">Yêu cầu xác thực</string>
-  <string name="legacy_error_message_fallback">Không cung cấp thông báo lỗi</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-zh-rCN/strings.xml b/libraries/session/src/main/res/values-zh-rCN/strings.xml
index c8e3107ff6..39e8ffdabc 100755
--- a/libraries/session/src/main/res/values-zh-rCN/strings.xml
+++ b/libraries/session/src/main/res/values-zh-rCN/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">跳转到下一项</string>
   <string name="media3_controls_seek_back_description">快退</string>
   <string name="media3_controls_seek_forward_description">快进</string>
-  <string name="authentication_required">需要进行身份验证</string>
-  <string name="legacy_error_message_fallback">未提供错误消息</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-zh-rHK/strings.xml b/libraries/session/src/main/res/values-zh-rHK/strings.xml
index 2c23e91531..69bd7d137f 100755
--- a/libraries/session/src/main/res/values-zh-rHK/strings.xml
+++ b/libraries/session/src/main/res/values-zh-rHK/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">跳去下一項</string>
   <string name="media3_controls_seek_back_description">後移</string>
   <string name="media3_controls_seek_forward_description">快轉</string>
-  <string name="authentication_required">需要驗證</string>
-  <string name="legacy_error_message_fallback">沒有提供錯誤訊息</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-zh-rTW/strings.xml b/libraries/session/src/main/res/values-zh-rTW/strings.xml
index 667732c4bd..d741eeeb5f 100755
--- a/libraries/session/src/main/res/values-zh-rTW/strings.xml
+++ b/libraries/session/src/main/res/values-zh-rTW/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">跳轉到下一個項目</string>
   <string name="media3_controls_seek_back_description">倒轉</string>
   <string name="media3_controls_seek_forward_description">快轉</string>
-  <string name="authentication_required">必須驗證</string>
-  <string name="legacy_error_message_fallback">未提供錯誤訊息</string>
 </resources>
diff --git a/libraries/session/src/main/res/values-zu/strings.xml b/libraries/session/src/main/res/values-zu/strings.xml
index e5265c0348..e75ae3af6d 100755
--- a/libraries/session/src/main/res/values-zu/strings.xml
+++ b/libraries/session/src/main/res/values-zu/strings.xml
@@ -7,6 +7,4 @@
   <string name="media3_controls_seek_to_next_description">Funa into elandelayo</string>
   <string name="media3_controls_seek_back_description">Funa okwangemuva</string>
   <string name="media3_controls_seek_forward_description">Funa uye phambili</string>
-  <string name="authentication_required">Ukufakazela ubuqiniso kudingekile</string>
-  <string name="legacy_error_message_fallback">Awukho umyalezo wephutha onikeziwe</string>
 </resources>
diff --git a/libraries/session/src/main/res/values/strings.xml b/libraries/session/src/main/res/values/strings.xml
index 7c2955e0bd..44fd3a7392 100644
--- a/libraries/session/src/main/res/values/strings.xml
+++ b/libraries/session/src/main/res/values/strings.xml
@@ -28,7 +28,38 @@
     <string name="media3_controls_seek_back_description">Seek back</string>
     <!-- Accessibility description for a 'seek forward' or 'fast-forward' button on a media notification. [CHAR LIMIT=NONE]  -->
     <string name="media3_controls_seek_forward_description">Seek forward</string>
-    <string name="authentication_required">Authentication required</string>
-    <!-- Fallback error message if a PlaybackStateCompat has an error code without an error message. [CHAR LIMIT=NONE] -->
-    <string name="legacy_error_message_fallback">No error message provided</string>
+    <!-- Fallback error message for an unknown error or when no error message is provided. [CHAR LIMIT=NONE] -->
+    <string name="error_message_fallback">Something’s wrong. Try later.</string>
+    <!-- Error message set when the action is interrupted due to some external event. [CHAR LIMIT=100] -->
+    <string name="error_message_info_cancelled">Couldn’t finish. Try again.</string>
+    <!-- Error message set when the application state is invalid to fulfill the request. [CHAR LIMIT=100] -->
+    <string name="error_message_invalid_state">Can’t do that right now</string>
+    <!-- Error message set when the request cannot be performed because authentication has expired. [CHAR LIMIT=100] -->
+    <string name="error_message_authentication_expired">Sign in to use this app</string>
+    <!-- Error message set when the requested content is already playing. [CHAR LIMIT=100] -->
+    <string name="error_message_content_already_playing">Already playing that content</string>
+    <!-- Error message set when the playback navigation (previous, next) is not possible because the queue was exhausted. [CHAR LIMIT=100] -->
+    <string name="error_message_end_of_playlist">Nothing else is queued up</string>
+    <!-- Error message set when too many concurrent streams are detected. [CHAR LIMIT=100] -->
+    <string name="error_message_concurrent_stream_limit">Listening on too many devices</string>
+    <!-- Error message set when the content is blocked due to being regionally unavailable. [CHAR LIMIT=100] -->
+    <string name="error_message_not_available_in_region">Can’t get that content here</string>
+    <!-- Error message set when the request is not supported by the application. [CHAR LIMIT=100] -->
+    <string name="error_message_not_supported">This app can’t do that</string>
+    <!-- Error message set when the content is blocked due to parental controls. [CHAR LIMIT=100] -->
+    <string name="error_message_parental_control_restricted">That content is blocked</string>
+    <!-- Error message set when a premium account is required for the request to succeed. [CHAR LIMIT=100] -->
+    <string name="error_message_premium_account_required">Premium access required</string>
+    <!-- Error message set when the application cannot skip any more songs because skip limit is reached. [CHAR LIMIT=100] -->
+    <string name="error_message_skip_limit_reached">Can’t skip any more tracks</string>
+    <!-- Error message set when the client provided incorrect or invalid input data. [CHAR LIMIT=100] -->
+    <string name="error_message_bad_value">Incorrect input data</string>
+    <!-- Error message set when the media app failed reading or writing data.[CHAR LIMIT=100] -->
+    <string name="error_message_io">Input/output error</string>
+    <!-- Error message set when access was denied. [CHAR LIMIT=100] -->
+    <string name="error_message_permission_denied">Access denied</string>
+    <!-- Error message set when the controller or browser was disconnected from the session app. [CHAR LIMIT=100] -->
+    <string name="error_message_disconnected">Disconnected from media app</string>
+    <!-- Error message set when setup is required for proper functioning. [CHAR LIMIT=100] -->
+    <string name="error_message_setup_required">Setup required</string>
 </resources>
diff --git a/libraries/session/src/test/java/androidx/media3/session/LegacyConversionsTest.java b/libraries/session/src/test/java/androidx/media3/session/LegacyConversionsTest.java
index 1189e3e4df..b9f168026d 100644
--- a/libraries/session/src/test/java/androidx/media3/session/LegacyConversionsTest.java
+++ b/libraries/session/src/test/java/androidx/media3/session/LegacyConversionsTest.java
@@ -404,7 +404,7 @@ public final class LegacyConversionsTest {
     MediaMetadata mediaMetadata =
         LegacyConversions.convertToMediaMetadata(testMediaMetadataCompat, RatingCompat.RATING_NONE);
 
-    assertThat(mediaMetadata.title).isEqualTo("displayTitle");
+    assertThat(mediaMetadata.title.toString()).isEqualTo("displayTitle");
     assertThat(mediaMetadata.displayTitle).isNull();
   }
 
@@ -1316,6 +1316,48 @@ public final class LegacyConversionsTest {
     assertThat(totalBufferedDurationMs).isEqualTo(testTotalBufferedDurationMs);
   }
 
+  @Test
+  public void convertToSessionError_unknownError_returnsNull() {
+    SessionError sessionError =
+        LegacyConversions.convertToSessionError(
+            PlaybackStateCompat.STATE_PLAYING,
+            PlaybackStateCompat.ERROR_CODE_UNKNOWN_ERROR,
+            "err message",
+            Bundle.EMPTY,
+            ApplicationProvider.getApplicationContext());
+
+    assertThat(sessionError).isNull();
+  }
+
+  @Test
+  public void convertToSessionError_stateError_returnsNull() {
+    SessionError sessionError =
+        LegacyConversions.convertToSessionError(
+            PlaybackStateCompat.STATE_ERROR,
+            PlaybackStateCompat.ERROR_CODE_AUTHENTICATION_EXPIRED,
+            "err message",
+            Bundle.EMPTY,
+            ApplicationProvider.getApplicationContext());
+
+    assertThat(sessionError).isNull();
+  }
+
+  @Test
+  public void convertToSessionError_errorMessageNull_useLocalizedStringResourceAsFallback() {
+    SessionError sessionError =
+        LegacyConversions.convertToSessionError(
+            PlaybackStateCompat.STATE_PLAYING,
+            PlaybackStateCompat.ERROR_CODE_AUTHENTICATION_EXPIRED,
+            /* errorMessage= */ null,
+            Bundle.EMPTY,
+            ApplicationProvider.getApplicationContext());
+
+    assertThat(sessionError.message)
+        .isEqualTo(
+            ApplicationProvider.getApplicationContext()
+                .getString(R.string.error_message_authentication_expired));
+  }
+
   // TODO(b/254265256): Move this method to a central place.
   private static ImmutableList<@Player.Command Integer> getCommandsAsList(
       Player.Commands commands) {
diff --git a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerCompatCallbackWithMediaSessionTest.java b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerCompatCallbackWithMediaSessionTest.java
index cd380e9ba2..5b5e27e798 100644
--- a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerCompatCallbackWithMediaSessionTest.java
+++ b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerCompatCallbackWithMediaSessionTest.java
@@ -263,7 +263,7 @@ public class MediaControllerCompatCallbackWithMediaSessionTest {
         new SessionError(
             /* code= */ SessionError.ERROR_SESSION_AUTHENTICATION_EXPIRED,
             /* message= */ ApplicationProvider.getApplicationContext()
-                .getString(R.string.authentication_required),
+                .getString(R.string.error_message_authentication_expired),
             errorBundle));
 
     assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
@@ -277,7 +277,7 @@ public class MediaControllerCompatCallbackWithMediaSessionTest {
     assertThat(errorPlaybackStateCompat.getErrorCode())
         .isEqualTo(PlaybackStateCompat.ERROR_CODE_AUTHENTICATION_EXPIRED);
     assertThat(errorPlaybackStateCompat.getErrorMessage().toString())
-        .isEqualTo(context.getString(R.string.authentication_required));
+        .isEqualTo(context.getString(R.string.error_message_authentication_expired));
     assertThat(errorPlaybackStateCompat.getExtras()).hasSize(3);
     assertThat(errorPlaybackStateCompat.getExtras()).integer("errorKey").isEqualTo(99);
     assertThat(errorPlaybackStateCompat.getExtras()).string("initialKey").isEqualTo("initialValue");
@@ -324,7 +324,7 @@ public class MediaControllerCompatCallbackWithMediaSessionTest {
         new SessionError(
             SessionError.ERROR_SESSION_AUTHENTICATION_EXPIRED,
             /* message= */ ApplicationProvider.getApplicationContext()
-                .getString(R.string.authentication_required),
+                .getString(R.string.error_message_authentication_expired),
             errorBundle));
 
     assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
@@ -338,7 +338,7 @@ public class MediaControllerCompatCallbackWithMediaSessionTest {
     assertThat(errorPlaybackStateCompat.getErrorCode())
         .isEqualTo(PlaybackStateCompat.ERROR_CODE_AUTHENTICATION_EXPIRED);
     assertThat(errorPlaybackStateCompat.getErrorMessage().toString())
-        .isEqualTo(context.getString(R.string.authentication_required));
+        .isEqualTo(context.getString(R.string.error_message_authentication_expired));
     assertThat(errorPlaybackStateCompat.getActions())
         .isEqualTo(initialPlaybackStateCompat.getActions());
     assertThat(errorPlaybackStateCompat.getExtras()).hasSize(3);
diff --git a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerListenerTest.java b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerListenerTest.java
index 758bb863d6..1ba681287b 100644
--- a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerListenerTest.java
+++ b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerListenerTest.java
@@ -2725,7 +2725,8 @@ public class MediaControllerListenerTest {
     SessionError error1 =
         new SessionError(
             /* code= */ SessionError.ERROR_SESSION_AUTHENTICATION_EXPIRED,
-            ApplicationProvider.getApplicationContext().getString(R.string.authentication_required),
+            ApplicationProvider.getApplicationContext()
+                .getString(R.string.error_message_authentication_expired),
             errorExtra1);
     Bundle errorExtra2 = new Bundle();
     errorExtra2.putInt("intKey", 2);
diff --git a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerListenerWithMediaSessionCompatTest.java b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerListenerWithMediaSessionCompatTest.java
index 3a9f11a64b..dc128f6093 100644
--- a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerListenerWithMediaSessionCompatTest.java
+++ b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerListenerWithMediaSessionCompatTest.java
@@ -215,7 +215,7 @@ public class MediaControllerListenerWithMediaSessionCompatTest {
             .setErrorMessage(
                 PlaybackStateCompat.ERROR_CODE_AUTHENTICATION_EXPIRED,
                 ApplicationProvider.getApplicationContext()
-                    .getString(R.string.authentication_required))
+                    .getString(R.string.error_message_authentication_expired))
             .setExtras(fatalErrorExtras)
             .build());
 
@@ -223,7 +223,7 @@ public class MediaControllerListenerWithMediaSessionCompatTest {
     assertThat(fatalErrorExceptions).hasSize(1);
     assertThat(fatalErrorExceptions.get(0))
         .hasMessageThat()
-        .isEqualTo(context.getString(R.string.authentication_required));
+        .isEqualTo(context.getString(R.string.error_message_authentication_expired));
     assertThat(fatalErrorExceptions.get(0).errorCode)
         .isEqualTo(PlaybackException.ERROR_CODE_AUTHENTICATION_EXPIRED);
     assertThat(TestUtils.equals(fatalErrorExceptions.get(0).extras, fatalErrorExtras)).isTrue();