From 861a06a0d0df7f645269bc99956d6cbf4465b79e Mon Sep 17 00:00:00 2001 From: Juby210 Date: Wed, 1 Dec 2021 08:34:08 +0100 Subject: [PATCH] 105.2 - Alpha (105202) --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 2 +- .../events/TrackUpdateUserSettingsLocal.java | 25 +- .../directories/DirectoryUtilsKt.java | 6 +- ...dCaptchaUtilsKt$handleHttpException$1.java | 23 +- ...dCaptchaUtilsKt$handleHttpException$2.java | 18 +- .../utilities/guilds/GuildCaptchaUtilsKt.java | 10 +- .../com/discord/utilities/icon/IconUtils.java | 7 +- .../discord/utilities/platform/Platform.java | 4 +- ...bineLatestOverloadsKt$combineLatest$7.java | 22 +- ...bineLatestOverloadsKt$combineLatest$8.java | 21 + .../ObservableCombineLatestOverloadsKt.java | 26 +- .../WidgetChatListModel$Companion$get$1.java | 12 +- .../directories/WidgetDirectoryCategory.java | 50 +- ...CanGuildAccessCommunicationDisabled$1.java | 2 +- ...ommunicationDisabledGuildsFeatureFlag.java | 2 +- ...WidgetGuildInvite$configureLoadedUI$2.java | 13 +- ...ompanion$enqueue$guildCaptchaNotice$1.java | 28 +- ...omSheet$Companion$registerForResult$1.java | 12 +- .../WidgetGuildJoinCaptchaBottomSheet.java | 18 +- .../widgets/settings/WidgetSettings.java | 2 +- .../usersheet/WidgetUserSheetViewModel.java | 116 +- ...ewModelStoreState$observeStoreState$3.java | 159 +- app/src/main/java/d0/e0/p/d/c.java | 8 +- app/src/main/java/d0/e0/p/d/j.java | 5 + app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java | 4 +- app/src/main/java/d0/z/c/a.java | 2 +- app/src/main/java/d0/z/c/b.java | 2 +- app/src/main/java/d0/z/c/c.java | 2 +- app/src/main/java/d0/z/c/d.java | 2 +- app/src/main/java/d0/z/c/e.java | 2 +- app/src/main/java/d0/z/c/f.java | 6 - app/src/main/java/d0/z/d/e0.java | 14 +- app/src/main/java/d0/z/d/f.java | 3 +- .../java/kotlin/jvm/functions/Function16.java | 7 + .../res/layout/view_server_discovery_item.xml | 2 +- app/src/main/res/values-ar-rXB/plurals.xml | 4 + app/src/main/res/values-ar-rXB/strings.xml | 71 +- app/src/main/res/values-bg/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-da/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-en-rXA/plurals.xml | 4 + app/src/main/res/values-en-rXA/strings.xml | 71 +- app/src/main/res/values-es-rES/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-hr/strings.xml | 1 - app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 3 +- app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-lt/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-no/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sv-rSE/strings.xml | 1 - app/src/main/res/values-th/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-vi/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/attrs.xml | 2 + app/src/main/res/values/plurals.xml | 4 + app/src/main/res/values/public.xml | 20901 ++++++++-------- app/src/main/res/values/strings.xml | 73 +- app/src/main/res/values/styles.xml | 2 + 73 files changed, 11016 insertions(+), 10787 deletions(-) create mode 100644 app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$8.java delete mode 100644 app/src/main/java/d0/z/c/f.java create mode 100644 app/src/main/java/kotlin/jvm/functions/Function16.java diff --git a/app/build.gradle b/app/build.gradle index 2afb65641c..e5ee1f8f8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 105201 - versionName "105.1 - Alpha" + versionCode 105202 + versionName "105.2 - Alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 95da8bd498..ed647f64e2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackUpdateUserSettingsLocal.java b/app/src/main/java/com/discord/analytics/generated/events/TrackUpdateUserSettingsLocal.java index 0a0332cf6d..0fce82eba4 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/TrackUpdateUserSettingsLocal.java +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackUpdateUserSettingsLocal.java @@ -9,6 +9,7 @@ import d0.z.d.m; public final class TrackUpdateUserSettingsLocal implements AnalyticsSchema, TrackBaseReceiver { private final Boolean alwaysPreviewVideo = null; private final transient String analyticsSchemaTypeName = "update_user_settings_local"; + private final Boolean showSnowsgiving2021 = null; private TrackBase trackBase; @Override // com.discord.api.science.AnalyticsSchema @@ -17,21 +18,31 @@ public final class TrackUpdateUserSettingsLocal implements AnalyticsSchema, Trac } public boolean equals(Object obj) { - if (this != obj) { - return (obj instanceof TrackUpdateUserSettingsLocal) && m.areEqual(this.alwaysPreviewVideo, ((TrackUpdateUserSettingsLocal) obj).alwaysPreviewVideo); + if (this == obj) { + return true; } - return true; + if (!(obj instanceof TrackUpdateUserSettingsLocal)) { + return false; + } + TrackUpdateUserSettingsLocal trackUpdateUserSettingsLocal = (TrackUpdateUserSettingsLocal) obj; + return m.areEqual(this.alwaysPreviewVideo, trackUpdateUserSettingsLocal.alwaysPreviewVideo) && m.areEqual(this.showSnowsgiving2021, trackUpdateUserSettingsLocal.showSnowsgiving2021); } public int hashCode() { Boolean bool = this.alwaysPreviewVideo; - if (bool != null) { - return bool.hashCode(); + int i = 0; + int hashCode = (bool != null ? bool.hashCode() : 0) * 31; + Boolean bool2 = this.showSnowsgiving2021; + if (bool2 != null) { + i = bool2.hashCode(); } - return 0; + return hashCode + i; } public String toString() { - return a.C(a.R("TrackUpdateUserSettingsLocal(alwaysPreviewVideo="), this.alwaysPreviewVideo, ")"); + StringBuilder R = a.R("TrackUpdateUserSettingsLocal(alwaysPreviewVideo="); + R.append(this.alwaysPreviewVideo); + R.append(", showSnowsgiving2021="); + return a.C(R, this.showSnowsgiving2021, ")"); } } diff --git a/app/src/main/java/com/discord/utilities/directories/DirectoryUtilsKt.java b/app/src/main/java/com/discord/utilities/directories/DirectoryUtilsKt.java index 856e49abde..2ce7c0f64a 100644 --- a/app/src/main/java/com/discord/utilities/directories/DirectoryUtilsKt.java +++ b/app/src/main/java/com/discord/utilities/directories/DirectoryUtilsKt.java @@ -10,7 +10,7 @@ import java.util.List; public final class DirectoryUtilsKt { private static final int MAXIMUM_SIZE = 200; public static final int MAX_HOME_CATEGORY_COUNT = 5; - private static final int MAX_RECOMMENDATION_COUNT = 5; + public static final int MAX_RECOMMENDATION_COUNT = 5; private static final int MINIMUM_MEMBER_COUNT = 5; private static final int MINIMUM_SIZE = 5; @@ -44,7 +44,7 @@ public final class DirectoryUtilsKt { return u.take(u.sortedWith(arrayList, new DirectoryUtilsKt$sortByAdded$$inlined$sortedByDescending$1()), 5); } - public static final List sortByRanking(List list) { + public static final List sortByRanking(List list, int i) { m.checkNotNullParameter(list, "$this$sortByRanking"); ArrayList arrayList = new ArrayList(); for (Object obj : list) { @@ -52,6 +52,6 @@ public final class DirectoryUtilsKt { arrayList.add(obj); } } - return u.take(rank$default(arrayList, null, 1, null), 4); + return u.take(rank$default(arrayList, null, 1, null), i); } } diff --git a/app/src/main/java/com/discord/utilities/guilds/GuildCaptchaUtilsKt$handleHttpException$1.java b/app/src/main/java/com/discord/utilities/guilds/GuildCaptchaUtilsKt$handleHttpException$1.java index 2f38f9208d..87b8f121a7 100644 --- a/app/src/main/java/com/discord/utilities/guilds/GuildCaptchaUtilsKt$handleHttpException$1.java +++ b/app/src/main/java/com/discord/utilities/guilds/GuildCaptchaUtilsKt$handleHttpException$1.java @@ -6,29 +6,28 @@ import com.discord.widgets.guilds.join.InviteArgs; import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; -import kotlin.jvm.functions.Function1; +import kotlin.jvm.functions.Function2; /* compiled from: GuildCaptchaUtils.kt */ -public final class GuildCaptchaUtilsKt$handleHttpException$1 extends o implements Function1 { +public final class GuildCaptchaUtilsKt$handleHttpException$1 extends o implements Function2 { public final /* synthetic */ InviteArgs $args; - public final /* synthetic */ AppFragment $fragment; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public GuildCaptchaUtilsKt$handleHttpException$1(InviteArgs inviteArgs, AppFragment appFragment) { - super(1); + public GuildCaptchaUtilsKt$handleHttpException$1(InviteArgs inviteArgs) { + super(2); this.$args = inviteArgs; - this.$fragment = appFragment; } /* 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(String str) { - invoke(str); + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */ + @Override // kotlin.jvm.functions.Function2 + public /* bridge */ /* synthetic */ Unit invoke(AppFragment appFragment, String str) { + invoke(appFragment, str); return Unit.a; } - public final void invoke(String str) { + public final void invoke(AppFragment appFragment, String str) { + m.checkNotNullParameter(appFragment, "newFragment"); m.checkNotNullParameter(str, "captchaToken"); - InviteJoinHelper.INSTANCE.joinViaInvite(this.$args.getInvite(), this.$args.getJavaClass(), this.$fragment, this.$args.getLocation(), this.$args.getOnInvitePostError(), this.$args.getOnInvitePostSuccess(), this.$args.getOnInviteFlowFinished(), str); + InviteJoinHelper.INSTANCE.joinViaInvite(this.$args.getInvite(), this.$args.getJavaClass(), appFragment, this.$args.getLocation(), this.$args.getOnInvitePostError(), this.$args.getOnInvitePostSuccess(), this.$args.getOnInviteFlowFinished(), str); } } diff --git a/app/src/main/java/com/discord/utilities/guilds/GuildCaptchaUtilsKt$handleHttpException$2.java b/app/src/main/java/com/discord/utilities/guilds/GuildCaptchaUtilsKt$handleHttpException$2.java index 7beba4ace6..4af2318f59 100644 --- a/app/src/main/java/com/discord/utilities/guilds/GuildCaptchaUtilsKt$handleHttpException$2.java +++ b/app/src/main/java/com/discord/utilities/guilds/GuildCaptchaUtilsKt$handleHttpException$2.java @@ -1,33 +1,35 @@ package com.discord.utilities.guilds; import android.content.Context; +import com.discord.app.AppFragment; import com.discord.widgets.guilds.join.GuildJoinHelperKt; import com.discord.widgets.guilds.join.JoinArgs; import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; -import kotlin.jvm.functions.Function1; +import kotlin.jvm.functions.Function2; /* compiled from: GuildCaptchaUtils.kt */ -public final class GuildCaptchaUtilsKt$handleHttpException$2 extends o implements Function1 { +public final class GuildCaptchaUtilsKt$handleHttpException$2 extends o implements Function2 { public final /* synthetic */ JoinArgs $args; public final /* synthetic */ Context $context; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public GuildCaptchaUtilsKt$handleHttpException$2(Context context, JoinArgs joinArgs) { - super(1); + super(2); this.$context = context; this.$args = joinArgs; } /* 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(String str) { - invoke(str); + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */ + @Override // kotlin.jvm.functions.Function2 + public /* bridge */ /* synthetic */ Unit invoke(AppFragment appFragment, String str) { + invoke(appFragment, str); return Unit.a; } - public final void invoke(String str) { + public final void invoke(AppFragment appFragment, String str) { + m.checkNotNullParameter(appFragment, ""); m.checkNotNullParameter(str, "captchaToken"); GuildJoinHelperKt.joinGuild$default(this.$context, this.$args.getGuildId(), this.$args.isLurker(), this.$args.getSessionId(), this.$args.getDirectoryChannelId(), null, this.$args.getErrorClass(), this.$args.getSubscriptionHandler(), this.$args.getErrorHandler(), str, this.$args.getOnNext(), 32, null); } diff --git a/app/src/main/java/com/discord/utilities/guilds/GuildCaptchaUtilsKt.java b/app/src/main/java/com/discord/utilities/guilds/GuildCaptchaUtilsKt.java index 85632ff672..cba0ca0f96 100644 --- a/app/src/main/java/com/discord/utilities/guilds/GuildCaptchaUtilsKt.java +++ b/app/src/main/java/com/discord/utilities/guilds/GuildCaptchaUtilsKt.java @@ -1,7 +1,7 @@ package com.discord.utilities.guilds; import android.content.Context; -import com.discord.app.AppFragment; +import androidx.fragment.app.Fragment; import com.discord.utilities.captcha.CaptchaErrorBody; import com.discord.utilities.captcha.CaptchaHelper; import com.discord.utilities.error.Error; @@ -37,15 +37,15 @@ public final class GuildCaptchaUtilsKt { } } - public static final void handleHttpException(Error error, AppFragment appFragment, InviteArgs inviteArgs) { + public static final void handleHttpException(Error error, Fragment fragment, InviteArgs inviteArgs) { m.checkNotNullParameter(error, "error"); - m.checkNotNullParameter(appFragment, "fragment"); + m.checkNotNullParameter(fragment, "fragment"); m.checkNotNullParameter(inviteArgs, "args"); if (error.getThrowable() instanceof HttpException) { String bodyText = error.getBodyText(); String str = null; if (m.areEqual(bodyText != null ? Boolean.valueOf(w.contains$default((CharSequence) bodyText, (CharSequence) CaptchaHelper.CAPTCHA_KEY, false, 2, (Object) null)) : null, Boolean.TRUE)) { - WidgetGuildJoinCaptchaBottomSheet.Companion.enqueue(REQUEST_KEY_GUILD_CAPTCHA, new GuildCaptchaUtilsKt$handleHttpException$1(inviteArgs, appFragment), CaptchaErrorBody.Companion.createFromError(error)); + WidgetGuildJoinCaptchaBottomSheet.Companion.enqueue(REQUEST_KEY_GUILD_CAPTCHA, new GuildCaptchaUtilsKt$handleHttpException$1(inviteArgs), CaptchaErrorBody.Companion.createFromError(error)); return; } Error.Response response = error.getResponse(); @@ -55,7 +55,7 @@ public final class GuildCaptchaUtilsKt { str = (String) u.firstOrNull((List) list); } if (str != null) { - c.a.d.m.j(appFragment, str, 0, 4); + c.a.d.m.j(fragment, str, 0, 4); } } } diff --git a/app/src/main/java/com/discord/utilities/icon/IconUtils.java b/app/src/main/java/com/discord/utilities/icon/IconUtils.java index 720fa746dc..2233f79a2e 100644 --- a/app/src/main/java/com/discord/utilities/icon/IconUtils.java +++ b/app/src/main/java/com/discord/utilities/icon/IconUtils.java @@ -86,7 +86,12 @@ public final class IconUtils { } private final String getAssetPlatformUrl(String str, String str2) { - if (str.hashCode() == -1998723398 && str.equals("spotify")) { + int hashCode = str.hashCode(); + if (hashCode != -1998723398) { + if (hashCode == 3491 && str.equals("mp")) { + return a.v("https://media.discordapp.net/", str2); + } + } else if (str.equals("spotify")) { return a.v("https://i.scdn.co/image/", str2); } return null; diff --git a/app/src/main/java/com/discord/utilities/platform/Platform.java b/app/src/main/java/com/discord/utilities/platform/Platform.java index d1395884de..85231c5047 100644 --- a/app/src/main/java/com/discord/utilities/platform/Platform.java +++ b/app/src/main/java/com/discord/utilities/platform/Platform.java @@ -16,7 +16,7 @@ import kotlin.jvm.internal.DefaultConstructorMarker; public enum Platform { BATTLENET("Battle.net", Integer.valueOf((int) R.color.battlenet), Integer.valueOf((int) R.attr.ic_account_battlenet), Integer.valueOf((int) R.drawable.ic_account_battlenet_white_24dp), false, false, false, 112, null), FACEBOOK("Facebook", Integer.valueOf((int) R.color.facebook), Integer.valueOf((int) R.attr.ic_account_facebook), Integer.valueOf((int) R.drawable.ic_account_facebook_white_24dp), false, false, true, 48, null), - GITHUB("Github", Integer.valueOf((int) R.color.github), Integer.valueOf((int) R.attr.ic_account_github), Integer.valueOf((int) R.drawable.ic_account_github_white_24dp), false, false, true, 48, null), + GITHUB("GitHub", Integer.valueOf((int) R.color.github), Integer.valueOf((int) R.attr.ic_account_github), Integer.valueOf((int) R.drawable.ic_account_github_white_24dp), false, false, true, 48, null), LEAGUEOFLEGENDS("League of Legends", Integer.valueOf((int) R.color.league_of_legends), Integer.valueOf((int) R.attr.ic_account_league_of_legends), Integer.valueOf((int) R.drawable.ic_account_league_of_legends_white_24dp), false, false, false, 112, null), REDDIT("Reddit", Integer.valueOf((int) R.color.reddit), Integer.valueOf((int) R.attr.ic_account_reddit), Integer.valueOf((int) R.drawable.ic_account_reddit_white_24dp), false, false, true, 48, null), SAMSUNG("Samsung Galaxy", null, Integer.valueOf((int) R.attr.ic_account_samsung), Integer.valueOf((int) R.drawable.ic_account_samsung_white_24dp), false, true, false, 82, null), @@ -26,7 +26,7 @@ public enum Platform { TWITCH("Twitch", Integer.valueOf((int) R.color.twitch), Integer.valueOf((int) R.attr.ic_account_twitch), Integer.valueOf((int) R.drawable.ic_account_twitch_white_24dp), false, false, true, 48, null), TWITTER("Twitter", Integer.valueOf((int) R.color.twitter), Integer.valueOf((int) R.attr.ic_account_twitter), Integer.valueOf((int) R.drawable.ic_account_twitter_white_24dp), false, false, true, 48, null), XBOX("Xbox Live", Integer.valueOf((int) R.color.xbox), Integer.valueOf((int) R.attr.ic_account_xbox), Integer.valueOf((int) R.drawable.ic_account_xbox_white_24dp), false, true, true, 16, null), - YOUTUBE("Youtube", Integer.valueOf((int) R.color.youtube), Integer.valueOf((int) R.attr.ic_account_youtube), Integer.valueOf((int) R.drawable.ic_account_youtube_white_24dp), false, false, true, 48, null), + YOUTUBE("YouTube", Integer.valueOf((int) R.color.youtube), Integer.valueOf((int) R.attr.ic_account_youtube), Integer.valueOf((int) R.drawable.ic_account_youtube_white_24dp), false, false, true, 48, null), NONE(null, null, null, null, false, false, false, 127, null); public static final Companion Companion = new Companion(null); diff --git a/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$7.java b/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$7.java index 6f95aa4920..7841742f08 100644 --- a/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$7.java +++ b/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$7.java @@ -1,21 +1,21 @@ package com.discord.utilities.rx; -import kotlin.jvm.functions.Function19; -import rx.functions.Func3; +import kotlin.jvm.functions.Function16; +import rx.functions.Func8; /* compiled from: ObservableCombineLatestOverloads.kt */ -public final class ObservableCombineLatestOverloadsKt$combineLatest$7 implements Func3, Holder, T19, R> { - public final /* synthetic */ Function19 $combineFunction; +public final class ObservableCombineLatestOverloadsKt$combineLatest$7 implements Func8, T10, T11, T12, T13, T14, T15, T16, R> { + public final /* synthetic */ Function16 $combineFunction; - public ObservableCombineLatestOverloadsKt$combineLatest$7(Function19 function19) { - this.$combineFunction = function19; + public ObservableCombineLatestOverloadsKt$combineLatest$7(Function16 function16) { + this.$combineFunction = function16; } - public final R call(Holder holder, Holder holder2, T19 t19) { - return (R) this.$combineFunction.invoke(holder.getT1(), holder.getT2(), holder.getT3(), holder.getT4(), holder.getT5(), holder.getT6(), holder.getT7(), holder.getT8(), holder.getT9(), holder2.getT1(), holder2.getT2(), holder2.getT3(), holder2.getT4(), holder2.getT5(), holder2.getT6(), holder2.getT7(), holder2.getT8(), holder2.getT9(), t19); + public final R call(Holder holder, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16) { + return (R) this.$combineFunction.invoke(holder.getT1(), holder.getT2(), holder.getT3(), holder.getT4(), holder.getT5(), holder.getT6(), holder.getT7(), holder.getT8(), holder.getT9(), t10, t11, t12, t13, t14, t15, t16); } - @Override // rx.functions.Func3 - public /* bridge */ /* synthetic */ Object call(Object obj, Object obj2, Object obj3) { - return call((Holder) ((Holder) obj), (Holder) ((Holder) obj2), (Holder) obj3); + @Override // rx.functions.Func8 + public /* bridge */ /* synthetic */ Object call(Object obj, Object obj2, Object obj3, Object obj4, Object obj5, Object obj6, Object obj7, Object obj8) { + return call((Holder) ((Holder) obj), (Holder) obj2, obj3, obj4, obj5, obj6, obj7, obj8); } } diff --git a/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$8.java b/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$8.java new file mode 100644 index 0000000000..2ba7183f97 --- /dev/null +++ b/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$8.java @@ -0,0 +1,21 @@ +package com.discord.utilities.rx; + +import kotlin.jvm.functions.Function19; +import rx.functions.Func3; +/* compiled from: ObservableCombineLatestOverloads.kt */ +public final class ObservableCombineLatestOverloadsKt$combineLatest$8 implements Func3, Holder, T19, R> { + public final /* synthetic */ Function19 $combineFunction; + + public ObservableCombineLatestOverloadsKt$combineLatest$8(Function19 function19) { + this.$combineFunction = function19; + } + + public final R call(Holder holder, Holder holder2, T19 t19) { + return (R) this.$combineFunction.invoke(holder.getT1(), holder.getT2(), holder.getT3(), holder.getT4(), holder.getT5(), holder.getT6(), holder.getT7(), holder.getT8(), holder.getT9(), holder2.getT1(), holder2.getT2(), holder2.getT3(), holder2.getT4(), holder2.getT5(), holder2.getT6(), holder2.getT7(), holder2.getT8(), holder2.getT9(), t19); + } + + @Override // rx.functions.Func3 + public /* bridge */ /* synthetic */ Object call(Object obj, Object obj2, Object obj3) { + return call((Holder) ((Holder) obj), (Holder) ((Holder) obj2), (Holder) obj3); + } +} diff --git a/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt.java b/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt.java index bc16a6b5cc..ed00199f85 100644 --- a/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt.java +++ b/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt.java @@ -7,6 +7,7 @@ import kotlin.jvm.functions.Function12; import kotlin.jvm.functions.Function13; import kotlin.jvm.functions.Function14; import kotlin.jvm.functions.Function15; +import kotlin.jvm.functions.Function16; import kotlin.jvm.functions.Function19; import rx.Observable; /* compiled from: ObservableCombineLatestOverloads.kt */ @@ -128,6 +129,29 @@ public final class ObservableCombineLatestOverloadsKt { return e; } + public static final Observable combineLatest(Observable observable, Observable observable2, Observable observable3, Observable observable4, Observable observable5, Observable observable6, Observable observable7, Observable observable8, Observable observable9, Observable observable10, Observable observable11, Observable observable12, Observable observable13, Observable observable14, Observable observable15, Observable observable16, Function16 function16) { + m.checkNotNullParameter(observable, "o1"); + m.checkNotNullParameter(observable2, "o2"); + m.checkNotNullParameter(observable3, "o3"); + m.checkNotNullParameter(observable4, "o4"); + m.checkNotNullParameter(observable5, "o5"); + m.checkNotNullParameter(observable6, "o6"); + m.checkNotNullParameter(observable7, "o7"); + m.checkNotNullParameter(observable8, "o8"); + m.checkNotNullParameter(observable9, "o9"); + m.checkNotNullParameter(observable10, "o10"); + m.checkNotNullParameter(observable11, "o11"); + m.checkNotNullParameter(observable12, "o12"); + m.checkNotNullParameter(observable13, "o13"); + m.checkNotNullParameter(observable14, "o14"); + m.checkNotNullParameter(observable15, "o15"); + m.checkNotNullParameter(observable16, "o16"); + m.checkNotNullParameter(function16, "combineFunction"); + Observable d = Observable.d(createHolderObservable(observable, observable2, observable3, observable4, observable5, observable6, observable7, observable8, observable9), observable10, observable11, observable12, observable13, observable14, observable15, observable16, new ObservableCombineLatestOverloadsKt$combineLatest$7(function16)); + m.checkNotNullExpressionValue(d, "Observable\n .comb…t16\n )\n }"); + return d; + } + public static final Observable combineLatest(Observable observable, Observable observable2, Observable observable3, Observable observable4, Observable observable5, Observable observable6, Observable observable7, Observable observable8, Observable observable9, Observable observable10, Observable observable11, Observable observable12, Observable observable13, Observable observable14, Observable observable15, Observable observable16, Observable observable17, Observable observable18, Observable observable19, Function19 function19) { m.checkNotNullParameter(observable, "o1"); m.checkNotNullParameter(observable2, "o2"); @@ -149,7 +173,7 @@ public final class ObservableCombineLatestOverloadsKt { m.checkNotNullParameter(observable18, "o18"); m.checkNotNullParameter(observable19, "o19"); m.checkNotNullParameter(function19, "combineFunction"); - Observable i = Observable.i(createHolderObservable(observable, observable2, observable3, observable4, observable5, observable6, observable7, observable8, observable9), createHolderObservable(observable10, observable11, observable12, observable13, observable14, observable15, observable16, observable17, observable18), observable19, new ObservableCombineLatestOverloadsKt$combineLatest$7(function19)); + Observable i = Observable.i(createHolderObservable(observable, observable2, observable3, observable4, observable5, observable6, observable7, observable8, observable9), createHolderObservable(observable10, observable11, observable12, observable13, observable14, observable15, observable16, observable17, observable18), observable19, new ObservableCombineLatestOverloadsKt$combineLatest$8(function19)); m.checkNotNullExpressionValue(i, "Observable\n .comb…o19\n )\n }"); return i; } diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$get$1.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$get$1.java index 931a64db7c..429afabcd7 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$get$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$get$1.java @@ -1,5 +1,6 @@ package com.discord.widgets.chat.list.model; +import com.discord.api.channel.ChannelUtils; import com.discord.stores.StoreChannelsSelected; import com.discord.widgets.chat.list.model.WidgetChatListModel; import j0.k.b; @@ -11,12 +12,13 @@ public final class WidgetChatListModel$Companion$get$1 implements b call(StoreChannelsSelected.ResolvedSelectedChannel resolvedSelectedChannel) { if (resolvedSelectedChannel instanceof StoreChannelsSelected.ResolvedSelectedChannel.Channel) { - return WidgetChatListModel.Companion.access$getChannel(WidgetChatListModel.Companion, ((StoreChannelsSelected.ResolvedSelectedChannel.Channel) resolvedSelectedChannel).getChannel()); - } - if (!(resolvedSelectedChannel instanceof StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft)) { + StoreChannelsSelected.ResolvedSelectedChannel.Channel channel = (StoreChannelsSelected.ResolvedSelectedChannel.Channel) resolvedSelectedChannel; + return ChannelUtils.o(channel.getChannel()) ? new j(null) : WidgetChatListModel.Companion.access$getChannel(WidgetChatListModel.Companion, channel.getChannel()); + } else if (!(resolvedSelectedChannel instanceof StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft)) { return new j(null); + } else { + StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft threadDraft = (StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft) resolvedSelectedChannel; + return WidgetChatListModel.Companion.access$getThreadDraft(WidgetChatListModel.Companion, threadDraft.getParentChannel(), threadDraft.getStarterMessageId()); } - StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft threadDraft = (StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft) resolvedSelectedChannel; - return WidgetChatListModel.Companion.access$getThreadDraft(WidgetChatListModel.Companion, threadDraft.getParentChannel(), threadDraft.getStarterMessageId()); } } diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryCategory.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryCategory.java index 1f53272e76..8c322026de 100644 --- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryCategory.java +++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryCategory.java @@ -31,7 +31,6 @@ import d0.z.d.a0; import d0.z.d.m; import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; import kotlin.Lazy; @@ -87,7 +86,6 @@ public final class WidgetDirectoryCategory extends AppFragment { private final void configureHomeUi(WidgetDirectoriesViewModel.ViewState viewState) { List directoryItems; - Object obj; List directoryItems2; List directoryItems3; if (viewState.getChannel() != null) { @@ -111,7 +109,7 @@ public final class WidgetDirectoryCategory extends AppFragment { sortByAdded = null; } if (!(sortByAdded == null || (directoryItems3 = toDirectoryItems(sortByAdded)) == null)) { - arrayList.add(new DirectoryChannelItem.SectionHeader(R.string.search_newest_short)); + arrayList.add(new DirectoryChannelItem.SectionHeader(R.string.search_newest)); arrayList.addAll(directoryItems3); for (DirectoryChannelItem.DirectoryItem directoryItem : directoryItems3) { linkedHashSet.add(Long.valueOf(directoryItem.getDirectoryEntryData().getEntry().e().h())); @@ -119,51 +117,43 @@ public final class WidgetDirectoryCategory extends AppFragment { } } if (hubUnreadsRecommendations) { - Iterator it = viewState.getAllDirectoryEntryData().iterator(); - while (true) { - if (!it.hasNext()) { - obj = null; + ArrayList arrayList3 = new ArrayList(); + for (DirectoryEntryData directoryEntryData : viewState.getAllDirectoryEntryData()) { + if (arrayList3.size() >= 2) { break; + } else if (!linkedHashSet.contains(Long.valueOf(directoryEntryData.getEntry().e().h()))) { + arrayList3.add(directoryEntryData); + linkedHashSet.add(Long.valueOf(directoryEntryData.getEntry().e().h())); } - obj = it.next(); - if (!linkedHashSet.contains(Long.valueOf(((DirectoryEntryData) obj).getEntry().e().h()))) { - break; - } - } - DirectoryEntryData directoryEntryData = (DirectoryEntryData) obj; - if (directoryEntryData != null) { - linkedHashSet.add(Long.valueOf(directoryEntryData.getEntry().e().h())); - } else { - directoryEntryData = null; } List allDirectoryEntryData = viewState.getAllDirectoryEntryData(); - ArrayList arrayList3 = new ArrayList(); - for (Object obj2 : allDirectoryEntryData) { - if (!linkedHashSet.contains(Long.valueOf(((DirectoryEntryData) obj2).getEntry().e().h()))) { - arrayList3.add(obj2); + ArrayList arrayList4 = new ArrayList(); + for (Object obj : allDirectoryEntryData) { + if (!linkedHashSet.contains(Long.valueOf(((DirectoryEntryData) obj).getEntry().e().h()))) { + arrayList4.add(obj); } } - List sortByRanking = DirectoryUtilsKt.sortByRanking(arrayList3); + List sortByRanking = DirectoryUtilsKt.sortByRanking(arrayList4, 5 - arrayList3.size()); if (!sortByRanking.isEmpty()) { arrayList2 = sortByRanking; } if (!(arrayList2 == null || (directoryItems2 = toDirectoryItems(arrayList2)) == null)) { arrayList.add(new DirectoryChannelItem.SectionHeader(R.string.directory_category_recommended)); - if (directoryEntryData != null) { - arrayList.add(new DirectoryChannelItem.DirectoryItem(directoryEntryData)); + for (DirectoryEntryData directoryEntryData2 : arrayList3) { + arrayList.add(new DirectoryChannelItem.DirectoryItem(directoryEntryData2)); } arrayList.addAll(directoryItems2); } } else { List allDirectoryEntryData2 = viewState.getAllDirectoryEntryData(); - ArrayList arrayList4 = new ArrayList(); - for (Object obj3 : allDirectoryEntryData2) { - if (!linkedHashSet.contains(Long.valueOf(((DirectoryEntryData) obj3).getEntry().e().h()))) { - arrayList4.add(obj3); + ArrayList arrayList5 = new ArrayList(); + for (Object obj2 : allDirectoryEntryData2) { + if (!linkedHashSet.contains(Long.valueOf(((DirectoryEntryData) obj2).getEntry().e().h()))) { + arrayList5.add(obj2); } } - if (!arrayList4.isEmpty()) { - arrayList2 = arrayList4; + if (!arrayList5.isEmpty()) { + arrayList2 = arrayList5; } if (!(arrayList2 == null || (directoryItems = toDirectoryItems(arrayList2)) == null)) { arrayList.add(new DirectoryChannelItem.SectionHeader(R.string.all_servers)); diff --git a/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/GuildCommunicationDisabledGuildsFeatureFlag$observeCanGuildAccessCommunicationDisabled$1.java b/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/GuildCommunicationDisabledGuildsFeatureFlag$observeCanGuildAccessCommunicationDisabled$1.java index 3e38c471c5..886d55dcf4 100644 --- a/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/GuildCommunicationDisabledGuildsFeatureFlag$observeCanGuildAccessCommunicationDisabled$1.java +++ b/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/GuildCommunicationDisabledGuildsFeatureFlag$observeCanGuildAccessCommunicationDisabled$1.java @@ -18,6 +18,6 @@ public final class GuildCommunicationDisabledGuildsFeatureFlag$observeCanGuildAc @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final Boolean mo1invoke() { - return (!this.this$0.canGuildAccessCommunicationDisabled(this.$guildId) || !this.this$0.canUserCreateRoleSubscriptions()) ? null : 1; + return (!this.this$0.canGuildAccessCommunicationDisabled(this.$guildId) || !this.this$0.canUserAccessDisableCommunication()) ? null : 1; } } diff --git a/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/GuildCommunicationDisabledGuildsFeatureFlag.java b/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/GuildCommunicationDisabledGuildsFeatureFlag.java index 2b9cc66434..706c80b2ef 100644 --- a/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/GuildCommunicationDisabledGuildsFeatureFlag.java +++ b/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/GuildCommunicationDisabledGuildsFeatureFlag.java @@ -62,7 +62,7 @@ public final class GuildCommunicationDisabledGuildsFeatureFlag { return (this.guildsStore.getGuild(j) == null || (guildExperiment = this.storeExperiments.getGuildExperiment("2021-11_guild_communication_disabled_guilds", j, true)) == null || guildExperiment.getBucket() != 1) ? false : true; } - public final boolean canUserCreateRoleSubscriptions() { + public final boolean canUserAccessDisableCommunication() { Experiment userExperiment = this.storeExperiments.getUserExperiment("2021-11_guild_communication_disabled_users", true); return userExperiment != null && userExperiment.getBucket() == 1; } diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureLoadedUI$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureLoadedUI$2.java index 216e48c5e7..56b24a4aec 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureLoadedUI$2.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureLoadedUI$2.java @@ -1,5 +1,6 @@ package com.discord.widgets.guilds.invite; +import android.content.Context; import android.content.Intent; import android.view.View; import c.a.d.j; @@ -107,10 +108,14 @@ public final class WidgetGuildInvite$configureLoadedUI$2 implements View.OnClick } addFlags.putExtra("com.discord.intent.extra.EXTRA_HOME_CONFIG", new HomeConfig(boxLong, l, false, 4, null)); m.checkNotNullExpressionValue(addFlags, "Intent()\n … )\n }"); - j.c(this.this$0.this$0.requireContext(), false, addFlags, 2); - AppActivity appActivity = this.this$0.this$0.getAppActivity(); - if (appActivity != null) { - appActivity.finish(); + Context context = this.this$0.this$0.getContext(); + if (context != null) { + m.checkNotNullExpressionValue(context, "context"); + j.c(context, false, addFlags, 2); + AppActivity appActivity = this.this$0.this$0.getAppActivity(); + if (appActivity != null) { + appActivity.finish(); + } } return Unit.a; } diff --git a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoinCaptchaBottomSheet$Companion$enqueue$guildCaptchaNotice$1.java b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoinCaptchaBottomSheet$Companion$enqueue$guildCaptchaNotice$1.java index 57bdfa4773..2560ec53cd 100644 --- a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoinCaptchaBottomSheet$Companion$enqueue$guildCaptchaNotice$1.java +++ b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoinCaptchaBottomSheet$Companion$enqueue$guildCaptchaNotice$1.java @@ -3,27 +3,31 @@ package com.discord.widgets.guilds.join; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentManager; +import com.discord.app.AppFragment; import com.discord.stores.StoreNotices; import com.discord.stores.StoreStream; import com.discord.utilities.captcha.CaptchaErrorBody; import com.discord.widgets.guilds.join.WidgetGuildJoinCaptchaBottomSheet; +import com.discord.widgets.tabs.WidgetTabsHost; +import d0.z.d.a0; import d0.z.d.m; import d0.z.d.o; import java.util.Iterator; import java.util.List; import kotlin.jvm.functions.Function1; +import kotlin.jvm.functions.Function2; /* compiled from: WidgetGuildJoinCaptchaBottomSheet.kt */ public final class WidgetGuildJoinCaptchaBottomSheet$Companion$enqueue$guildCaptchaNotice$1 extends o implements Function1 { public final /* synthetic */ CaptchaErrorBody $error; - public final /* synthetic */ Function1 $onCaptchaTokenReceived; + public final /* synthetic */ Function2 $onCaptchaTokenReceived; public final /* synthetic */ String $requestKey; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetGuildJoinCaptchaBottomSheet$Companion$enqueue$guildCaptchaNotice$1(String str, CaptchaErrorBody captchaErrorBody, Function1 function1) { + public WidgetGuildJoinCaptchaBottomSheet$Companion$enqueue$guildCaptchaNotice$1(String str, CaptchaErrorBody captchaErrorBody, Function2 function2) { super(1); this.$requestKey = str; this.$error = captchaErrorBody; - this.$onCaptchaTokenReceived = function1; + this.$onCaptchaTokenReceived = function2; } /* Return type fixed from 'java.lang.Object' to match base method */ @@ -35,7 +39,6 @@ public final class WidgetGuildJoinCaptchaBottomSheet$Companion$enqueue$guildCapt public final boolean invoke(FragmentActivity fragmentActivity) { Object obj; - boolean z2; m.checkNotNullParameter(fragmentActivity, "appActivity"); WidgetGuildJoinCaptchaBottomSheet.Companion companion = WidgetGuildJoinCaptchaBottomSheet.Companion; FragmentManager supportFragmentManager = fragmentActivity.getSupportFragmentManager(); @@ -53,22 +56,15 @@ public final class WidgetGuildJoinCaptchaBottomSheet$Companion$enqueue$guildCapt break; } obj = it.next(); - Fragment fragment = (Fragment) obj; - if (fragment == null || !fragment.isVisible()) { - z2 = false; - continue; - } else { - z2 = true; - continue; - } - if (z2) { + if (m.areEqual(a0.getOrCreateKotlinClass(((Fragment) obj).getClass()), a0.getOrCreateKotlinClass(WidgetTabsHost.class))) { break; } } - Fragment fragment2 = (Fragment) obj; - if (fragment2 != null) { - WidgetGuildJoinCaptchaBottomSheet.Companion.registerForResult(fragment2, this.$requestKey, this.$onCaptchaTokenReceived); + Fragment fragment = (Fragment) obj; + if (fragment == null) { + return true; } + WidgetGuildJoinCaptchaBottomSheet.Companion.registerForResult((AppFragment) fragment, this.$requestKey, this.$onCaptchaTokenReceived); return true; } } diff --git a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoinCaptchaBottomSheet$Companion$registerForResult$1.java b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoinCaptchaBottomSheet$Companion$registerForResult$1.java index 7be72dd8b6..6a1ccf9225 100644 --- a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoinCaptchaBottomSheet$Companion$registerForResult$1.java +++ b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoinCaptchaBottomSheet$Companion$registerForResult$1.java @@ -1,21 +1,23 @@ package com.discord.widgets.guilds.join; import android.os.Bundle; +import com.discord.app.AppFragment; import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; -import kotlin.jvm.functions.Function1; import kotlin.jvm.functions.Function2; /* compiled from: WidgetGuildJoinCaptchaBottomSheet.kt */ public final class WidgetGuildJoinCaptchaBottomSheet$Companion$registerForResult$1 extends o implements Function2 { - public final /* synthetic */ Function1 $onCaptchaTokenReceived; + public final /* synthetic */ AppFragment $fragment; + public final /* synthetic */ Function2 $onCaptchaTokenReceived; public final /* synthetic */ String $requestKey; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetGuildJoinCaptchaBottomSheet$Companion$registerForResult$1(String str, Function1 function1) { + public WidgetGuildJoinCaptchaBottomSheet$Companion$registerForResult$1(String str, Function2 function2, AppFragment appFragment) { super(2); this.$requestKey = str; - this.$onCaptchaTokenReceived = function1; + this.$onCaptchaTokenReceived = function2; + this.$fragment = appFragment; } /* Return type fixed from 'java.lang.Object' to match base method */ @@ -31,7 +33,7 @@ public final class WidgetGuildJoinCaptchaBottomSheet$Companion$registerForResult m.checkNotNullParameter(str, "resultRequestKey"); m.checkNotNullParameter(bundle, "bundle"); if (m.areEqual(this.$requestKey, str) && (string = bundle.getString("INTENT_EXTRA_CAPTCHA_TOKEN", "")) != null && (!m.areEqual(string, ""))) { - this.$onCaptchaTokenReceived.invoke(string); + this.$onCaptchaTokenReceived.invoke(this.$fragment, string); } } } diff --git a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoinCaptchaBottomSheet.java b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoinCaptchaBottomSheet.java index c4573fba19..d4804de45f 100644 --- a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoinCaptchaBottomSheet.java +++ b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoinCaptchaBottomSheet.java @@ -13,6 +13,7 @@ import c.a.k.b; import c.d.b.a.a; import com.discord.R; import com.discord.app.AppBottomSheet; +import com.discord.app.AppFragment; import com.discord.databinding.WidgetGuildJoinCaptchaBottomSheetBinding; import com.discord.stores.StoreNotices; import com.discord.stores.StoreStream; @@ -23,7 +24,7 @@ import com.discord.utilities.font.FontUtils; import com.discord.utilities.rx.ObservableExtensionsKt; import com.discord.utilities.viewbinding.FragmentViewBindingDelegate; import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt; -import com.discord.widgets.home.WidgetHome; +import com.discord.widgets.tabs.WidgetTabsHost; import com.google.android.material.button.MaterialButton; import d0.g; import d0.z.d.a0; @@ -32,6 +33,7 @@ import kotlin.Lazy; import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; +import kotlin.jvm.functions.Function2; import kotlin.jvm.internal.DefaultConstructorMarker; import kotlin.reflect.KProperty; /* compiled from: WidgetGuildJoinCaptchaBottomSheet.kt */ @@ -54,17 +56,17 @@ public final class WidgetGuildJoinCaptchaBottomSheet extends AppBottomSheet { this(); } - public final void enqueue(String str, Function1 function1, CaptchaErrorBody captchaErrorBody) { + public final void enqueue(String str, Function2 function2, CaptchaErrorBody captchaErrorBody) { m.checkNotNullParameter(str, "requestKey"); - m.checkNotNullParameter(function1, "onCaptchaTokenReceived"); - StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice(WidgetGuildJoinCaptchaBottomSheet.NOTICE_NAME, null, 0, 0, false, d0.t.m.listOf(a0.getOrCreateKotlinClass(WidgetHome.class)), 0, false, 0, new WidgetGuildJoinCaptchaBottomSheet$Companion$enqueue$guildCaptchaNotice$1(str, captchaErrorBody, function1), FontUtils.MAX_FONT_SCALING, null)); + m.checkNotNullParameter(function2, "onCaptchaTokenReceived"); + StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice(WidgetGuildJoinCaptchaBottomSheet.NOTICE_NAME, null, 0, 0, false, d0.t.m.listOf(a0.getOrCreateKotlinClass(WidgetTabsHost.class)), 0, false, 0, new WidgetGuildJoinCaptchaBottomSheet$Companion$enqueue$guildCaptchaNotice$1(str, captchaErrorBody, function2), FontUtils.MAX_FONT_SCALING, null)); } - public final void registerForResult(Fragment fragment, String str, Function1 function1) { - m.checkNotNullParameter(fragment, "fragment"); + public final void registerForResult(AppFragment appFragment, String str, Function2 function2) { + m.checkNotNullParameter(appFragment, "fragment"); m.checkNotNullParameter(str, "requestKey"); - m.checkNotNullParameter(function1, "onCaptchaTokenReceived"); - FragmentKt.setFragmentResultListener(fragment, str, new WidgetGuildJoinCaptchaBottomSheet$Companion$registerForResult$1(str, function1)); + m.checkNotNullParameter(function2, "onCaptchaTokenReceived"); + FragmentKt.setFragmentResultListener(appFragment, str, new WidgetGuildJoinCaptchaBottomSheet$Companion$registerForResult$1(str, function2, appFragment)); } public final void show(FragmentManager fragmentManager, String str, CaptchaErrorBody captchaErrorBody) { diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java index 62943539b5..0f48485d5f 100644 --- 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 + " - 105.1 - Alpha (105201)"); + textView.setText(string + " - 105.2 - Alpha (105202)"); 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); diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java index 61affaa06e..bddee43c05 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java @@ -810,6 +810,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { /* compiled from: WidgetUserSheetViewModel.kt */ public static final class StoreState { + private final boolean canDisableCommunication; private final Channel channel; private final Map computedMembers; private final Map currentChannelVoiceStates; @@ -835,7 +836,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { private final StageRequestToSpeakState userRequestToSpeakState; private final StageRoles userStageRoles; - private StoreState(User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2) { + private StoreState(User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, boolean z5) { this.user = user; this.f2285me = meUser; this.channel = channel; @@ -858,15 +859,16 @@ public final class WidgetUserSheetViewModel extends AppViewModel { this.userStageRoles = stageRoles; this.userRequestToSpeakState = stageRequestToSpeakState; this.myStageRoles = stageRoles2; + this.canDisableCommunication = z5; } - public /* synthetic */ StoreState(User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, DefaultConstructorMarker defaultConstructorMarker) { - this(user, meUser, channel, map, map2, map3, map4, z2, z3, z4, f, modelRichPresence, guild, l, streamContext, userProfile, num, userNoteState, channel2, stageRoles, stageRequestToSpeakState, stageRoles2); + public /* synthetic */ StoreState(User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, boolean z5, DefaultConstructorMarker defaultConstructorMarker) { + this(user, meUser, channel, map, map2, map3, map4, z2, z3, z4, f, modelRichPresence, guild, l, streamContext, userProfile, num, userNoteState, channel2, stageRoles, stageRequestToSpeakState, stageRoles2, z5); } - /* renamed from: copy-1YV1AGg$default reason: not valid java name */ - public static /* synthetic */ StoreState m49copy1YV1AGg$default(StoreState storeState, User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, int i, Object obj) { - return storeState.m52copy1YV1AGg((i & 1) != 0 ? storeState.user : user, (i & 2) != 0 ? storeState.f2285me : meUser, (i & 4) != 0 ? storeState.channel : channel, (i & 8) != 0 ? storeState.computedMembers : map, (i & 16) != 0 ? storeState.guildRoles : map2, (i & 32) != 0 ? storeState.mySelectedVoiceChannelVoiceStates : map3, (i & 64) != 0 ? storeState.currentChannelVoiceStates : map4, (i & 128) != 0 ? storeState.muted : z2, (i & 256) != 0 ? storeState.selfMuted : z3, (i & 512) != 0 ? storeState.selfDeafened : z4, (i & 1024) != 0 ? storeState.outputVolume : f, (i & 2048) != 0 ? storeState.richPresence : modelRichPresence, (i & 4096) != 0 ? storeState.guild : guild, (i & 8192) != 0 ? storeState.permissions : l, (i & 16384) != 0 ? storeState.streamContext : streamContext, (i & 32768) != 0 ? storeState.userProfile : userProfile, (i & 65536) != 0 ? storeState.userRelationshipType : num, (i & 131072) != 0 ? storeState.userNoteFetchState : userNoteState, (i & 262144) != 0 ? storeState.stageChannel : channel2, (i & 524288) != 0 ? storeState.userStageRoles : stageRoles, (i & 1048576) != 0 ? storeState.userRequestToSpeakState : stageRequestToSpeakState, (i & 2097152) != 0 ? storeState.myStageRoles : stageRoles2); + /* renamed from: copy-U9gTzXU$default reason: not valid java name */ + public static /* synthetic */ StoreState m49copyU9gTzXU$default(StoreState storeState, User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, boolean z5, int i, Object obj) { + return storeState.m52copyU9gTzXU((i & 1) != 0 ? storeState.user : user, (i & 2) != 0 ? storeState.f2285me : meUser, (i & 4) != 0 ? storeState.channel : channel, (i & 8) != 0 ? storeState.computedMembers : map, (i & 16) != 0 ? storeState.guildRoles : map2, (i & 32) != 0 ? storeState.mySelectedVoiceChannelVoiceStates : map3, (i & 64) != 0 ? storeState.currentChannelVoiceStates : map4, (i & 128) != 0 ? storeState.muted : z2, (i & 256) != 0 ? storeState.selfMuted : z3, (i & 512) != 0 ? storeState.selfDeafened : z4, (i & 1024) != 0 ? storeState.outputVolume : f, (i & 2048) != 0 ? storeState.richPresence : modelRichPresence, (i & 4096) != 0 ? storeState.guild : guild, (i & 8192) != 0 ? storeState.permissions : l, (i & 16384) != 0 ? storeState.streamContext : streamContext, (i & 32768) != 0 ? storeState.userProfile : userProfile, (i & 65536) != 0 ? storeState.userRelationshipType : num, (i & 131072) != 0 ? storeState.userNoteFetchState : userNoteState, (i & 262144) != 0 ? storeState.stageChannel : channel2, (i & 524288) != 0 ? storeState.userStageRoles : stageRoles, (i & 1048576) != 0 ? storeState.userRequestToSpeakState : stageRequestToSpeakState, (i & 2097152) != 0 ? storeState.myStageRoles : stageRoles2, (i & 4194304) != 0 ? storeState.canDisableCommunication : z5); } public final User component1() { @@ -931,6 +933,10 @@ public final class WidgetUserSheetViewModel extends AppViewModel { return this.myStageRoles; } + public final boolean component23() { + return this.canDisableCommunication; + } + public final Channel component3() { return this.channel; } @@ -959,8 +965,8 @@ public final class WidgetUserSheetViewModel extends AppViewModel { return this.selfMuted; } - /* renamed from: copy-1YV1AGg reason: not valid java name */ - public final StoreState m52copy1YV1AGg(User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2) { + /* renamed from: copy-U9gTzXU reason: not valid java name */ + public final StoreState m52copyU9gTzXU(User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, boolean z5) { m.checkNotNullParameter(user, "user"); m.checkNotNullParameter(meUser, "me"); m.checkNotNullParameter(map, "computedMembers"); @@ -970,7 +976,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { m.checkNotNullParameter(userProfile, "userProfile"); m.checkNotNullParameter(userNoteState, "userNoteFetchState"); m.checkNotNullParameter(stageRequestToSpeakState, "userRequestToSpeakState"); - return new StoreState(user, meUser, channel, map, map2, map3, map4, z2, z3, z4, f, modelRichPresence, guild, l, streamContext, userProfile, num, userNoteState, channel2, stageRoles, stageRequestToSpeakState, stageRoles2); + return new StoreState(user, meUser, channel, map, map2, map3, map4, z2, z3, z4, f, modelRichPresence, guild, l, streamContext, userProfile, num, userNoteState, channel2, stageRoles, stageRequestToSpeakState, stageRoles2, z5); } public boolean equals(Object obj) { @@ -981,7 +987,11 @@ public final class WidgetUserSheetViewModel extends AppViewModel { return false; } StoreState storeState = (StoreState) obj; - return m.areEqual(this.user, storeState.user) && m.areEqual(this.f2285me, storeState.f2285me) && m.areEqual(this.channel, storeState.channel) && m.areEqual(this.computedMembers, storeState.computedMembers) && m.areEqual(this.guildRoles, storeState.guildRoles) && m.areEqual(this.mySelectedVoiceChannelVoiceStates, storeState.mySelectedVoiceChannelVoiceStates) && m.areEqual(this.currentChannelVoiceStates, storeState.currentChannelVoiceStates) && this.muted == storeState.muted && this.selfMuted == storeState.selfMuted && this.selfDeafened == storeState.selfDeafened && Float.compare(this.outputVolume, storeState.outputVolume) == 0 && m.areEqual(this.richPresence, storeState.richPresence) && m.areEqual(this.guild, storeState.guild) && m.areEqual(this.permissions, storeState.permissions) && m.areEqual(this.streamContext, storeState.streamContext) && m.areEqual(this.userProfile, storeState.userProfile) && m.areEqual(this.userRelationshipType, storeState.userRelationshipType) && m.areEqual(this.userNoteFetchState, storeState.userNoteFetchState) && m.areEqual(this.stageChannel, storeState.stageChannel) && m.areEqual(this.userStageRoles, storeState.userStageRoles) && m.areEqual(this.userRequestToSpeakState, storeState.userRequestToSpeakState) && m.areEqual(this.myStageRoles, storeState.myStageRoles); + return m.areEqual(this.user, storeState.user) && m.areEqual(this.f2285me, storeState.f2285me) && m.areEqual(this.channel, storeState.channel) && m.areEqual(this.computedMembers, storeState.computedMembers) && m.areEqual(this.guildRoles, storeState.guildRoles) && m.areEqual(this.mySelectedVoiceChannelVoiceStates, storeState.mySelectedVoiceChannelVoiceStates) && m.areEqual(this.currentChannelVoiceStates, storeState.currentChannelVoiceStates) && this.muted == storeState.muted && this.selfMuted == storeState.selfMuted && this.selfDeafened == storeState.selfDeafened && Float.compare(this.outputVolume, storeState.outputVolume) == 0 && m.areEqual(this.richPresence, storeState.richPresence) && m.areEqual(this.guild, storeState.guild) && m.areEqual(this.permissions, storeState.permissions) && m.areEqual(this.streamContext, storeState.streamContext) && m.areEqual(this.userProfile, storeState.userProfile) && m.areEqual(this.userRelationshipType, storeState.userRelationshipType) && m.areEqual(this.userNoteFetchState, storeState.userNoteFetchState) && m.areEqual(this.stageChannel, storeState.stageChannel) && m.areEqual(this.userStageRoles, storeState.userStageRoles) && m.areEqual(this.userRequestToSpeakState, storeState.userRequestToSpeakState) && m.areEqual(this.myStageRoles, storeState.myStageRoles) && this.canDisableCommunication == storeState.canDisableCommunication; + } + + public final boolean getCanDisableCommunication() { + return this.canDisableCommunication; } public final Channel getChannel() { @@ -1108,10 +1118,13 @@ public final class WidgetUserSheetViewModel extends AppViewModel { int i9 = z3 ? 1 : 0; int i10 = (i6 + i7) * 31; boolean z4 = this.selfDeafened; - if (!z4) { - i2 = z4 ? 1 : 0; + if (z4) { + z4 = true; } - int floatToIntBits = (Float.floatToIntBits(this.outputVolume) + ((i10 + i2) * 31)) * 31; + int i11 = z4 ? 1 : 0; + int i12 = z4 ? 1 : 0; + int i13 = z4 ? 1 : 0; + int floatToIntBits = (Float.floatToIntBits(this.outputVolume) + ((i10 + i11) * 31)) * 31; ModelRichPresence modelRichPresence = this.richPresence; int hashCode8 = (floatToIntBits + (modelRichPresence != null ? modelRichPresence.hashCode() : 0)) * 31; Guild guild = this.guild; @@ -1136,7 +1149,12 @@ public final class WidgetUserSheetViewModel extends AppViewModel { if (stageRoles2 != null) { i = stageRoles2.hashCode(); } - return hashCode17 + i; + int i14 = (hashCode17 + i) * 31; + boolean z5 = this.canDisableCommunication; + if (!z5) { + i2 = z5 ? 1 : 0; + } + return i14 + i2; } public String toString() { @@ -1184,8 +1202,8 @@ public final class WidgetUserSheetViewModel extends AppViewModel { R.append(this.userRequestToSpeakState); R.append(", myStageRoles="); R.append(this.myStageRoles); - R.append(")"); - return R.toString(); + R.append(", canDisableCommunication="); + return a.L(R, this.canDisableCommunication, ")"); } } @@ -1733,35 +1751,35 @@ public final class WidgetUserSheetViewModel extends AppViewModel { widgetUserSheetViewModel.updateViewState(viewState); } - private final UserProfileAdminView.ViewState createAdminViewState(Channel channel, boolean z2, boolean z3, ManageUserContext manageUserContext, VoiceState voiceState) { - boolean z4; + private final UserProfileAdminView.ViewState createAdminViewState(Channel channel, boolean z2, boolean z3, ManageUserContext manageUserContext, VoiceState voiceState, boolean z4) { + boolean z5; if (channel == null) { return null; } - boolean z5 = manageUserContext != null && (manageUserContext.getCanChangeNickname() || manageUserContext.getCanManageRoles()); - boolean z6 = !ChannelUtils.w(channel) ? !(manageUserContext == null || !manageUserContext.getCanKick()) : !(ChannelUtils.v(channel) || !z2 || z3); - boolean z7 = manageUserContext != null && manageUserContext.getCanDisableCommunication() && !z3; + boolean z6 = manageUserContext != null && (manageUserContext.getCanChangeNickname() || manageUserContext.getCanManageRoles()); + boolean z7 = !ChannelUtils.w(channel) ? !(manageUserContext == null || !manageUserContext.getCanKick()) : !(ChannelUtils.v(channel) || !z2 || z3); + boolean z8 = z4 && manageUserContext != null && manageUserContext.getCanDisableCommunication() && !z3; boolean w = ChannelUtils.w(channel); - boolean z8 = manageUserContext != null && manageUserContext.getCanBan(); - boolean z9 = voiceState != null && manageUserContext != null && manageUserContext.getCanMute() && !ChannelUtils.z(channel); - boolean z10 = voiceState != null && voiceState.e(); - boolean z11 = (voiceState == null || manageUserContext == null || !manageUserContext.getCanDeafen()) ? false : true; - boolean z12 = voiceState != null && voiceState.b(); - boolean z13 = (voiceState == null || manageUserContext == null || !manageUserContext.getCanMove()) ? false : true; - Boolean[] boolArr = {Boolean.valueOf(z5), Boolean.valueOf(z6), Boolean.valueOf(z8), Boolean.valueOf(z9), Boolean.valueOf(z11), Boolean.valueOf(z13)}; + boolean z9 = manageUserContext != null && manageUserContext.getCanBan(); + boolean z10 = voiceState != null && manageUserContext != null && manageUserContext.getCanMute() && !ChannelUtils.z(channel); + boolean z11 = voiceState != null && voiceState.e(); + boolean z12 = (voiceState == null || manageUserContext == null || !manageUserContext.getCanDeafen()) ? false : true; + boolean z13 = voiceState != null && voiceState.b(); + boolean z14 = (voiceState == null || manageUserContext == null || !manageUserContext.getCanMove()) ? false : true; + Boolean[] boolArr = {Boolean.valueOf(z6), Boolean.valueOf(z7), Boolean.valueOf(z9), Boolean.valueOf(z10), Boolean.valueOf(z12), Boolean.valueOf(z14)}; int i = 0; while (true) { if (i >= 6) { - z4 = false; + z5 = false; break; } else if (boolArr[i].booleanValue()) { - z4 = true; + z5 = true; break; } else { i++; } } - return new UserProfileAdminView.ViewState(z5, z6, z7, w, z8, z9, z10, z11, z12, z13, z4, z3); + return new UserProfileAdminView.ViewState(z6, z7, z8, w, z9, z10, z11, z12, z13, z14, z5, z3); } private final List> createAndProcessBioAstFromText(String str) { @@ -1842,24 +1860,24 @@ public final class WidgetUserSheetViewModel extends AppViewModel { } /* JADX WARNING: Code restructure failed: missing block: B:19:0x008e, code lost: - if (r2 != null) goto L_0x0095; + if (r3 != null) goto L_0x0095; */ - /* JADX WARNING: Removed duplicated region for block: B:105:0x0244 */ - /* JADX WARNING: Removed duplicated region for block: B:108:0x0249 */ - /* JADX WARNING: Removed duplicated region for block: B:114:0x025d */ - /* JADX WARNING: Removed duplicated region for block: B:117:0x0262 */ - /* JADX WARNING: Removed duplicated region for block: B:118:0x0267 */ - /* JADX WARNING: Removed duplicated region for block: B:121:0x026c */ - /* JADX WARNING: Removed duplicated region for block: B:127:0x027f */ - /* JADX WARNING: Removed duplicated region for block: B:135:0x0291 A[ADDED_TO_REGION] */ - /* JADX WARNING: Removed duplicated region for block: B:138:0x029a */ - /* JADX WARNING: Removed duplicated region for block: B:142:0x02a6 */ - /* JADX WARNING: Removed duplicated region for block: B:143:0x02ad */ - /* JADX WARNING: Removed duplicated region for block: B:145:0x02b1 */ - /* JADX WARNING: Removed duplicated region for block: B:146:0x02b8 */ - /* JADX WARNING: Removed duplicated region for block: B:82:0x01f0 */ - /* JADX WARNING: Removed duplicated region for block: B:91:0x0216 */ - /* JADX WARNING: Removed duplicated region for block: B:98:0x022d */ + /* JADX WARNING: Removed duplicated region for block: B:100:0x0241 */ + /* JADX WARNING: Removed duplicated region for block: B:106:0x0256 */ + /* JADX WARNING: Removed duplicated region for block: B:109:0x025c */ + /* JADX WARNING: Removed duplicated region for block: B:115:0x0271 */ + /* JADX WARNING: Removed duplicated region for block: B:118:0x0277 */ + /* JADX WARNING: Removed duplicated region for block: B:119:0x027c */ + /* JADX WARNING: Removed duplicated region for block: B:122:0x0282 */ + /* JADX WARNING: Removed duplicated region for block: B:128:0x0295 */ + /* JADX WARNING: Removed duplicated region for block: B:136:0x02a7 A[ADDED_TO_REGION] */ + /* JADX WARNING: Removed duplicated region for block: B:139:0x02b0 */ + /* JADX WARNING: Removed duplicated region for block: B:143:0x02bc */ + /* JADX WARNING: Removed duplicated region for block: B:144:0x02c3 */ + /* JADX WARNING: Removed duplicated region for block: B:146:0x02c7 */ + /* JADX WARNING: Removed duplicated region for block: B:147:0x02ce */ + /* JADX WARNING: Removed duplicated region for block: B:82:0x01fd */ + /* JADX WARNING: Removed duplicated region for block: B:92:0x0227 */ private final void handleStoreState(StoreState storeState) { List list; boolean z2; @@ -1925,7 +1943,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { UserProfileVoiceSettingsView.ViewState viewState2 = new UserProfileVoiceSettingsView.ViewState(selfMuted, valueOf, f); VoiceState voiceState3 = (VoiceState) a.e(user2, storeState.getCurrentChannelVoiceStates()); String c2 = (guild == null || (name = guild.getName()) == null) ? (channel == null || !ChannelUtils.w(channel)) ? null : ChannelUtils.c(channel) : name; - UserProfileAdminView.ViewState createAdminViewState = createAdminViewState(channel, z8, z7, from, voiceState3); + UserProfileAdminView.ViewState createAdminViewState = createAdminViewState(channel, z8, z7, from, voiceState3, storeState.getCanDisableCommunication()); UserProfile userProfile = storeState.getUserProfile(); UserProfileConnectionsView.ViewState createConnectionsViewState = createConnectionsViewState(userProfile, z7, z2); StreamContext streamContext = storeState.getStreamContext(); diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState$observeStoreState$3.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState$observeStoreState$3.java index 3bd1a1ac63..8899a4b2cd 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState$observeStoreState$3.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState$observeStoreState$3.java @@ -23,6 +23,7 @@ import com.discord.stores.StoreVoiceStates; import com.discord.utilities.rx.ObservableCombineLatestOverloadsKt; import com.discord.utilities.streams.StreamContext; import com.discord.utilities.streams.StreamContextService; +import com.discord.widgets.guildcommunicationdisabled.start.GuildCommunicationDisabledGuildsFeatureFlag; import com.discord.widgets.stage.StageRoles; import com.discord.widgets.user.presence.ModelRichPresence; import com.discord.widgets.user.usersheet.WidgetUserSheetViewModel; @@ -35,7 +36,7 @@ import j0.k.b; import j0.l.e.j; import java.util.Map; import java.util.concurrent.TimeUnit; -import kotlin.jvm.functions.Function15; +import kotlin.jvm.functions.Function16; import rx.Observable; /* compiled from: WidgetUserSheetViewModelStoreState.kt */ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3 implements b> { @@ -63,7 +64,7 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3 /* compiled from: WidgetUserSheetViewModelStoreState.kt */ /* renamed from: com.discord.widgets.user.usersheet.WidgetUserSheetViewModelStoreState$observeStoreState$3$2 reason: invalid class name */ - public static final class AnonymousClass2 extends o implements Function15, Map, Map, Map, StoreMediaSettings.VoiceConfiguration, ModelRichPresence, Guild, Long, StreamContext, UserProfile, Integer, StoreUserNotes.UserNoteState, StageRoles, StageRequestToSpeakState, StageRoles, WidgetUserSheetViewModel.StoreState> { + public static final class AnonymousClass2 extends o implements Function16, Map, Map, Map, StoreMediaSettings.VoiceConfiguration, ModelRichPresence, Guild, Long, StreamContext, UserProfile, Integer, StoreUserNotes.UserNoteState, StageRoles, StageRequestToSpeakState, StageRoles, Boolean, WidgetUserSheetViewModel.StoreState> { public final /* synthetic */ Channel $channel; public final /* synthetic */ MeUser $me; public final /* synthetic */ Channel $selectedVoiceChannel; @@ -71,14 +72,14 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3 /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public AnonymousClass2(User user, MeUser meUser, Channel channel, Channel channel2) { - super(15); + super(16); this.$user = user; this.$me = meUser; this.$channel = channel; this.$selectedVoiceChannel = channel2; } - public final WidgetUserSheetViewModel.StoreState invoke(Map map, Map map2, Map map3, Map map4, StoreMediaSettings.VoiceConfiguration voiceConfiguration, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2) { + public final WidgetUserSheetViewModel.StoreState invoke(Map map, Map map2, Map map3, Map map4, StoreMediaSettings.VoiceConfiguration voiceConfiguration, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, boolean z2) { m.checkNotNullParameter(map, "computedMembers"); m.checkNotNullParameter(map2, "guildRoles"); m.checkNotNullParameter(map3, "mySelectedVoiceChannelVoiceStates"); @@ -97,14 +98,14 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3 MeUser meUser = this.$me; Channel channel = this.$channel; Channel channel2 = this.$selectedVoiceChannel; - return new WidgetUserSheetViewModel.StoreState(user, meUser, channel, map, map2, map3, map4, booleanValue, isSelfMuted, isSelfDeafened, floatValue, modelRichPresence, guild, l, streamContext, userProfile, num, userNoteState, (channel2 == null || !ChannelUtils.z(channel2)) ? null : channel2, stageRoles, stageRequestToSpeakState, stageRoles2, null); + return new WidgetUserSheetViewModel.StoreState(user, meUser, channel, map, map2, map3, map4, booleanValue, isSelfMuted, isSelfDeafened, floatValue, modelRichPresence, guild, l, streamContext, userProfile, num, userNoteState, (channel2 == null || !ChannelUtils.z(channel2)) ? null : channel2, stageRoles, stageRequestToSpeakState, stageRoles2, z2, 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, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */ - @Override // kotlin.jvm.functions.Function15 - public /* bridge */ /* synthetic */ WidgetUserSheetViewModel.StoreState invoke(Map map, Map map2, Map map3, Map map4, StoreMediaSettings.VoiceConfiguration voiceConfiguration, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2) { - return invoke((Map) map, (Map) map2, (Map) map3, (Map) map4, voiceConfiguration, modelRichPresence, guild, l, streamContext, userProfile, num, userNoteState, stageRoles, stageRequestToSpeakState, stageRoles2); + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */ + @Override // kotlin.jvm.functions.Function16 + public /* bridge */ /* synthetic */ WidgetUserSheetViewModel.StoreState invoke(Map map, Map map2, Map map3, Map map4, StoreMediaSettings.VoiceConfiguration voiceConfiguration, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, Boolean bool) { + return invoke((Map) map, (Map) map2, (Map) map3, (Map) map4, voiceConfiguration, modelRichPresence, guild, l, streamContext, userProfile, num, userNoteState, stageRoles, stageRequestToSpeakState, stageRoles2, bool.booleanValue()); } } @@ -123,31 +124,43 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3 } /* JADX WARNING: Code restructure failed: missing block: B:32:0x00e3, code lost: - if (r5 != null) goto L_0x00ec; + if (r6 != null) goto L_0x00ec; */ - /* JADX WARNING: Code restructure failed: missing block: B:41:0x011f, code lost: - if (r7 != null) goto L_0x012a; + /* JADX WARNING: Code restructure failed: missing block: B:36:0x00f9, code lost: + if (r7 != null) goto L_0x0103; */ - /* JADX WARNING: Code restructure failed: missing block: B:46:0x013d, code lost: - if (r2 != null) goto L_0x014b; + /* JADX WARNING: Code restructure failed: missing block: B:42:0x0123, code lost: + if (r2 != null) goto L_0x012f; + */ + /* JADX WARNING: Code restructure failed: missing block: B:47:0x0141, code lost: + if (r3 != null) goto L_0x014e; + */ + /* JADX WARNING: Code restructure failed: missing block: B:56:0x0176, code lost: + if (r5 != null) goto L_0x0181; */ /* JADX WARNING: Removed duplicated region for block: B:15:0x0071 */ /* JADX WARNING: Removed duplicated region for block: B:20:0x008e */ /* JADX WARNING: Removed duplicated region for block: B:25:0x00ac */ /* JADX WARNING: Removed duplicated region for block: B:31:0x00d6 */ - /* JADX WARNING: Removed duplicated region for block: B:40:0x010f */ - /* JADX WARNING: Removed duplicated region for block: B:42:0x0122 */ - /* JADX WARNING: Removed duplicated region for block: B:45:0x012c */ - /* JADX WARNING: Removed duplicated region for block: B:47:0x0140 */ + /* JADX WARNING: Removed duplicated region for block: B:35:0x00ee */ + /* JADX WARNING: Removed duplicated region for block: B:37:0x00fc */ + /* JADX WARNING: Removed duplicated region for block: B:41:0x0112 */ + /* JADX WARNING: Removed duplicated region for block: B:43:0x0126 */ + /* JADX WARNING: Removed duplicated region for block: B:46:0x0131 */ + /* JADX WARNING: Removed duplicated region for block: B:48:0x0144 */ + /* JADX WARNING: Removed duplicated region for block: B:55:0x0165 */ public final Observable call(WidgetUserSheetViewModelStoreState.BootstrapData bootstrapData) { Observable> observable; Observable> observable2; Observable observable3; - Observable observable4; - Observable observable5; + Observable observable4; + Observable observable5; Channel channel; MeUser meUser; - Observable observable6; + Observable observable6; + MeUser meUser2; + Observable observable7; + Observable observable8; Observable> observe; Observable> observe2; User component1 = bootstrapData.component1(); @@ -173,49 +186,59 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3 observable2 = observeRoles; Observable> jVar = (component4 != null || (observe2 = this.$storeVoiceStates.observe(component4.f(), component4.h())) == null) ? new j(h0.emptyMap()) : observe2; Observable> jVar2 = (component3 != null || (observe = this.$storeVoiceStates.observe(component3.f(), component3.h())) == null) ? new j(h0.emptyMap()) : observe; - Observable observable7 = ModelRichPresence.Companion.get(component1.getId(), this.$storeUserPresence); + Observable observable9 = ModelRichPresence.Companion.get(component1.getId(), this.$storeUserPresence); if (l != null) { l.longValue(); observable3 = this.$storeGuilds.observeGuild(l.longValue()); } observable3 = new j<>(null); - if (component3 == null || (r6 = this.$storePermissions.observePermissionsForChannel(component3.h())) == null) { - Observable observable8 = new j<>(null); - } - Observable forUser = this.$streamContextService.getForUser(component1.getId(), true); - if (component4 != null) { - observable4 = observable7; - observable5 = this.$storeStageChannels.observeUserRoles(component1.getId(), component4.h()); + if (component3 != null) { + observable4 = observable; + observable5 = this.$storePermissions.observePermissionsForChannel(component3.h()); } else { - observable4 = observable7; + observable4 = observable; } observable5 = new j<>(null); + Observable forUser = this.$streamContextService.getForUser(component1.getId(), true); if (component4 != null) { meUser = component2; channel = component3; - observable6 = this.$storeStageChannels.observeUserRequestToSpeakState(component1.getId(), component4.h()); + observable6 = this.$storeStageChannels.observeUserRoles(component1.getId(), component4.h()); } else { meUser = component2; channel = component3; } - observable6 = new j(StageRequestToSpeakState.NONE); - if (component4 == null || (r3 = this.$storeStageChannels.observeMyRoles(component4.h())) == null) { - Observable observable9 = new j<>(null); + observable6 = new j<>(null); + if (component4 != null) { + meUser2 = meUser; + observable7 = this.$storeStageChannels.observeUserRequestToSpeakState(component1.getId(), component4.h()); + } else { + meUser2 = meUser; } - m.checkNotNullExpressionValue(observable, "computedMembersObservable"); + observable7 = new j(StageRequestToSpeakState.NONE); + if (component4 == null || (r9 = this.$storeStageChannels.observeMyRoles(component4.h())) == null) { + Observable observable10 = new j<>(null); + } + if (l != null) { + l.longValue(); + observable8 = GuildCommunicationDisabledGuildsFeatureFlag.Companion.getINSTANCE().observeCanGuildAccessCommunicationDisabled(l.longValue()); + } + observable8 = new j(Boolean.FALSE); + m.checkNotNullExpressionValue(observable4, "computedMembersObservable"); m.checkNotNullExpressionValue(observable2, "guildRolesObservable"); m.checkNotNullExpressionValue(jVar, "mySelectedVoiceChannelVoiceStatesObservable"); m.checkNotNullExpressionValue(jVar2, "currentChannelVoiceStatesObservable"); Observable voiceConfig = this.$storeMediaSettings.getVoiceConfig(); m.checkNotNullExpressionValue(observable3, "guildsObservable"); - m.checkNotNullExpressionValue(observable8, "permissionsObservable"); + m.checkNotNullExpressionValue(observable5, "permissionsObservable"); Observable observeUserProfile = this.$storeUserProfile.observeUserProfile(component1.getId()); Observable observe3 = this.$storeUserRelationships.observe(component1.getId()); Observable observeUserNote = this.$storeUserNotes.observeUserNote(component1.getId()); - m.checkNotNullExpressionValue(observable5, "userStageRolesObservable"); - m.checkNotNullExpressionValue(observable6, "userStageRequestToSpeakStateObservable"); - m.checkNotNullExpressionValue(observable9, "myStageRolesObservable"); - return ObservableCombineLatestOverloadsKt.combineLatest(observable, observable2, jVar, jVar2, voiceConfig, observable4, observable3, observable8, forUser, observeUserProfile, observe3, observeUserNote, observable5, observable6, observable9, new AnonymousClass2(component1, meUser, channel, component4)); + m.checkNotNullExpressionValue(observable6, "userStageRolesObservable"); + m.checkNotNullExpressionValue(observable7, "userStageRequestToSpeakStateObservable"); + m.checkNotNullExpressionValue(observable10, "myStageRolesObservable"); + m.checkNotNullExpressionValue(observable8, "canDisableCommunicationObservable"); + return ObservableCombineLatestOverloadsKt.combineLatest(observable4, observable2, jVar, jVar2, voiceConfig, observable9, observable3, observable5, forUser, observeUserProfile, observe3, observeUserNote, observable6, observable7, observable10, observable8, new AnonymousClass2(component1, meUser2, channel, component4)); } } observable2 = new j(h0.emptyMap()); @@ -223,33 +246,39 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3 } if (component3 != null) { } - Observable observable7 = ModelRichPresence.Companion.get(component1.getId(), this.$storeUserPresence); + Observable observable9 = ModelRichPresence.Companion.get(component1.getId(), this.$storeUserPresence); if (l != null) { } observable3 = new j<>(null); - Observable observable8 = new j<>(null); + if (component3 != null) { + } + observable5 = new j<>(null); Observable forUser = this.$streamContextService.getForUser(component1.getId(), true); if (component4 != null) { } - observable5 = new j<>(null); + observable6 = new j<>(null); if (component4 != null) { } - observable6 = new j(StageRequestToSpeakState.NONE); - Observable observable9 = new j<>(null); - m.checkNotNullExpressionValue(observable, "computedMembersObservable"); + observable7 = new j(StageRequestToSpeakState.NONE); + Observable observable10 = new j<>(null); + if (l != null) { + } + observable8 = new j(Boolean.FALSE); + m.checkNotNullExpressionValue(observable4, "computedMembersObservable"); m.checkNotNullExpressionValue(observable2, "guildRolesObservable"); m.checkNotNullExpressionValue(jVar, "mySelectedVoiceChannelVoiceStatesObservable"); m.checkNotNullExpressionValue(jVar2, "currentChannelVoiceStatesObservable"); Observable voiceConfig = this.$storeMediaSettings.getVoiceConfig(); m.checkNotNullExpressionValue(observable3, "guildsObservable"); - m.checkNotNullExpressionValue(observable8, "permissionsObservable"); + m.checkNotNullExpressionValue(observable5, "permissionsObservable"); Observable observeUserProfile = this.$storeUserProfile.observeUserProfile(component1.getId()); Observable observe3 = this.$storeUserRelationships.observe(component1.getId()); Observable observeUserNote = this.$storeUserNotes.observeUserNote(component1.getId()); - m.checkNotNullExpressionValue(observable5, "userStageRolesObservable"); - m.checkNotNullExpressionValue(observable6, "userStageRequestToSpeakStateObservable"); - m.checkNotNullExpressionValue(observable9, "myStageRolesObservable"); - return ObservableCombineLatestOverloadsKt.combineLatest(observable, observable2, jVar, jVar2, voiceConfig, observable4, observable3, observable8, forUser, observeUserProfile, observe3, observeUserNote, observable5, observable6, observable9, new AnonymousClass2(component1, meUser, channel, component4)); + m.checkNotNullExpressionValue(observable6, "userStageRolesObservable"); + m.checkNotNullExpressionValue(observable7, "userStageRequestToSpeakStateObservable"); + m.checkNotNullExpressionValue(observable10, "myStageRolesObservable"); + m.checkNotNullExpressionValue(observable8, "canDisableCommunicationObservable"); + return ObservableCombineLatestOverloadsKt.combineLatest(observable4, observable2, jVar, jVar2, voiceConfig, observable9, observable3, observable5, forUser, observeUserProfile, observe3, observeUserNote, observable6, observable7, observable10, observable8, new AnonymousClass2(component1, meUser2, channel, component4)); } } observable = new j(h0.emptyMap()); @@ -260,32 +289,38 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3 } if (component3 != null) { } - Observable observable7 = ModelRichPresence.Companion.get(component1.getId(), this.$storeUserPresence); + Observable observable9 = ModelRichPresence.Companion.get(component1.getId(), this.$storeUserPresence); if (l != null) { } observable3 = new j<>(null); - Observable observable8 = new j<>(null); + if (component3 != null) { + } + observable5 = new j<>(null); Observable forUser = this.$streamContextService.getForUser(component1.getId(), true); if (component4 != null) { } - observable5 = new j<>(null); + observable6 = new j<>(null); if (component4 != null) { } - observable6 = new j(StageRequestToSpeakState.NONE); - Observable observable9 = new j<>(null); - m.checkNotNullExpressionValue(observable, "computedMembersObservable"); + observable7 = new j(StageRequestToSpeakState.NONE); + Observable observable10 = new j<>(null); + if (l != null) { + } + observable8 = new j(Boolean.FALSE); + m.checkNotNullExpressionValue(observable4, "computedMembersObservable"); m.checkNotNullExpressionValue(observable2, "guildRolesObservable"); m.checkNotNullExpressionValue(jVar, "mySelectedVoiceChannelVoiceStatesObservable"); m.checkNotNullExpressionValue(jVar2, "currentChannelVoiceStatesObservable"); Observable voiceConfig = this.$storeMediaSettings.getVoiceConfig(); m.checkNotNullExpressionValue(observable3, "guildsObservable"); - m.checkNotNullExpressionValue(observable8, "permissionsObservable"); + m.checkNotNullExpressionValue(observable5, "permissionsObservable"); Observable observeUserProfile = this.$storeUserProfile.observeUserProfile(component1.getId()); Observable observe3 = this.$storeUserRelationships.observe(component1.getId()); Observable observeUserNote = this.$storeUserNotes.observeUserNote(component1.getId()); - m.checkNotNullExpressionValue(observable5, "userStageRolesObservable"); - m.checkNotNullExpressionValue(observable6, "userStageRequestToSpeakStateObservable"); - m.checkNotNullExpressionValue(observable9, "myStageRolesObservable"); - return ObservableCombineLatestOverloadsKt.combineLatest(observable, observable2, jVar, jVar2, voiceConfig, observable4, observable3, observable8, forUser, observeUserProfile, observe3, observeUserNote, observable5, observable6, observable9, new AnonymousClass2(component1, meUser, channel, component4)); + m.checkNotNullExpressionValue(observable6, "userStageRolesObservable"); + m.checkNotNullExpressionValue(observable7, "userStageRequestToSpeakStateObservable"); + m.checkNotNullExpressionValue(observable10, "myStageRolesObservable"); + m.checkNotNullExpressionValue(observable8, "canDisableCommunicationObservable"); + return ObservableCombineLatestOverloadsKt.combineLatest(observable4, observable2, jVar, jVar2, voiceConfig, observable9, observable3, observable5, forUser, observeUserProfile, observe3, observeUserNote, observable6, observable7, observable10, observable8, new AnonymousClass2(component1, meUser2, channel, component4)); } } diff --git a/app/src/main/java/d0/e0/p/d/c.java b/app/src/main/java/d0/e0/p/d/c.java index 77fe1c8f6c..3adbfc3905 100644 --- a/app/src/main/java/d0/e0/p/d/c.java +++ b/app/src/main/java/d0/e0/p/d/c.java @@ -3,7 +3,6 @@ package d0.e0.p.d; import d0.z.c.b; import d0.z.c.d; import d0.z.c.e; -import d0.z.c.f; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; import kotlin.jvm.functions.Function10; @@ -12,6 +11,7 @@ import kotlin.jvm.functions.Function12; import kotlin.jvm.functions.Function13; import kotlin.jvm.functions.Function14; import kotlin.jvm.functions.Function15; +import kotlin.jvm.functions.Function16; import kotlin.jvm.functions.Function19; import kotlin.jvm.functions.Function2; import kotlin.jvm.functions.Function3; @@ -23,7 +23,7 @@ import kotlin.jvm.functions.Function8; import kotlin.jvm.functions.Function9; import kotlin.reflect.KCallable; /* compiled from: FunctionWithAllInvokes.kt */ -public interface c extends Function0, Function1, Function10, Function11, Function12, Function13, Function14, Function15, d0.z.c.a, b, d0.z.c.c, Function19, Function2, d, e, f, Function3, Function4, Function5, Function6, Function7, Function8, Function9, KCallable { +public interface c extends Function0, Function1, Function10, Function11, Function12, Function13, Function14, Function15, Function16, d0.z.c.a, b, Function19, Function2, d0.z.c.c, d, e, Function3, Function4, Function5, Function6, Function7, Function8, Function9, KCallable { /* compiled from: FunctionWithAllInvokes.kt */ public static final class a { @@ -91,6 +91,10 @@ public interface c extends Function0, Function1, Functio return ((f) cVar).call(obj, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15); } + public static Object invoke(c cVar, Object obj, Object obj2, Object obj3, Object obj4, Object obj5, Object obj6, Object obj7, Object obj8, Object obj9, Object obj10, Object obj11, Object obj12, Object obj13, Object obj14, Object obj15, Object obj16) { + return ((f) cVar).call(obj, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15, obj16); + } + public static Object invoke(c cVar, Object obj, Object obj2, Object obj3, Object obj4, Object obj5, Object obj6, Object obj7, Object obj8, Object obj9, Object obj10, Object obj11, Object obj12, Object obj13, Object obj14, Object obj15, Object obj16, Object obj17, Object obj18, Object obj19) { return ((f) cVar).call(obj, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15, obj16, obj17, obj18, obj19); } diff --git a/app/src/main/java/d0/e0/p/d/j.java b/app/src/main/java/d0/e0/p/d/j.java index 23043c93ec..b2ad74a030 100644 --- a/app/src/main/java/d0/e0/p/d/j.java +++ b/app/src/main/java/d0/e0/p/d/j.java @@ -373,6 +373,11 @@ public final class j extends f implements i, KFunction, return c.a.invoke(this, obj, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15); } + @Override // kotlin.jvm.functions.Function16 + public Object invoke(Object obj, Object obj2, Object obj3, Object obj4, Object obj5, Object obj6, Object obj7, Object obj8, Object obj9, Object obj10, Object obj11, Object obj12, Object obj13, Object obj14, Object obj15, Object obj16) { + return c.a.invoke(this, obj, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15, obj16); + } + @Override // kotlin.jvm.functions.Function19 public Object invoke(Object obj, Object obj2, Object obj3, Object obj4, Object obj5, Object obj6, Object obj7, Object obj8, Object obj9, Object obj10, Object obj11, Object obj12, Object obj13, Object obj14, Object obj15, Object obj16, Object obj17, Object obj18, Object obj19) { return c.a.invoke(this, obj, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15, obj16, obj17, obj18, obj19); diff --git a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java index 7583dd8113..b084a6bbff 100644 --- a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java +++ b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java @@ -10,7 +10,6 @@ import d0.t.k; import d0.t.n; import d0.z.c.d; import d0.z.c.e; -import d0.z.c.f; import d0.z.d.a0; import d0.z.d.m; import d0.z.d.o; @@ -29,6 +28,7 @@ import kotlin.jvm.functions.Function12; import kotlin.jvm.functions.Function13; import kotlin.jvm.functions.Function14; import kotlin.jvm.functions.Function15; +import kotlin.jvm.functions.Function16; import kotlin.jvm.functions.Function19; import kotlin.jvm.functions.Function2; import kotlin.jvm.functions.Function3; @@ -102,7 +102,7 @@ public final class b { arrayList2.add(d0.o.to(d0.z.a.getJavaPrimitiveType(cVar2), d0.z.a.getJavaObjectType(cVar2))); } f2610c = h0.toMap(arrayList2); - List listOf2 = n.listOf((Object[]) new Class[]{Function0.class, Function1.class, Function2.class, Function3.class, Function4.class, Function5.class, Function6.class, Function7.class, Function8.class, Function9.class, Function10.class, Function11.class, Function12.class, Function13.class, Function14.class, Function15.class, d0.z.c.a.class, d0.z.c.b.class, d0.z.c.c.class, Function19.class, d.class, e.class, f.class}); + List listOf2 = n.listOf((Object[]) new Class[]{Function0.class, Function1.class, Function2.class, Function3.class, Function4.class, Function5.class, Function6.class, Function7.class, Function8.class, Function9.class, Function10.class, Function11.class, Function12.class, Function13.class, Function14.class, Function15.class, Function16.class, d0.z.c.a.class, d0.z.c.b.class, Function19.class, d0.z.c.c.class, d.class, e.class}); ArrayList arrayList3 = new ArrayList(d0.t.o.collectionSizeOrDefault(listOf2, 10)); for (Object obj : listOf2) { int i2 = i + 1; diff --git a/app/src/main/java/d0/z/c/a.java b/app/src/main/java/d0/z/c/a.java index a6ed4abc90..10eb9c7ea1 100644 --- a/app/src/main/java/d0/z/c/a.java +++ b/app/src/main/java/d0/z/c/a.java @@ -2,5 +2,5 @@ package d0.z.c; import d0.c; /* compiled from: Functions.kt */ -public interface a extends c { +public interface a extends c { } diff --git a/app/src/main/java/d0/z/c/b.java b/app/src/main/java/d0/z/c/b.java index e8b2a9c7bf..f7c3d0ee6a 100644 --- a/app/src/main/java/d0/z/c/b.java +++ b/app/src/main/java/d0/z/c/b.java @@ -2,5 +2,5 @@ package d0.z.c; import d0.c; /* compiled from: Functions.kt */ -public interface b extends c { +public interface b extends c { } diff --git a/app/src/main/java/d0/z/c/c.java b/app/src/main/java/d0/z/c/c.java index 7fa74d0db1..74a6049852 100644 --- a/app/src/main/java/d0/z/c/c.java +++ b/app/src/main/java/d0/z/c/c.java @@ -1,4 +1,4 @@ package d0.z.c; /* compiled from: Functions.kt */ -public interface c extends d0.c { +public interface c extends d0.c { } diff --git a/app/src/main/java/d0/z/c/d.java b/app/src/main/java/d0/z/c/d.java index 92001f2c2a..810651ab65 100644 --- a/app/src/main/java/d0/z/c/d.java +++ b/app/src/main/java/d0/z/c/d.java @@ -2,5 +2,5 @@ package d0.z.c; import d0.c; /* compiled from: Functions.kt */ -public interface d extends c { +public interface d extends c { } diff --git a/app/src/main/java/d0/z/c/e.java b/app/src/main/java/d0/z/c/e.java index f0ffc6ee80..ace2334596 100644 --- a/app/src/main/java/d0/z/c/e.java +++ b/app/src/main/java/d0/z/c/e.java @@ -2,5 +2,5 @@ package d0.z.c; import d0.c; /* compiled from: Functions.kt */ -public interface e extends c { +public interface e extends c { } diff --git a/app/src/main/java/d0/z/c/f.java b/app/src/main/java/d0/z/c/f.java deleted file mode 100644 index 18139a6318..0000000000 --- a/app/src/main/java/d0/z/c/f.java +++ /dev/null @@ -1,6 +0,0 @@ -package d0.z.c; - -import d0.c; -/* compiled from: Functions.kt */ -public interface f extends c { -} diff --git a/app/src/main/java/d0/z/d/e0.java b/app/src/main/java/d0/z/d/e0.java index ca6be3ab3c..ea653c6815 100644 --- a/app/src/main/java/d0/z/d/e0.java +++ b/app/src/main/java/d0/z/d/e0.java @@ -1,6 +1,5 @@ package d0.z.d; -import d0.z.c.f; import d0.z.d.g0.a; import d0.z.d.g0.b; import d0.z.d.g0.c; @@ -18,6 +17,7 @@ import kotlin.jvm.functions.Function12; import kotlin.jvm.functions.Function13; import kotlin.jvm.functions.Function14; import kotlin.jvm.functions.Function15; +import kotlin.jvm.functions.Function16; import kotlin.jvm.functions.Function19; import kotlin.jvm.functions.Function2; import kotlin.jvm.functions.Function3; @@ -163,25 +163,25 @@ public class e0 { if (obj instanceof Function15) { return 15; } - if (obj instanceof d0.z.c.a) { + if (obj instanceof Function16) { return 16; } - if (obj instanceof d0.z.c.b) { + if (obj instanceof d0.z.c.a) { return 17; } - if (obj instanceof d0.z.c.c) { + if (obj instanceof d0.z.c.b) { return 18; } if (obj instanceof Function19) { return 19; } - if (obj instanceof d0.z.c.d) { + if (obj instanceof d0.z.c.c) { return 20; } - if (obj instanceof d0.z.c.e) { + if (obj instanceof d0.z.c.d) { return 21; } - return obj instanceof f ? 22 : -1; + return obj instanceof d0.z.c.e ? 22 : -1; } public static boolean isFunctionOfArity(Object obj, int i) { diff --git a/app/src/main/java/d0/z/d/f.java b/app/src/main/java/d0/z/d/f.java index 4e126dab67..3befc6c773 100644 --- a/app/src/main/java/d0/z/d/f.java +++ b/app/src/main/java/d0/z/d/f.java @@ -28,6 +28,7 @@ import kotlin.jvm.functions.Function12; import kotlin.jvm.functions.Function13; import kotlin.jvm.functions.Function14; import kotlin.jvm.functions.Function15; +import kotlin.jvm.functions.Function16; import kotlin.jvm.functions.Function19; import kotlin.jvm.functions.Function2; import kotlin.jvm.functions.Function3; @@ -122,7 +123,7 @@ public final class f implements c, e { /* JADX WARN: Multi-variable type inference failed */ static { int i2 = 0; - List listOf = n.listOf((Object[]) new Class[]{Function0.class, Function1.class, Function2.class, Function3.class, Function4.class, Function5.class, Function6.class, Function7.class, Function8.class, Function9.class, Function10.class, Function11.class, Function12.class, Function13.class, Function14.class, Function15.class, d0.z.c.a.class, b.class, d0.z.c.c.class, Function19.class, d.class, e.class, d0.z.c.f.class}); + List listOf = n.listOf((Object[]) new Class[]{Function0.class, Function1.class, Function2.class, Function3.class, Function4.class, Function5.class, Function6.class, Function7.class, Function8.class, Function9.class, Function10.class, Function11.class, Function12.class, Function13.class, Function14.class, Function15.class, Function16.class, d0.z.c.a.class, b.class, Function19.class, d0.z.c.c.class, d.class, e.class}); ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(listOf, 10)); for (Object obj : listOf) { int i3 = i2 + 1; diff --git a/app/src/main/java/kotlin/jvm/functions/Function16.java b/app/src/main/java/kotlin/jvm/functions/Function16.java new file mode 100644 index 0000000000..111197ad9a --- /dev/null +++ b/app/src/main/java/kotlin/jvm/functions/Function16.java @@ -0,0 +1,7 @@ +package kotlin.jvm.functions; + +import d0.c; +/* compiled from: Functions.kt */ +public interface Function16 extends c { + R invoke(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9, P10 p10, P11 p11, P12 p12, P13 p13, P14 p14, P15 p15, P16 p16); +} diff --git a/app/src/main/res/layout/view_server_discovery_item.xml b/app/src/main/res/layout/view_server_discovery_item.xml index eeba24eef4..a0dbd0c66d 100644 --- a/app/src/main/res/layout/view_server_discovery_item.xml +++ b/app/src/main/res/layout/view_server_discovery_item.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/values-ar-rXB/plurals.xml b/app/src/main/res/values-ar-rXB/plurals.xml index e1eed2f867..f42e21bc4e 100644 --- a/app/src/main/res/values-ar-rXB/plurals.xml +++ b/app/src/main/res/values-ar-rXB/plurals.xml @@ -928,6 +928,10 @@ ‏‮{emojis}‬‏ ‏‮server‬‏ ‏‮emoji‬‏ ‏‮{emojis}‬‏ ‏‮server‬‏ ‏‮emojis‬‏ + + ‏‮{count}‬‏ ‏‮other‬‏ ‏‮rule‬‏ + ‏‮{count}‬‏ ‏‮other‬‏ ‏‮rules‬‏ + ‏‮1‬‏ ‏‮Member‬‏ ‏‮{members}‬‏ ‏‮Members‬‏ diff --git a/app/src/main/res/values-ar-rXB/strings.xml b/app/src/main/res/values-ar-rXB/strings.xml index 1d796d8256..f193fc784d 100644 --- a/app/src/main/res/values-ar-rXB/strings.xml +++ b/app/src/main/res/values-ar-rXB/strings.xml @@ -1565,8 +1565,14 @@ ‏‮Not‬‏ ‏‮a‬‏ ‏‮valid‬‏ ‏‮choice.‬‏ ‏‮Not‬‏ ‏‮a‬‏ ‏‮valid‬‏ ‏‮value.‬‏ ‏‮Input‬‏ ‏‮a‬‏ ‏‮valid‬‏ ‏‮integer.‬‏ + ‏‮Input‬‏ ‏‮an‬‏ ‏‮integer‬‏ ‏‮at‬‏ ‏‮most‬‏ ‏‮!!‬‏‏‮{maximum}‬‏‏‮!!.‬‏ + ‏‮Input‬‏ ‏‮an‬‏ ‏‮integer‬‏ ‏‮at‬‏ ‏‮least‬‏ ‏‮!!‬‏‏‮{minimum}‬‏‏‮!!.‬‏ + ‏‮Input‬‏ ‏‮an‬‏ ‏‮integer‬‏ ‏‮from‬‏ ‏‮!!‬‏‏‮{minimum}‬‏‏‮!!‬‏ ‏‮to‬‏ ‏‮!!‬‏‏‮{maximum}‬‏‏‮!!.‬‏ ‏‮Not‬‏ ‏‮a‬‏ ‏‮valid‬‏ ‏‮user‬‏ ‏‮or‬‏ ‏‮role.‬‏ ‏‮Input‬‏ ‏‮a‬‏ ‏‮valid‬‏ ‏‮number.‬‏ + ‏‮Input‬‏ ‏‮a‬‏ ‏‮number‬‏ ‏‮at‬‏ ‏‮most‬‏ ‏‮!!‬‏‏‮{maximum}‬‏‏‮!!.‬‏ + ‏‮Input‬‏ ‏‮a‬‏ ‏‮number‬‏ ‏‮at‬‏ ‏‮least‬‏ ‏‮!!‬‏‏‮{minimum}‬‏‏‮!!.‬‏ + ‏‮Input‬‏ ‏‮a‬‏ ‏‮number‬‏ ‏‮from‬‏ ‏‮!!‬‏‏‮{minimum}‬‏‏‮!!‬‏ ‏‮to‬‏ ‏‮!!‬‏‏‮{maximum}‬‏‏‮!!.‬‏ ‏‮This‬‏ ‏‮option‬‏ ‏‮is‬‏ ‏‮required.‬‏ ‏‮Specify‬‏ ‏‮a‬‏ ‏‮value.‬‏ ‏‮Not‬‏ ‏‮a‬‏ ‏‮valid‬‏ ‏‮role.‬‏ ‏‮Not‬‏ ‏‮a‬‏ ‏‮valid‬‏ ‏‮user.‬‏ @@ -2271,11 +2277,11 @@ ‏‮Disable‬‏ ‏‮Account‬‏ ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮that‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮disable‬‏ ‏‮your‬‏ ‏‮account?‬‏ ‏‮This‬‏ ‏‮will‬‏ ‏‮immediately‬‏ ‏‮log‬‏ ‏‮you‬‏ ‏‮out‬‏ ‏‮and‬‏ ‏‮make‬‏ ‏‮your‬‏ ‏‮account‬‏ ‏‮inaccessible‬‏ ‏‮to‬‏ ‏‮anyone.‬‏ ‏‮Success!‬‏ ‏‮We\'ve‬‏ ‏‮disabled‬‏ ‏‮e-mail‬‏ ‏‮notifications‬‏ ‏‮for‬‏ ‏‮you!‬‏ - ‏‮When‬‏ ‏‮you‬‏ ‏‮put‬‏ ‏‮a‬‏ ‏‮user‬‏ ‏‮in‬‏ ‏‮time‬‏ ‏‮out‬‏ ‏‮they‬‏ ‏‮will‬‏ ‏‮not‬‏ ‏‮be‬‏ ‏‮able‬‏ ‏‮to‬‏ ‏‮send‬‏ ‏‮messages‬‏ ‏‮in‬‏ ‏‮chat,‬‏ ‏‮reply‬‏ ‏‮within‬‏ ‏‮threads,‬‏ ‏‮react‬‏ ‏‮to‬‏ ‏‮messages,‬‏ ‏‮or‬‏ ‏‮speak‬‏ ‏‮in‬‏ ‏‮voice‬‏ ‏‮or‬‏ ‏‮stage‬‏ ‏‮channels.‬‏ ‏‮[Learn‬‏ ‏‮more](‬‏‏‮{helpdeskArticle}‬‏‏‮)‬‏ + ‏‮When‬‏ ‏‮you‬‏ ‏‮put‬‏ ‏‮a‬‏ ‏‮user‬‏ ‏‮in‬‏ ‏‮timeout‬‏ ‏‮they‬‏ ‏‮will‬‏ ‏‮not‬‏ ‏‮be‬‏ ‏‮able‬‏ ‏‮to‬‏ ‏‮send‬‏ ‏‮messages‬‏ ‏‮in‬‏ ‏‮chat,‬‏ ‏‮reply‬‏ ‏‮within‬‏ ‏‮threads,‬‏ ‏‮react‬‏ ‏‮to‬‏ ‏‮messages,‬‏ ‏‮or‬‏ ‏‮speak‬‏ ‏‮in‬‏ ‏‮voice‬‏ ‏‮or‬‏ ‏‮stage‬‏ ‏‮channels.‬‏ ‏‮[Learn‬‏ ‏‮more](‬‏‏‮{helpdeskArticle}‬‏‏‮)‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮timed‬‏ ‏‮out‬‏ ‏‮for‬‏ ‏‮{duration}‬‏ - ‏‮Time‬‏ ‏‮Out‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ + ‏‮Timeout‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮The‬‏ ‏‮reason‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮recorded‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮audit‬‏ ‏‮log.‬‏ - ‏‮Time‬‏ ‏‮Out‬‏ + ‏‮Timeout‬‏ ‏‮Disable‬‏ ‏‮Sync‬‏ ‏‮Disabling‬‏ ‏‮sync‬‏ ‏‮will‬‏ ‏‮perform‬‏ ‏‮the‬‏ ‏‮selected‬‏ ‏‮expired‬‏ ‏‮sub‬‏ ‏‮behavior‬‏ ‏‮as‬‏ ‏‮if‬‏ ‏‮all‬‏ ‏‮subs‬‏ ‏‮have‬‏ ‏‮expired.‬‏ ‏‮Disabling‬‏ ‏‮sync‬‏ ‏‮will‬‏ ‏‮perform‬‏ ‏‮the‬‏ ‏‮selected‬‏ ‏‮expired‬‏ ‏‮membership‬‏ ‏‮behavior‬‏ ‏‮as‬‏ ‏‮if‬‏ ‏‮all‬‏ ‏‮members‬‏ ‏‮have‬‏ ‏‮expired.‬‏ @@ -2556,9 +2562,9 @@ ‏‮To‬‏ ‏‮minimize‬‏ ‏‮spam,‬‏ ‏‮members‬‏ ‏‮of‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮must‬‏ ‏‮have‬‏ ‏‮a‬‏ ‏‮verified‬‏ ‏‮email‬‏ ‏‮before‬‏ ‏‮they‬‏ ‏‮can‬‏ ‏‮send‬‏ ‏‮messages.‬‏ ‏‮This‬‏ ‏‮does‬‏ ‏‮not‬‏ ‏‮apply‬‏ ‏‮to‬‏ ‏‮members‬‏ ‏‮with‬‏ ‏‮roles.‬‏ ‏‮Verified‬‏ ‏‮email‬‏ ‏‮required‬‏ ‏‮Your‬‏ ‏‮server‬‏ ‏‮already‬‏ ‏‮meets‬‏ ‏‮or‬‏ ‏‮exceeds‬‏ ‏‮the‬‏ ‏‮verification‬‏ ‏‮level‬‏ ‏‮requirement.‬‏ - ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮end‬‏ ‏‮time‬‏ ‏‮out‬‏ ‏‮for‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮with‬‏ ‏‮{timeRemaining}‬‏ ‏‮remaining?‬‏ - ‏‮!!‬‏‏‮{user}‬‏ ‏‮time‬‏ ‏‮out‬‏ ‏‮ended‬‏ - ‏‮Remove‬‏ ‏‮Time‬‏ ‏‮Out‬‏ ‏‮From‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ + ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮end‬‏ ‏‮timeout‬‏ ‏‮for‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮with‬‏ ‏‮{timeRemaining}‬‏ ‏‮remaining?‬‏ + ‏‮!!‬‏‏‮{user}‬‏ ‏‮timeout‬‏ ‏‮ended‬‏ + ‏‮Remove‬‏ ‏‮Timeout‬‏ ‏‮From‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮Enable‬‏ ‏‮in-game‬‏ ‏‮overlay.‬‏ ‏‮Enable‬‏ ‏‮Noise‬‏ ‏‮Suppression‬‏ ‏‮Enable‬‏ ‏‮notifications‬‏ @@ -3436,15 +3442,17 @@ ‏‮Wanna‬‏ ‏‮join‬‏ ‏‮more‬‏ ‏‮servers?‬‏ ‏‮Upgrade‬‏ ‏‮to‬‏ ‏‮Discord‬‏ ‏‮Nitro‬‏ ‏‮to‬‏ ‏‮join‬‏ ‏‮up‬‏ ‏‮to‬‏ ‏‮200‬‏ ‏‮servers!‬‏ ‏‮This‬‏ ‏‮reason‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮recorded‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮audit‬‏ ‏‮log.‬‏ - ‏‮When‬‏ ‏‮you‬‏ ‏‮put‬‏ ‏‮a‬‏ ‏‮user‬‏ ‏‮in‬‏ ‏‮time‬‏ ‏‮out‬‏ ‏‮they‬‏ ‏‮will‬‏ ‏‮not‬‏ ‏‮be‬‏ ‏‮able‬‏ ‏‮to‬‏ ‏‮send‬‏ ‏‮messages‬‏ ‏‮in‬‏ ‏‮chat,‬‏ ‏‮reply‬‏ ‏‮within‬‏ ‏‮threads,‬‏ ‏‮react‬‏ ‏‮to‬‏ ‏‮messages,‬‏ ‏‮or‬‏ ‏‮speak‬‏ ‏‮in‬‏ ‏‮voice‬‏ ‏‮or‬‏ ‏‮stage‬‏ ‏‮channels‬‏ + ‏‮When‬‏ ‏‮you‬‏ ‏‮put‬‏ ‏‮a‬‏ ‏‮user‬‏ ‏‮in‬‏ ‏‮timeout‬‏ ‏‮they‬‏ ‏‮will‬‏ ‏‮not‬‏ ‏‮be‬‏ ‏‮able‬‏ ‏‮to‬‏ ‏‮send‬‏ ‏‮messages‬‏ ‏‮in‬‏ ‏‮chat,‬‏ ‏‮reply‬‏ ‏‮within‬‏ ‏‮threads,‬‏ ‏‮react‬‏ ‏‮to‬‏ ‏‮messages,‬‏ ‏‮or‬‏ ‏‮speak‬‏ ‏‮in‬‏ ‏‮voice‬‏ ‏‮or‬‏ ‏‮stage‬‏ ‏‮channels‬‏ + ‏‮{guildName}‬‏ ‏‮has‬‏ ‏‮put‬‏ ‏‮you‬‏ ‏‮in‬‏ ‏‮time‬‏ ‏‮out‬‏ ‏‮mode‬‏ ‏‮for‬‏ ‏‮{time}‬‏‏‮.‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮not‬‏ ‏‮reply,‬‏ ‏‮react,‬‏ ‏‮message‬‏ ‏‮or‬‏ ‏‮speak‬‏ ‏‮in‬‏ ‏‮voice‬‏ ‏‮the‬‏ ‏‮duration‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮time‬‏ ‏‮out.‬‏ ‏‮[Learn‬‏ ‏‮more](‬‏‏‮{link}‬‏‏‮)‬‏ + ‏‮Time‬‏ ‏‮Out‬‏ ‏‮Mode‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮not‬‏ ‏‮reply,‬‏ ‏‮react,‬‏ ‏‮message‬‏ ‏‮or‬‏ ‏‮speak‬‏ ‏‮in‬‏ ‏‮voice.‬‏ ‏‮[Learn‬‏ ‏‮more](‬‏‏‮{link}‬‏‏‮)‬‏ ‏‮{time}‬‏ ‏‮left‬‏ - ‏‮TIME‬‏ ‏‮OUT‬‏ ‏‮MODE‬‏ + ‏‮TIMEOUT‬‏ ‏‮MODE‬‏ ‏‮DURATION‬‏ ‏‮You‬‏ ‏‮are‬‏ ‏‮in‬‏ ‏‮timeout‬‏ ‏‮mode‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮not‬‏ ‏‮reply,‬‏ ‏‮react,‬‏ ‏‮message‬‏ ‏‮or‬‏ ‏‮speak‬‏ ‏‮in‬‏ ‏‮voice.‬‏ ‏‮[Learn‬‏ ‏‮more](‬‏‏‮{link}‬‏‏‮)‬‏ ‏‮REASON‬‏ - ‏‮Reason‬‏ ‏‮for‬‏ ‏‮time‬‏ ‏‮out‬‏ + ‏‮Reason‬‏ ‏‮for‬‏ ‏‮timeout‬‏ ‏‮{quantity}‬‏ ‏‮remaining‬‏ ‏‮Less‬‏ ‏‮than‬‏ ‏‮1‬‏ ‏‮minute‬‏ ‏‮remaining‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮Timed‬‏ ‏‮out‬‏ ‏‮for‬‏ ‏‮{label}‬‏ @@ -3510,9 +3518,9 @@ ‏‮Explore‬‏ ‏‮Public‬‏ ‏‮Servers‬‏ ‏‮View‬‏ ‏‮Remove‬‏ ‏‮it‬‏ ‏‮now‬‏ ‏‮to‬‏ ‏‮let‬‏ ‏‮them‬‏ ‏‮post‬‏ ‏‮and‬‏ ‏‮react‬‏ ‏‮to‬‏ ‏‮messages,‬‏ ‏‮and‬‏ ‏‮speak‬‏ ‏‮in‬‏ ‏‮voice‬‏ ‏‮and‬‏ ‏‮stage‬‏ ‏‮channels.‬‏ ‏‮[Learn‬‏ ‏‮More](https://www.google.com)‬‏ - ‏‮Remove‬‏ ‏‮Time‬‏ ‏‮Out‬‏ - ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮time‬‏ ‏‮out‬‏ ‏‮ended‬‏ - ‏‮!!‬‏‏‮{username}‬‏‏‮!!‬‏ ‏‮has‬‏ ‏‮$[](countdown)‬‏ ‏‮remaining‬‏ ‏‮in‬‏ ‏‮their‬‏ ‏‮time‬‏ ‏‮out.‬‏ + ‏‮Remove‬‏ ‏‮Timeout‬‏ + ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮timeout‬‏ ‏‮ended‬‏ + ‏‮!!‬‏‏‮{username}‬‏‏‮!!‬‏ ‏‮has‬‏ ‏‮$[](countdown)‬‏ ‏‮remaining‬‏ ‏‮in‬‏ ‏‮their‬‏ ‏‮timeout.‬‏ ‏‮Enable‬‏ ‏‮Progress‬‏ ‏‮Bar‬‏ ‏‮Add‬‏ ‏‮Moderators‬‏ ‏‮Missing‬‏ ‏‮permission‬‏ ‏‮to‬‏ ‏‮connect.‬‏ @@ -4498,6 +4506,8 @@ ‏‮Set‬‏ ‏‮up‬‏ ‏‮Membership‬‏ ‏‮Screening‬‏ ‏‮Manual‬‏ ‏‮Approval‬‏ ‏‮New‬‏ ‏‮members‬‏ ‏‮will‬‏ ‏‮not‬‏ ‏‮be‬‏ ‏‮able‬‏ ‏‮to‬‏ ‏‮join‬‏ ‏‮or‬‏ ‏‮talk‬‏ ‏‮until‬‏ ‏‮a‬‏ ‏‮mod‬‏ ‏‮approves‬‏ ‏‮their‬‏ ‏‮application.‬‏ + ‏‮Manual‬‏ ‏‮Approval‬‏ ‏‮Required‬‏ + ‏‮Set‬‏ ‏‮up‬‏ ‏‮rules‬‏ ‏‮that‬‏ ‏‮new‬‏ ‏‮members‬‏ ‏‮must‬‏ ‏‮explicitly‬‏ ‏‮agree‬‏ ‏‮to‬‏ ‏‮before‬‏ ‏‮they‬‏ ‏‮can‬‏ ‏‮talk‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮(includes‬‏ ‏‮DMing‬‏ ‏‮members).‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮also‬‏ ‏‮add‬‏ ‏‮questions‬‏ ‏‮that‬‏ ‏‮people‬‏ ‏‮who‬‏ ‏‮request‬‏ ‏‮to‬‏ ‏‮join‬‏ ‏‮must‬‏ ‏‮answer‬‏ ‏‮for‬‏ ‏‮you‬‏ ‏‮to‬‏ ‏‮approve‬‏ ‏‮their‬‏ ‏‮membership.‬‏ ‏‮Pending‬‏ ‏‮Preview‬‏ ‏‮New‬‏ ‏‮members‬‏ ‏‮can‬‏ ‏‮browse‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮before‬‏ ‏‮meeting‬‏ ‏‮the‬‏ ‏‮requirements.‬‏ ‏‮We‬‏ ‏‮recommend‬‏ ‏‮keeping‬‏ ‏‮this‬‏ ‏‮enabled‬‏ ‏‮so‬‏ ‏‮they‬‏ ‏‮can‬‏ ‏‮see‬‏ ‏‮what‬‏ ‏‮your‬‏ ‏‮community‬‏ ‏‮is‬‏ ‏‮like.‬‏ ‏‮If‬‏ ‏‮disabled,‬‏ ‏‮new‬‏ ‏‮members‬‏ ‏‮can’t‬‏ ‏‮view‬‏ ‏‮any‬‏ ‏‮contents‬‏ ‏‮of‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮until‬‏ ‏‮they‬‏ ‏‮meet‬‏ ‏‮the‬‏ ‏‮requirements.‬‏ ‏‮[Learn‬‏ ‏‮more.](‬‏‏‮{helpdeskArticle}‬‏‏‮)‬‏ @@ -5066,9 +5076,9 @@ ‏‮Everyone‬‏ ‏‮stays‬‏ ‏‮muted‬‏ ‏‮so‬‏ ‏‮you‬‏ ‏‮can‬‏ ‏‮quietly‬‏ ‏‮cram‬‏ ‏‮for‬‏ ‏‮tests‬‏ ‏‮together.‬‏ ‏‮NEW!‬‏ ‏‮Hub‬‏ ‏‮study‬‏ ‏‮rooms‬‏ ‏‮Study‬‏ ‏‮Together‬‏ - ‏‮This‬‏ ‏‮is‬‏ ‏‮a‬‏ ‏‮special‬‏ ‏‮place‬‏ ‏‮where‬‏ ‏‮people‬‏ ‏‮hang‬‏ ‏‮out‬‏ ‏‮quietly.‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮use‬‏ ‏‮the‬‏ ‏‮voice‬‏ ‏‮channel\'s‬‏ ‏‮text‬‏ ‏‮chat‬‏ ‏‮to‬‏ ‏‮communicate.‬‏ + ‏‮This‬‏ ‏‮is‬‏ ‏‮a‬‏ ‏‮special‬‏ ‏‮place‬‏ ‏‮where‬‏ ‏‮people‬‏ ‏‮hang‬‏ ‏‮out‬‏ ‏‮quietly.‬‏ ‏‮In‬‏ ‏‮Hubs,‬‏ ‏‮everyone‬‏ ‏‮is‬‏ ‏‮muted‬‏ ‏‮by‬‏ ‏‮default‬‏ ‏‮in‬‏ ‏‮Voice‬‏ ‏‮Channels‬‏ - ‏‮studying‬‏ ‏‮•‬‏ ‏‮video‬‏ ‏‮optional‬‏ + ‏‮quiet‬‏ ‏‮studying‬‏ ‏‮My‬‏ ‏‮school‬‏ ‏‮isn\'t‬‏ ‏‮here‬‏ ‏‮Verified‬‏ ‏‮Student‬‏ ‏‮Hub‬‏ ‏‮Verify‬‏ ‏‮your‬‏ ‏‮email‬‏ ‏‮to‬‏ ‏‮join‬‏ @@ -5950,6 +5960,8 @@ ‏‮This‬‏ ‏‮person‬‏ ‏‮is‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮owner‬‏ ‏‮and‬‏ ‏‮always‬‏ ‏‮has‬‏ ‏‮all‬‏ ‏‮permissions‬‏ ‏‮regardless‬‏ ‏‮of‬‏ ‏‮roles.‬‏ ‏‮Hide‬‏ ‏‮Member‬‏ ‏‮List‬‏ ‏‮Add‬‏ ‏‮a‬‏ ‏‮question‬‏ + ‏‮Add‬‏ ‏‮Questions‬‏ + ‏‮Use‬‏ ‏‮questions‬‏ ‏‮to‬‏ ‏‮manually‬‏ ‏‮approve‬‏ ‏‮new‬‏ ‏‮members‬‏ ‏‮before‬‏ ‏‮they‬‏ ‏‮can‬‏ ‏‮talk‬‏ ‏‮in‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮Add‬‏ ‏‮a‬‏ ‏‮rule‬‏ ‏‮You\'ll‬‏ ‏‮get‬‏ ‏‮notified‬‏ ‏‮when‬‏ ‏‮there\'s‬‏ ‏‮an‬‏ ‏‮update.‬‏ ‏‮Your‬‏ ‏‮application‬‏ ‏‮to‬‏ ‏‮join‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮is‬‏ ‏‮awaiting‬‏ ‏‮review!‬‏ @@ -6001,6 +6013,7 @@ ‏‮Multiple‬‏ ‏‮Choice‬‏ ‏‮Paragraph‬‏ ‏‮You‬‏ ‏‮must‬‏ ‏‮verify‬‏ ‏‮your‬‏ ‏‮phone‬‏ ‏‮number.‬‏ + ‏‮New‬‏ ‏‮members‬‏ ‏‮must‬‏ ‏‮verify‬‏ ‏‮their‬‏ ‏‮phone‬‏ ‏‮number‬‏ ‏‮Server‬‏ ‏‮Rules‬‏ ‏‮Short‬‏ ‏‮Answer‬‏ ‏‮Connections‬‏ @@ -6008,8 +6021,10 @@ ‏‮Read‬‏ ‏‮and‬‏ ‏‮agree‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮rules‬‏ ‏‮To‬‏ ‏‮change‬‏ ‏‮this,‬‏ ‏‮[go‬‏ ‏‮to‬‏ ‏‮Moderation‬‏ ‏‮settings](onSettingsClick)‬‏ ‏‮Get‬‏ ‏‮Started‬‏ + ‏‮Members‬‏ ‏‮are‬‏ ‏‮required‬‏ ‏‮to‬‏ ‏‮agree‬‏ ‏‮to‬‏ ‏‮server‬‏ ‏‮rules‬‏ ‏‮before‬‏ ‏‮they‬‏ ‏‮can‬‏ ‏‮talk.‬‏ ‏‮Create‬‏ ‏‮server‬‏ ‏‮rules‬‏ ‏‮and‬‏ ‏‮ask‬‏ ‏‮pending‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮agree‬‏ ‏‮to‬‏ ‏‮them‬‏ ‏‮before‬‏ ‏‮they‬‏ ‏‮can‬‏ ‏‮talk.‬‏ ‏‮Set‬‏ ‏‮up‬‏ ‏‮server‬‏ ‏‮rules!‬‏ + ‏‮Verification‬‏ ‏‮Level:‬‏ ‏‮$[](verificationLevelHook)‬‏ ‏‮Server‬‏ ‏‮Application‬‏ ‏‮Status‬‏ ‏‮Learn‬‏ ‏‮more‬‏ ‏‮Complete‬‏ ‏‮Application‬‏ ‏‮Later‬‏ @@ -6026,6 +6041,9 @@ ‏‮{emojis}‬‏ ‏‮{members}‬‏ ‏‮Members‬‏ ‏‮{membersOnline}‬‏ ‏‮Online‬‏ + ‏‮Off‬‏ + ‏‮On‬‏ + ‏‮{count}‬‏ ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮withdraw‬‏ ‏‮your‬‏ ‏‮application?‬‏ ‏‮Stylized‬‏ ‏‮image‬‏ ‏‮of‬‏ ‏‮a‬‏ ‏‮clipboard‬‏ ‏‮and‬‏ ‏‮pencil‬‏ ‏‮You’ll‬‏ ‏‮have‬‏ ‏‮to‬‏ ‏‮resubmit‬‏ ‏‮your‬‏ ‏‮application‬‏ ‏‮if‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮join‬‏ ‏‮again‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮future.‬‏ @@ -6040,7 +6058,9 @@ ‏‮Withdraw‬‏ ‏‮and‬‏ ‏‮Leave‬‏ ‏‮Server‬‏ ‏‮You‬‏ ‏‮have‬‏ ‏‮a‬‏ ‏‮verified‬‏ ‏‮phone‬‏ ‏‮number.‬‏ ‏‮Phone‬‏ ‏‮Verified‬‏ + ‏‮Members‬‏ ‏‮won’t‬‏ ‏‮see‬‏ ‏‮the‬‏ ‏‮application‬‏ ‏‮until‬‏ ‏‮you‬‏ ‏‮enable‬‏ ‏‮Member‬‏ ‏‮Application.‬‏ ‏‮Channel‬‏ ‏‮and‬‏ ‏‮role‬‏ ‏‮mentions‬‏ ‏‮will‬‏ ‏‮not‬‏ ‏‮show‬‏ ‏‮up‬‏ ‏‮properly‬‏ ‏‮in‬‏ ‏‮rules‬‏ ‏‮if‬‏ ‏‮you\'ve‬‏ ‏‮disabled‬‏ ‏‮preview.‬‏ + ‏‮New‬‏ ‏‮members‬‏ ‏‮must‬‏ ‏‮complete‬‏ ‏‮the‬‏ ‏‮member‬‏ ‏‮application‬‏ ‏‮to‬‏ ‏‮talk‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮server.‬‏ ‏‮Close‬‏ ‏‮Anyway‬‏ ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure?‬‏ ‏‮Your‬‏ ‏‮progress‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮lost.‬‏ ‏‮I‬‏ ‏‮have‬‏ ‏‮read‬‏ ‏‮and‬‏ ‏‮agree‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮rules‬‏ @@ -6185,7 +6205,7 @@ ‏‮Screen‬‏ ‏‮Share‬‏ ‏‮Sharing‬‏ ‏‮screen‬‏ ‏‮Stop‬‏ ‏‮sharing‬‏ - ‏‮Moderate‬‏ ‏‮Member‬‏ + ‏‮Moderate‬‏ ‏‮Members‬‏ ‏‮Moderate‬‏ ‏‮Members‬‏ ‏‮Moderation‬‏ ‏‮Allow‬‏ ‏‮requests‬‏ ‏‮from‬‏ ‏‮@everyone‬‏ @@ -6207,8 +6227,8 @@ ‏‮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.‬‏ ‏‮Move‬‏ ‏‮To‬‏ ‏‮User‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮moved‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮selected‬‏ ‏‮channel.‬‏ - ‏‮Alert‬‏ ‏‮Cleared‬‏ - ‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏ + ‏‮Alert‬‏ ‏‮Cleared‬‏ + ‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏ ‏‮New‬‏ ‏‮notification‬‏ ‏‮Remove‬‏ ‏‮%1$s‬‏ ‏‮More‬‏ ‏‮than‬‏ %1$d ‏‮new‬‏ ‏‮notifications‬‏ @@ -7553,6 +7573,7 @@ ‏‮Private‬‏ ‏‮Thread‬‏ ‏‮**View‬‏ ‏‮Channels**‬‏ ‏‮and‬‏ ‏‮**Connect**‬‏ ‏‮permissions‬‏ ‏‮required‬‏ ‏‮to‬‏ ‏‮create‬‏ ‏‮this‬‏ ‏‮private‬‏ ‏‮channel.‬‏ ‏‮Profile‬‏ + ‏‮Profile‬‏ ‏‮Actions‬‏ ‏‮Upload‬‏ ‏‮your‬‏ ‏‮own‬‏ ‏‮personalized‬‏ ‏‮banner‬‏ ‏‮and‬‏ ‏‮more‬‏ ‏‮with‬‏ ‏‮Discord‬‏ ‏‮Nitro!‬‏ ‏‮$[](renderTimeHook)‬‏ ‏‮elapsed‬‏ ‏‮Profile‬‏ ‏‮Customization‬‏ ‏‮is‬‏ ‏‮currently‬‏ ‏‮available‬‏ ‏‮to‬‏ ‏‮a‬‏ ‏‮limited‬‏ ‏‮number‬‏ ‏‮of‬‏ ‏‮people.‬‏ @@ -7738,7 +7759,7 @@ ‏‮This‬‏ ‏‮will‬‏ ‏‮remove‬‏ ‏‮this‬‏ ‏‮attachment‬‏ ‏‮from‬‏ ‏‮this‬‏ ‏‮message‬‏ ‏‮permanently.‬‏ ‏‮Remove‬‏ ‏‮Attachment‬‏ ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure?‬‏ - ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮remove‬‏ ‏‮time‬‏ ‏‮out‬‏ ‏‮on‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮for‬‏ ‏‮{time}‬‏‏‮?‬‏ + ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮remove‬‏ ‏‮timeout‬‏ ‏‮on‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮for‬‏ ‏‮{time}‬‏‏‮?‬‏ ‏‮Remove‬‏ ‏‮file‬‏ ‏‮Remove‬‏ ‏‮Friend‬‏ ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮permanently‬‏ ‏‮remove‬‏ ‏‮**!!‬‏‏‮{name}‬‏‏‮!!**‬‏ ‏‮from‬‏ ‏‮your‬‏ ‏‮friends?‬‏ @@ -7750,7 +7771,7 @@ ‏‮Remove‬‏ ‏‮Reaction‬‏ ‏‮Remove‬‏ ‏‮!!‬‏‏‮{name}‬‏‏‮!!‬‏ ‏‮Remove‬‏ ‏‮Role‬‏ - ‏‮Remove‬‏ ‏‮Time‬‏ ‏‮Out‬‏ + ‏‮Remove‬‏ ‏‮Timeout‬‏ ‏‮Remove‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮from‬‏ ‏‮Thread‬‏ ‏‮Remove‬‏ ‏‮Vanity‬‏ ‏‮URL‬‏ ‏‮Show‬‏ ‏‮website‬‏ ‏‮preview‬‏ ‏‮info‬‏ ‏‮from‬‏ ‏‮links‬‏ ‏‮pasted‬‏ ‏‮into‬‏ ‏‮chat‬‏ @@ -8118,7 +8139,7 @@ ‏‮Allows‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮use‬‏ ‏‮@everyone‬‏ ‏‮(everyone‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮server)‬‏ ‏‮or‬‏ ‏‮@here‬‏ ‏‮(only‬‏ ‏‮online‬‏ ‏‮members‬‏ ‏‮in‬‏ ‏‮that‬‏ ‏‮channel).‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮also‬‏ ‏‮@mention‬‏ ‏‮all‬‏ ‏‮roles,‬‏ ‏‮even‬‏ ‏‮if‬‏ ‏‮the‬‏ ‏‮role’s‬‏ ‏‮“Allow‬‏ ‏‮anyone‬‏ ‏‮to‬‏ ‏‮mention‬‏ ‏‮this‬‏ ‏‮role”‬‏ ‏‮permission‬‏ ‏‮is‬‏ ‏‮disabled.‬‏ ‏‮Allows‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮use‬‏ ‏‮@everyone‬‏ ‏‮or‬‏ ‏‮@here‬‏ ‏‮(only‬‏ ‏‮online‬‏ ‏‮members)‬‏ ‏‮in‬‏ ‏‮these‬‏ ‏‮channels.‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮also‬‏ ‏‮@mention‬‏ ‏‮all‬‏ ‏‮roles‬‏ ‏‮in‬‏ ‏‮these‬‏ ‏‮channels,‬‏ ‏‮even‬‏ ‏‮if‬‏ ‏‮the‬‏ ‏‮role’s‬‏ ‏‮“Allow‬‏ ‏‮anyone‬‏ ‏‮to‬‏ ‏‮mention‬‏ ‏‮this‬‏ ‏‮role”‬‏ ‏‮permission‬‏ ‏‮is‬‏ ‏‮disabled.‬‏ ‏‮Allows‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮use‬‏ ‏‮@everyone‬‏ ‏‮or‬‏ ‏‮@here‬‏ ‏‮(only‬‏ ‏‮online‬‏ ‏‮members)‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮channel.‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮also‬‏ ‏‮@mention‬‏ ‏‮all‬‏ ‏‮roles‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮channel,‬‏ ‏‮even‬‏ ‏‮if‬‏ ‏‮the‬‏ ‏‮role’s‬‏ ‏‮“Allow‬‏ ‏‮anyone‬‏ ‏‮to‬‏ ‏‮mention‬‏ ‏‮this‬‏ ‏‮role”‬‏ ‏‮permission‬‏ ‏‮is‬‏ ‏‮disabled.‬‏ - ‏‮When‬‏ ‏‮you‬‏ ‏‮put‬‏ ‏‮a‬‏ ‏‮user‬‏ ‏‮in‬‏ ‏‮time‬‏ ‏‮out‬‏ ‏‮they‬‏ ‏‮will‬‏ ‏‮not‬‏ ‏‮be‬‏ ‏‮able‬‏ ‏‮to‬‏ ‏‮send‬‏ ‏‮messages‬‏ ‏‮in‬‏ ‏‮chat,‬‏ ‏‮reply‬‏ ‏‮within‬‏ ‏‮threads,‬‏ ‏‮react‬‏ ‏‮to‬‏ ‏‮messages,‬‏ ‏‮or‬‏ ‏‮speak‬‏ ‏‮in‬‏ ‏‮voice‬‏ ‏‮or‬‏ ‏‮stage‬‏ ‏‮channels.‬‏ + ‏‮When‬‏ ‏‮you‬‏ ‏‮put‬‏ ‏‮a‬‏ ‏‮user‬‏ ‏‮in‬‏ ‏‮timeout‬‏ ‏‮they‬‏ ‏‮will‬‏ ‏‮not‬‏ ‏‮be‬‏ ‏‮able‬‏ ‏‮to‬‏ ‏‮send‬‏ ‏‮messages‬‏ ‏‮in‬‏ ‏‮chat,‬‏ ‏‮reply‬‏ ‏‮within‬‏ ‏‮threads,‬‏ ‏‮react‬‏ ‏‮to‬‏ ‏‮messages,‬‏ ‏‮or‬‏ ‏‮speak‬‏ ‏‮in‬‏ ‏‮voice‬‏ ‏‮or‬‏ ‏‮stage‬‏ ‏‮channels.‬‏ ‏‮Allow‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮perform‬‏ ‏‮limited‬‏ ‏‮moderation‬‏ ‏‮actions‬‏ ‏‮(timeout).‬‏ ‏‮Allows‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮move‬‏ ‏‮other‬‏ ‏‮members‬‏ ‏‮between‬‏ ‏‮voice‬‏ ‏‮channels‬‏ ‏‮that‬‏ ‏‮the‬‏ ‏‮member‬‏ ‏‮with‬‏ ‏‮this‬‏ ‏‮permission‬‏ ‏‮has‬‏ ‏‮access‬‏ ‏‮to.‬‏ ‏‮Allows‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮disconnect‬‏ ‏‮other‬‏ ‏‮members‬‏ ‏‮from‬‏ ‏‮these‬‏ ‏‮channels.‬‏ ‏‮They‬‏ ‏‮will‬‏ ‏‮also‬‏ ‏‮be‬‏ ‏‮able‬‏ ‏‮to‬‏ ‏‮move‬‏ ‏‮somebody‬‏ ‏‮into‬‏ ‏‮other‬‏ ‏‮channels‬‏ ‏‮that‬‏ ‏‮they‬‏ ‏‮have‬‏ ‏‮this‬‏ ‏‮permission‬‏ ‏‮in.‬‏ @@ -8441,6 +8462,8 @@ ‏‮Search‬‏ ‏‮Tenor‬‏ ‏‮Search‬‏ ‏‮with‬‏ ‏‮Google‬‏ ‏‮Searching…‬‏ + ‏‮Decorates‬‏ ‏‮the‬‏ ‏‮app‬‏ ‏‮for‬‏ ‏‮a‬‏ ‏‮special‬‏ ‏‮occasion.‬‏ ‏‮Disable‬‏ ‏‮to‬‏ ‏‮switch‬‏ ‏‮back‬‏ ‏‮to‬‏ ‏‮normal.‬‏ + ‏‮Show‬‏ ‏‮Seasonal‬‏ ‏‮Theme‬‏ ‏‮Customize‬‏ ‏‮your‬‏ ‏‮gift‬‏ ‏‮BOX:‬‏ ‏‮Open‬‏ ‏‮Gift‬‏ ‏‮Give‬‏ ‏‮a‬‏ ‏‮friend‬‏ ‏‮the‬‏ ‏‮gift‬‏ ‏‮of‬‏ ‏‮higher‬‏ ‏‮quality‬‏ ‏‮streams,‬‏ ‏‮multiple‬‏ ‏‮custom‬‏ ‏‮profiles,‬‏ ‏‮and‬‏ ‏‮all‬‏ ‏‮the‬‏ ‏‮emoji!‬‏ @@ -8732,6 +8755,8 @@ ‏‮Sky‬‏ ‏‮blue‬‏ ‏‮An‬‏ ‏‮SMS‬‏ ‏‮was‬‏ ‏‮sent‬‏ ‏‮to‬‏ ‏‮!!‬‏‏‮{phone}‬‏‏‮!!.‬‏ ‏‮Enter‬‏ ‏‮your‬‏ ‏‮confirmation‬‏ ‏‮code‬‏ + ‏‮**We‬‏ ‏‮got‬‏ ‏‮you‬‏ ‏‮something…**‬‏ + ‏‮Visit‬‏ ‏‮discord.com‬‏ ‏‮for‬‏ ‏‮today’s‬‏ ‏‮surprise‬‏ ‏‮$[linkIcon](linkIconHook)‬‏ ‏‮Sofort‬‏ ‏‮Email‬‏ ‏‮By‬‏ ‏‮providing‬‏ ‏‮your‬‏ ‏‮payment‬‏ ‏‮information‬‏ ‏‮and‬‏ ‏‮confirming‬‏ ‏‮this‬‏ ‏‮payment,‬‏ ‏‮you‬‏ ‏‮authorise‬‏ ‏‮(A)‬‏ ‏‮Discord‬‏ ‏‮and‬‏ ‏‮Stripe,‬‏ ‏‮our‬‏ ‏‮payment‬‏ ‏‮service‬‏ ‏‮provider‬‏ ‏‮and/or‬‏ ‏‮PPRO,‬‏ ‏‮its‬‏ ‏‮local‬‏ ‏‮service‬‏ ‏‮provider,‬‏ ‏‮to‬‏ ‏‮send‬‏ ‏‮instructions‬‏ ‏‮to‬‏ ‏‮your‬‏ ‏‮bank‬‏ ‏‮to‬‏ ‏‮debit‬‏ ‏‮your‬‏ ‏‮account‬‏ ‏‮and‬‏ ‏‮(B)‬‏ ‏‮your‬‏ ‏‮bank‬‏ ‏‮to‬‏ ‏‮debit‬‏ ‏‮your‬‏ ‏‮account‬‏ ‏‮in‬‏ ‏‮accordance‬‏ ‏‮with‬‏ ‏‮those‬‏ ‏‮instructions.‬‏ ‏‮As‬‏ ‏‮part‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮rights,‬‏ ‏‮you‬‏ ‏‮are‬‏ ‏‮entitled‬‏ ‏‮to‬‏ ‏‮a‬‏ ‏‮refund‬‏ ‏‮from‬‏ ‏‮your‬‏ ‏‮bank‬‏ ‏‮under‬‏ ‏‮the‬‏ ‏‮terms‬‏ ‏‮and‬‏ ‏‮conditions‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮agreement‬‏ ‏‮with‬‏ ‏‮your‬‏ ‏‮bank.‬‏ ‏‮A‬‏ ‏‮refund‬‏ ‏‮must‬‏ ‏‮be‬‏ ‏‮claimed‬‏ ‏‮within‬‏ ‏‮8‬‏ ‏‮weeks‬‏ ‏‮starting‬‏ ‏‮from‬‏ ‏‮the‬‏ ‏‮date‬‏ ‏‮on‬‏ ‏‮which‬‏ ‏‮your‬‏ ‏‮account‬‏ ‏‮was‬‏ ‏‮debited.‬‏ ‏‮Your‬‏ ‏‮rights‬‏ ‏‮are‬‏ ‏‮explained‬‏ ‏‮in‬‏ ‏‮a‬‏ ‏‮statement‬‏ ‏‮that‬‏ ‏‮you‬‏ ‏‮can‬‏ ‏‮obtain‬‏ ‏‮from‬‏ ‏‮your‬‏ ‏‮bank.‬‏ ‏‮You‬‏ ‏‮agree‬‏ ‏‮to‬‏ ‏‮receive‬‏ ‏‮notifications‬‏ ‏‮for‬‏ ‏‮future‬‏ ‏‮debits‬‏ ‏‮up‬‏ ‏‮to‬‏ ‏‮2‬‏ ‏‮days‬‏ ‏‮before‬‏ ‏‮they‬‏ ‏‮occur.‬‏ ‏‮Sofort‬‏ ‏‮Name‬‏ @@ -9476,7 +9501,7 @@ ‏‮Say‬‏ ‏‮Hello‬‏ ‏‮to‬‏ ‏‮Threads!‬‏ ‏‮Threads‬‏ ‏‮**!!‬‏‏‮{a}‬‏‏‮!!**,‬‏ ‏‮**!!‬‏‏‮{b}‬‏‏‮!!**,‬‏ ‏‮and‬‏ ‏‮**!!‬‏‏‮{c}‬‏‏‮!!**‬‏ ‏‮are‬‏ ‏‮typing…‬‏ - ‏‮Time‬‏ ‏‮Out‬‏ + ‏‮Timeout‬‏ ‏‮10‬‏ ‏‮minutes‬‏ ‏‮1‬‏ ‏‮day‬‏ ‏‮1‬‏ ‏‮hour‬‏ @@ -10153,6 +10178,10 @@ ‏‮Had‬‏ ‏‮an‬‏ ‏‮issue?‬‏ ‏‮Thanks‬‏ ‏‮for‬‏ ‏‮reporting‬‏ ‏‮your‬‏ ‏‮issue!‬‏ ‏‮Feedback‬‏ ‏‮like‬‏ ‏‮yours‬‏ ‏‮helps‬‏ ‏‮us‬‏ ‏‮improve‬‏ ‏‮Video‬‏ ‏‮Backgrounds‬‏ ‏‮Remove‬‏ ‏‮Background‬‏ + ‏‮Blurple‬‏ ‏‮Blizzard‬‏ + ‏‮Winter‬‏ ‏‮Wilderness‬‏ + ‏‮Cracklin‬‏ ‏‮\'n\'‬‏ ‏‮Cozy‬‏ + ‏‮Snowsgiving‬‏ ‏‮Edition‬‏ ‏‮Get‬‏ ‏‮more‬‏ ‏‮customization‬‏ ‏‮by‬‏ ‏‮uploading‬‏ ‏‮your‬‏ ‏‮own‬‏ ‏‮video‬‏ ‏‮background,‬‏ ‏‮custom‬‏ ‏‮global‬‏ ‏‮emojis,‬‏ ‏‮[and‬‏ ‏‮more‬‏ ‏‮with‬‏ ‏‮Discord‬‏ ‏‮Nitro!](onLearnMore)‬‏ ‏‮Wanna‬‏ ‏‮upload‬‏ ‏‮your‬‏ ‏‮own‬‏ ‏‮background?‬‏ ‏‮Focus‬‏ diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index eb21c63449..0ad7315a0e 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -516,7 +516,6 @@ Купуване на DLC Платформата ти не се поддържа от тази игра. Тази игра се поддържа само на {operatingSystem}. - Готов си да получиш подарък! Вече притежаваш това приложение, можеш да купиш само подаръци. Можеш да купиш само подарък и за съжаление не поддържаме подаръци за този метод на плащане. Пакети diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index b6ee5ecc70..97de0b1eb9 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -516,7 +516,6 @@ Koupit DLC Tahle hra nepodporuje tvou platformu. Tato hra podporuje pouze operační systém {operatingSystem}. - Darování připraveno! Tuto aplikaci už máš. Můžeš ji zakoupit pouze jako dárek. Můžeš jenom koupit dárek, ale tato platební metoda bohužel nepodporuje darování. Balíčky diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 39209d81a1..674191c583 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -516,7 +516,6 @@ Køb DLC Din platform understøttes ikke af dette spil. Dette spil understøttes kun på {operatingSystem}. - Klar til at modtage gaver! Du ejer allerede denne app, kun gaver kan købes. Du kan kun købe en gave, og desværre understøtter vi ikke at give gaver med denne betalingsmetode. Bundter diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index bf00e61ba6..abb4992b64 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -516,7 +516,6 @@ DLC kaufen Dieses Spiel unterstützt deine Plattform nicht. Dieses Spiel wird nur unter {operatingSystem} unterstützt. - Bereit für Geschenke! Du besitzt diese Anwendung bereits. Es können nur Geschenke gekauft werden. Du kannst nur ein Geschenk kaufen und leider unterstützen wir den Kauf von Geschenken mit dieser Zahlungsart nicht. Bundles diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index addfa79b54..4fd3011c69 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -516,7 +516,6 @@ Αγορά Περιεχομένου προς Λήψη (DLC) Η πλατφόρμα σου δεν υποστηρίζεται από αυτό το παιχνίδι. Αυτό το παιχνίδι υποστηρίζεται μόνο σε {operatingSystem}. - Έτοιμοι να λάβετε ένα δώρο! Σας ανήκει ήδη αυτή η εφαρμογή, μπορείτε να αγοράσετε μόνο δώρα. Μπορείτε να αγοράσετε μόνο δώρα και δυστυχώς δεν υποστηρίζουμε τη πραγματοποίηση δώρων για αυτόν τον τρόπο πληρωμής. Πακέτα diff --git a/app/src/main/res/values-en-rXA/plurals.xml b/app/src/main/res/values-en-rXA/plurals.xml index ebd73a36c6..85216362da 100644 --- a/app/src/main/res/values-en-rXA/plurals.xml +++ b/app/src/main/res/values-en-rXA/plurals.xml @@ -928,6 +928,10 @@ [»{emojis}« šéŕVéŕ éḿöĵî one two] [»{emojis}« šéŕVéŕ éḿöĵîš one two three] + + [»{count}« öţĥéŕ ŕûļé one two] + [»{count}« öţĥéŕ ŕûļéš one two] + [1 Ḿéḿɓéŕ one two] [»{members}« Ḿéḿɓéŕš one two] diff --git a/app/src/main/res/values-en-rXA/strings.xml b/app/src/main/res/values-en-rXA/strings.xml index cccd1434a7..65ec83e451 100644 --- a/app/src/main/res/values-en-rXA/strings.xml +++ b/app/src/main/res/values-en-rXA/strings.xml @@ -1565,8 +1565,14 @@ [Ñöţ å Våļîð çĥöîçé. one two three] [Ñöţ å Våļîð Våļûé. one two three] [Îñþûţ å Våļîð îñţéĝéŕ. one two three] + [Îñþûţ åñ îñţéĝéŕ åţ ḿöšţ ¡¡»{maximum}«¡¡. one two three four] + [Îñþûţ åñ îñţéĝéŕ åţ ļéåšţ ¡¡»{minimum}«¡¡. one two three four] + [Îñþûţ åñ îñţéĝéŕ ƒŕöḿ ¡¡»{minimum}«¡¡ ţö ¡¡»{maximum}«¡¡. one two three four] [Ñöţ å Våļîð ûšéŕ öŕ ŕöļé. one two three] [Îñþûţ å Våļîð ñûḿɓéŕ. one two three] + [Îñþûţ å ñûḿɓéŕ åţ ḿöšţ ¡¡»{maximum}«¡¡. one two three four] + [Îñþûţ å ñûḿɓéŕ åţ ļéåšţ ¡¡»{minimum}«¡¡. one two three four] + [Îñþûţ å ñûḿɓéŕ ƒŕöḿ ¡¡»{minimum}«¡¡ ţö ¡¡»{maximum}«¡¡. one two three four] [Ţĥîš öþţîöñ îš ŕéQûîŕéð. Šþéçîƒý å Våļûé. one two three four five] [Ñöţ å Våļîð ŕöļé. one two three] [Ñöţ å Våļîð ûšéŕ. one two three] @@ -2271,11 +2277,11 @@ [Ðîšåɓļé Åççöûñţ one two three] [Åŕé ýöû šûŕé ţĥåţ ýöû ŵåñţ ţö ðîšåɓļé ýöûŕ åççöûñţ¿ Ţĥîš ŵîļļ îḿḿéðîåţéļý ļöĝ ýöû öûţ åñð ḿåķé ýöûŕ åççöûñţ îñåççéššîɓļé ţö åñýöñé. one two three four five six seven eight nine ten eleven twelve thirteen] [Šûççéšš¡ Ŵé\'Vé ðîšåɓļéð é-ḿåîļ ñöţîƒîçåţîöñš ƒöŕ ýöû¡ one two three four five six] - [Ŵĥéñ ýöû þûţ å ûšéŕ îñ ţîḿé öûţ ţĥéý ŵîļļ ñöţ ɓé åɓļé ţö šéñð ḿéššåĝéš îñ çĥåţ, ŕéþļý ŵîţĥîñ ţĥŕéåðš, ŕéåçţ ţö ḿéššåĝéš, öŕ šþéåķ îñ Vöîçé öŕ šţåĝé çĥåññéļš. [Ļéåŕñ ḿöŕé](»{helpdeskArticle}«) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven] + [Ŵĥéñ ýöû þûţ å ûšéŕ îñ ţîḿéöûţ ţĥéý ŵîļļ ñöţ ɓé åɓļé ţö šéñð ḿéššåĝéš îñ çĥåţ, ŕéþļý ŵîţĥîñ ţĥŕéåðš, ŕéåçţ ţö ḿéššåĝéš, öŕ šþéåķ îñ Vöîçé öŕ šţåĝé çĥåññéļš. [Ļéåŕñ ḿöŕé](»{helpdeskArticle}«) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten] [¡¡»{user}«¡¡ ĥåš ɓééñ ţîḿéð öûţ ƒöŕ »{duration}« one two three four] - [Ţîḿé Öûţ ¡¡»{user}«¡¡ one two] + [Ţîḿéöûţ ¡¡»{user}«¡¡ one two] [Ţĥé ŕéåšöñ ŵîļļ ɓé ŕéçöŕðéð îñ ţĥé åûðîţ ļöĝ. one two three four five] - [Ţîḿé Öûţ one two] + [Ţîḿéöûţ one two] [Ðîšåɓļé Šýñç one two] [Ðîšåɓļîñĝ šýñç ŵîļļ þéŕƒöŕḿ ţĥé šéļéçţéð éхþîŕéð šûɓ ɓéĥåVîöŕ åš îƒ åļļ šûɓš ĥåVé éхþîŕéð. one two three four five six seven eight nine ten] [Ðîšåɓļîñĝ šýñç ŵîļļ þéŕƒöŕḿ ţĥé šéļéçţéð éхþîŕéð ḿéḿɓéŕšĥîþ ɓéĥåVîöŕ åš îƒ åļļ ḿéḿɓéŕš ĥåVé éхþîŕéð. one two three four five six seven eight nine ten eleven] @@ -2556,9 +2562,9 @@ [Ţö ḿîñîḿîžé šþåḿ, ḿéḿɓéŕš öƒ ţĥé šéŕVéŕ ḿûšţ ĥåVé å Véŕîƒîéð éḿåîļ ɓéƒöŕé ţĥéý çåñ šéñð ḿéššåĝéš. Ţĥîš ðöéš ñöţ åþþļý ţö ḿéḿɓéŕš ŵîţĥ ŕöļéš. one two three four five six seven eight nine ten eleven twelve thirteen] [νéŕîƒîéð éḿåîļ ŕéQûîŕéð one two three] [Ýöûŕ šéŕVéŕ åļŕéåðý ḿééţš öŕ éхçééðš ţĥé Véŕîƒîçåţîöñ ļéVéļ ŕéQûîŕéḿéñţ. one two three four five six seven eight] - [Åŕé ýöû šûŕé ýöû ŵåñţ ţö éñð ţîḿé öûţ ƒöŕ ¡¡»{user}«¡¡ ŵîţĥ »{timeRemaining}« ŕéḿåîñîñĝ¿ one two three four five six seven] - [¡¡»{user}« ţîḿé öûţ éñðéð one two three] - [ŔéḿöVé Ţîḿé Öûţ Fŕöḿ ¡¡»{user}«¡¡ one two three] + [Åŕé ýöû šûŕé ýöû ŵåñţ ţö éñð ţîḿéöûţ ƒöŕ ¡¡»{user}«¡¡ ŵîţĥ »{timeRemaining}« ŕéḿåîñîñĝ¿ one two three four five six seven] + [¡¡»{user}« ţîḿéöûţ éñðéð one two three] + [ŔéḿöVé Ţîḿéöûţ Fŕöḿ ¡¡»{user}«¡¡ one two three] [Éñåɓļé îñ-ĝåḿé öVéŕļåý. one two three] [Éñåɓļé Ñöîšé Šûþþŕéššîöñ one two three] [Éñåɓļé ñöţîƒîçåţîöñš one two three] @@ -3436,15 +3442,17 @@ [Ŵåññå ĵöîñ ḿöŕé šéŕVéŕš¿ one two three] [Ûþĝŕåðé ţö Ðîšçöŕð Ñîţŕö ţö ĵöîñ ûþ ţö 200 šéŕVéŕš¡ one two three four five six] [Ţĥîš ŕéåšöñ ŵîļļ ɓé ŕéçöŕðéð îñ ţĥé åûðîţ ļöĝ. one two three four five six] - [Ŵĥéñ ýöû þûţ å ûšéŕ îñ ţîḿé öûţ ţĥéý ŵîļļ ñöţ ɓé åɓļé ţö šéñð ḿéššåĝéš îñ çĥåţ, ŕéþļý ŵîţĥîñ ţĥŕéåðš, ŕéåçţ ţö ḿéššåĝéš, öŕ šþéåķ îñ Vöîçé öŕ šţåĝé çĥåññéļš one two three four five six seven eight nine ten eleven twelve thirteen fourteen] + [Ŵĥéñ ýöû þûţ å ûšéŕ îñ ţîḿéöûţ ţĥéý ŵîļļ ñöţ ɓé åɓļé ţö šéñð ḿéššåĝéš îñ çĥåţ, ŕéþļý ŵîţĥîñ ţĥŕéåðš, ŕéåçţ ţö ḿéššåĝéš, öŕ šþéåķ îñ Vöîçé öŕ šţåĝé çĥåññéļš one two three four five six seven eight nine ten eleven twelve thirteen fourteen] + [»{guildName}« ĥåš þûţ ýöû îñ ţîḿé öûţ ḿöðé ƒöŕ »{time}«. Ýöû çåñ ñöţ ŕéþļý, ŕéåçţ, ḿéššåĝé öŕ šþéåķ îñ Vöîçé ţĥé ðûŕåţîöñ öƒ ýöûŕ ţîḿé öûţ. [Ļéåŕñ ḿöŕé](»{link}«) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three] + [Ţîḿé Öûţ Ḿöðé one two] [Ýöû çåñ ñöţ ŕéþļý, ŕéåçţ, ḿéššåĝé öŕ šþéåķ îñ Vöîçé. [Ļéåŕñ ḿöŕé](»{link}«) one two three four five six seven eight nine ten eleven twelve thirteen] [»{time}« ļéƒţ one] - [ŢÎḾÉ ÖÛŢ ḾÖÐÉ one two] + [ŢÎḾÉÖÛŢ ḾÖÐÉ one two] [ÐÛŔÅŢÎÖÑ one two] [Ýöû åŕé îñ ţîḿéöûţ ḿöðé one two three] [Ýöû çåñ ñöţ ŕéþļý, ŕéåçţ, ḿéššåĝé öŕ šþéåķ îñ Vöîçé. [Ļéåŕñ ḿöŕé](»{link}«) one two three four five six seven eight nine ten eleven twelve thirteen] [ŔÉÅŠÖÑ one two] - [Ŕéåšöñ ƒöŕ ţîḿé öûţ one two three] + [Ŕéåšöñ ƒöŕ ţîḿéöûţ one two three] [»{quantity}« ŕéḿåîñîñĝ one two] [Ļéšš ţĥåñ 1 ḿîñûţé ŕéḿåîñîñĝ one two three four] [¡¡»{user}«¡¡ Ţîḿéð öûţ ƒöŕ »{label}« one two three] @@ -3510,9 +3518,9 @@ [Éхþļöŕé Þûɓļîç ŠéŕVéŕš one two three] [νîéŵ one] [ŔéḿöVé îţ ñöŵ ţö ļéţ ţĥéḿ þöšţ åñð ŕéåçţ ţö ḿéššåĝéš, åñð šþéåķ îñ Vöîçé åñð šţåĝé çĥåññéļš. [Ļéåŕñ Ḿöŕé](ĥţţþš://ŵŵŵ.ĝööĝļé.çöḿ) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two] - [ŔéḿöVé Ţîḿé Öûţ one two three] - [¡¡»{user}«¡¡ ţîḿé öûţ éñðéð one two three] - [¡¡»{username}«¡¡ ĥåš €[](çöûñţðöŵñ) ŕéḿåîñîñĝ îñ ţĥéîŕ ţîḿé öûţ. one two three four five six] + [ŔéḿöVé Ţîḿéöûţ one two three] + [¡¡»{user}«¡¡ ţîḿéöûţ éñðéð one two three] + [¡¡»{username}«¡¡ ĥåš €[](çöûñţðöŵñ) ŕéḿåîñîñĝ îñ ţĥéîŕ ţîḿéöûţ. one two three four five six] [Éñåɓļé Þŕöĝŕéšš βåŕ one two three] [Åðð Ḿöðéŕåţöŕš one two three] [Ḿîššîñĝ þéŕḿîššîöñ ţö çöññéçţ. one two three four] @@ -4498,6 +4506,8 @@ [Šéţ ûþ Ḿéḿɓéŕšĥîþ Šçŕééñîñĝ one two three four] [Ḿåñûåļ ÅþþŕöVåļ one two three] [Ñéŵ ḿéḿɓéŕš ŵîļļ ñöţ ɓé åɓļé ţö ĵöîñ öŕ ţåļķ ûñţîļ å ḿöð åþþŕöVéš ţĥéîŕ åþþļîçåţîöñ. one two three four five six seven eight nine] + [Ḿåñûåļ ÅþþŕöVåļ ŔéQûîŕéð one two three] + [Šéţ ûþ ŕûļéš ţĥåţ ñéŵ ḿéḿɓéŕš ḿûšţ éхþļîçîţļý åĝŕéé ţö ɓéƒöŕé ţĥéý çåñ ţåļķ îñ ţĥé šéŕVéŕ (îñçļûðéš ÐḾîñĝ ḿéḿɓéŕš). Ýöû çåñ åļšö åðð Qûéšţîöñš ţĥåţ þéöþļé ŵĥö ŕéQûéšţ ţö ĵöîñ ḿûšţ åñšŵéŕ ƒöŕ ýöû ţö åþþŕöVé ţĥéîŕ ḿéḿɓéŕšĥîþ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen] [Þéñðîñĝ one two] [ÞŕéVîéŵ one two] [Ñéŵ ḿéḿɓéŕš çåñ ɓŕöŵšé ţĥé šéŕVéŕ ɓéƒöŕé ḿééţîñĝ ţĥé ŕéQûîŕéḿéñţš. Ŵé ŕéçöḿḿéñð ķééþîñĝ ţĥîš éñåɓļéð šö ţĥéý çåñ šéé ŵĥåţ ýöûŕ çöḿḿûñîţý îš ļîķé. ΃ ðîšåɓļéð, ñéŵ ḿéḿɓéŕš çåñ’ţ Vîéŵ åñý çöñţéñţš öƒ ţĥé šéŕVéŕ ûñţîļ ţĥéý ḿééţ ţĥé ŕéQûîŕéḿéñţš. [Ļéåŕñ ḿöŕé.](»{helpdeskArticle}«) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three] @@ -5066,9 +5076,9 @@ [ÉVéŕýöñé šţåýš ḿûţéð šö ýöû çåñ Qûîéţļý çŕåḿ ƒöŕ ţéšţš ţöĝéţĥéŕ. one two three four five six seven] [ÑÉŴ¡ Ĥûɓ šţûðý ŕööḿš one two three] [Šţûðý Ţöĝéţĥéŕ one two three] - [Ţĥîš îš å šþéçîåļ þļåçé ŵĥéŕé þéöþļé ĥåñĝ öûţ Qûîéţļý. Ýöû çåñ ûšé ţĥé Vöîçé çĥåññéļ\'š ţéхţ çĥåţ ţö çöḿḿûñîçåţé. one two three four five six seven eight nine ten eleven twelve] + [Ţĥîš îš å šþéçîåļ þļåçé ŵĥéŕé þéöþļé ĥåñĝ öûţ Qûîéţļý. one two three four five six seven] [Îñ Ĥûɓš, éVéŕýöñé îš ḿûţéð ɓý ðéƒåûļţ îñ νöîçé Çĥåññéļš one two three four five six seven] - [šţûðýîñĝ • Vîðéö öþţîöñåļ one two three] + [Qûîéţ šţûðýîñĝ one two three] [Ḿý šçĥööļ îšñ\'ţ ĥéŕé one two three] [νéŕîƒîéð Šţûðéñţ Ĥûɓ one two three] [νéŕîƒý ýöûŕ éḿåîļ ţö ĵöîñ one two three] @@ -5950,6 +5960,8 @@ [Ţĥîš þéŕšöñ îš ţĥé šéŕVéŕ öŵñéŕ åñð åļŵåýš ĥåš åļļ þéŕḿîššîöñš ŕéĝåŕðļéšš öƒ ŕöļéš. one two three four five six seven eight nine] [Ĥîðé Ḿéḿɓéŕ Ļîšţ one two three] [Åðð å Qûéšţîöñ one two three] + [Åðð qûéšţîöñš one two] + [Ûšé Qûéšţîöñš ţö ḿåñûåļļý åþþŕöVé ñéŵ ḿéḿɓéŕš ɓéƒöŕé ţĥéý çåñ ţåļķ îñ ýöûŕ šéŕVéŕ one two three four five six seven eight nine] [Åðð å ŕûļé one two] [Ýöû\'ļļ ĝéţ ñöţîƒîéð ŵĥéñ ţĥéŕé\'š åñ ûþðåţé. one two three four five] [Ýöûŕ åþþļîçåţîöñ ţö ĵöîñ ţĥé šéŕVéŕ îš åŵåîţîñĝ ŕéVîéŵ¡ one two three four five six seven] @@ -6001,6 +6013,7 @@ [Ḿûļţîþļé Çĥöîçé one two three] [Þåŕåĝŕåþĥ one two] [Ýöû ḿûšţ Véŕîƒý ýöûŕ þĥöñé ñûḿɓéŕ. one two three four] + [Ñéŵ ḿéḿɓéŕš ḿûšţ Véŕîƒý ţĥéîŕ þĥöñé ñûḿɓéŕ one two three four five] [ŠéŕVéŕ Ŕûļéš one two] [Šĥöŕţ Åñšŵéŕ one two] [Çöññéçţîöñš one two] @@ -6008,8 +6021,10 @@ [Ŕéåð åñð åĝŕéé ţö ţĥé šéŕVéŕ ŕûļéš one two three four] [Ţö çĥåñĝé ţĥîš, [ĝö ţö Ḿöðéŕåţîöñ šéţţîñĝš](öñŠéţţîñĝšÇļîçķ) one two three four five six seven] [Ĝéţ Šţåŕţéð one two] + [Ḿéḿɓéŕš åŕé ŕéQûîŕéð ţö åĝŕéé ţö šéŕVéŕ ŕûļéš ɓéƒöŕé ţĥéý çåñ ţåļķ. one two three four five six seven eight] [Çŕéåţé šéŕVéŕ ŕûļéš åñð åšķ þéñðîñĝ ḿéḿɓéŕš ţö åĝŕéé ţö ţĥéḿ ɓéƒöŕé ţĥéý çåñ ţåļķ. one two three four five six seven eight nine] [Šéţ ûþ šéŕVéŕ ŕûļéš¡ one two three] + [νéŕîƒîçåţîöñ ĻéVéļ: €[](VéŕîƒîçåţîöñĻéVéļĤööķ) one two three four five six] [ŠéŕVéŕ Åþþļîçåţîöñ Šţåţûš one two three] [Ļéåŕñ ḿöŕé one two] [Çöḿþļéţé Åþþļîçåţîöñ Ļåţéŕ one two three four] @@ -6026,6 +6041,9 @@ [»{emojis}«] [»{members}« Ḿéḿɓéŕš one two] [»{membersOnline}« Öñļîñé one two] + [Öƒƒ one] + [Öñ one] + [»{count}«] [Åŕé ýöû šûŕé ýöû ŵåñţ ţö ŵîţĥðŕåŵ ýöûŕ åþþļîçåţîöñ¿ one two three four five six] [Šţýļîžéð îḿåĝé öƒ å çļîþɓöåŕð åñð þéñçîļ one two three four five] [Ýöû’ļļ ĥåVé ţö ŕéšûɓḿîţ ýöûŕ åþþļîçåţîöñ îƒ ýöû ŵåñţ ţö ĵöîñ åĝåîñ îñ ţĥé ƒûţûŕé. one two three four five six seven eight nine] @@ -6040,7 +6058,9 @@ [Ŵîţĥðŕåŵ åñð ĻéåVé ŠéŕVéŕ one two three] [Ýöû ĥåVé å Véŕîƒîéð þĥöñé ñûḿɓéŕ. one two three four] [Þĥöñé νéŕîƒîéð one two three] + [Ḿéḿɓéŕš ŵöñ’ţ šéé ţĥé åþþļîçåţîöñ ûñţîļ ýöû éñåɓļé Ḿéḿɓéŕ Åþþļîçåţîöñ. one two three four five six seven eight] [Çĥåññéļ åñð ŕöļé ḿéñţîöñš ŵîļļ ñöţ šĥöŵ ûþ þŕöþéŕļý îñ ŕûļéš îƒ ýöû\'Vé ðîšåɓļéð þŕéVîéŵ. one two three four five six seven eight nine ten] + [Ñéŵ ḿéḿɓéŕš ḿûšţ çöḿþļéţé ţĥé ḿéḿɓéŕ åþþļîçåţîöñ ţö ţåļķ îñ ţĥé šéŕVéŕ. one two three four five six seven eight] [Çļöšé Åñýŵåý one two] [Åŕé ýöû šûŕé¿ Ýöûŕ þŕöĝŕéšš ŵîļļ ɓé ļöšţ. one two three four five] [Î ĥåVé ŕéåð åñð åĝŕéé ţö ţĥé ŕûļéš one two three four] @@ -6185,7 +6205,7 @@ [Šçŕééñ Šĥåŕé one two] [Šĥåŕîñĝ šçŕééñ one two three] [Šţöþ šĥåŕîñĝ one two] - [Ḿöðéŕåţé Ḿéḿɓéŕ one two three] + [Ḿöðéŕåţé Ḿéḿɓéŕš one two three] [Ḿöðéŕåţé Ḿéḿɓéŕš one two three] [Ḿöðéŕåţîöñ one two] [Åļļöŵ ŕéQûéšţš ƒŕöḿ @éVéŕýöñé one two three four] @@ -6207,8 +6227,8 @@ [Ḿéḿɓéŕš ŵîţĥ ţĥîš þéŕḿîššîöñ çåñ ðŕåĝ öţĥéŕ ḿéḿɓéŕš öûţ öƒ ţĥîš çĥåññéļ. Ţĥéý çåñ öñļý ḿöVé ḿéḿɓéŕš ɓéţŵééñ çĥåññéļš ɓöţĥ ţĥéý åñð ţĥé ḿéḿɓéŕ ţĥéý åŕé ḿöVîñĝ ĥåVé åççéšš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] [ḾöVé Ţö one two] [Ûšéŕ ĥåš ɓééñ ḿöVéð ţö ţĥé šéļéçţéð çĥåññéļ. one two three four five] - [Åļéŕţ Çļéåŕéð one two] - [Ñö Åļéŕţ Šĥöŵîñĝ one two three] + [Åļéŕţ Çļéåŕéð one two] + [Ñö Åļéŕţ Šĥöŵîñĝ one two three] [Ñéŵ ñöţîƒîçåţîöñ one two three] [ŔéḿöVé »%1$s« one two] [Ḿöŕé ţĥåñ %1$d ñéŵ ñöţîƒîçåţîöñš one two three four] @@ -7553,6 +7573,7 @@ [ÞŕîVåţé Ţĥŕéåð one two three] [**νîéŵ Çĥåññéļš** åñð **Çöññéçţ** þéŕḿîššîöñš ŕéQûîŕéð ţö çŕéåţé ţĥîš þŕîVåţé çĥåññéļ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] [Þŕöƒîļé one two] + [Þŕöƒîļé Åçţîöñš one two three] [Ûþļöåð ýöûŕ öŵñ þéŕšöñåļîžéð ɓåññéŕ åñð ḿöŕé ŵîţĥ Ðîšçöŕð Ñîţŕö¡ one two three four five six seven] [€[](ŕéñðéŕŢîḿéĤööķ) éļåþšéð one two three four] [Þŕöƒîļé Çûšţöḿîžåţîöñ îš çûŕŕéñţļý åVåîļåɓļé ţö å ļîḿîţéð ñûḿɓéŕ öƒ þéöþļé. one two three four five six seven eight] @@ -7738,7 +7759,7 @@ [Ţĥîš ŵîļļ ŕéḿöVé ţĥîš åţţåçĥḿéñţ ƒŕöḿ ţĥîš ḿéššåĝé þéŕḿåñéñţļý. one two three four five six seven] [ŔéḿöVé Åţţåçĥḿéñţ one two three] [Åŕé ýöû šûŕé¿ one two] - [Åŕé ýöû šûŕé ýöû ŵåñţ ţö ŕéḿöVé ţîḿé öûţ öñ ¡¡»{user}«¡¡ ƒöŕ »{time}«¿ one two three four five six seven] + [Åŕé ýöû šûŕé ýöû ŵåñţ ţö ŕéḿöVé ţîḿéöûţ öñ ¡¡»{user}«¡¡ ƒöŕ »{time}«¿ one two three four five six] [ŔéḿöVé ƒîļé one two] [ŔéḿöVé Fŕîéñð one two] [Åŕé ýöû šûŕé ýöû ŵåñţ ţö þéŕḿåñéñţļý ŕéḿöVé **¡¡»{name}«¡¡** ƒŕöḿ ýöûŕ ƒŕîéñðš¿ one two three four five six seven eight] @@ -7750,7 +7771,7 @@ [ŔéḿöVé Ŕéåçţîöñ one two three] [ŔéḿöVé ¡¡»{name}«¡¡ one two] [ŔéḿöVé Ŕöļé one two] - [ŔéḿöVé Ţîḿé Öûţ one two three] + [ŔéḿöVé Ţîḿéöûţ one two three] [ŔéḿöVé ¡¡»{user}«¡¡ ƒŕöḿ Ţĥŕéåð one two three] [ŔéḿöVé νåñîţý ÛŔĻ one two three] [Šĥöŵ ŵéɓšîţé þŕéVîéŵ îñƒö ƒŕöḿ ļîñķš þåšţéð îñţö çĥåţ one two three four five six] @@ -8118,7 +8139,7 @@ [Åļļöŵš ḿéḿɓéŕš ţö ûšé @éVéŕýöñé (éVéŕýöñé îñ ţĥé šéŕVéŕ) öŕ @ĥéŕé (öñļý öñļîñé ḿéḿɓéŕš îñ ţĥåţ çĥåññéļ). Ţĥéý çåñ åļšö @ḿéñţîöñ åļļ ŕöļéš, éVéñ îƒ ţĥé ŕöļé’š “Åļļöŵ åñýöñé ţö ḿéñţîöñ ţĥîš ŕöļé” þéŕḿîššîöñ îš ðîšåɓļéð. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen] [Åļļöŵš ḿéḿɓéŕš ţö ûšé @éVéŕýöñé öŕ @ĥéŕé (öñļý öñļîñé ḿéḿɓéŕš) îñ ţĥéšé çĥåññéļš. Ţĥéý çåñ åļšö @ḿéñţîöñ åļļ ŕöļéš îñ ţĥéšé çĥåññéļš, éVéñ îƒ ţĥé ŕöļé’š “Åļļöŵ åñýöñé ţö ḿéñţîöñ ţĥîš ŕöļé” þéŕḿîššîöñ îš ðîšåɓļéð. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] [Åļļöŵš ḿéḿɓéŕš ţö ûšé @éVéŕýöñé öŕ @ĥéŕé (öñļý öñļîñé ḿéḿɓéŕš) îñ ţĥîš çĥåññéļ. Ţĥéý çåñ åļšö @ḿéñţîöñ åļļ ŕöļéš îñ ţĥîš çĥåññéļ, éVéñ îƒ ţĥé ŕöļé’š “Åļļöŵ åñýöñé ţö ḿéñţîöñ ţĥîš ŕöļé” þéŕḿîššîöñ îš ðîšåɓļéð. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] - [Ŵĥéñ ýöû þûţ å ûšéŕ îñ ţîḿé öûţ ţĥéý ŵîļļ ñöţ ɓé åɓļé ţö šéñð ḿéššåĝéš îñ çĥåţ, ŕéþļý ŵîţĥîñ ţĥŕéåðš, ŕéåçţ ţö ḿéššåĝéš, öŕ šþéåķ îñ Vöîçé öŕ šţåĝé çĥåññéļš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight] + [Ŵĥéñ ýöû þûţ å ûšéŕ îñ ţîḿéöûţ ţĥéý ŵîļļ ñöţ ɓé åɓļé ţö šéñð ḿéššåĝéš îñ çĥåţ, ŕéþļý ŵîţĥîñ ţĥŕéåðš, ŕéåçţ ţö ḿéššåĝéš, öŕ šþéåķ îñ Vöîçé öŕ šţåĝé çĥåññéļš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven] [Åļļöŵ ḿéḿɓéŕš ţö þéŕƒöŕḿ ļîḿîţéð ḿöðéŕåţîöñ åçţîöñš (ţîḿéöûţ). one two three four five six seven] [Åļļöŵš ḿéḿɓéŕš ţö ḿöVé öţĥéŕ ḿéḿɓéŕš ɓéţŵééñ Vöîçé çĥåññéļš ţĥåţ ţĥé ḿéḿɓéŕ ŵîţĥ ţĥîš þéŕḿîššîöñ ĥåš åççéšš ţö. one two three four five six seven eight nine ten eleven twelve] [Åļļöŵš ḿéḿɓéŕš ţö ðîšçöññéçţ öţĥéŕ ḿéḿɓéŕš ƒŕöḿ ţĥéšé çĥåññéļš. Ţĥéý ŵîļļ åļšö ɓé åɓļé ţö ḿöVé šöḿéɓöðý îñţö öţĥéŕ çĥåññéļš ţĥåţ ţĥéý ĥåVé ţĥîš þéŕḿîššîöñ îñ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen] @@ -8441,6 +8462,8 @@ [Šéåŕçĥ Ţéñöŕ one two] [Šéåŕçĥ ŵîţĥ Ĝööĝļé one two three] [Šéåŕçĥîñĝ… one two] + [Ðéçöŕåţéš ţĥé åþþ ƒöŕ å šþéçîåļ öççåšîöñ. Ðîšåɓļé ţö šŵîţçĥ ɓåçķ ţö ñöŕḿåļ. one two three four five six seven eight] + [Šĥöŵ Šéåšöñåļ Ţĥéḿé one two three] [Çûšţöḿîžé ýöûŕ ĝîƒţ βÖ×: one two three] [Öþéñ Ĝîƒţ one two] [ĜîVé å ƒŕîéñð ţĥé ĝîƒţ öƒ ĥîĝĥéŕ Qûåļîţý šţŕéåḿš, ḿûļţîþļé çûšţöḿ þŕöƒîļéš, åñð åļļ ţĥé éḿöĵî¡ one two three four five six seven eight nine ten] @@ -8732,6 +8755,8 @@ [Šķý ɓļûé one two] [Åñ ŠḾŠ ŵåš šéñţ ţö ¡¡»{phone}«¡¡. one two three] [Éñţéŕ ýöûŕ çöñƒîŕḿåţîöñ çöðé one two three four] + [**Ŵé ĝöţ ýöû šöḿéţĥîñĝ…** one two three] + [νîšîţ ðîšçöŕð.çöḿ ƒöŕ ţöðåý’š šûŕþŕîšé €[ļîñķÎçöñ](ļîñķÎçöñĤööķ) one two three four five six seven] [Šöƒöŕţ Éḿåîļ one two] [βý þŕöVîðîñĝ ýöûŕ þåýḿéñţ îñƒöŕḿåţîöñ åñð çöñƒîŕḿîñĝ ţĥîš þåýḿéñţ, ýöû åûţĥöŕîšé (Å) Ðîšçöŕð åñð Šţŕîþé, öûŕ þåýḿéñţ šéŕVîçé þŕöVîðéŕ åñð/öŕ ÞÞŔÖ, îţš ļöçåļ šéŕVîçé þŕöVîðéŕ, ţö šéñð îñšţŕûçţîöñš ţö ýöûŕ ɓåñķ ţö ðéɓîţ ýöûŕ åççöûñţ åñð (β) ýöûŕ ɓåñķ ţö ðéɓîţ ýöûŕ åççöûñţ îñ åççöŕðåñçé ŵîţĥ ţĥöšé îñšţŕûçţîöñš. Åš þåŕţ öƒ ýöûŕ ŕîĝĥţš, ýöû åŕé éñţîţļéð ţö å ŕéƒûñð ƒŕöḿ ýöûŕ ɓåñķ ûñðéŕ ţĥé ţéŕḿš åñð çöñðîţîöñš öƒ ýöûŕ åĝŕééḿéñţ ŵîţĥ ýöûŕ ɓåñķ. Å ŕéƒûñð ḿûšţ ɓé çļåîḿéð ŵîţĥîñ 8 ŵééķš šţåŕţîñĝ ƒŕöḿ ţĥé ðåţé öñ ŵĥîçĥ ýöûŕ åççöûñţ ŵåš ðéɓîţéð. Ýöûŕ ŕîĝĥţš åŕé éхþļåîñéð îñ å šţåţéḿéñţ ţĥåţ ýöû çåñ öɓţåîñ ƒŕöḿ ýöûŕ ɓåñķ. Ýöû åĝŕéé ţö ŕéçéîVé ñöţîƒîçåţîöñš ƒöŕ ƒûţûŕé ðéɓîţš ûþ ţö 2 ðåýš ɓéƒöŕé ţĥéý öççûŕ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] [Šöƒöŕţ Ñåḿé one two] @@ -9476,7 +9501,7 @@ [Šåý Ĥéļļö ţö Ţĥŕéåðš¡ one two three] [Ţĥŕéåðš one two] [**¡¡»{a}«¡¡**, **¡¡»{b}«¡¡**, åñð **¡¡»{c}«¡¡** åŕé ţýþîñĝ… one two three four five six seven eight nine ten] - [Ţîḿé Öûţ one two] + [Ţîḿéöûţ one two] [10 ḿîñûţéš one two] [1 ðåý one] [1 ĥöûŕ one two] @@ -10153,6 +10178,10 @@ [Ĥåð åñ îššûé¿ one two] [Ţĥåñķš ƒöŕ ŕéþöŕţîñĝ ýöûŕ îššûé¡ Fééðɓåçķ ļîķé ýöûŕš ĥéļþš ûš îḿþŕöVé νîðéö βåçķĝŕöûñðš one two three four five six seven eight nine] [ŔéḿöVé βåçķĝŕöûñð one two three] + [βļûŕþļé βļîžžåŕð one two three] + [Ŵîñţéŕ Ŵîļðéŕñéšš one two three] + [Çŕåçķļîñ \'ñ\' Çöžý one two three] + [ŠñöŵšĝîVîñĝ Éðîţîöñ one two three] [Ĝéţ ḿöŕé çûšţöḿîžåţîöñ ɓý ûþļöåðîñĝ ýöûŕ öŵñ Vîðéö ɓåçķĝŕöûñð, çûšţöḿ ĝļöɓåļ éḿöĵîš, [åñð ḿöŕé ŵîţĥ Ðîšçöŕð Ñîţŕö¡](öñĻéåŕñḾöŕé) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two] [Ŵåññå ûþļöåð ýöûŕ öŵñ ɓåçķĝŕöûñð¿ one two three four] [Föçûš one] diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 1d4a5b10d5..b9e7538754 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -489,7 +489,6 @@ Comprar DLC Tu plataforma no es compatible con este juego. Este juego solo está disponible para {operatingSystem}. - ¡Listo para regalar! Ya tienes esta aplicación, solo se pueden comprar regalos. Solo puedes comprar un regalo y, por desgracia, este método de pago no se puede utilizar para regalar. Lotes diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 8c1d1b797f..e6b158970c 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -516,7 +516,6 @@ Osta DLC Peli ei tue käyttöjärjestelmääsi. Ainoa tämän pelin tukema käyttöjärjestelmä on {operatingSystem}. - Valmis lahjoitettavaksi! Omistat jo tämän sovelluksen, joten voit ostaa sen vain lahjaksi. Voit ostaa tämän vain lahjaksi, mutta valitettavasti emme hyväksy lahjaostojen maksamista tällä maksutavalla. Paketit diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 0c612580c8..329ad9d707 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -516,7 +516,6 @@ Acheter le DLC Ta plateforme n\'est pas prise en charge par ce jeu. Ce jeu n\'est compatible qu\'avec {operatingSystem}. - Prêt à offrir ! Tu possèdes déjà cette application. Seuls les cadeaux peuvent être achetés. Tu ne peux acheter qu\'un cadeau et malheureusement, nous ne supportons pas l\'envoi de cadeau avec ce mode de paiement. Lots diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 3284b11543..1f616ee79c 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -516,7 +516,6 @@ DLC खरीदें यह गेम आपके प्लैटफ़ार्म को सपोर्ट नहीं करता है. यह गेम सिर्फ {operatingSystem} पर उपलब्ध कराया जाता है. - तोहफे में देने के लिए तैयार! आपके पास यह ऐप्लीकेशन पहले से है, आप सिर्फ गिफ्ट खरीद सकते हैं. आप सिर्फ एक गिफ्ट खरीद सकते हैं और बदकिस्मती से हम इस पेमेंट का तरीका के लिए गिफ्टिंग उपलब्ध नहीं कराते. बंडल diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index e9a9966325..13c535d04c 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -516,7 +516,6 @@ Kupi DLC Ova igra ne podržava tvoju platformu. Ova igra podržana je samo na sustavu {operatingSystem}. - Spreman/na za primanje dara? Već posjeduješ ovu aplikaciju i možeš je kupiti samo za darivanje. Možeš je kupiti samo kao dar, a mi, nažalost, ne podržavamo darivanje za ovaj način plaćanja. Paketi diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 6070d8382e..6251cc75bc 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -516,7 +516,6 @@ DLC vásárlása A platformodat nem támogatja ez a játék. Ezt a játékot csak {operatingSystem} operációs rendszeren lehet futtatni. - Készen áll az ajándékozásra! Ez az alkalmazás már a tulajdonodban van, csak ajándékok vásárolhatók. Csak egy ajándékot vásárolhatsz, és sajnos nem támogatjuk az ajándékozást ennél a fizetési módszernél. Csomagok diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 110b969740..39c396ccdd 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -516,7 +516,6 @@ Acquista DLC La tua piattaforma non è supportata da questo gioco. Questo gioco è supportato solo su {operatingSystem}. - Pronto a ricevere un regalo! Possiedi già questa applicazione, può essere acquistata solo come regalo. Puoi solo comprare un regalo e sfortunatamente non accettiamo questo metodo di pagamento per la donazione. Bundle @@ -3692,7 +3691,7 @@ Imposta il comportamento per gli abbonamenti scaduti a **Espelli** Imposta il comportamento per gli abbonamenti scaduti a **Rimuovi ruolo** Imposta il periodo di tolleranza dopo la scadenza su **{newValue}** - $[**!!{user}!!**](userHook) ha aggiornato l\'integrazione per $[**!!{target}!!**](targetHook) + $[**!!{user}!!**](userHook) ha aggiornato l\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0 Per il canale **!!{newValue}!!** Con il codice **!!{newValue}!!** $[**!!{user}!!**](userHook) ha creato un invito $[**!!{target}!!**](targetHook) diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 405bed6e87..9528e32360 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -516,7 +516,6 @@ DLCを購入 あなたのプラットフォームはこのゲームでサポートされていません。 このゲームは{operatingSystem}でのみサポートされています。 - 贈られる準備ができました！ このアプリはもう所有しているので、ギフトの購入だけができます。 ギフトのみの購入はできますが、残念ながらこの支払い方法では、ギフトをサポートしていません。 バンドル diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 2b029d531b..d96afe8c0c 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -516,7 +516,6 @@ DLC 구입하기 이 게임은 해당 플랫폼을 지원하지 않아요. 이 게임은 {operatingSystem}만 지원해요. - 선물 준비 완료! 이미 보유한 애플리케이션이라서 선물로만 구매할 수 있어요. 현재 선물만 구매하실 수 있고, 이 결제 방식으로는 선물을 지원하지 않아요. 번들 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index fa2aee3590..8937db0cb9 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -516,7 +516,6 @@ Pirkti DLC Tavo platforma šiam žaidimui netinka. Šis žaidimas suderinamas tik su {operatingSystem}. - Paruošta dovanoti! Jau turi šią programėlę, galima pirkti tik dovanas. Gali pirkti tik dovaną, tačiau, deja, nepalaikome dovanojimo naudojant šį mokėjimo būdą. Paketai diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 0e11439221..9cc9867e4d 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -516,7 +516,6 @@ DLC kopen Je platform wordt niet ondersteund door deze game. Deze game wordt enkel ondersteund door {operatingSystem}. - Klaar om cadeau te worden gedaan! Je hebt deze applicatie al in bezit. Alleen cadeaus kunnen worden gekocht. Je kunt een cadeau alleen kopen en helaas wordt het geven van cadeaus niet ondersteund bij deze betalingsmethode. Bundels diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 3be29e2d30..e550d1ee05 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -489,7 +489,6 @@ Kjøp DLC Spillet støttes ikke på plattformen din. Dette spillet er støttes bare på {operatingSystem}. - Klar til å bli gitt i gave! Du eier allerede dette programmet. Bare gaver kan kjøpes. Du kan bare kjøpe en gave, og dessverre støtter vi ikke gavekjøp for denne betalingsmåten. Pakker diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index a38c619e37..b5aa7371ca 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -516,7 +516,6 @@ Kup zawartość do pobrania Twoja platforma nie jest obsługiwana przez tę grę. Gra jest obsługiwana tylko przez system operacyjny {operatingSystem}. - Gotowe do podarowania! Już masz tę aplikację. Można kupić tylko jako prezent. Można kupić tylko jako prezent, ale niestety nie obsługujemy prezentów przy tej metodzie płatności. Pakiety diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 9b31385d10..0e25d65e5e 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -516,7 +516,6 @@ Comprar DLC Sua plataforma é incompatível com este jogo. Este jogo só é compatível com {operatingSystem}. - Pronto para ser dado de presente! Você já possui esse aplicativo e só pode comprá-lo como presente. Você só pode comprar um presente e, infelizmente, não oferecemos suporte a presentes para esse método de pagamento. Pacotes diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 662285c258..67be5f71e8 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -516,7 +516,6 @@ Cumpără DLC Platforma ta nu este acceptată de acest joc. Acest joc este acceptat numai pe {operatingSystem}. - Gata să fie dăruit! Deții deja această aplicație; se pot achiziționa doar cadouri. Un cadou poate fi doar achiziționat și, din păcate, în sistemul nostru nu poți oferi cadouri folosind această metodă de plată. Pachete diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index a39869f6ee..01b489c844 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -516,7 +516,6 @@ Купить дополнение Ваша платформа не поддерживается этой игрой. Эта игра работает только под {operatingSystem}. - Можно дарить! У вас уже есть это приложение — вы можете купить его только в подарок. Вы можете купить только подарок, но, к сожалению, данный способ оплаты не поддерживает отправку подарков. Наборы diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index 7c0c59ec87..099be1f9af 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -489,7 +489,6 @@ Köp nedladdningsbart innehåll Spelet stödjer inte din plattform. Det här spelet stöds endast på {operatingSystem}. - Redo att ges bort som gåva! Du äger redan den här applikationen, endast gåvor kan köpas. Du kan endast köpa gåvor och tyvärr har vi inget stöd för gåvor för den här betalningsmetoden. Paket diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 20778be5fc..33d7557c41 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -516,7 +516,6 @@ ซื้อ DLC เกมนี้ไม่รองรับแพลตฟอร์มของคุณ เกมนี้รองรับเฉพาะใน {operatingSystem} - พร้อมรับของขวัญ! คุณเป็นเจ้าของแอพลิเคชันนี้แล้ว สามารถซื้อเพิ่มได้แแต่ของขวัญ คุณสามารถซื้อของขวัญเท่านั้นและโชคร้ายที่เราไม่สามารถสนับสนุนการให้ของขวัญด้วยวิธีการชำระเงินนี้ แพ็ครวม diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index bfafc1237e..8687f9f435 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -516,7 +516,6 @@ DLC satın al Platformun bu oyun tarafından desteklenmiyor. Bu oyunu sadece {operatingSystem} destekliyor. - Hediye edilmeye hazır! Bu başvuruya zaten sahipsin, sadece hediyeler satın alınabilir. Sadece bir hediye satın alabilirsin ve maalesef bu ödeme yöntemi için hediye verme işlevini desteklemiyoruz. Paketler diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index c49962a0c5..1d7e83b4c7 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -516,7 +516,6 @@ Купити контент для завантаження Ваша платформа не підтримується цією грою. Цю гру підтримує тільки {operatingSystem}. - Готуйся до подарунків! У тебе вже є ця програма, можна купити тільки подарунки. Ти можеш тільки купити подарунок, але, на жаль, ми не підтримуємо подарунки для цього способу оплати. Комплекти diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index cd7e2414c9..c7a5445943 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -516,7 +516,6 @@ Mua DLC Nền tảng của bạn không hỗ trợ trò chơi này. Trò chơi này chỉ được hỗ trợ trên hệ điều hành {operatingSystem}. - Sẵn sàng để được tặng quà chưa! Bạn đã sở hữu ứng dụng này rồi, chỉ có thể mua làm quà tặng được thôi. Bạn chỉ có thể mua 1 món quà và tiếc là chúng tôi không hỗ trợ tặng quà với phương thức thanh toán này. Gói diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 53266fa4ed..d03c176ea9 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -516,7 +516,6 @@ 购买 DLC 此游戏不支持您的平台。 该游戏仅支持 {operatingSystem}。 - 可以收礼啦！ 您已经拥有此 APP，只能作为礼物购买。 您只能购买礼物，很遗憾的是，我们不支持使用该付款方式发送礼物。 同捆包 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 8b2ec4b910..442ca58ccc 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -516,7 +516,6 @@ 購買下載內容 此遊戲不支援您的平台。 本遊戲只可在 {operatingSystem} 上運作。 - 準備收禮吧！ 您已經擁有此應用程式了，您僅能購買禮物。 您僅能購買禮物，而且很遺憾，我們不支援使用此付款方式進行送禮。 組合包 diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 7ebb84fe2e..2232705897 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -819,6 +819,8 @@ + + diff --git a/app/src/main/res/values/plurals.xml b/app/src/main/res/values/plurals.xml index ec1e313dea..4270c07329 100644 --- a/app/src/main/res/values/plurals.xml +++ b/app/src/main/res/values/plurals.xml @@ -928,6 +928,10 @@ {emojis} server emoji {emojis} server emojis + + {count} other rule + {count} other rules + 1 Member {members} Members diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml index 0f9823cafe..a21e110737 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -458,1477 +458,1478 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10853,171 +10854,172 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16143,8805 +16145,8834 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 347eb7041e..26379a1c14 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1530,7 +1530,7 @@ Select a color Transparency Use Default - 185d66d177ad44869f3b07d03c801bab + d6af314b260047019632cc2616a1d4b9 Coming Soon Slash command application {applicationName} {applicationName} application @@ -1569,8 +1569,14 @@ Not a valid choice. Not a valid value. Input a valid integer. + Input an integer at most !!{maximum}!!. + Input an integer at least !!{minimum}!!. + Input an integer from !!{minimum}!! to !!{maximum}!!. Not a valid user or role. Input a valid number. + Input a number at most !!{maximum}!!. + Input a number at least !!{minimum}!!. + Input a number from !!{minimum}!! to !!{maximum}!!. This option is required. Specify a value. Not a valid role. Not a valid user. @@ -2276,11 +2282,11 @@ Disable Account Are you sure that you want to disable your account? This will immediately log you out and make your account inaccessible to anyone. Success! We\'ve disabled e-mail notifications for you! - When you put a user in time out they will not be able to send messages in chat, reply within threads, react to messages, or speak in voice or stage channels. [Learn more]({helpdeskArticle}) + When you put a user in timeout they will not be able to send messages in chat, reply within threads, react to messages, or speak in voice or stage channels. [Learn more]({helpdeskArticle}) !!{user}!! has been timed out for {duration} - Time Out !!{user}!! + Timeout !!{user}!! The reason will be recorded in the audit log. - Time Out + Timeout Disable Sync Disabling sync will perform the selected expired sub behavior as if all subs have expired. Disabling sync will perform the selected expired membership behavior as if all members have expired. @@ -2562,9 +2568,9 @@ To minimize spam, members of the server must have a verified email before they can send messages. This does not apply to members with roles. Verified email required Your server already meets or exceeds the verification level requirement. - Are you sure you want to end time out for !!{user}!! with {timeRemaining} remaining? - !!{user} time out ended - Remove Time Out From !!{user}!! + Are you sure you want to end timeout for !!{user}!! with {timeRemaining} remaining? + !!{user} timeout ended + Remove Timeout From !!{user}!! Enable in-game overlay. Enable Noise Suppression Enable notifications @@ -3452,15 +3458,17 @@ Wanna join more servers? Upgrade to Discord Nitro to join up to 200 servers! This reason will be recorded in the audit log. - When you put a user in time out they will not be able to send messages in chat, reply within threads, react to messages, or speak in voice or stage channels + When you put a user in timeout they will not be able to send messages in chat, reply within threads, react to messages, or speak in voice or stage channels + {guildName} has put you in time out mode for {time}. You can not reply, react, message or speak in voice the duration of your time out. [Learn more]({link}) + Time Out Mode You can not reply, react, message or speak in voice. [Learn more]({link}) {time} left - TIME OUT MODE + TIMEOUT MODE DURATION You are in timeout mode You can not reply, react, message or speak in voice. [Learn more]({link}) REASON - Reason for time out + Reason for timeout {quantity} remaining Less than 1 minute remaining !!{user}!! Timed out for {label} @@ -3526,9 +3534,9 @@ Explore Public Servers View Remove it now to let them post and react to messages, and speak in voice and stage channels. [Learn More](https://www.google.com) - Remove Time Out - !!{user}!! time out ended - !!{username}!! has $[](countdown) remaining in their time out. + Remove Timeout + !!{user}!! timeout ended + !!{username}!! has $[](countdown) remaining in their timeout. Enable Progress Bar Add Moderators Missing permission to connect. @@ -4514,6 +4522,8 @@ Set up Membership Screening Manual Approval New members will not be able to join or talk until a mod approves their application. + Manual Approval Required + Set up rules that new members must explicitly agree to before they can talk in the server (includes DMing members). You can also add questions that people who request to join must answer for you to approve their membership. Pending Preview New members can browse the server before meeting the requirements. We recommend keeping this enabled so they can see what your community is like. If disabled, new members can’t view any contents of the server until they meet the requirements. [Learn more.]({helpdeskArticle}) @@ -5083,9 +5093,9 @@ Everyone stays muted so you can quietly cram for tests together. NEW! Hub study rooms Study Together - This is a special place where people hang out quietly. You can use the voice channel\'s text chat to communicate. + This is a special place where people hang out quietly. In Hubs, everyone is muted by default in Voice Channels - studying • video optional + quiet studying My school isn\'t here Verified Student Hub Verify your email to join @@ -5969,6 +5979,8 @@ This person is the server owner and always has all permissions regardless of roles. Hide Member List Add a question + Add Questions + Use questions to manually approve new members before they can talk in your server Add a rule You\'ll get notified when there\'s an update. Your application to join the server is awaiting review! @@ -6020,6 +6032,7 @@ Multiple Choice Paragraph You must verify your phone number. + New members must verify their phone number Server Rules Short Answer Connections @@ -6027,8 +6040,10 @@ Read and agree to the server rules To change this, [go to Moderation settings](onSettingsClick) Get Started + Members are required to agree to server rules before they can talk. Create server rules and ask pending members to agree to them before they can talk. Set up server rules! + Verification Level: $[](verificationLevelHook) Server Application Status Learn more Complete Application Later @@ -6045,6 +6060,9 @@ {emojis} {members} Members {membersOnline} Online + Off + On + {count} Are you sure you want to withdraw your application? Stylized image of a clipboard and pencil You’ll have to resubmit your application if you want to join again in the future. @@ -6059,7 +6077,9 @@ Withdraw and Leave Server You have a verified phone number. Phone Verified + Members won’t see the application until you enable Member Application. Channel and role mentions will not show up properly in rules if you\'ve disabled preview. + New members must complete the member application to talk in the server. Close Anyway Are you sure? Your progress will be lost. I have read and agree to the rules @@ -6204,7 +6224,7 @@ Screen Share Sharing screen Stop sharing - Moderate Member + Moderate Members Moderate Members Moderation Allow requests from @everyone @@ -6226,8 +6246,8 @@ 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. Move To User has been moved to the selected channel. - Alert Cleared - No Alert Showing + Alert Cleared + No Alert Showing New notification Remove %1$s More than %1$d new notifications @@ -7579,6 +7599,7 @@ Private Thread **View Channels** and **Connect** permissions required to create this private channel. Profile + Profile Actions Upload your own personalized banner and more with Discord Nitro! $[](renderTimeHook) elapsed Profile Customization is currently available to a limited number of people. @@ -7765,7 +7786,7 @@ This will remove this attachment from this message permanently. Remove Attachment Are you sure? - Are you sure you want to remove time out on !!{user}!! for {time}? + Are you sure you want to remove timeout on !!{user}!! for {time}? Remove file Remove Friend Are you sure you want to permanently remove **!!{name}!!** from your friends? @@ -7777,7 +7798,7 @@ Remove Reaction Remove !!{name}!! Remove Role - Remove Time Out + Remove Timeout Remove !!{user}!! from Thread Remove Vanity URL Show website preview info from links pasted into chat @@ -8145,7 +8166,7 @@ Allows members to use @everyone (everyone in the server) or @here (only online members in that channel). They can also @mention all roles, even if the role’s “Allow anyone to mention this role” permission is disabled. Allows members to use @everyone or @here (only online members) in these channels. They can also @mention all roles in these channels, even if the role’s “Allow anyone to mention this role” permission is disabled. Allows members to use @everyone or @here (only online members) in this channel. They can also @mention all roles in this channel, even if the role’s “Allow anyone to mention this role” permission is disabled. - When you put a user in time out they will not be able to send messages in chat, reply within threads, react to messages, or speak in voice or stage channels. + When you put a user in timeout they will not be able to send messages in chat, reply within threads, react to messages, or speak in voice or stage channels. Allow members to perform limited moderation actions (timeout). Allows members to move other members between voice channels that the member with this permission has access to. Allows members to disconnect other members from these channels. They will also be able to move somebody into other channels that they have this permission in. @@ -8468,6 +8489,8 @@ Search Tenor Search with Google Searching… + Decorates the app for a special occasion. Disable to switch back to normal. + Show Seasonal Theme Customize your gift BOX: Open Gift Give a friend the gift of higher quality streams, multiple custom profiles, and all the emoji! @@ -8759,6 +8782,8 @@ Sky blue An SMS was sent to !!{phone}!!. Enter your confirmation code + **We got you something…** + Visit discord.com for today’s surprise $[linkIcon](linkIconHook) Sofort Email By providing your payment information and confirming this payment, you authorise (A) Discord and Stripe, our payment service provider and/or PPRO, its local service provider, to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with those instructions. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights are explained in a statement that you can obtain from your bank. You agree to receive notifications for future debits up to 2 days before they occur. Sofort Name @@ -9503,7 +9528,7 @@ Say Hello to Threads! Threads **!!{a}!!**, **!!{b}!!**, and **!!{c}!!** are typing… - Time Out + Timeout 10 minutes 1 day 1 hour @@ -10182,6 +10207,10 @@ Had an issue? Thanks for reporting your issue! Feedback like yours helps us improve Video Backgrounds Remove Background + Blurple Blizzard + Winter Wilderness + Cracklin \'n\' Cozy + Snowsgiving Edition Get more customization by uploading your own video background, custom global emojis, [and more with Discord Nitro!](onLearnMore) Wanna upload your own background? Focus diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index bd72924bc4..36541f58a6 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -123,6 +123,7 @@ #3d4f545c #294f545c #524f545c + @color/primary_dark_630 @color/primary_dark_600 @color/primary_dark_630 @color/primary_dark_660 @@ -196,6 +197,7 @@ #29747f8d #14747f8d #3d747f8d + @color/white @color/white @color/primary_light_130 @color/primary_light_160