103.0 - Alpha (103200)

2021-11-15 08:16:47 +01:00 · 2021-11-15 08:16:47 +01:00 · a8e37f060e
commit a8e37f060e
parent cf781bb890
17 changed files with 5534 additions and 5462 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -10,8 +10,8 @@ android {
        applicationId 'com.discord'
        minSdkVersion 21
        targetSdkVersion 30
-        versionCode 102205
-        versionName "102.5 - Alpha"
+        versionCode 103200
+        versionName "103.0 - Alpha"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="102205" android:versionName="102.5 - Alpha" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="103200" android:versionName="103.0 - Alpha" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
    <uses-feature android:name="android.hardware.camera" android:required="false"/>
    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
@ -346,7 +346,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
        TextView textView = binding.f;
        m.checkNotNullExpressionValue(textView, "appInfoHeader");
        String string = getString(R.string.app_information);
-        textView.setText(string + " - 102.5 - Alpha (102205)");
+        textView.setText(string + " - 103.0 - Alpha (103200)");
        binding.B.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this));
        binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE);
        binding.q.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE);
--- a/app/src/main/java/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$1.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$1.java
@ -1,16 +1,34 @@
 package com.discord.widgets.user;

-import android.view.View;
+import com.discord.i18n.RenderContext;
+import d0.z.d.m;
+import d0.z.d.o;
+import java.util.Map;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetKickUser.kt */
-public final class WidgetKickUser$onViewBoundOrOnResume$1 implements View.OnClickListener {
-    public final /* synthetic */ WidgetKickUser this$0;
+public final class WidgetKickUser$onViewBoundOrOnResume$1 extends o implements Function1<RenderContext, Unit> {
+    public final /* synthetic */ String $userName;

-    public WidgetKickUser$onViewBoundOrOnResume$1(WidgetKickUser widgetKickUser) {
-        this.this$0 = widgetKickUser;
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetKickUser$onViewBoundOrOnResume$1(String str) {
+        super(1);
+        this.$userName = str;
    }

-    @Override // android.view.View.OnClickListener
-    public final void onClick(View view) {
-        this.this$0.dismiss();
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(RenderContext renderContext) {
+        invoke(renderContext);
+        return Unit.a;
+    }
+
+    public final void invoke(RenderContext renderContext) {
+        m.checkNotNullParameter(renderContext, "$receiver");
+        Map<String, String> map = renderContext.a;
+        String str = this.$userName;
+        m.checkNotNullExpressionValue(str, "userName");
+        map.put("user", str);
    }
 }
--- a/app/src/main/java/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.java
@ -1,65 +1,34 @@
 package com.discord.widgets.user;

-import android.content.Context;
-import android.view.View;
-import c.a.d.m;
-import c.a.k.b;
-import com.discord.R;
-import com.discord.utilities.rest.RestAPI;
-import com.discord.utilities.rx.ObservableExtensionsKt;
-import com.discord.utilities.view.extensions.ViewExtensions;
-import com.google.android.material.textfield.TextInputLayout;
-import d0.g0.t;
+import com.discord.i18n.RenderContext;
+import d0.z.d.m;
 import d0.z.d.o;
+import java.util.Map;
 import kotlin.Unit;
-import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetKickUser.kt */
-public final class WidgetKickUser$onViewBoundOrOnResume$2 implements View.OnClickListener {
-    public final /* synthetic */ long $guildId;
-    public final /* synthetic */ long $userId;
+public final class WidgetKickUser$onViewBoundOrOnResume$2 extends o implements Function1<RenderContext, Unit> {
    public final /* synthetic */ String $userName;
-    public final /* synthetic */ WidgetKickUser this$0;

-    /* compiled from: WidgetKickUser.kt */
-    /* renamed from: com.discord.widgets.user.WidgetKickUser$onViewBoundOrOnResume$2$1  reason: invalid class name */
-    public static final class AnonymousClass1 extends o implements Function1<Void, Unit> {
-        public final /* synthetic */ WidgetKickUser$onViewBoundOrOnResume$2 this$0;
-
-        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public AnonymousClass1(WidgetKickUser$onViewBoundOrOnResume$2 widgetKickUser$onViewBoundOrOnResume$2) {
-            super(1);
-            this.this$0 = widgetKickUser$onViewBoundOrOnResume$2;
-        }
-
-        /* Return type fixed from 'java.lang.Object' to match base method */
-        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
-        @Override // kotlin.jvm.functions.Function1
-        public /* bridge */ /* synthetic */ Unit invoke(Void r1) {
-            invoke(r1);
-            return Unit.a;
-        }
-
-        public final void invoke(Void r7) {
-            Context context = this.this$0.this$0.getContext();
-            Context context2 = this.this$0.this$0.getContext();
-            m.h(context, context2 != null ? b.h(context2, R.string.kick_user_confirmed, new Object[]{this.this$0.$userName}, null, 4) : null, 0, null, 12);
-            this.this$0.this$0.dismiss();
-        }
-    }
-
-    public WidgetKickUser$onViewBoundOrOnResume$2(WidgetKickUser widgetKickUser, long j, long j2, String str) {
-        this.this$0 = widgetKickUser;
-        this.$guildId = j;
-        this.$userId = j2;
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetKickUser$onViewBoundOrOnResume$2(String str) {
+        super(1);
        this.$userName = str;
    }

-    @Override // android.view.View.OnClickListener
-    public final void onClick(View view) {
-        TextInputLayout textInputLayout = WidgetKickUser.access$getBinding$p(this.this$0).e;
-        d0.z.d.m.checkNotNullExpressionValue(textInputLayout, "binding.kickUserReason");
-        String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout);
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().kickGuildMember(this.$guildId, this.$userId, t.isBlank(textOrEmpty) ^ true ? textOrEmpty : null), false, 1, null), this.this$0, null, 2, null), this.this$0.getClass(), this.this$0.getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 60, (Object) null);
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(RenderContext renderContext) {
+        invoke(renderContext);
+        return Unit.a;
+    }
+
+    public final void invoke(RenderContext renderContext) {
+        m.checkNotNullParameter(renderContext, "$receiver");
+        Map<String, String> map = renderContext.a;
+        String str = this.$userName;
+        m.checkNotNullExpressionValue(str, "userName");
+        map.put("user", str);
    }
 }
--- a/app/src/main/java/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$3.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$3.java
@ -0,0 +1,16 @@
+package com.discord.widgets.user;
+
+import android.view.View;
+/* compiled from: WidgetKickUser.kt */
+public final class WidgetKickUser$onViewBoundOrOnResume$3 implements View.OnClickListener {
+    public final /* synthetic */ WidgetKickUser this$0;
+
+    public WidgetKickUser$onViewBoundOrOnResume$3(WidgetKickUser widgetKickUser) {
+        this.this$0 = widgetKickUser;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        this.this$0.dismiss();
+    }
+}
--- a/app/src/main/java/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$4.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$4.java
@ -0,0 +1,65 @@
+package com.discord.widgets.user;
+
+import android.content.Context;
+import android.view.View;
+import c.a.d.m;
+import c.a.k.b;
+import com.discord.R;
+import com.discord.utilities.rest.RestAPI;
+import com.discord.utilities.rx.ObservableExtensionsKt;
+import com.discord.utilities.view.extensions.ViewExtensions;
+import com.google.android.material.textfield.TextInputLayout;
+import d0.g0.t;
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetKickUser.kt */
+public final class WidgetKickUser$onViewBoundOrOnResume$4 implements View.OnClickListener {
+    public final /* synthetic */ long $guildId;
+    public final /* synthetic */ long $userId;
+    public final /* synthetic */ String $userName;
+    public final /* synthetic */ WidgetKickUser this$0;
+
+    /* compiled from: WidgetKickUser.kt */
+    /* renamed from: com.discord.widgets.user.WidgetKickUser$onViewBoundOrOnResume$4$1  reason: invalid class name */
+    public static final class AnonymousClass1 extends o implements Function1<Void, Unit> {
+        public final /* synthetic */ WidgetKickUser$onViewBoundOrOnResume$4 this$0;
+
+        /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+        public AnonymousClass1(WidgetKickUser$onViewBoundOrOnResume$4 widgetKickUser$onViewBoundOrOnResume$4) {
+            super(1);
+            this.this$0 = widgetKickUser$onViewBoundOrOnResume$4;
+        }
+
+        /* Return type fixed from 'java.lang.Object' to match base method */
+        /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+        @Override // kotlin.jvm.functions.Function1
+        public /* bridge */ /* synthetic */ Unit invoke(Void r1) {
+            invoke(r1);
+            return Unit.a;
+        }
+
+        public final void invoke(Void r7) {
+            Context context = this.this$0.this$0.getContext();
+            Context context2 = this.this$0.this$0.getContext();
+            m.h(context, context2 != null ? b.h(context2, R.string.kick_user_confirmed, new Object[]{this.this$0.$userName}, null, 4) : null, 0, null, 12);
+            this.this$0.this$0.dismiss();
+        }
+    }
+
+    public WidgetKickUser$onViewBoundOrOnResume$4(WidgetKickUser widgetKickUser, long j, long j2, String str) {
+        this.this$0 = widgetKickUser;
+        this.$guildId = j;
+        this.$userId = j2;
+        this.$userName = str;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        TextInputLayout textInputLayout = WidgetKickUser.access$getBinding$p(this.this$0).e;
+        d0.z.d.m.checkNotNullExpressionValue(textInputLayout, "binding.kickUserReason");
+        String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().kickGuildMember(this.$guildId, this.$userId, t.isBlank(textOrEmpty) ^ true ? textOrEmpty : null), false, 1, null), this.this$0, null, 2, null), this.this$0.getClass(), this.this$0.getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 60, (Object) null);
+    }
+}
--- a/app/src/main/java/com/discord/widgets/user/WidgetKickUser.java
+++ b/app/src/main/java/com/discord/widgets/user/WidgetKickUser.java
@ -66,11 +66,11 @@ public final class WidgetKickUser extends AppDialog {
        long j2 = getArgumentsOrDefault().getLong("com.discord.intent.extra.EXTRA_USER_ID", -1);
        TextView textView = getBinding().f;
        m.checkNotNullExpressionValue(textView, "binding.kickUserTitle");
-        b.n(textView, R.string.kick_user_title, new Object[]{string}, null, 4);
+        b.m(textView, R.string.kick_user_title, new Object[0], new WidgetKickUser$onViewBoundOrOnResume$1(string));
        TextView textView2 = getBinding().b;
        m.checkNotNullExpressionValue(textView2, "binding.kickUserBody");
-        b.n(textView2, R.string.kick_user_body, new Object[]{string}, null, 4);
-        getBinding().f1941c.setOnClickListener(new WidgetKickUser$onViewBoundOrOnResume$1(this));
-        getBinding().d.setOnClickListener(new WidgetKickUser$onViewBoundOrOnResume$2(this, j, j2, string));
+        b.m(textView2, R.string.kick_user_body, new Object[0], new WidgetKickUser$onViewBoundOrOnResume$2(string));
+        getBinding().f1941c.setOnClickListener(new WidgetKickUser$onViewBoundOrOnResume$3(this));
+        getBinding().d.setOnClickListener(new WidgetKickUser$onViewBoundOrOnResume$4(this, j, j2, string));
    }
 }
--- a/app/src/main/res/layout/widget_settings_language_select.xml
+++ b/app/src/main/res/layout/widget_settings_language_select.xml
@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" style="@style/UiKit_ViewGroup_ScrollView_Page">
-    <LinearLayout android:paddingBottom="16dp" style="@style/UiKit_ViewGroup_LinearLayout">
+    <LinearLayout style="@style/UiKit_ViewGroup_LinearLayout">
        <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit_Sheet_Header">
            <androidx.constraintlayout.widget.Guideline style="@style/UiKit_Sheet_Guideline"/>
            <TextView android:text="@string/language_select" style="@style/UiKit_Sheet_Header_Title"/>
        </androidx.constraintlayout.widget.ConstraintLayout>
        <View style="@style/UiKit_Divider"/>
-        <com.discord.utilities.view.recycler.MaxHeightRecyclerView android:id="@+id/settings_language_select_list" android:scrollbars="vertical" android:overScrollMode="never" app:max_height_screen_ratio="0.5" style="@style/UiKit_ViewGroup_RecyclerView"/>
+        <com.discord.utilities.view.recycler.MaxHeightRecyclerView android:scrollbarStyle="outsideOverlay" android:id="@+id/settings_language_select_list" android:paddingBottom="16dp" android:scrollbars="vertical" app:max_height_screen_ratio="0.5" style="@style/UiKit_ViewGroup_RecyclerView"/>
    </LinearLayout>
 </androidx.core.widget.NestedScrollView>
--- a/app/src/main/res/values-ar-rXB/strings.xml
+++ b/app/src/main/res/values-ar-rXB/strings.xml
@ -4860,12 +4860,13 @@
    <string name="holiday_premium_marketing_hero_restrictions">‏‮[Rules‬‏ ‏‮and‬‏ ‏‮restrictions‬‏ ‏‮apply.](‬‏‏‮{termsURL}‬‏‏‮)‬‏</string>
    <string name="holiday_premium_modal_header">‏‮Enjoy‬‏ ‏‮a‬‏ ‏‮free‬‏ ‏‮month‬‏ ‏‮on‬‏ ‏‮us‬‏</string>
    <string name="holiday_premium_modal_plus_one">‏‮+1‬‏ ‏‮month‬‏ ‏‮free‬‏</string>
+    <string name="holiday_promotion_ineligible_continue">‏‮Continue‬‏ ‏‮Without‬‏ ‏‮Offer‬‏</string>
    <string name="holiday_promotion_mobile_blurb_part_1">‏‮Curious‬‏ ‏‮about‬‏ ‏‮our‬‏ ‏‮holiday‬‏ ‏‮promotion?‬‏</string>
    <string name="holiday_promotion_mobile_blurb_part_2">‏‮Check‬‏ ‏‮it‬‏ ‏‮out‬‏ ‏‮on‬‏ ‏‮web‬‏ ‏‮or‬‏ ‏‮in‬‏ ‏‮our‬‏ ‏‮desktop‬‏ ‏‮app‬‏</string>
    <string name="holiday_promotion_new_subscriber_eligible_body">‏‮A‬‏ ‏‮free‬‏ ‏‮month‬‏ ‏‮will‬‏ ‏‮automatically‬‏ ‏‮get‬‏ ‏‮added‬‏ ‏‮to‬‏ ‏‮your‬‏ ‏‮account.‬‏ ‏‮Enjoy!‬‏</string>
    <string name="holiday_promotion_new_subscriber_eligible_header">‏‮You\'re‬‏ ‏‮getting‬‏ ‏‮a‬‏ ‏‮free‬‏ ‏‮month!‬‏</string>
    <string name="holiday_promotion_new_subscriber_ineligible_body">‏‮Learn‬‏ ‏‮more‬‏ ‏‮about‬‏ ‏‮this‬‏ ‏‮promotion\'s‬‏ ‏‮[rules‬‏ ‏‮and‬‏ ‏‮restrictions](‬‏‏‮{helpdeskUrl}‬‏‏‮).‬‏</string>
-    <string name="holiday_promotion_new_subscriber_ineligible_header">‏‮You‬‏ ‏‮are‬‏ ‏‮ineligible‬‏ ‏‮for‬‏ ‏‮this‬‏ ‏‮offer‬‏</string>
+    <string name="holiday_promotion_new_subscriber_ineligible_header">‏‮You\'re‬‏ ‏‮ineligible‬‏ ‏‮for‬‏ ‏‮this‬‏ ‏‮offer‬‏</string>
    <string name="home">‏‮Home‬‏</string>
    <string name="how_to_invite_others">‏‮Hello.‬‏ ‏‮Beep.‬‏ ‏‮Boop.‬‏ ‏‮If‬‏ ‏‮you‬‏ ‏‮wanna‬‏ ‏‮invite‬‏ ‏‮friends‬‏ ‏‮to‬‏ ‏‮this‬‏ ‏‮server,‬‏ ‏‮click‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮name‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮top‬‏ ‏‮left‬‏ ‏‮and‬‏ ‏‮select‬‏ ‏‮!!‬‏‏‮{invitePeople}‬‏‏‮!!.‬‏ ‏‮Beep!‬‏</string>
    <string name="hr">‏‮Croatian‬‏</string>
@ -6109,8 +6110,8 @@
    <string name="move_members_description">‏‮Members‬‏ ‏‮with‬‏ ‏‮this‬‏ ‏‮permission‬‏ ‏‮can‬‏ ‏‮drag‬‏ ‏‮other‬‏ ‏‮members‬‏ ‏‮out‬‏ ‏‮of‬‏ ‏‮this‬‏ ‏‮channel.‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮only‬‏ ‏‮move‬‏ ‏‮members‬‏ ‏‮between‬‏ ‏‮channels‬‏ ‏‮both‬‏ ‏‮they‬‏ ‏‮and‬‏ ‏‮the‬‏ ‏‮member‬‏ ‏‮they‬‏ ‏‮are‬‏ ‏‮moving‬‏ ‏‮have‬‏ ‏‮access.‬‏</string>
    <string name="move_to">‏‮Move‬‏ ‏‮To‬‏</string>
    <string name="move_to_success">‏‮User‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮moved‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮selected‬‏ ‏‮channel.‬‏</string>
-    <string name="res_2131892208_msg_alert_cleared">‏‮Alert‬‏ ‏‮Cleared‬‏</string>
-    <string name="res_2131892209_msg_no_alert_showing">‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏</string>
+    <string name="res_2131892209_msg_alert_cleared">‏‮Alert‬‏ ‏‮Cleared‬‏</string>
+    <string name="res_2131892210_msg_no_alert_showing">‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏</string>
    <string name="mtrl_badge_numberless_content_description">‏‮New‬‏ ‏‮notification‬‏</string>
    <string name="mtrl_chip_close_icon_content_description">‏‮Remove‬‏ ‏‮%1$s‬‏</string>
    <string name="mtrl_exceed_max_badge_number_content_description">‏‮More‬‏ ‏‮than‬‏ %1$d ‏‮new‬‏ ‏‮notifications‬‏</string>
@ -8363,7 +8364,7 @@
    <string name="send_tts_messages_description">‏‮Members‬‏ ‏‮with‬‏ ‏‮this‬‏ ‏‮permission‬‏ ‏‮can‬‏ ‏‮send‬‏ ‏‮text-to-speech‬‏ ‏‮messages‬‏ ‏‮by‬‏ ‏‮starting‬‏ ‏‮a‬‏ ‏‮message‬‏ ‏‮with‬‏ ‏‮/tts.‬‏ ‏‮These‬‏ ‏‮messages‬‏ ‏‮can‬‏ ‏‮be‬‏ ‏‮heard‬‏ ‏‮by‬‏ ‏‮everyone‬‏ ‏‮focused‬‏ ‏‮on‬‏ ‏‮the‬‏ ‏‮channel.‬‏</string>
    <string name="send_wave">‏‮Send‬‏ ‏‮a‬‏ ‏‮wave‬‏</string>
    <string name="sending_invite">‏‮Sending‬‏ ‏‮invite…‬‏</string>
-    <string name="separated_premium_marketing_gift_body">‏‮Gift‬‏ ‏‮someone‬‏ ‏‮Nitro‬‏ ‏‮to‬‏ ‏‮give‬‏ ‏‮access‬‏ ‏‮to‬‏ ‏‮special‬‏ ‏‮perks,‬‏ ‏‮server‬‏ ‏‮boosting‬‏ ‏‮AND‬‏ ‏‮super‬‏ ‏‮powered‬‏ ‏‮chat‬‏ ‏‮features.‬‏</string>
+    <string name="separated_premium_marketing_gift_body">‏‮Gift‬‏ ‏‮someone‬‏ ‏‮Nitro‬‏ ‏‮to‬‏ ‏‮give‬‏ ‏‮them‬‏ ‏‮access‬‏ ‏‮to‬‏ ‏‮profile‬‏ ‏‮customization,‬‏ ‏‮emoji,‬‏ ‏‮and‬‏ ‏‮superpowered‬‏ ‏‮chat‬‏ ‏‮features.‬‏</string>
    <string name="separated_premium_marketing_gift_header">‏‮Give‬‏ ‏‮the‬‏ ‏‮gift‬‏ ‏‮of‬‏ ‏‮Nitro‬‏</string>
    <string name="server_deafen">‏‮Server‬‏ ‏‮Deafen‬‏</string>
    <string name="server_deafened">‏‮Server‬‏ ‏‮Deafened‬‏</string>
--- a/app/src/main/res/values-cs/plurals.xml
+++ b/app/src/main/res/values-cs/plurals.xml
@ -923,7 +923,7 @@
    <plurals name="invite_expires_days_or_uses_plural_numDays">
        <item quantity="one">{numDays} den</item>
        <item quantity="few">{numDays} dny</item>
-        <item quantity="other">dní</item>
+        <item quantity="other"> dní</item>
    </plurals>
    <plurals name="invite_expires_days_or_uses_plural_numUses">
        <item quantity="one">{numUses} použití</item>
@ -1545,7 +1545,7 @@
        <item quantity="other">{speakerCount} řečníků</item>
    </plurals>
    <plurals name="stage_channel_users_are_speaking_count">
-        <item quantity="one">člověk</item>
+        <item quantity="one"> člověk</item>
        <item quantity="few">{count} lidé</item>
        <item quantity="other">{count} lidí</item>
    </plurals>
--- a/app/src/main/res/values-de/plurals.xml
+++ b/app/src/main/res/values-de/plurals.xml
@ -381,16 +381,16 @@
        <item quantity="other">vor {#} Jahren</item>
    </plurals>
    <plurals name="game_library_time_played_hours_time">
-        <item quantity="one">Stunde</item>
-        <item quantity="other">Stunden</item>
+        <item quantity="one"> Stunde</item>
+        <item quantity="other"> Stunden</item>
    </plurals>
    <plurals name="game_library_time_played_minutes_time">
-        <item quantity="one">Minute</item>
-        <item quantity="other">Minuten</item>
+        <item quantity="one"> Minute</item>
+        <item quantity="other"> Minuten</item>
    </plurals>
    <plurals name="game_library_time_played_seconds_time">
-        <item quantity="one">Sekunde</item>
-        <item quantity="other">Sekunden</item>
+        <item quantity="one"> Sekunde</item>
+        <item quantity="other"> Sekunden</item>
    </plurals>
    <plurals name="game_library_updates_installing_hours_timeRemaining">
        <item quantity="one">1 Stunde</item>
@ -949,7 +949,7 @@
        <item quantity="other">{#} Boosts</item>
    </plurals>
    <plurals name="premium_guild_num_month_guild_subscriptions_num">
-        <item quantity="one">Server Boost</item>
+        <item quantity="one"> Server Boost</item>
        <item quantity="other">Server Boosts</item>
    </plurals>
    <plurals name="premium_guild_num_month_guild_subscriptions_unformatted_num">
--- a/app/src/main/res/values-en-rXA/strings.xml
+++ b/app/src/main/res/values-en-rXA/strings.xml
@ -4860,12 +4860,13 @@
    <string name="holiday_premium_marketing_hero_restrictions">[[Ŕûļéš åñð ŕéšţŕîçţîöñš åþþļý.](»{termsURL}«) one two three four]</string>
    <string name="holiday_premium_modal_header">[Éñĵöý å ƒŕéé ḿöñţĥ öñ ûš one two three]</string>
    <string name="holiday_premium_modal_plus_one">[+1 ḿöñţĥ ƒŕéé one two]</string>
+    <string name="holiday_promotion_ineligible_continue">[Çöñţîñûé Ŵîţĥöûţ Öƒƒéŕ one two three]</string>
    <string name="holiday_promotion_mobile_blurb_part_1">[Çûŕîöûš åɓöûţ öûŕ ĥöļîðåý þŕöḿöţîöñ¿ one two three four five]</string>
    <string name="holiday_promotion_mobile_blurb_part_2">[Çĥéçķ îţ öûţ öñ ŵéɓ öŕ îñ öûŕ ðéšķţöþ åþþ one two three four five]</string>
    <string name="holiday_promotion_new_subscriber_eligible_body">[Å ƒŕéé ḿöñţĥ ŵîļļ åûţöḿåţîçåļļý ĝéţ åððéð ţö ýöûŕ åççöûñţ. Éñĵöý¡ one two three four five six seven]</string>
    <string name="holiday_promotion_new_subscriber_eligible_header">[Ýöû\'ŕé ĝéţţîñĝ å ƒŕéé ḿöñţĥ¡ one two three four]</string>
    <string name="holiday_promotion_new_subscriber_ineligible_body">[Ļéåŕñ ḿöŕé åɓöûţ ţĥîš þŕöḿöţîöñ\'š [ŕûļéš åñð ŕéšţŕîçţîöñš](»{helpdeskUrl}«). one two three four five six seven eight nine ten eleven twelve]</string>
-    <string name="holiday_promotion_new_subscriber_ineligible_header">[Ýöû åŕé îñéļîĝîɓļé ƒöŕ ţĥîš öƒƒéŕ one two three four]</string>
+    <string name="holiday_promotion_new_subscriber_ineligible_header">[Ýöû\'ŕé îñéļîĝîɓļé ƒöŕ ţĥîš öƒƒéŕ one two three four]</string>
    <string name="home">[Ĥöḿé one]</string>
    <string name="how_to_invite_others">[Ĥéļļö. βééþ. βööþ. Îƒ ýöû ŵåññå îñVîţé ƒŕîéñðš ţö ţĥîš šéŕVéŕ, çļîçķ ţĥé šéŕVéŕ ñåḿé îñ ţĥé ţöþ ļéƒţ åñð šéļéçţ ¡¡»{invitePeople}«¡¡. βééþ¡ one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty]</string>
    <string name="hr">[Çŕöåţîåñ one two]</string>
@ -6109,8 +6110,8 @@
    <string name="move_members_description">[Ḿéḿɓéŕš ŵîţĥ ţĥîš þéŕḿîššîöñ çåñ ðŕåĝ öţĥéŕ ḿéḿɓéŕš öûţ öƒ ţĥîš çĥåññéļ. Ţĥéý çåñ öñļý ḿöVé ḿéḿɓéŕš ɓéţŵééñ çĥåññéļš ɓöţĥ ţĥéý åñð ţĥé ḿéḿɓéŕ ţĥéý åŕé ḿöVîñĝ ĥåVé åççéšš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen]</string>
    <string name="move_to">[ḾöVé Ţö one two]</string>
    <string name="move_to_success">[Ûšéŕ ĥåš ɓééñ ḿöVéð ţö ţĥé šéļéçţéð çĥåññéļ. one two three four five]</string>
-    <string name="res_2131892208_msg_alert_cleared">[Åļéŕţ Çļéåŕéð one two]</string>
-    <string name="res_2131892209_msg_no_alert_showing">[Ñö Åļéŕţ Šĥöŵîñĝ one two three]</string>
+    <string name="res_2131892209_msg_alert_cleared">[Åļéŕţ Çļéåŕéð one two]</string>
+    <string name="res_2131892210_msg_no_alert_showing">[Ñö Åļéŕţ Šĥöŵîñĝ one two three]</string>
    <string name="mtrl_badge_numberless_content_description">[Ñéŵ ñöţîƒîçåţîöñ one two three]</string>
    <string name="mtrl_chip_close_icon_content_description">[ŔéḿöVé »%1$s« one two]</string>
    <string name="mtrl_exceed_max_badge_number_content_description">[Ḿöŕé ţĥåñ %1$d ñéŵ ñöţîƒîçåţîöñš one two three four]</string>
@ -8363,7 +8364,7 @@
    <string name="send_tts_messages_description">[Ḿéḿɓéŕš ŵîţĥ ţĥîš þéŕḿîššîöñ çåñ šéñð ţéхţ-ţö-šþééçĥ ḿéššåĝéš ɓý šţåŕţîñĝ å ḿéššåĝé ŵîţĥ /ţţš. Ţĥéšé ḿéššåĝéš çåñ ɓé ĥéåŕð ɓý éVéŕýöñé ƒöçûšéð öñ ţĥé çĥåññéļ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen]</string>
    <string name="send_wave">[Šéñð å ŵåVé one two]</string>
    <string name="sending_invite">[Šéñðîñĝ îñVîţé… one two three]</string>
-    <string name="separated_premium_marketing_gift_body">[Ĝîƒţ šöḿéöñé Ñîţŕö ţö ĝîVé åççéšš ţö šþéçîåļ þéŕķš, šéŕVéŕ ɓööšţîñĝ ÅÑÐ šûþéŕ þöŵéŕéð çĥåţ ƒéåţûŕéš. one two three four five six seven eight nine ten eleven]</string>
+    <string name="separated_premium_marketing_gift_body">[Ĝîƒţ šöḿéöñé Ñîţŕö ţö ĝîVé ţĥéḿ åççéšš ţö þŕöƒîļé çûšţöḿîžåţîöñ, éḿöĵî, åñð šûþéŕþöŵéŕéð çĥåţ ƒéåţûŕéš. one two three four five six seven eight nine ten eleven]</string>
    <string name="separated_premium_marketing_gift_header">[ĜîVé ţĥé ĝîƒţ öƒ Ñîţŕö one two three]</string>
    <string name="server_deafen">[ŠéŕVéŕ Ðéåƒéñ one two]</string>
    <string name="server_deafened">[ŠéŕVéŕ Ðéåƒéñéð one two three]</string>
--- a/app/src/main/res/values-fr/plurals.xml
+++ b/app/src/main/res/values-fr/plurals.xml
@ -333,16 +333,16 @@
        <item quantity="other">minutes</item>
    </plurals>
    <plurals name="game_feed_user_played_months_ago_time">
-        <item quantity="one">mois</item>
-        <item quantity="other">mois</item>
+        <item quantity="one"> mois</item>
+        <item quantity="other"> mois</item>
    </plurals>
    <plurals name="game_feed_user_played_weeks_ago_time">
-        <item quantity="one">semaine</item>
-        <item quantity="other">semaines</item>
+        <item quantity="one"> semaine</item>
+        <item quantity="other"> semaines</item>
    </plurals>
    <plurals name="game_feed_user_played_years_ago_time">
-        <item quantity="one">an</item>
-        <item quantity="other">ans</item>
+        <item quantity="one"> an</item>
+        <item quantity="other"> ans</item>
    </plurals>
    <plurals name="game_feed_user_playing_for_days_time">
        <item quantity="one">jour</item>
@ -1085,24 +1085,24 @@
        <item quantity="other">boosts de serveur</item>
    </plurals>
    <plurals name="premium_guild_subscriptions_renewal_info_android_quantity">
-        <item quantity="one">boost de serveur</item>
-        <item quantity="other">boosts de serveur</item>
+        <item quantity="one"> boost de serveur</item>
+        <item quantity="other"> boosts de serveur</item>
    </plurals>
    <plurals name="premium_guild_subscriptions_renewal_info_no_price_quantity">
        <item quantity="one">boost de serveur</item>
        <item quantity="other">boosts de serveur</item>
    </plurals>
    <plurals name="premium_guild_subscriptions_renewal_info_pending_cancelation_android_quantity">
-        <item quantity="one">boost de serveur</item>
-        <item quantity="other">boosts de serveur</item>
+        <item quantity="one"> boost de serveur</item>
+        <item quantity="other"> boosts de serveur</item>
    </plurals>
    <plurals name="premium_guild_subscriptions_renewal_info_pending_cancelation_no_price_quantity">
        <item quantity="one">boost de serveur</item>
        <item quantity="other">boosts de serveur</item>
    </plurals>
    <plurals name="premium_guild_subscriptions_renewal_info_pending_cancelation_quantity">
-        <item quantity="one">boost de serveur</item>
-        <item quantity="other">boosts de serveur</item>
+        <item quantity="one"> boost de serveur</item>
+        <item quantity="other"> boosts de serveur</item>
    </plurals>
    <plurals name="premium_guild_subscriptions_renewal_info_quantity">
        <item quantity="one">boost de serveur</item>
@ -1423,19 +1423,19 @@
        <item quantity="other">{count} transferts de fichiers ont échoué</item>
    </plurals>
    <plurals name="user_activity_timestamp_end_hours">
-        <item quantity="other">{hours} h</item>
+        <item quantity="other">{hours} h </item>
    </plurals>
    <plurals name="user_activity_timestamp_end_minutes">
-        <item quantity="other">{minutes} min</item>
+        <item quantity="other">{minutes} min </item>
    </plurals>
    <plurals name="user_activity_timestamp_end_seconds">
        <item quantity="other">{seconds} s</item>
    </plurals>
    <plurals name="user_activity_timestamp_start_hours">
-        <item quantity="other">{hours} h</item>
+        <item quantity="other">{hours} h </item>
    </plurals>
    <plurals name="user_activity_timestamp_start_minutes">
-        <item quantity="other">{minutes} min</item>
+        <item quantity="other">{minutes} min </item>
    </plurals>
    <plurals name="user_activity_timestamp_start_seconds">
        <item quantity="other">{seconds} s</item>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -2048,7 +2048,7 @@
    <string name="delete_server_title">Supprimer \'!!{name}!!\'</string>
    <string name="delete_thread">Supprimer le fil</string>
    <string name="delete_updates_channel_body">Les serveurs de communauté doivent disposer d\'un salon réservé aux mises à jour de la communauté dans lequel Discord peut envoyer les mises à jour importantes de serveurs de communauté.</string>
-    <string name="description">Description</string>
+    <string name="description">Description </string>
    <string name="designate_other_channel">Tu dois en désigner un autre dans [Paramètres du serveur &gt; Communauté &gt; Vue d\'ensemble](onClick) avant de pouvoir supprimer ce salon.</string>
    <string name="desktop_app">Application de bureau Discord</string>
    <string name="desktop_notifications_enable">Activer les notifications sur le bureau</string>
--- a/app/src/main/res/values/public.xml
+++ b/app/src/main/res/values/public.xml
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -1505,7 +1505,7 @@
    <string name="color_picker_title">Select a color</string>
    <string name="color_picker_transparency">Transparency</string>
    <string name="color_picker_use_default">Use Default</string>
-    <string name="res_2131887585_com_crashlytics_android_build_id">16572bd70250442d93afe9ff4a1345a4</string>
+    <string name="res_2131887585_com_crashlytics_android_build_id">57ddc7570ca54976994f9c907caf7c59</string>
    <string name="coming_soon">Coming Soon</string>
    <string name="command_accessibility_desc_app_header_item">Slash command application {applicationName}</string>
    <string name="command_accessibility_desc_app_item">{applicationName} application</string>
@ -4877,12 +4877,13 @@
    <string name="holiday_premium_marketing_hero_restrictions">[Rules and restrictions apply.]({termsURL})</string>
    <string name="holiday_premium_modal_header">Enjoy a free month on us</string>
    <string name="holiday_premium_modal_plus_one">+1 month free</string>
+    <string name="holiday_promotion_ineligible_continue">Continue Without Offer</string>
    <string name="holiday_promotion_mobile_blurb_part_1">Curious about our holiday promotion?</string>
    <string name="holiday_promotion_mobile_blurb_part_2">Check it out on web or in our desktop app</string>
    <string name="holiday_promotion_new_subscriber_eligible_body">A free month will automatically get added to your account. Enjoy!</string>
    <string name="holiday_promotion_new_subscriber_eligible_header">You\'re getting a free month!</string>
    <string name="holiday_promotion_new_subscriber_ineligible_body">Learn more about this promotion\'s [rules and restrictions]({helpdeskUrl}).</string>
-    <string name="holiday_promotion_new_subscriber_ineligible_header">You are ineligible for this offer</string>
+    <string name="holiday_promotion_new_subscriber_ineligible_header">You\'re ineligible for this offer</string>
    <string name="home">Home</string>
    <string name="how_to_invite_others">Hello. Beep. Boop. If you wanna invite friends to this server, click the server name in the top left and select !!{invitePeople}!!. Beep!</string>
    <string name="hr">Croatian</string>
@ -6128,8 +6129,8 @@
    <string name="move_members_description">Members with this permission can drag other members out of this channel. They can only move members between channels both they and the member they are moving have access.</string>
    <string name="move_to">Move To</string>
    <string name="move_to_success">User has been moved to the selected channel.</string>
-    <string name="res_2131892208_msg_alert_cleared">Alert Cleared</string>
-    <string name="res_2131892209_msg_no_alert_showing">No Alert Showing</string>
+    <string name="res_2131892209_msg_alert_cleared">Alert Cleared</string>
+    <string name="res_2131892210_msg_no_alert_showing">No Alert Showing</string>
    <string name="mtrl_badge_numberless_content_description">New notification</string>
    <string name="mtrl_chip_close_icon_content_description">Remove %1$s</string>
    <string name="mtrl_exceed_max_badge_number_content_description">More than %1$d new notifications</string>
@ -8390,7 +8391,7 @@
    <string name="send_tts_messages_description">Members with this permission can send text-to-speech messages by starting a message with /tts. These messages can be heard by everyone focused on the channel.</string>
    <string name="send_wave">Send a wave</string>
    <string name="sending_invite">Sending invite…</string>
-    <string name="separated_premium_marketing_gift_body">Gift someone Nitro to give access to special perks, server boosting AND super powered chat features.</string>
+    <string name="separated_premium_marketing_gift_body">Gift someone Nitro to give them access to profile customization, emoji, and superpowered chat features.</string>
    <string name="separated_premium_marketing_gift_header">Give the gift of Nitro</string>
    <string name="server_deafen">Server Deafen</string>
    <string name="server_deafened">Server Deafened</string>