From d8b4356e85bf514948226f504175df68257fcd4a Mon Sep 17 00:00:00 2001 From: Juby210 Date: Mon, 27 Dec 2021 08:18:26 +0100 Subject: [PATCH] 109.0 - Alpha (109200) --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 2 +- .../events/TrackPaymentFlowCompleted.java | 15 +- .../events/TrackPaymentFlowStep.java | 15 +- ...idgetDisableGuildCommunicationBinding.java | 33 +- .../auth/WidgetAuthMfa$onViewBound$1.java | 4 +- ...dgetTextChannelSettings$configureUI$1.java | 4 +- .../WidgetThreadBrowser$updateMenu$1.java | 4 +- .../WidgetFriendsList$configureToolbar$1.java | 6 +- ...etDisableGuildCommunication$binding$2.java | 94 +- ...mmunication$configureDurationOption$1.java | 2 +- ...sableGuildCommunication$configureUI$2.java | 2 +- .../WidgetDisableGuildCommunication.java | 40 +- ...meHeaderManager$getOnSelectedAction$1.java | 14 +- .../WidgetMedia$onViewBoundOrOnResume$1.java | 6 +- .../widgets/notice/WidgetNoticeDialog.java | 4 +- ...tServerSettingsChannels$configureUI$1.java | 4 +- .../WidgetServerSettingsEditIntegration.java | 6 +- .../servers/WidgetServerSettingsEditRole.java | 102 +- ...tServerSettingsAuditLog$onViewBound$1.java | 4 +- .../WidgetSettings$configureToolbar$1.java | 4 +- .../widgets/settings/WidgetSettings.java | 2 +- .../WidgetCallFullscreen$configureMenu$1.java | 8 +- .../widget_disable_guild_communication.xml | 5 +- .../widget_disable_guild_communication.xml | 5 +- app/src/main/res/values-ar-rXB/plurals.xml | 4 + app/src/main/res/values-ar-rXB/strings.xml | 18 +- app/src/main/res/values-bg/strings.xml | 3 - app/src/main/res/values-cs/strings.xml | 5 +- app/src/main/res/values-da/strings.xml | 3 - app/src/main/res/values-de/strings.xml | 3 - app/src/main/res/values-el/strings.xml | 3 - app/src/main/res/values-en-rXA/plurals.xml | 4 + app/src/main/res/values-en-rXA/strings.xml | 18 +- app/src/main/res/values-es-rES/strings.xml | 3 - app/src/main/res/values-fi/strings.xml | 3 - app/src/main/res/values-fr/strings.xml | 3 - app/src/main/res/values-hi/strings.xml | 3 - app/src/main/res/values-hr/strings.xml | 3 - app/src/main/res/values-hu/strings.xml | 3 - app/src/main/res/values-it/strings.xml | 3 - app/src/main/res/values-ja/strings.xml | 3 - app/src/main/res/values-ko/strings.xml | 3 - app/src/main/res/values-lt/strings.xml | 3 - app/src/main/res/values-nl/strings.xml | 3 - app/src/main/res/values-no/strings.xml | 3 - app/src/main/res/values-pl/strings.xml | 3 - app/src/main/res/values-pt-rBR/strings.xml | 3 - app/src/main/res/values-ro/strings.xml | 3 - app/src/main/res/values-ru/strings.xml | 3 - app/src/main/res/values-sv-rSE/strings.xml | 3 - app/src/main/res/values-th/strings.xml | 3 - app/src/main/res/values-tr/strings.xml | 3 - app/src/main/res/values-uk/strings.xml | 3 - app/src/main/res/values-vi/strings.xml | 3 - app/src/main/res/values-zh-rCN/strings.xml | 3 - app/src/main/res/values-zh-rTW/strings.xml | 3 - app/src/main/res/values/plurals.xml | 4 + app/src/main/res/values/public.xml | 24322 ++++++++-------- app/src/main/res/values/strings.xml | 20 +- 60 files changed, 12379 insertions(+), 12486 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fb864b187a..ae884bda23 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 108201 - versionName "108.1 - Alpha" + versionCode 109200 + versionName "109.0 - Alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e314acd101..5de9322565 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/TrackPaymentFlowCompleted.java b/app/src/main/java/com/discord/analytics/generated/events/TrackPaymentFlowCompleted.java index e84e3787b3..6c05b22a7e 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/TrackPaymentFlowCompleted.java +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackPaymentFlowCompleted.java @@ -18,6 +18,7 @@ public final class TrackPaymentFlowCompleted implements AnalyticsSchema, TrackBa private final transient String analyticsSchemaTypeName = "payment_flow_completed"; private final Long durationMs = null; private final Boolean eligibleForTrial = null; + private final Long guildId = null; private final CharSequence loadId = null; private TrackBase trackBase; private TrackLocationMetadata trackLocationMetadata; @@ -39,7 +40,7 @@ public final class TrackPaymentFlowCompleted implements AnalyticsSchema, TrackBa return false; } TrackPaymentFlowCompleted trackPaymentFlowCompleted = (TrackPaymentFlowCompleted) obj; - return m.areEqual(this.loadId, trackPaymentFlowCompleted.loadId) && m.areEqual(this.durationMs, trackPaymentFlowCompleted.durationMs) && m.areEqual(this.trialPeriodLengthDays, trackPaymentFlowCompleted.trialPeriodLengthDays) && m.areEqual(this.eligibleForTrial, trackPaymentFlowCompleted.eligibleForTrial); + return m.areEqual(this.loadId, trackPaymentFlowCompleted.loadId) && m.areEqual(this.durationMs, trackPaymentFlowCompleted.durationMs) && m.areEqual(this.trialPeriodLengthDays, trackPaymentFlowCompleted.trialPeriodLengthDays) && m.areEqual(this.eligibleForTrial, trackPaymentFlowCompleted.eligibleForTrial) && m.areEqual(this.guildId, trackPaymentFlowCompleted.guildId); } public int hashCode() { @@ -51,10 +52,12 @@ public final class TrackPaymentFlowCompleted implements AnalyticsSchema, TrackBa Long l2 = this.trialPeriodLengthDays; int hashCode3 = (hashCode2 + (l2 != null ? l2.hashCode() : 0)) * 31; Boolean bool = this.eligibleForTrial; - if (bool != null) { - i = bool.hashCode(); + int hashCode4 = (hashCode3 + (bool != null ? bool.hashCode() : 0)) * 31; + Long l3 = this.guildId; + if (l3 != null) { + i = l3.hashCode(); } - return hashCode3 + i; + return hashCode4 + i; } public String toString() { @@ -65,6 +68,8 @@ public final class TrackPaymentFlowCompleted implements AnalyticsSchema, TrackBa R.append(", trialPeriodLengthDays="); R.append(this.trialPeriodLengthDays); R.append(", eligibleForTrial="); - return a.C(R, this.eligibleForTrial, ")"); + R.append(this.eligibleForTrial); + R.append(", guildId="); + return a.F(R, this.guildId, ")"); } } diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackPaymentFlowStep.java b/app/src/main/java/com/discord/analytics/generated/events/TrackPaymentFlowStep.java index 24c561a919..232674aa35 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/TrackPaymentFlowStep.java +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackPaymentFlowStep.java @@ -19,6 +19,7 @@ public final class TrackPaymentFlowStep implements AnalyticsSchema, TrackBaseRec private final Boolean eligibleForTrial = null; private final Long flowDurationMs = null; private final CharSequence fromStep = null; + private final Long guildId = null; private final CharSequence loadId = null; private final Long stepDurationMs = null; private final CharSequence toStep = null; @@ -41,7 +42,7 @@ public final class TrackPaymentFlowStep implements AnalyticsSchema, TrackBaseRec return false; } TrackPaymentFlowStep trackPaymentFlowStep = (TrackPaymentFlowStep) obj; - return m.areEqual(this.toStep, trackPaymentFlowStep.toStep) && m.areEqual(this.fromStep, trackPaymentFlowStep.fromStep) && m.areEqual(this.loadId, trackPaymentFlowStep.loadId) && m.areEqual(this.stepDurationMs, trackPaymentFlowStep.stepDurationMs) && m.areEqual(this.flowDurationMs, trackPaymentFlowStep.flowDurationMs) && m.areEqual(this.eligibleForTrial, trackPaymentFlowStep.eligibleForTrial); + return m.areEqual(this.toStep, trackPaymentFlowStep.toStep) && m.areEqual(this.fromStep, trackPaymentFlowStep.fromStep) && m.areEqual(this.loadId, trackPaymentFlowStep.loadId) && m.areEqual(this.stepDurationMs, trackPaymentFlowStep.stepDurationMs) && m.areEqual(this.flowDurationMs, trackPaymentFlowStep.flowDurationMs) && m.areEqual(this.eligibleForTrial, trackPaymentFlowStep.eligibleForTrial) && m.areEqual(this.guildId, trackPaymentFlowStep.guildId); } public int hashCode() { @@ -57,10 +58,12 @@ public final class TrackPaymentFlowStep implements AnalyticsSchema, TrackBaseRec Long l2 = this.flowDurationMs; int hashCode5 = (hashCode4 + (l2 != null ? l2.hashCode() : 0)) * 31; Boolean bool = this.eligibleForTrial; - if (bool != null) { - i = bool.hashCode(); + int hashCode6 = (hashCode5 + (bool != null ? bool.hashCode() : 0)) * 31; + Long l3 = this.guildId; + if (l3 != null) { + i = l3.hashCode(); } - return hashCode5 + i; + return hashCode6 + i; } public String toString() { @@ -75,6 +78,8 @@ public final class TrackPaymentFlowStep implements AnalyticsSchema, TrackBaseRec R.append(", flowDurationMs="); R.append(this.flowDurationMs); R.append(", eligibleForTrial="); - return a.C(R, this.eligibleForTrial, ")"); + R.append(this.eligibleForTrial); + R.append(", guildId="); + return a.F(R, this.guildId, ")"); } } diff --git a/app/src/main/java/com/discord/databinding/WidgetDisableGuildCommunicationBinding.java b/app/src/main/java/com/discord/databinding/WidgetDisableGuildCommunicationBinding.java index 68f924bcc9..be599f4eec 100644 --- a/app/src/main/java/com/discord/databinding/WidgetDisableGuildCommunicationBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetDisableGuildCommunicationBinding.java @@ -19,43 +19,34 @@ public final class WidgetDisableGuildCommunicationBinding implements ViewBinding @NonNull public final TextView c; @NonNull - public final TextView d; + public final TextInputLayout d; @NonNull public final TextView e; @NonNull - public final TextView f; + public final CheckedSetting f; @NonNull - public final TextInputLayout g; + public final CheckedSetting g; @NonNull - public final TextView h; + public final CheckedSetting h; @NonNull public final CheckedSetting i; @NonNull public final CheckedSetting j; @NonNull public final CheckedSetting k; - @NonNull - public final CheckedSetting l; - @NonNull - public final CheckedSetting m; - @NonNull - public final CheckedSetting n; - public WidgetDisableGuildCommunicationBinding(@NonNull ConstraintLayout constraintLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull LinearLayout linearLayout, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull View view, @NonNull TextView textView8, @NonNull ConstraintLayout constraintLayout2, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4, @NonNull CheckedSetting checkedSetting5, @NonNull CheckedSetting checkedSetting6) { + public WidgetDisableGuildCommunicationBinding(@NonNull ConstraintLayout constraintLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull View view, @NonNull TextView textView5, @NonNull ConstraintLayout constraintLayout2, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4, @NonNull CheckedSetting checkedSetting5, @NonNull CheckedSetting checkedSetting6) { this.a = constraintLayout; this.f2335b = materialButton; this.c = textView; - this.d = textView2; + this.d = textInputLayout; this.e = textView3; - this.f = textView4; - this.g = textInputLayout; - this.h = textView6; - this.i = checkedSetting; - this.j = checkedSetting2; - this.k = checkedSetting3; - this.l = checkedSetting4; - this.m = checkedSetting5; - this.n = checkedSetting6; + this.f = checkedSetting; + this.g = checkedSetting2; + this.h = checkedSetting3; + this.i = checkedSetting4; + this.j = checkedSetting5; + this.k = checkedSetting6; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java index 6d76e119d9..b00099579b 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java @@ -16,10 +16,10 @@ public final class WidgetAuthMfa$onViewBound$1 implements Action2 implements Ac public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case R.id.menu_channel_settings_delete /* 2131364298 */: + case R.id.menu_channel_settings_delete /* 2131364295 */: if (this.$this_configureUI.isPublicGuildRulesChannel() || this.$this_configureUI.isPublicGuildUpdatesChannel()) { WidgetTextChannelSettings.access$cannotDeleteWarn(this.this$0, this.$this_configureUI.isPublicGuildRulesChannel()); return; @@ -29,7 +29,7 @@ public final class WidgetTextChannelSettings$configureUI$1 implements Ac WidgetTextChannelSettings.access$confirmDelete(this.this$0, this.$this_configureUI.getChannel()); return; } - case R.id.menu_channel_settings_reset /* 2131364299 */: + case R.id.menu_channel_settings_reset /* 2131364296 */: StoreUserGuildSettings userGuildSettings = StoreStream.Companion.getUserGuildSettings(); m.checkNotNullExpressionValue(context, "context"); userGuildSettings.setChannelNotificationsDefault(context, this.$this_configureUI.getChannel()); diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java index 4e11b7e72c..37f4b2aa5d 100644 --- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java +++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java @@ -19,11 +19,11 @@ public final class WidgetThreadBrowser$updateMenu$1 implements Action2 implements Actio public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case R.id.menu_friends_add_friend /* 2131364318 */: + case R.id.menu_friends_add_friend /* 2131364315 */: WidgetFriendsAdd.Companion companion = WidgetFriendsAdd.Companion; m.checkNotNullExpressionValue(context, "context"); WidgetFriendsAdd.Companion.show$default(companion, context, null, "Friends", 2, null); return; - case R.id.menu_friends_contact_sync /* 2131364319 */: + case R.id.menu_friends_contact_sync /* 2131364316 */: ContactSyncFlowAnalytics.Companion.trackStart$default(ContactSyncFlowAnalytics.Companion, false, g0.mapOf(o.to("location_page", "Friends List Icon")), 1, null); AnalyticsTracker.INSTANCE.openModal("Contact Sync", new Traits.Location("Friends List Icon", null, null, null, null, 30, null)); WidgetContactSync.Companion companion2 = WidgetContactSync.Companion; m.checkNotNullExpressionValue(context, "context"); WidgetContactSync.Companion.launch$default(companion2, context, null, false, false, false, 30, null); return; - case R.id.menu_friends_start_group /* 2131364320 */: + case R.id.menu_friends_start_group /* 2131364317 */: if (GroupInviteFriendsSheetFeatureFlag.Companion.getINSTANCE().isEnabled()) { GroupInviteFriendsSheet.Companion companion3 = GroupInviteFriendsSheet.Companion; FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); diff --git a/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication$binding$2.java b/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication$binding$2.java index 6c52744d06..8770deea7c 100644 --- a/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication$binding$2.java +++ b/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication$binding$2.java @@ -28,59 +28,47 @@ public final /* synthetic */ class WidgetDisableGuildCommunication$binding$2 ext i = R.id.disable_guild_communication_body; TextView textView = (TextView) view.findViewById(R.id.disable_guild_communication_body); if (textView != null) { - i = R.id.disable_guild_communication_item_1; - TextView textView2 = (TextView) view.findViewById(R.id.disable_guild_communication_item_1); - if (textView2 != null) { - i = R.id.disable_guild_communication_item_2; - TextView textView3 = (TextView) view.findViewById(R.id.disable_guild_communication_item_2); - if (textView3 != null) { - i = R.id.disable_guild_communication_item_3; - TextView textView4 = (TextView) view.findViewById(R.id.disable_guild_communication_item_3); - if (textView4 != null) { - i = R.id.disable_guild_communication_options; - LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.disable_guild_communication_options); - if (linearLayout != null) { - i = R.id.disable_guild_communication_reason; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.disable_guild_communication_reason); - if (textInputLayout != null) { - i = R.id.disable_guild_communication_reason_header; - TextView textView5 = (TextView) view.findViewById(R.id.disable_guild_communication_reason_header); - if (textView5 != null) { - i = R.id.disable_guild_communication_subtitle; - TextView textView6 = (TextView) view.findViewById(R.id.disable_guild_communication_subtitle); - if (textView6 != null) { - i = R.id.disable_guild_communication_title; - TextView textView7 = (TextView) view.findViewById(R.id.disable_guild_communication_title); - if (textView7 != null) { - i = R.id.divider; - View findViewById = view.findViewById(R.id.divider); - if (findViewById != null) { - i = R.id.label_duration; - TextView textView8 = (TextView) view.findViewById(R.id.label_duration); - if (textView8 != null) { - ConstraintLayout constraintLayout = (ConstraintLayout) view; - i = R.id.time_unit_10_minutes; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.time_unit_10_minutes); - if (checkedSetting != null) { - i = R.id.time_unit_1_day; - CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.time_unit_1_day); - if (checkedSetting2 != null) { - i = R.id.time_unit_1_hour; - CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(R.id.time_unit_1_hour); - if (checkedSetting3 != null) { - i = R.id.time_unit_1_week; - CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(R.id.time_unit_1_week); - if (checkedSetting4 != null) { - i = R.id.time_unit_5_minutes; - CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(R.id.time_unit_5_minutes); - if (checkedSetting5 != null) { - i = R.id.time_unit_60_seconds; - CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(R.id.time_unit_60_seconds); - if (checkedSetting6 != null) { - return new WidgetDisableGuildCommunicationBinding(constraintLayout, materialButton, textView, textView2, textView3, textView4, linearLayout, textInputLayout, textView5, textView6, textView7, findViewById, textView8, constraintLayout, checkedSetting, checkedSetting2, checkedSetting3, checkedSetting4, checkedSetting5, checkedSetting6); - } - } - } + i = R.id.disable_guild_communication_options; + LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.disable_guild_communication_options); + if (linearLayout != null) { + i = R.id.disable_guild_communication_reason; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(R.id.disable_guild_communication_reason); + if (textInputLayout != null) { + i = R.id.disable_guild_communication_reason_header; + TextView textView2 = (TextView) view.findViewById(R.id.disable_guild_communication_reason_header); + if (textView2 != null) { + i = R.id.disable_guild_communication_subtitle; + TextView textView3 = (TextView) view.findViewById(R.id.disable_guild_communication_subtitle); + if (textView3 != null) { + i = R.id.disable_guild_communication_title; + TextView textView4 = (TextView) view.findViewById(R.id.disable_guild_communication_title); + if (textView4 != null) { + i = R.id.divider; + View findViewById = view.findViewById(R.id.divider); + if (findViewById != null) { + i = R.id.label_duration; + TextView textView5 = (TextView) view.findViewById(R.id.label_duration); + if (textView5 != null) { + ConstraintLayout constraintLayout = (ConstraintLayout) view; + i = R.id.time_unit_10_minutes; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(R.id.time_unit_10_minutes); + if (checkedSetting != null) { + i = R.id.time_unit_1_day; + CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(R.id.time_unit_1_day); + if (checkedSetting2 != null) { + i = R.id.time_unit_1_hour; + CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(R.id.time_unit_1_hour); + if (checkedSetting3 != null) { + i = R.id.time_unit_1_week; + CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(R.id.time_unit_1_week); + if (checkedSetting4 != null) { + i = R.id.time_unit_5_minutes; + CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(R.id.time_unit_5_minutes); + if (checkedSetting5 != null) { + i = R.id.time_unit_60_seconds; + CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(R.id.time_unit_60_seconds); + if (checkedSetting6 != null) { + return new WidgetDisableGuildCommunicationBinding(constraintLayout, materialButton, textView, linearLayout, textInputLayout, textView2, textView3, textView4, findViewById, textView5, constraintLayout, checkedSetting, checkedSetting2, checkedSetting3, checkedSetting4, checkedSetting5, checkedSetting6); } } } diff --git a/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication$configureDurationOption$1.java b/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication$configureDurationOption$1.java index 7b458a4013..8336bf2797 100644 --- a/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication$configureDurationOption$1.java +++ b/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication$configureDurationOption$1.java @@ -14,7 +14,7 @@ public final class WidgetDisableGuildCommunication$configureDurationOption$1 imp @Override // android.view.View.OnClickListener public final void onClick(View view) { - WidgetDisableGuildCommunication.access$getBinding$p(this.this$0).g.clearFocus(); + WidgetDisableGuildCommunication.access$getBinding$p(this.this$0).d.clearFocus(); AppFragment.hideKeyboard$default(this.this$0, null, 1, null); WidgetDisableGuildCommunication.access$getViewModel$p(this.this$0).onDurationLengthSelected(this.$settingValue); } diff --git a/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication$configureUI$2.java b/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication$configureUI$2.java index 3dc4a7976b..e7a3fd8192 100644 --- a/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication$configureUI$2.java +++ b/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication$configureUI$2.java @@ -64,7 +64,7 @@ public final class WidgetDisableGuildCommunication$configureUI$2 implements View public final void onClick(View view) { WeakReference weakReference = new WeakReference<>(this.this$0.requireContext()); DisableGuildCommunicationViewModel access$getViewModel$p = WidgetDisableGuildCommunication.access$getViewModel$p(this.this$0); - TextInputLayout textInputLayout = WidgetDisableGuildCommunication.access$getBinding$p(this.this$0).g; + TextInputLayout textInputLayout = WidgetDisableGuildCommunication.access$getBinding$p(this.this$0).d; d0.z.d.m.checkNotNullExpressionValue(textInputLayout, "binding.disableGuildCommunicationReason"); access$getViewModel$p.onDisableCommunicationConfirm(weakReference, ViewExtensions.getTextOrEmpty(textInputLayout), new AnonymousClass1(this)); } diff --git a/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication.java b/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication.java index 26046d536f..0419939539 100644 --- a/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication.java +++ b/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/WidgetDisableGuildCommunication.java @@ -2,8 +2,6 @@ package com.discord.widgets.guildcommunicationdisabled.start; import android.content.Context; import android.content.Intent; -import android.text.SpannableString; -import android.view.View; import android.widget.TextView; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentViewModelLazyKt; @@ -19,7 +17,6 @@ import com.discord.databinding.WidgetDisableGuildCommunicationBinding; import com.discord.models.user.User; import com.discord.utilities.analytics.AnalyticsTracker; import com.discord.utilities.rx.ObservableExtensionsKt; -import com.discord.utilities.spans.BulletSpan; import com.discord.utilities.user.UserUtils; import com.discord.utilities.viewbinding.FragmentViewBindingDelegate; import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt; @@ -90,12 +87,6 @@ public final class WidgetDisableGuildCommunication extends AppFragment { return widgetDisableGuildCommunication.getViewModel(); } - private final void configureBulletSpan(TextView textView) { - SpannableString spannableString = new SpannableString(textView.getText()); - spannableString.setSpan(new BulletSpan(16, 0, 2, null), 0, spannableString.length(), 33); - textView.setText(spannableString); - } - private final void configureDurationOption(DisableGuildCommunicationViewModel.ViewState.Valid valid, CheckedSetting checkedSetting, TimeDurationDisabledCommunication timeDurationDisabledCommunication) { checkedSetting.setChecked(valid.getSelectedDurationOption() == timeDurationDisabledCommunication); checkedSetting.e(new WidgetDisableGuildCommunication$configureDurationOption$1(this, timeDurationDisabledCommunication)); @@ -104,31 +95,31 @@ public final class WidgetDisableGuildCommunication extends AppFragment { private final void configureUI(DisableGuildCommunicationViewModel.ViewState viewState) { if (viewState instanceof DisableGuildCommunicationViewModel.ViewState.Valid) { DisableGuildCommunicationViewModel.ViewState.Valid valid = (DisableGuildCommunicationViewModel.ViewState.Valid) viewState; - CheckedSetting checkedSetting = getBinding().n; + CheckedSetting checkedSetting = getBinding().k; m.checkNotNullExpressionValue(checkedSetting, "binding.timeUnit60Seconds"); configureDurationOption(valid, checkedSetting, TimeDurationDisabledCommunication.SECONDS_60); - CheckedSetting checkedSetting2 = getBinding().m; + CheckedSetting checkedSetting2 = getBinding().j; m.checkNotNullExpressionValue(checkedSetting2, "binding.timeUnit5Minutes"); configureDurationOption(valid, checkedSetting2, TimeDurationDisabledCommunication.MINUTES_5); - CheckedSetting checkedSetting3 = getBinding().i; + CheckedSetting checkedSetting3 = getBinding().f; m.checkNotNullExpressionValue(checkedSetting3, "binding.timeUnit10Minutes"); configureDurationOption(valid, checkedSetting3, TimeDurationDisabledCommunication.MINUTES_10); - CheckedSetting checkedSetting4 = getBinding().k; + CheckedSetting checkedSetting4 = getBinding().h; m.checkNotNullExpressionValue(checkedSetting4, "binding.timeUnit1Hour"); configureDurationOption(valid, checkedSetting4, TimeDurationDisabledCommunication.HOUR_1); - CheckedSetting checkedSetting5 = getBinding().j; + CheckedSetting checkedSetting5 = getBinding().g; m.checkNotNullExpressionValue(checkedSetting5, "binding.timeUnit1Day"); configureDurationOption(valid, checkedSetting5, TimeDurationDisabledCommunication.DAY_1); - CheckedSetting checkedSetting6 = getBinding().l; + CheckedSetting checkedSetting6 = getBinding().i; m.checkNotNullExpressionValue(checkedSetting6, "binding.timeUnit1Week"); configureDurationOption(valid, checkedSetting6, TimeDurationDisabledCommunication.WEEK_1); Context context = getContext(); - CharSequence h = context != null ? b.h(context, R.string.disable_guild_communication_body, new Object[]{f.a.a(4413305239191L, null)}, null, 4) : null; + CharSequence h = context != null ? b.h(context, R.string.disable_guild_communication_body_header, new Object[]{f.a.a(4413305239191L, null)}, null, 4) : null; TextView textView = getBinding().c; m.checkNotNullExpressionValue(textView, "binding.disableGuildCommunicationBody"); textView.setText(h); getBinding().c.setOnClickListener(new WidgetDisableGuildCommunication$configureUI$1(this)); - TextView textView2 = getBinding().h; + TextView textView2 = getBinding().e; m.checkNotNullExpressionValue(textView2, "binding.disableGuildCommunicationSubtitle"); User user = valid.getUser(); b.o(textView2, user != null ? UserUtils.getUserNameWithDiscriminator$default(UserUtils.INSTANCE, user, null, null, 3, null) : null, new Object[0], null, 4); @@ -161,19 +152,4 @@ public final class WidgetDisableGuildCommunication extends AppFragment { super.onResume(); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(getViewModel().observeViewState(), this, null, 2, null), WidgetDisableGuildCommunication.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetDisableGuildCommunication$onResume$1(this), 62, (Object) null); } - - @Override // com.discord.app.AppFragment - public void onViewBound(View view) { - m.checkNotNullParameter(view, "view"); - super.onViewBound(view); - TextView textView = getBinding().d; - m.checkNotNullExpressionValue(textView, "binding.disableGuildCommunicationItem1"); - configureBulletSpan(textView); - TextView textView2 = getBinding().e; - m.checkNotNullExpressionValue(textView2, "binding.disableGuildCommunicationItem2"); - configureBulletSpan(textView2); - TextView textView3 = getBinding().f; - m.checkNotNullExpressionValue(textView3, "binding.disableGuildCommunicationItem3"); - configureBulletSpan(textView3); - } } diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java index 5821f7515d..ea5cccb644 100644 --- a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java +++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java @@ -47,25 +47,25 @@ public final class WidgetHomeHeaderManager$getOnSelectedAction$1 implements Acti m.checkNotNullExpressionValue(parentFragmentManager, "appFragment.parentFragmentManager"); PrivateCallLauncher privateCallLauncher = new PrivateCallLauncher(appFragment, appFragment, context, parentFragmentManager); switch (menuItem.getItemId()) { - case R.id.menu_chat_add_friend /* 2131364300 */: + case R.id.menu_chat_add_friend /* 2131364297 */: WidgetFriendsAdd.Companion.show$default(WidgetFriendsAdd.Companion, context, null, "Toolbar", 2, null); break; - case R.id.menu_chat_search /* 2131364301 */: + case R.id.menu_chat_search /* 2131364298 */: launchForSearch(context); break; - case R.id.menu_chat_side_panel /* 2131364302 */: + case R.id.menu_chat_side_panel /* 2131364299 */: this.$panelLayout.openEndPanel(); break; - case R.id.menu_chat_start_call /* 2131364303 */: + case R.id.menu_chat_start_call /* 2131364300 */: privateCallLauncher.launchVoiceCall(this.$this_getOnSelectedAction.getChannelId()); break; - case R.id.menu_chat_start_group /* 2131364304 */: + case R.id.menu_chat_start_group /* 2131364301 */: ChannelInviteLaunchUtils.inviteToChannel$default(ChannelInviteLaunchUtils.INSTANCE, this.$appFragment, this.$this_getOnSelectedAction.getChannel(), "Toolbar", null, null, 24, null); break; - case R.id.menu_chat_start_video_call /* 2131364305 */: + case R.id.menu_chat_start_video_call /* 2131364302 */: privateCallLauncher.launchVideoCall(this.$this_getOnSelectedAction.getChannelId()); break; - case R.id.menu_chat_stop_call /* 2131364306 */: + case R.id.menu_chat_stop_call /* 2131364303 */: StoreStream.Companion.getVoiceChannelSelected().clear(); break; } diff --git a/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java b/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java index 86aa7bf28a..a1bd452b2f 100644 --- a/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java +++ b/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java @@ -116,16 +116,16 @@ public final class WidgetMedia$onViewBoundOrOnResume$1 implements Action public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case R.id.menu_media_browser /* 2131364323 */: + case R.id.menu_media_browser /* 2131364320 */: m.checkNotNullExpressionValue(context, "context"); String uri = this.$sourceUri.toString(); m.checkNotNullExpressionValue(uri, "sourceUri.toString()"); UriHandler.handleOrUntrusted$default(context, uri, null, 4, null); return; - case R.id.menu_media_download /* 2131364324 */: + case R.id.menu_media_download /* 2131364321 */: this.this$0.requestMediaDownload(new AnonymousClass1(this, context)); return; - case R.id.menu_media_share /* 2131364325 */: + case R.id.menu_media_share /* 2131364322 */: m.checkNotNullExpressionValue(context, "context"); String uri2 = this.$sourceUri.toString(); m.checkNotNullExpressionValue(uri2, "sourceUri.toString()"); diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java index 58fccd618e..ee158bf767 100644 --- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java +++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java @@ -64,11 +64,11 @@ public final class WidgetNoticeDialog extends AppDialog { private static final String ARG_THEME_ID = "theme_id"; /* renamed from: CANCEL_BUTTON */ - public static final int notice_cancel = 2131364479; + public static final int notice_cancel = 2131364476; public static final Companion Companion = new Companion(null); /* renamed from: OK_BUTTON */ - public static final int notice_ok = 2131364484; + public static final int notice_ok = 2131364481; public static final int ON_SHOW = 0; private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetNoticeDialog$binding$2.INSTANCE, null, 2, null); private Map> listenerMap; diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java index 5061a501ff..d7550299cb 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java @@ -45,13 +45,13 @@ public final class WidgetServerSettingsChannels$configureUI$1 implements public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case R.id.menu_sort_channel /* 2131364341 */: + case R.id.menu_sort_channel /* 2131364338 */: WidgetServerSettingsChannelsSortActions.Companion companion = WidgetServerSettingsChannelsSortActions.Companion; FragmentManager childFragmentManager = this.this$0.getChildFragmentManager(); m.checkNotNullExpressionValue(childFragmentManager, "childFragmentManager"); companion.show(childFragmentManager, new AnonymousClass1(this)); return; - case R.id.menu_sort_done /* 2131364342 */: + case R.id.menu_sort_done /* 2131364339 */: WidgetServerSettingsChannels.access$getChannelSortTypeSubject$p(this.this$0).onNext(-1); return; default: diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java index f2e05b5d2c..f11995d48b 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java @@ -51,9 +51,9 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment { public static final Companion Companion = new Companion(null); private static final String INTENT_EXTRA_GUILD_ID = "INTENT_EXTRA_GUILD_ID"; private static final String INTENT_EXTRA_INTEGRATION_ID = "INTENT_EXTRA_INTEGRATION_ID"; - private static final int STATE_KEY_ENABLE_TWITCH_EMOTES = 2131363115; - private static final int STATE_KEY_EXPIRE_BEHAVIOR = 2131363118; - private static final int STATE_KEY_GRACE_PERIOD = 2131363119; + private static final int STATE_KEY_ENABLE_TWITCH_EMOTES = 2131363112; + private static final int STATE_KEY_EXPIRE_BEHAVIOR = 2131363115; + private static final int STATE_KEY_GRACE_PERIOD = 2131363116; private static final int[] gracePeriodDays = {1, 3, 7, 14, 30}; private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsEditIntegration$binding$2.INSTANCE, null, 2, null); private RadioManager expiryBehaviorRadioManager; diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java index 4280d1d58a..8bd210531d 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java @@ -591,138 +591,138 @@ public final class WidgetServerSettingsEditRole extends AppFragment { for (CheckedSetting checkedSetting : n.listOf((Object[]) new CheckedSetting[]{getBinding().g, getBinding().h, getBinding().i, getBinding().j, getBinding().m, getBinding().r, getBinding().u, getBinding().v, getBinding().f2343y, getBinding().C, getBinding().f2344z, getBinding().w, getBinding().A, getBinding().B, getBinding().G, getBinding().D, getBinding().E, getBinding().I, getBinding().J, getBinding().O, getBinding().P, getBinding().o, getBinding().n, getBinding().Q, getBinding().R, getBinding().S, getBinding().T, getBinding().f, getBinding().U, getBinding().W, getBinding().f2337a0, getBinding().f2340c0, getBinding().Z, getBinding().X, getBinding().Y, getBinding().f2339b0, getBinding().H, getBinding().V, getBinding().K, getBinding().f2342x})) { m.checkNotNullExpressionValue(checkedSetting, "setting"); switch (checkedSetting.getId()) { - case R.id.role_settings_add_reactions /* 2131364890 */: + case R.id.role_settings_add_reactions /* 2131364887 */: j = 64; break; - case R.id.role_settings_administrator /* 2131364891 */: + case R.id.role_settings_administrator /* 2131364888 */: j = 8; break; - case R.id.role_settings_attach_files /* 2131364892 */: + case R.id.role_settings_attach_files /* 2131364889 */: j = Permission.ATTACH_FILES; break; - case R.id.role_settings_ban_members /* 2131364893 */: + case R.id.role_settings_ban_members /* 2131364890 */: j = 4; break; - case R.id.role_settings_change_nickname /* 2131364894 */: + case R.id.role_settings_change_nickname /* 2131364891 */: j = Permission.CHANGE_NICKNAME; break; - case R.id.role_settings_color_disabled_overlay /* 2131364895 */: - case R.id.role_settings_color_selector_container /* 2131364896 */: - case R.id.role_settings_current_color_display /* 2131364900 */: - case R.id.role_settings_edit_name_disabled_overlay /* 2131364901 */: - case R.id.role_settings_hoist_checkedsetting /* 2131364903 */: - case R.id.role_settings_icon_container /* 2131364904 */: - case R.id.role_settings_mentionable_checkedsetting /* 2131364916 */: - case R.id.role_settings_overview_scroll /* 2131364918 */: - case R.id.role_settings_role_icon /* 2131364923 */: - case R.id.role_settings_role_icon_divider /* 2131364924 */: - case R.id.role_settings_role_icon_header /* 2131364925 */: + case R.id.role_settings_color_disabled_overlay /* 2131364892 */: + case R.id.role_settings_color_selector_container /* 2131364893 */: + case R.id.role_settings_current_color_display /* 2131364897 */: + case R.id.role_settings_edit_name_disabled_overlay /* 2131364898 */: + case R.id.role_settings_hoist_checkedsetting /* 2131364900 */: + case R.id.role_settings_icon_container /* 2131364901 */: + case R.id.role_settings_mentionable_checkedsetting /* 2131364913 */: + case R.id.role_settings_overview_scroll /* 2131364915 */: + case R.id.role_settings_role_icon /* 2131364920 */: + case R.id.role_settings_role_icon_divider /* 2131364921 */: + case R.id.role_settings_role_icon_header /* 2131364922 */: default: j = 0; break; - case R.id.role_settings_create_instant_invite /* 2131364897 */: + case R.id.role_settings_create_instant_invite /* 2131364894 */: j = 1; break; - case R.id.role_settings_create_private_threads /* 2131364898 */: + case R.id.role_settings_create_private_threads /* 2131364895 */: j = Permission.CREATE_PRIVATE_THREADS; break; - case R.id.role_settings_create_public_threads /* 2131364899 */: + case R.id.role_settings_create_public_threads /* 2131364896 */: j = Permission.CREATE_PUBLIC_THREADS; break; - case R.id.role_settings_embed_links /* 2131364902 */: + case R.id.role_settings_embed_links /* 2131364899 */: j = Permission.EMBED_LINKS; break; - case R.id.role_settings_kick_members /* 2131364905 */: + case R.id.role_settings_kick_members /* 2131364902 */: j = 2; break; - case R.id.role_settings_manage_channels /* 2131364906 */: + case R.id.role_settings_manage_channels /* 2131364903 */: j = 16; break; - case R.id.role_settings_manage_emojis_and_stickers /* 2131364907 */: + case R.id.role_settings_manage_emojis_and_stickers /* 2131364904 */: j = Permission.MANAGE_EMOJIS_AND_STICKERS; break; - case R.id.role_settings_manage_events /* 2131364908 */: + case R.id.role_settings_manage_events /* 2131364905 */: j = Permission.MANAGE_EVENTS; break; - case R.id.role_settings_manage_messages /* 2131364909 */: + case R.id.role_settings_manage_messages /* 2131364906 */: j = Permission.MANAGE_MESSAGES; break; - case R.id.role_settings_manage_nicknames /* 2131364910 */: + case R.id.role_settings_manage_nicknames /* 2131364907 */: j = Permission.MANAGE_NICKNAMES; break; - case R.id.role_settings_manage_roles /* 2131364911 */: + case R.id.role_settings_manage_roles /* 2131364908 */: j = Permission.MANAGE_ROLES; break; - case R.id.role_settings_manage_server /* 2131364912 */: + case R.id.role_settings_manage_server /* 2131364909 */: j = 32; break; - case R.id.role_settings_manage_threads /* 2131364913 */: + case R.id.role_settings_manage_threads /* 2131364910 */: j = Permission.MANAGE_THREADS; break; - case R.id.role_settings_manage_webhooks /* 2131364914 */: + case R.id.role_settings_manage_webhooks /* 2131364911 */: j = Permission.MANAGE_WEBHOOKS; break; - case R.id.role_settings_mention_everyone /* 2131364915 */: + case R.id.role_settings_mention_everyone /* 2131364912 */: j = Permission.MENTION_EVERYONE; break; - case R.id.role_settings_moderate_member /* 2131364917 */: + case R.id.role_settings_moderate_member /* 2131364914 */: j = Permission.MODERATE_MEMBER; break; - case R.id.role_settings_priority_speaker /* 2131364919 */: + case R.id.role_settings_priority_speaker /* 2131364916 */: j = 256; break; - case R.id.role_settings_read_message_history /* 2131364920 */: + case R.id.role_settings_read_message_history /* 2131364917 */: j = Permission.READ_MESSAGE_HISTORY; break; - case R.id.role_settings_read_messages /* 2131364921 */: + case R.id.role_settings_read_messages /* 2131364918 */: j = Permission.VIEW_CHANNEL; break; - case R.id.role_settings_request_to_speak /* 2131364922 */: + case R.id.role_settings_request_to_speak /* 2131364919 */: j = Permission.REQUEST_TO_SPEAK; break; - case R.id.role_settings_send_messages /* 2131364926 */: + case R.id.role_settings_send_messages /* 2131364923 */: j = Permission.SEND_MESSAGES; break; - case R.id.role_settings_send_messages_in_threads /* 2131364927 */: + case R.id.role_settings_send_messages_in_threads /* 2131364924 */: j = Permission.SEND_MESSAGES_IN_THREADS; break; - case R.id.role_settings_send_tts_messages /* 2131364928 */: + case R.id.role_settings_send_tts_messages /* 2131364925 */: j = Permission.SEND_TTS_MESSAGES; break; - case R.id.role_settings_use_application_commands /* 2131364929 */: + case R.id.role_settings_use_application_commands /* 2131364926 */: j = Permission.USE_APPLICATION_COMMANDS; break; - case R.id.role_settings_use_external_emojis /* 2131364930 */: + case R.id.role_settings_use_external_emojis /* 2131364927 */: j = Permission.USE_EXTERNAL_EMOJIS; break; - case R.id.role_settings_use_external_stickers /* 2131364931 */: + case R.id.role_settings_use_external_stickers /* 2131364928 */: j = Permission.USE_EXTERNAL_STICKERS; break; - case R.id.role_settings_view_audit_log /* 2131364932 */: + case R.id.role_settings_view_audit_log /* 2131364929 */: j = 128; break; - case R.id.role_settings_view_guild_analytics /* 2131364933 */: + case R.id.role_settings_view_guild_analytics /* 2131364930 */: j = Permission.VIEW_GUILD_ANALYTICS; break; - case R.id.role_settings_voice_connect /* 2131364934 */: + case R.id.role_settings_voice_connect /* 2131364931 */: j = Permission.CONNECT; break; - case R.id.role_settings_voice_deafen_members /* 2131364935 */: + case R.id.role_settings_voice_deafen_members /* 2131364932 */: j = Permission.DEAFEN_MEMBERS; break; - case R.id.role_settings_voice_move_members /* 2131364936 */: + case R.id.role_settings_voice_move_members /* 2131364933 */: j = Permission.MOVE_MEMBERS; break; - case R.id.role_settings_voice_mute_members /* 2131364937 */: + case R.id.role_settings_voice_mute_members /* 2131364934 */: j = Permission.MUTE_MEMBERS; break; - case R.id.role_settings_voice_speak /* 2131364938 */: + case R.id.role_settings_voice_speak /* 2131364935 */: j = Permission.SPEAK; break; - case R.id.role_settings_voice_use_voice_activity /* 2131364939 */: + case R.id.role_settings_voice_use_voice_activity /* 2131364936 */: j = Permission.USE_VAD; break; - case R.id.role_settings_voice_video /* 2131364940 */: + case R.id.role_settings_voice_video /* 2131364937 */: j = 512; break; } diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java index ced49a4999..7ef8a6d24f 100644 --- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java +++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java @@ -33,10 +33,10 @@ public final class WidgetServerSettingsAuditLog$onViewBound$1 implements Acti public final boolean onMenuItemClick(MenuItem menuItem) { m.checkNotNullExpressionValue(menuItem, "it"); switch (menuItem.getItemId()) { - case R.id.menu_audit_log_sort_actions /* 2131364290 */: + case R.id.menu_audit_log_sort_actions /* 2131364287 */: WidgetServerSettingsAuditLogFilter.Companion.show(a.x(this.$view, "view", "view.context"), WidgetServerSettingsAuditLog.access$getGuildId$p(this.this$0.this$0.this$0), 1); break; - case R.id.menu_audit_log_sort_users /* 2131364291 */: + case R.id.menu_audit_log_sort_users /* 2131364288 */: WidgetServerSettingsAuditLogFilter.Companion.show(a.x(this.$view, "view", "view.context"), WidgetServerSettingsAuditLog.access$getGuildId$p(this.this$0.this$0.this$0), 0); break; } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java index 5d4004f4c6..87b9d1bbae 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java @@ -17,12 +17,12 @@ public final class WidgetSettings$configureToolbar$1 implements Action2< public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case R.id.menu_settings_debugging /* 2131364336 */: + case R.id.menu_settings_debugging /* 2131364333 */: WidgetDebugging.Companion companion = WidgetDebugging.Companion; m.checkNotNullExpressionValue(context, "context"); companion.launch(context); return; - case R.id.menu_settings_log_out /* 2131364337 */: + case R.id.menu_settings_log_out /* 2131364334 */: WidgetSettings widgetSettings = this.this$0; m.checkNotNullExpressionValue(context, "context"); WidgetSettings.access$showLogoutDialog(widgetSettings, context); 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 3cabf07839..29eebe5fda 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 + " - 108.1 - Alpha (108201)"); + textView.setText(string + " - 109.0 - Alpha (109200)"); 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/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java index c431994e7d..2fa01cd9c5 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java @@ -52,21 +52,21 @@ public final class WidgetCallFullscreen$configureMenu$1 implements Actio public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case R.id.menu_call_overlay_launcher /* 2131364294 */: + case R.id.menu_call_overlay_launcher /* 2131364291 */: DiscordOverlayService.Companion companion = DiscordOverlayService.Companion; m.checkNotNullExpressionValue(context, "context"); companion.launchForConnect(context); return; - case R.id.menu_call_switch_camera /* 2131364295 */: + case R.id.menu_call_switch_camera /* 2131364292 */: WidgetCallFullscreen.access$getViewModel$p(this.this$0).switchCameraInputPressed(); return; - case R.id.menu_call_video_list /* 2131364296 */: + case R.id.menu_call_video_list /* 2131364293 */: WidgetVoiceBottomSheet.Companion companion2 = WidgetVoiceBottomSheet.Companion; FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); companion2.show(parentFragmentManager, this.$viewState.getCallModel().getChannel().h(), false, WidgetVoiceBottomSheet.FeatureContext.FULLSCREEN_CALL).setOnStreamPreviewClickedListener(new AnonymousClass1(this)); return; - case R.id.menu_call_voice_settings /* 2131364297 */: + case R.id.menu_call_voice_settings /* 2131364294 */: WidgetVoiceSettingsBottomSheet.Companion companion3 = WidgetVoiceSettingsBottomSheet.Companion; Long valueOf = Long.valueOf(this.$viewState.getCallModel().getChannel().h()); FragmentManager parentFragmentManager2 = this.this$0.getParentFragmentManager(); diff --git a/app/src/main/res/layout-v22/widget_disable_guild_communication.xml b/app/src/main/res/layout-v22/widget_disable_guild_communication.xml index 8b59dd4923..854c64b7a9 100644 --- a/app/src/main/res/layout-v22/widget_disable_guild_communication.xml +++ b/app/src/main/res/layout-v22/widget_disable_guild_communication.xml @@ -6,10 +6,7 @@ - - - - + diff --git a/app/src/main/res/layout/widget_disable_guild_communication.xml b/app/src/main/res/layout/widget_disable_guild_communication.xml index 57d602e231..87c16cc39a 100644 --- a/app/src/main/res/layout/widget_disable_guild_communication.xml +++ b/app/src/main/res/layout/widget_disable_guild_communication.xml @@ -6,10 +6,7 @@ - - - - + diff --git a/app/src/main/res/values-ar-rXB/plurals.xml b/app/src/main/res/values-ar-rXB/plurals.xml index fc181d3ee4..bc53e8b74b 100644 --- a/app/src/main/res/values-ar-rXB/plurals.xml +++ b/app/src/main/res/values-ar-rXB/plurals.xml @@ -524,6 +524,10 @@ ‏‮You‬‏ ‏‮must‬‏ ‏‮unselect‬‏ ‏‮1‬‏ ‏‮friend.‬‏ ‏‮You‬‏ ‏‮must‬‏ ‏‮unselect‬‏ ‏‮{number}‬‏ ‏‮friends.‬‏ + + ‏‮boost‬‏ + ‏‮boosts‬‏ + ‏‮{#}‬‏ ‏‮{unit}‬‏ ‏‮{#}‬‏ ‏‮{unit}‬‏‏‮s‬‏ diff --git a/app/src/main/res/values-ar-rXB/strings.xml b/app/src/main/res/values-ar-rXB/strings.xml index 123f34eee8..c871b528f0 100644 --- a/app/src/main/res/values-ar-rXB/strings.xml +++ b/app/src/main/res/values-ar-rXB/strings.xml @@ -1310,7 +1310,7 @@ ‏‮Unlock‬‏ ‏‮with‬‏ ‏‮Nitro‬‏ ‏‮Trying‬‏ ‏‮to‬‏ ‏‮change‬‏ ‏‮your‬‏ ‏‮default‬‏ ‏‮profile?‬‏ ‏‮Go‬‏ ‏‮to‬‏ ‏‮your‬‏ ‏‮[User‬‏ ‏‮Profile](onUserProfileClick)‬‏ ‏‮page.‬‏ ‏‮Change‬‏ ‏‮Log‬‏ - ‏‮Accessibility‬‏ ‏‮and‬‏ ‏‮Safety‬‏ ‏‮{progress}‬‏\n‏‮======================‬‏\n\n‏‮*‬‏ ‏‮**New‬‏ ‏‮server‬‏ ‏‮time-out‬‏ ‏‮function.**‬‏ ‏‮Moderators‬‏ ‏‮and‬‏ ‏‮admins‬‏ ‏‮of‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮can‬‏ ‏‮now‬‏ ‏‮temporarily‬‏ ‏‮prevent‬‏ ‏‮a‬‏ ‏‮user‬‏ ‏‮from‬‏ ‏‮interacting‬‏ ‏‮to‬‏ ‏‮help‬‏ ‏‮curb‬‏ ‏‮disruptive‬‏ ‏‮behavior.‬‏ ‏‮Also‬‏ ‏‮known‬‏ ‏‮as‬‏ ‏‮the‬‏ ‏‮\"yo‬‏ ‏‮dude‬‏ ‏‮stop‬‏ ‏‮you\'re‬‏ ‏‮being‬‏ ‏‮really‬‏ ‏‮weird.\"‬‏ ‏‮button.‬‏\n‏‮*‬‏ ‏‮**You‬‏ ‏‮can‬‏ ‏‮now‬‏ ‏‮directly‬‏ ‏‮report‬‏ ‏‮spam.**‬‏ ‏‮Added‬‏ ‏‮a‬‏ ‏‮prominent‬‏ ‏‮Report‬‏ ‏‮Spam‬‏ ‏‮button‬‏ ‏‮in‬‏ ‏‮DMs‬‏ ‏‮so‬‏ ‏‮you‬‏ ‏‮can‬‏ ‏‮give‬‏ ‏‮us‬‏ ‏‮a‬‏ ‏‮faster‬‏ ‏‮signal‬‏ ‏‮when‬‏ ‏‮you\'re‬‏ ‏‮being‬‏ ‏‮bothered.‬‏ ‏‮Also‬‏ ‏‮added‬‏ ‏‮a‬‏ ‏‮Roast‬‏ ‏‮Spam‬‏ ‏‮button‬‏ ‏‮for‬‏ ‏‮a‬‏ ‏‮faster‬‏ ‏‮way‬‏ ‏‮to‬‏ ‏‮make‬‏ ‏‮musubi.‬‏ \n‏‮*‬‏ ‏‮**Beefed‬‏ ‏‮up‬‏ ‏‮our‬‏ ‏‮suspicious‬‏ ‏‮link‬‏ ‏‮warning.**‬‏ ‏‮This‬‏ ‏‮new‬‏ ‏‮system‬‏ ‏‮can‬‏ ‏‮also‬‏ ‏‮better‬‏ ‏‮warn‬‏ ‏‮you‬‏ ‏‮before‬‏ ‏‮you‬‏ ‏‮visit‬‏ ‏‮a‬‏ ‏‮malicious‬‏ ‏‮domain.‬‏ ‏‮Don\'t‬‏ ‏‮click‬‏ ‏‮suspicious‬‏ ‏‮links.‬‏ ‏‮Free‬‏ ‏‮Nitro‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮login‬‏ ‏‮information‬‏ ‏‮is‬‏ ‏‮a‬‏ ‏‮lie.‬‏ ‏‮Discord‬‏ ‏‮employees‬‏ ‏‮don\'t‬‏ ‏‮want‬‏ ‏‮your‬‏ ‏‮password.‬‏ ‏‮We‬‏ ‏‮can‬‏ ‏‮barely‬‏ ‏‮remember‬‏ ‏‮our‬‏ ‏‮own.‬‏\n\n‏‮Before‬‏ ‏‮We‬‏ ‏‮Go...‬‏ ‏‮{progress}‬‏\n‏‮======================‬‏\n\n‏‮*‬‏ ‏‮**Happy‬‏ ‏‮New‬‏ ‏‮Year‬‏ ‏‮<3**‬‏ ‏‮Thanks‬‏ ‏‮for‬‏ ‏‮choosing‬‏ ‏‮to‬‏ ‏‮use‬‏ ‏‮Discord‬‏ ‏‮to‬‏ ‏‮connect‬‏ ‏‮with‬‏ ‏‮your‬‏ ‏‮friends‬‏ ‏‮and‬‏ ‏‮communities.‬‏ ‏‮Almost‬‏ ‏‮7‬‏ ‏‮years‬‏ ‏‮ago,‬‏ ‏‮Discord‬‏ ‏‮was‬‏ ‏‮just‬‏ ‏‮this‬‏ ‏‮thing‬‏ ‏‮your‬‏ ‏‮friend‬‏ ‏‮told‬‏ ‏‮you‬‏ ‏‮to‬‏ ‏‮join‬‏ ‏‮and‬‏ ‏‮at‬‏ ‏‮first‬‏ ‏‮you‬‏ ‏‮refused‬‏ ‏‮because‬‏ ‏‮you‬‏ ‏‮\"didn\'t‬‏ ‏‮wanna‬‏ ‏‮download‬‏ ‏‮another‬‏ ‏‮app.\"‬‏ ‏‮And‬‏ ‏‮now‬‏ ‏‮you\'re‬‏ ‏‮the‬‏ ‏‮annoying‬‏ ‏‮friend‬‏ ‏‮making‬‏ ‏‮everyone‬‏ ‏‮download‬‏ ‏‮another‬‏ ‏‮app.‬‏ ‏‮Time‬‏ ‏‮flies,‬‏ ‏‮things‬‏ ‏‮change,‬‏ ‏‮but‬‏ ‏‮we‬‏ ‏‮hope‬‏ ‏‮the‬‏ ‏‮feeling‬‏ ‏‮of‬‏ ‏‮hanging‬‏ ‏‮out‬‏ ‏‮with‬‏ ‏‮the‬‏ ‏‮people‬‏ ‏‮you‬‏ ‏‮care‬‏ ‏‮about‬‏ ‏‮on‬‏ ‏‮Discord‬‏ ‏‮stays‬‏ ‏‮the‬‏ ‏‮same.‬‏ ‏‮Have‬‏ ‏‮a‬‏ ‏‮safe‬‏ ‏‮and‬‏ ‏‮happy‬‏ ‏‮new‬‏ ‏‮year,‬‏ ‏‮and‬‏ ‏‮see‬‏ ‏‮you‬‏ ‏‮in‬‏ ‏‮2022.‬‏\n\n\n + ‏‮Safety‬‏ ‏‮{progress}‬‏\n‏‮======================‬‏\n\n‏‮*‬‏ ‏‮**New‬‏ ‏‮server‬‏ ‏‮time-out‬‏ ‏‮function.**‬‏ ‏‮Moderators‬‏ ‏‮and‬‏ ‏‮admins‬‏ ‏‮of‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮can‬‏ ‏‮now‬‏ ‏‮temporarily‬‏ ‏‮prevent‬‏ ‏‮a‬‏ ‏‮user‬‏ ‏‮from‬‏ ‏‮interacting‬‏ ‏‮to‬‏ ‏‮help‬‏ ‏‮curb‬‏ ‏‮disruptive‬‏ ‏‮behavior.‬‏ ‏‮Also‬‏ ‏‮known‬‏ ‏‮as‬‏ ‏‮the‬‏ ‏‮\"yo‬‏ ‏‮dude‬‏ ‏‮stop‬‏ ‏‮you\'re‬‏ ‏‮being‬‏ ‏‮really‬‏ ‏‮weird.\"‬‏ ‏‮button.‬‏\n‏‮*‬‏ ‏‮**You‬‏ ‏‮can‬‏ ‏‮now‬‏ ‏‮directly‬‏ ‏‮report‬‏ ‏‮spam.**‬‏ ‏‮Added‬‏ ‏‮a‬‏ ‏‮prominent‬‏ ‏‮Report‬‏ ‏‮Spam‬‏ ‏‮button‬‏ ‏‮in‬‏ ‏‮DMs‬‏ ‏‮so‬‏ ‏‮you‬‏ ‏‮can‬‏ ‏‮give‬‏ ‏‮us‬‏ ‏‮a‬‏ ‏‮faster‬‏ ‏‮signal‬‏ ‏‮when‬‏ ‏‮you\'re‬‏ ‏‮being‬‏ ‏‮bothered.‬‏ ‏‮Also‬‏ ‏‮added‬‏ ‏‮a‬‏ ‏‮Roast‬‏ ‏‮Spam‬‏ ‏‮button‬‏ ‏‮for‬‏ ‏‮a‬‏ ‏‮faster‬‏ ‏‮way‬‏ ‏‮to‬‏ ‏‮make‬‏ ‏‮musubi.‬‏ \n‏‮*‬‏ ‏‮**Beefed‬‏ ‏‮up‬‏ ‏‮our‬‏ ‏‮suspicious‬‏ ‏‮link‬‏ ‏‮warning.**‬‏ ‏‮This‬‏ ‏‮new‬‏ ‏‮system‬‏ ‏‮can‬‏ ‏‮also‬‏ ‏‮better‬‏ ‏‮warn‬‏ ‏‮you‬‏ ‏‮before‬‏ ‏‮you‬‏ ‏‮visit‬‏ ‏‮a‬‏ ‏‮malicious‬‏ ‏‮domain.‬‏ ‏‮Don\'t‬‏ ‏‮click‬‏ ‏‮suspicious‬‏ ‏‮links.‬‏ ‏‮Free‬‏ ‏‮Nitro‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮login‬‏ ‏‮information‬‏ ‏‮is‬‏ ‏‮a‬‏ ‏‮lie.‬‏ ‏‮Discord‬‏ ‏‮employees‬‏ ‏‮don\'t‬‏ ‏‮want‬‏ ‏‮your‬‏ ‏‮password.‬‏ ‏‮We‬‏ ‏‮can‬‏ ‏‮barely‬‏ ‏‮remember‬‏ ‏‮our‬‏ ‏‮own.‬‏\n\n‏‮Before‬‏ ‏‮We‬‏ ‏‮Go...‬‏ ‏‮{progress}‬‏\n‏‮======================‬‏\n\n‏‮*‬‏ ‏‮**Happy‬‏ ‏‮New‬‏ ‏‮Year‬‏ ‏‮<3**‬‏ ‏‮Thanks‬‏ ‏‮for‬‏ ‏‮choosing‬‏ ‏‮to‬‏ ‏‮use‬‏ ‏‮Discord‬‏ ‏‮to‬‏ ‏‮connect‬‏ ‏‮with‬‏ ‏‮your‬‏ ‏‮friends‬‏ ‏‮and‬‏ ‏‮communities.‬‏ ‏‮Almost‬‏ ‏‮7‬‏ ‏‮years‬‏ ‏‮ago,‬‏ ‏‮Discord‬‏ ‏‮was‬‏ ‏‮just‬‏ ‏‮this‬‏ ‏‮thing‬‏ ‏‮your‬‏ ‏‮friend‬‏ ‏‮told‬‏ ‏‮you‬‏ ‏‮to‬‏ ‏‮join‬‏ ‏‮and‬‏ ‏‮at‬‏ ‏‮first‬‏ ‏‮you‬‏ ‏‮refused‬‏ ‏‮because‬‏ ‏‮you‬‏ ‏‮\"didn\'t‬‏ ‏‮wanna‬‏ ‏‮download‬‏ ‏‮another‬‏ ‏‮app.\"‬‏ ‏‮And‬‏ ‏‮now‬‏ ‏‮you\'re‬‏ ‏‮the‬‏ ‏‮annoying‬‏ ‏‮friend‬‏ ‏‮making‬‏ ‏‮everyone‬‏ ‏‮download‬‏ ‏‮another‬‏ ‏‮app.‬‏ ‏‮Time‬‏ ‏‮flies,‬‏ ‏‮things‬‏ ‏‮change,‬‏ ‏‮but‬‏ ‏‮we‬‏ ‏‮hope‬‏ ‏‮the‬‏ ‏‮feeling‬‏ ‏‮of‬‏ ‏‮hanging‬‏ ‏‮out‬‏ ‏‮with‬‏ ‏‮the‬‏ ‏‮people‬‏ ‏‮you‬‏ ‏‮care‬‏ ‏‮about‬‏ ‏‮on‬‏ ‏‮Discord‬‏ ‏‮stays‬‏ ‏‮the‬‏ ‏‮same.‬‏ ‏‮Have‬‏ ‏‮a‬‏ ‏‮safe‬‏ ‏‮and‬‏ ‏‮happy‬‏ ‏‮new‬‏ ‏‮year,‬‏ ‏‮and‬‏ ‏‮see‬‏ ‏‮you‬‏ ‏‮in‬‏ ‏‮2022.‬‏\n\n\n ‏‮2021-12-20‬‏ ‏‮en-US‬‏ ‏‮1‬‏ @@ -2281,7 +2281,7 @@ ‏‮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‬‏ ‏‮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}‬‏‏‮)‬‏ - ‏‮Timeout‬‏ ‏‮temporarily‬‏ ‏‮removes‬‏ ‏‮some‬‏ ‏‮permissions.‬‏ ‏‮[Learn‬‏ ‏‮more](‬‏‏‮{helpdeskArticle}‬‏‏‮)‬‏ + ‏‮Members‬‏ ‏‮who‬‏ ‏‮are‬‏ ‏‮in‬‏ ‏‮timeout‬‏ ‏‮are‬‏ ‏‮temporarily‬‏ ‏‮not‬‏ ‏‮allowed‬‏ ‏‮to‬‏ ‏‮chat‬‏ ‏‮or‬‏ ‏‮react‬‏ ‏‮in‬‏ ‏‮text‬‏ ‏‮channels.‬‏ ‏‮They‬‏ ‏‮are‬‏ ‏‮also‬‏ ‏‮not‬‏ ‏‮allowed‬‏ ‏‮to‬‏ ‏‮connect‬‏ ‏‮to‬‏ ‏‮voice‬‏ ‏‮or‬‏ ‏‮Stage‬‏ ‏‮channels.‬‏ ‏‮[Learn‬‏ ‏‮more.](‬‏‏‮{helpdeskArticle}‬‏‏‮)‬‏ ‏‮Disables‬‏ ‏‮posting‬‏ ‏‮or‬‏ ‏‮reacting‬‏ ‏‮to‬‏ ‏‮messages‬‏ ‏‮in‬‏ ‏‮text‬‏ ‏‮chat‬‏ ‏‮Prevents‬‏ ‏‮them‬‏ ‏‮from‬‏ ‏‮connecting‬‏ ‏‮to‬‏ ‏‮voice‬‏ ‏‮or‬‏ ‏‮stage‬‏ ‏‮channels‬‏ ‏‮Automatically‬‏ ‏‮disconnects‬‏ ‏‮them‬‏ ‏‮from‬‏ ‏‮a‬‏ ‏‮voice‬‏ ‏‮or‬‏ ‏‮stage‬‏ ‏‮channel‬‏ @@ -3440,6 +3440,7 @@ ‏‮Uh‬‏ ‏‮oh!‬‏ ‏‮Looks‬‏ ‏‮like‬‏ ‏‮something‬‏ ‏‮broke.‬‏ ‏‮Please‬‏ ‏‮refresh‬‏ ‏‮the‬‏ ‏‮application‬‏ ‏‮and‬‏ ‏‮try‬‏ ‏‮again.‬‏ ‏‮From‬‏ ‏‮the‬‏ ‏‮most‬‏ ‏‮recent‬‏ ‏‮week‬‏ ‏‮This‬‏ ‏‮is‬‏ ‏‮a‬‏ ‏‮preview.‬‏ ‏‮Boost‬‏ ‏‮to‬‏ ‏‮{targetLevelOrPlan}‬‏ ‏‮to‬‏ ‏‮use‬‏ ‏‮this‬‏ ‏‮GIF.‬‏ + ‏‮Do‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮a‬‏ ‏‮sweet‬‏ ‏‮banner‬‏ ‏‮like‬‏ ‏‮this‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮server?‬‏ ‏‮You‬‏ ‏‮only‬‏ ‏‮need‬‏ ‏‮**‬‏‏‮{boostsNeeded}‬‏ ‏‮more‬‏ ‏‮{boostsNeeded}‬‏‏‮!**‬‏ ‏‮You’ll‬‏ ‏‮also‬‏ ‏‮help‬‏ ‏‮unlock‬‏ ‏‮more‬‏ ‏‮customization‬‏ ‏‮features‬‏ ‏‮and‬‏ ‏‮utility‬‏ ‏‮upgrades‬‏ ‏‮for‬‏ ‏‮everyone‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮like:‬‏ ‏‮Boost‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮to‬‏ ‏‮{targetLevelOrPlan}‬‏ ‏‮to‬‏ ‏‮apply‬‏ ‏‮your‬‏ ‏‮new‬‏ ‏‮animated‬‏ ‏‮server‬‏ ‏‮banner.‬‏ ‏‮Boost‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮{targetLevelOrPlan}‬‏ ‏‮plan‬‏ ‏‮to‬‏ ‏‮apply‬‏ ‏‮your‬‏ ‏‮new‬‏ ‏‮animated‬‏ ‏‮server‬‏ ‏‮banner.‬‏ @@ -3867,6 +3868,7 @@ ‏‮Deferred‬‏ ‏‮Error‬‏ ‏‮Paid‬‏ + ‏‮Pending‬‏ ‏‮Rejected‬‏ ‏‮Under‬‏ ‏‮Review‬‏ ‏‮Scheduled‬‏ @@ -4499,7 +4501,6 @@ ‏‮By‬‏ ‏‮**‬‏‏‮{username}‬‏‏‮**#‬‏‏‮{discriminator}‬‏ ‏‮on‬‏ ‏‮{date}‬‏ ‏‮By‬‏ ‏‮$[](usernameHook)‬‏ ‏‮on‬‏ ‏‮{date}‬‏ ‏‮submitted‬‏ ‏‮on‬‏ ‏‮{date}‬‏ - ‏‮Applications‬‏ ‏‮Review‬‏ ‏‮Applications‬‏ ‏‮Approve‬‏ ‏‮Approved‬‏ @@ -4540,6 +4541,7 @@ ‏‮This‬‏ ‏‮means‬‏ ‏‮that‬‏ ‏‮new‬‏ ‏‮members‬‏ ‏‮will‬‏ ‏‮not‬‏ ‏‮be‬‏ ‏‮able‬‏ ‏‮to‬‏ ‏‮talk‬‏ ‏‮or‬‏ ‏‮join‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮**until‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮staff‬‏ ‏‮approves‬‏ ‏‮their‬‏ ‏‮application.**‬‏ ‏‮Warning:‬‏ ‏‮Switching‬‏ ‏‮to‬‏ ‏‮Manual‬‏ ‏‮Approval‬‏ ‏‮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.‬‏ + ‏‮A‬‏ ‏‮free-form‬‏ ‏‮response‬‏ ‏‮with‬‏ ‏‮a‬‏ ‏‮1,000‬‏ ‏‮character‬‏ ‏‮limit.‬‏ ‏‮Let‬‏ ‏‮them‬‏ ‏‮go‬‏ ‏‮wild.‬‏ ‏‮Pending‬‏ ‏‮Pending‬‏ ‏‮(‬‏‏‮{count}‬‏‏‮)‬‏ ‏‮Pending‬‏ ‏‮-‬‏ ‏‮(‬‏‏‮{count}‬‏‏‮)‬‏ @@ -4552,6 +4554,7 @@ ‏‮Reason‬‏ ‏‮shared‬‏ ‏‮with‬‏ ‏‮user‬‏ ‏‮Rejected‬‏ ‏‮Rejected‬‏ ‏‮-‬‏ ‏‮(‬‏‏‮{count}‬‏‏‮)‬‏ + ‏‮Member‬‏ ‏‮Requirements‬‏ ‏‮You‬‏ ‏‮are‬‏ ‏‮reviewing‬‏ ‏‮an‬‏ ‏‮application‬‏ ‏‮from‬‏ ‏‮someone‬‏ ‏‮who‬‏ ‏‮wants‬‏ ‏‮to‬‏ ‏‮join‬‏ ‏‮your‬‏ ‏‮server.‬‏ ‏‮Until‬‏ ‏‮you‬‏ ‏‮approve‬‏ ‏‮them,‬‏ ‏‮they‬‏ ‏‮cannot‬‏ ‏‮join‬‏ ‏‮or‬‏ ‏‮talk‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮server.‬‏ ‏‮Review‬‏ ‏‮Application‬‏ ‏‮{count}‬‏ ‏‮Approved‬‏ ‏‮Applications‬‏ @@ -4563,6 +4566,7 @@ ‏‮Sort‬‏ ‏‮by:‬‏ ‏‮Newest‬‏ ‏‮Sort‬‏ ‏‮by:‬‏ ‏‮Oldest‬‏ ‏‮A‬‏ ‏‮way‬‏ ‏‮to‬‏ ‏‮screen‬‏ ‏‮members‬‏ ‏‮joining‬‏ ‏‮your‬‏ ‏‮community,‬‏ ‏‮from‬‏ ‏‮simple‬‏ ‏‮rule‬‏ ‏‮agreements‬‏ ‏‮to‬‏ ‏‮detailed‬‏ ‏‮questions.‬‏ + ‏‮A‬‏ ‏‮free-form‬‏ ‏‮response‬‏ ‏‮with‬‏ ‏‮a‬‏ ‏‮300‬‏ ‏‮character‬‏ ‏‮limit.‬‏ ‏‮Add‬‏ ‏‮role‬‏ ‏‮Display‬‏ ‏‮role:‬‏ ‏‮Remove‬‏ ‏‮role‬‏ ‏‮!!‬‏‏‮{roleName}‬‏‏‮!!‬‏ @@ -6078,7 +6082,7 @@ ‏‮Example‬‏ ‏‮rules‬‏ ‏‮(click‬‏ ‏‮them!)‬‏ ‏‮Example‬‏ ‏‮rules‬‏ ‏‮Placeholder‬‏ ‏‮Text‬‏ ‏‮(Optional)‬‏ - ‏‮Question‬‏ + ‏‮Enter‬‏ ‏‮your‬‏ ‏‮question‬‏ ‏‮You‬‏ ‏‮must‬‏ ‏‮enter‬‏ ‏‮a‬‏ ‏‮question.‬‏ ‏‮Pending‬‏ ‏‮Join‬‏ ‏‮Requests‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮only‬‏ ‏‮add‬‏ ‏‮up‬‏ ‏‮to‬‏ ‏‮{number}‬‏ ‏‮questions‬‏ @@ -6311,8 +6315,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‬‏ @@ -6969,8 +6973,6 @@ ‏‮Pending‬‏ ‏‮Friends‬‏ ‏‮People‬‏ ‏‮Server‬‏ ‏‮Avatar‬‏ - ‏‮Be‬‏ ‏‮who‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮and‬‏ ‏‮use‬‏ ‏‮a‬‏ ‏‮different‬‏ ‏‮avatar‬‏ ‏‮in‬‏ ‏‮each‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮servers.‬‏ - ‏‮Multiple‬‏ ‏‮Avatars‬‏ ‏‮Be‬‏ ‏‮who‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮and‬‏ ‏‮use‬‏ ‏‮a‬‏ ‏‮different‬‏ ‏‮avatar‬‏ ‏‮in‬‏ ‏‮each‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮servers‬‏ ‏‮Server‬‏ ‏‮Profile‬‏ ‏‮updated!‬‏ ‏‮Be‬‏ ‏‮who‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮and‬‏ ‏‮use‬‏ ‏‮a‬‏ ‏‮different‬‏ ‏‮avatar,‬‏ ‏‮banner,‬‏ ‏‮and‬‏ ‏‮bio‬‏ ‏‮in‬‏ ‏‮each‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮servers.‬‏ diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index a9e527e588..a2cbc2beba 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2199,7 +2199,6 @@ Наистина ли искаш да деактивираш своя акаунт? Това ще те отпише незабавно и акаунтът ти няма да е достъпен за никой. Успех! Деактивирахме имейл известията ти! Когато поставиш даден потребител в таймаут, той няма да може да изпраща съобщения в чата, да отговаря в диалози от съобщения, да реагира на съобщения или да говори в гласови канали или канали със сцена. [Научете повече]({helpdeskArticle}) - Таймаутът временно премахва някои разрешения. [Научи повече]({helpdeskArticle}) Забранява публикуването или реагирането на съобщения в текстов чат Не позволява свързване с гласови канали или канали със сцени Автоматично изключва от гласов канал или канал със сцена @@ -6463,8 +6462,6 @@ Чакащи приятели Хора Аватар за сървър - Бъди това, което искаш, и използвай различен аватар за всеки от своите сървъри. - Няколко аватара Бъди, който искаш да бъдеш, и ползвай различен аватар на всеки от сървърите си Профилът на сървъра беше актуализиран! Бъди какъвто си и използвай различен аватар, банер и био за всеки от сървърите си. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 77c78662ca..ad4bfac0ff 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2204,7 +2204,6 @@ Určitě chceš vypnout svůj účet? Po této akci tě okamžitě z účtu odhlásíme a nebude pro nikoho přístupný. Povedlo se! Vypnuli jsme ti e-mailová oznámení! Když uživatele dočasně zablokuješ pauzou, nebude moct posílat zprávy v chatu, odpovídat ve vláknech, reagovat na zprávy ani mluvit v hlasových nebo řečnických kanálech. [Zjistit více]({helpdeskArticle}) - Při pauze jsou dočasně odebrána některá oprávnění. [Zjistit více]({helpdeskArticle}) Zakazuje psaní příspěvků a reagování na zprávy v textovém chatu Brání v připojení k hlasovým a řečnickým kanálům Automaticky uživatele odpojí z hlasového či řečnického kanálu @@ -3487,7 +3486,7 @@ Kontrola Čas ukončení musí být v budoucnosti. Čas zahájení musí být v budoucnosti. - Až bude čas začít, přejdi do $[**!!{channelName}!!**](channelHook) a zahaj svou událost! + Až bude čas začít, přejdi do $[**!!{channelName}!!**](channelHook) au00A0zahaj svou událost! Tato událost se automaticky zahájí ve stanovený čas. Tady je náhled tvojí události. Tuto událost mohou vidět jenom členové, kteří vidí tento kanál. @@ -6467,8 +6466,6 @@ Čekající přátelé Lidé Avatar serveru - Buď tím, kým chceš, a na každém ze svých serverů používej různé avatary. - Více avatarů Buď, kým chceš být, a na každém serveru používej jiný avatar Profil serveru byl aktualizován! Buď tím, kým chceš být, a na každém serveru používej jiný avatar, banner a informace o sobě. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index fec5aef4dd..088fc3f771 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2199,7 +2199,6 @@ Er du sikker på, at du vil deaktivere din konto? Dette vil øjeblikkeligt logge dig ud og gøre din konto utilgængelig for alle. Succes! Vi har deaktiveret e-mailmeddelelser for dig. Når du sætter en bruger i timeout, kan de ikke sende beskeder i chat, svare i tråde, reagere på beskeder eller tale i tale- eller podiekanaler. [Få mere at vide]({helpdeskArticle}) - Timeout fjerner midlertidigt nogle tilladelser. [Få mere at vide]({helpdeskArticle}) Deaktiverer muligheden for at sende eller reagere på meddelelser i tekstchatten Forhindrer dem i at oprette forbindelse til tale- eller podiekanaler Afbryder automatisk forbindelsen for dem fra en tale- eller podiekanal @@ -6462,8 +6461,6 @@ Afventende venner Mennesker Server-avatarer - Vær den, du ønsker at være, og brug en anden avatar på hver af dine servere. - Flere avatarer Vær den, du ønsker at være, og brug en anden avatar på hver af dine servere Serverprofil opdateret! Vær den, du ønsker at være, og brug en anden avatar, et andet banner og en anden bio på hver af dine servere. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9c7d8773d3..daf1ed56b3 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2209,7 +2209,6 @@ Bist du sicher, dass du deinen Account deaktivieren möchtest? Du wirst sofort abgemeldet und dein Account ist für niemanden mehr zugänglich. Erfolgreich! Wir haben E-Mail-Benachrichtigungen für dich deaktiviert! Wenn du jemandem ein Timeout gibst, kann diese Person weder Chatnachrichten senden noch auf Threads antworten, auf Nachrichten reagieren oder in Sprach- oder Stage-Kanälen sprechen. [Mehr erfahren]({helpdeskArticle}) - Ein Timeout entfernt zeitweise einige Berechtigungen. [Mehr erfahren]({helpdeskArticle}) Verhindert das Posten und Reagieren im Textchat. Verhindert den Beitritt zu Sprachchats und Stage-Kanälen. Trennt automatisch die Verbindung zu Sprachchats und Stage-Kanälen. @@ -6473,8 +6472,6 @@ Ausstehende Freunde Personen Server-Avatar - Zeig, wer du bist, und benutze einen anderen Avatar auf jedem deiner Server. - Mehrere Avatare Zeig, wer du bist, und benutze einen anderen Avatar auf jedem deiner Server! Serverprofil wurde aktualisiert! Zeig, wer du bist, und benutze einen anderen Avatar, ein anderes Banner und eine andere Bio auf jedem deiner Server. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index dc5fe5076b..05ea1f95a6 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2199,7 +2199,6 @@ Είσαι σίγουρος ότι θέλεις να απενεργοποιήσεις τον λογαριασμό σου; Αυτό θα σε αποσυνδέσει αμέσως από τον λογαριασμό σου και δεν θα έχει κανείς πρόσβαση σε αυτόν. Μεγάλη επιτυχία! Απενεργοποιήσαμε τις ειδοποιήσεις ηλεκτρονικού ταχυδρομείου για σένα! Όταν βάζεις έναν χρήστη σε διάλειμμα δεν θα μπορεί να στέλνει μηνύματα στη συνομιλία, να απαντά εντός των νημάτων, να αντιδρά στα μηνύματα ή να μιλά σε κανάλια ομιλίας ή σκηνής. [Μάθε περισσότερα]({helpdeskArticle}) - Το διάλειμμα αφαιρεί προσωρινά ορισμένες άδειες. [Μάθε περισσότερα]({helpdeskArticle}) Απενεργοποιεί τη δημοσίευση ή την αντίδραση σε μηνύματα στη γραπτή συνομιλία Εμποδίζει τον χρήστη να συνδεθεί σε κανάλια ομιλίας ή σκηνής Αποσυνδέει αυτόματα τον χρήστη από ένα κανάλι ομιλίας ή σκηνής @@ -6463,8 +6462,6 @@ Φίλοι σε εκκρεμότητα Άτομα Άβαταρ διακομιστή - Γίνε όποιος θέλεις και χρησιμοποίησε διαφορετικό άβαταρ σε κάθε διακομιστή σου. - Πολλαπλά άβαταρ Γίνε όποιος θέλεις και χρησιμοποίησε διαφορετικό άβαταρ σε κάθε διακομιστή σου Το προφίλ διακομιστή ενημερώθηκε! Γίνε όποιος θέλεις και χρησιμοποίησε διαφορετικό άβαταρ, banner και βιογραφικό σε κάθε διακομιστή σου. diff --git a/app/src/main/res/values-en-rXA/plurals.xml b/app/src/main/res/values-en-rXA/plurals.xml index fb9d756262..97a753c3a1 100644 --- a/app/src/main/res/values-en-rXA/plurals.xml +++ b/app/src/main/res/values-en-rXA/plurals.xml @@ -524,6 +524,10 @@ [Ýöû ḿûšţ ûñšéļéçţ 1 ƒŕîéñð. one two three four] [Ýöû ḿûšţ ûñšéļéçţ »{number}« ƒŕîéñðš. one two three four] + + [ɓööšţ one] + [ɓööšţš one two] + [»{#}« »{unit}« one] [»{#}« »{unit}«š one] diff --git a/app/src/main/res/values-en-rXA/strings.xml b/app/src/main/res/values-en-rXA/strings.xml index 58029ad0ff..ab0e789483 100644 --- a/app/src/main/res/values-en-rXA/strings.xml +++ b/app/src/main/res/values-en-rXA/strings.xml @@ -1310,7 +1310,7 @@ [Ûñļöçķ ŵîţĥ Ñîţŕö one two three] [Ţŕýîñĝ ţö çĥåñĝé ýöûŕ ðéƒåûļţ þŕöƒîļé¿ Ĝö ţö ýöûŕ [Ûšéŕ Þŕöƒîļé](öñÛšéŕÞŕöƒîļéÇļîçķ) þåĝé. one two three four five six seven eight nine ten] [Çĥåñĝé Ļöĝ one two] - [Åççéššîɓîļîţý åñð Šåƒéţý »{progress}«\n======================\n\n* **Ñéŵ šéŕVéŕ ţîḿé-öûţ ƒûñçţîöñ.** Ḿöðéŕåţöŕš åñð åðḿîñš öƒ å šéŕVéŕ çåñ ñöŵ ţéḿþöŕåŕîļý þŕéVéñţ å ûšéŕ ƒŕöḿ îñţéŕåçţîñĝ ţö ĥéļþ çûŕɓ ðîšŕûþţîVé ɓéĥåVîöŕ. Åļšö ķñöŵñ åš ţĥé \"ýö ðûðé šţöþ ýöû\'ŕé ɓéîñĝ ŕéåļļý ŵéîŕð.\" ɓûţţöñ.\n* **Ýöû çåñ ñöŵ ðîŕéçţļý ŕéþöŕţ šþåḿ.** Åððéð å þŕöḿîñéñţ Ŕéþöŕţ Šþåḿ ɓûţţöñ îñ ÐḾš šö ýöû çåñ ĝîVé ûš å ƒåšţéŕ šîĝñåļ ŵĥéñ ýöû\'ŕé ɓéîñĝ ɓöţĥéŕéð. Åļšö åððéð å Ŕöåšţ Šþåḿ ɓûţţöñ ƒöŕ å ƒåšţéŕ ŵåý ţö ḿåķé ḿûšûɓî. \n* **βééƒéð ûþ öûŕ šûšþîçîöûš ļîñķ ŵåŕñîñĝ.** Ţĥîš ñéŵ šýšţéḿ çåñ åļšö ɓéţţéŕ ŵåŕñ ýöû ɓéƒöŕé ýöû Vîšîţ å ḿåļîçîöûš ðöḿåîñ. Ðöñ\'ţ çļîçķ šûšþîçîöûš ļîñķš. Fŕéé Ñîţŕö ƒöŕ ýöûŕ ļöĝîñ îñƒöŕḿåţîöñ îš å ļîé. Ðîšçöŕð éḿþļöýééš ðöñ\'ţ ŵåñţ ýöûŕ þåššŵöŕð. Ŵé çåñ ɓåŕéļý ŕéḿéḿɓéŕ öûŕ öŵñ.\n\nβéƒöŕé Ŵé Ĝö... »{progress}«\n======================\n\n* **Ĥåþþý Ñéŵ Ýéåŕ <3** Ţĥåñķš ƒöŕ çĥööšîñĝ ţö ûšé Ðîšçöŕð ţö çöññéçţ ŵîţĥ ýöûŕ ƒŕîéñðš åñð çöḿḿûñîţîéš. Åļḿöšţ 7 ýéåŕš åĝö, Ðîšçöŕð ŵåš ĵûšţ ţĥîš ţĥîñĝ ýöûŕ ƒŕîéñð ţöļð ýöû ţö ĵöîñ åñð åţ ƒîŕšţ ýöû ŕéƒûšéð ɓéçåûšé ýöû \"ðîðñ\'ţ ŵåññå ðöŵñļöåð åñöţĥéŕ åþþ.\" Åñð ñöŵ ýöû\'ŕé ţĥé åññöýîñĝ ƒŕîéñð ḿåķîñĝ éVéŕýöñé ðöŵñļöåð åñöţĥéŕ åþþ. Ţîḿé ƒļîéš, ţĥîñĝš çĥåñĝé, ɓûţ ŵé ĥöþé ţĥé ƒééļîñĝ öƒ ĥåñĝîñĝ öûţ ŵîţĥ ţĥé þéöþļé ýöû çåŕé åɓöûţ öñ Ðîšçöŕð šţåýš ţĥé šåḿé. ĤåVé å šåƒé åñð ĥåþþý ñéŵ ýéåŕ, åñð šéé ýöû îñ 2022.\n\n\n 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 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] + [Šåƒéţý »{progress}«\n======================\n\n* **Ñéŵ šéŕVéŕ ţîḿé-öûţ ƒûñçţîöñ.** Ḿöðéŕåţöŕš åñð åðḿîñš öƒ å šéŕVéŕ çåñ ñöŵ ţéḿþöŕåŕîļý þŕéVéñţ å ûšéŕ ƒŕöḿ îñţéŕåçţîñĝ ţö ĥéļþ çûŕɓ ðîšŕûþţîVé ɓéĥåVîöŕ. Åļšö ķñöŵñ åš ţĥé \"ýö ðûðé šţöþ ýöû\'ŕé ɓéîñĝ ŕéåļļý ŵéîŕð.\" ɓûţţöñ.\n* **Ýöû çåñ ñöŵ ðîŕéçţļý ŕéþöŕţ šþåḿ.** Åððéð å þŕöḿîñéñţ Ŕéþöŕţ Šþåḿ ɓûţţöñ îñ ÐḾš šö ýöû çåñ ĝîVé ûš å ƒåšţéŕ šîĝñåļ ŵĥéñ ýöû\'ŕé ɓéîñĝ ɓöţĥéŕéð. Åļšö åððéð å Ŕöåšţ Šþåḿ ɓûţţöñ ƒöŕ å ƒåšţéŕ ŵåý ţö ḿåķé ḿûšûɓî. \n* **βééƒéð ûþ öûŕ šûšþîçîöûš ļîñķ ŵåŕñîñĝ.** Ţĥîš ñéŵ šýšţéḿ çåñ åļšö ɓéţţéŕ ŵåŕñ ýöû ɓéƒöŕé ýöû Vîšîţ å ḿåļîçîöûš ðöḿåîñ. Ðöñ\'ţ çļîçķ šûšþîçîöûš ļîñķš. Fŕéé Ñîţŕö ƒöŕ ýöûŕ ļöĝîñ îñƒöŕḿåţîöñ îš å ļîé. Ðîšçöŕð éḿþļöýééš ðöñ\'ţ ŵåñţ ýöûŕ þåššŵöŕð. Ŵé çåñ ɓåŕéļý ŕéḿéḿɓéŕ öûŕ öŵñ.\n\nβéƒöŕé Ŵé Ĝö... »{progress}«\n======================\n\n* **Ĥåþþý Ñéŵ Ýéåŕ <3** Ţĥåñķš ƒöŕ çĥööšîñĝ ţö ûšé Ðîšçöŕð ţö çöññéçţ ŵîţĥ ýöûŕ ƒŕîéñðš åñð çöḿḿûñîţîéš. Åļḿöšţ 7 ýéåŕš åĝö, Ðîšçöŕð ŵåš ĵûšţ ţĥîš ţĥîñĝ ýöûŕ ƒŕîéñð ţöļð ýöû ţö ĵöîñ åñð åţ ƒîŕšţ ýöû ŕéƒûšéð ɓéçåûšé ýöû \"ðîðñ\'ţ ŵåññå ðöŵñļöåð åñöţĥéŕ åþþ.\" Åñð ñöŵ ýöû\'ŕé ţĥé åññöýîñĝ ƒŕîéñð ḿåķîñĝ éVéŕýöñé ðöŵñļöåð åñöţĥéŕ åþþ. Ţîḿé ƒļîéš, ţĥîñĝš çĥåñĝé, ɓûţ ŵé ĥöþé ţĥé ƒééļîñĝ öƒ ĥåñĝîñĝ öûţ ŵîţĥ ţĥé þéöþļé ýöû çåŕé åɓöûţ öñ Ðîšçöŕð šţåýš ţĥé šåḿé. ĤåVé å šåƒé åñð ĥåþþý ñéŵ ýéåŕ, åñð šéé ýöû îñ 2022.\n\n\n 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 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] [2021-12-20 one two] [éñ-ÛŠ one] [1 one] @@ -2281,7 +2281,7 @@ [Åŕé ýöû šûŕé ţĥåţ ýöû ŵåñţ ţö ðîšåɓļé ýöûŕ åççöûñţ¿ Ţĥîš ŵîļļ îḿḿéðîåţéļý ļöĝ ýöû öûţ åñð ḿåķé ýöûŕ åççöûñţ îñåççéššîɓļé ţö åñýöñé. 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] - [Ţîḿéöûţ ţéḿþöŕåŕîļý ŕéḿöVéš šöḿé þéŕḿîššîöñš. [Ļéåŕñ ḿöŕé](»{helpdeskArticle}«) one two three four five six seven eight nine ten eleven twelve] + [Ḿéḿɓéŕš ŵĥö åŕé îñ ţîḿéöûţ åŕé ţéḿþöŕåŕîļý ñöţ åļļöŵéð ţö çĥåţ öŕ ŕéåçţ îñ ţéхţ çĥåññéļš. Ţĥéý åŕé åļšö ñöţ åļļöŵéð ţö çöññéçţ ţö 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] [Ðîšåɓļéš þöšţîñĝ öŕ ŕéåçţîñĝ ţö ḿéššåĝéš îñ ţéхţ çĥåţ one two three four five six] [ÞŕéVéñţš ţĥéḿ ƒŕöḿ çöññéçţîñĝ ţö Vöîçé öŕ šţåĝé çĥåññéļš one two three four five six seven] [Åûţöḿåţîçåļļý ðîšçöññéçţš ţĥéḿ ƒŕöḿ å Vöîçé öŕ šţåĝé çĥåññéļ one two three four five six seven] @@ -3440,6 +3440,7 @@ [Ûĥ öĥ¡ Ļööķš ļîķé šöḿéţĥîñĝ ɓŕöķé. Þļéåšé ŕéƒŕéšĥ ţĥé åþþļîçåţîöñ åñð ţŕý åĝåîñ. one two three four five six seven eight nine] [Fŕöḿ ţĥé ḿöšţ ŕéçéñţ ŵééķ one two three] [Ţĥîš îš å þŕéVîéŵ. βööšţ ţö »{targetLevelOrPlan}« ţö ûšé ţĥîš ĜÎF. one two three four five] + [Ðö ýöû ŵåñţ å šŵééţ ɓåññéŕ ļîķé ţĥîš ƒöŕ ýöûŕ šéŕVéŕ¿ Ýöû öñļý ñééð **»{boostsNeeded}« ḿöŕé »{boostsNeeded}«¡** one two three four five six seven eight nine] [Ýöû’ļļ åļšö ĥéļþ ûñļöçķ ḿöŕé çûšţöḿîžåţîöñ ƒéåţûŕéš åñð ûţîļîţý ûþĝŕåðéš ƒöŕ éVéŕýöñé îñ ţĥé šéŕVéŕ ļîķé: one two three four five six seven eight nine ten eleven] [βööšţ ýöûŕ šéŕVéŕ ţö »{targetLevelOrPlan}« ţö åþþļý ýöûŕ ñéŵ åñîḿåţéð šéŕVéŕ ɓåññéŕ. one two three four five six seven] [βööšţ ýöûŕ šéŕVéŕ ţö ţĥé »{targetLevelOrPlan}« þļåñ ţö åþþļý ýöûŕ ñéŵ åñîḿåţéð šéŕVéŕ ɓåññéŕ. one two three four five six seven eight] @@ -3867,6 +3868,7 @@ [Ðéƒéŕŕéð one two] [Éŕŕöŕ one] [Þåîð one] + [Þéñðîñĝ one two] [Ŕéĵéçţéð one two] [Ûñðéŕ ŔéVîéŵ one two] [Šçĥéðûļéð one two] @@ -4499,7 +4501,6 @@ [βý **»{username}«**#»{discriminator}« öñ »{date}« one two] [βý €[](ûšéŕñåḿéĤööķ) öñ »{date}« one two three] [šûɓḿîţţéð öñ »{date}« one two] - [Åþþļîçåţîöñš one two] [ŔéVîéŵ Åþþļîçåţîöñš one two three] [ÅþþŕöVé one two] [ÅþþŕöVéð one two] @@ -4540,6 +4541,7 @@ [Ţĥîš ḿéåñš ţĥåţ ñéŵ ḿéḿɓéŕš ŵîļļ ñöţ ɓé åɓļé ţö ţåļķ öŕ ĵöîñ ţĥé šéŕVéŕ **ûñţîļ å šéŕVéŕ šţ僃 åþþŕöVéš ţĥéîŕ åþþļîçåţîöñ.** one two three four five six seven eight nine ten eleven twelve thirteen] [Ŵåŕñîñĝ: Šŵîţçĥîñĝ ţö Ḿåñûåļ ÅþþŕöVåļ one two three four five] [Šéţ ûþ ŕûļéš ţĥåţ ñéŵ ḿéḿɓéŕš ḿûšţ éхþļîçîţļý åĝŕéé ţö ɓéƒöŕé ţĥéý çåñ ţåļķ îñ ţĥé šéŕVéŕ (îñçļûðéš ÐḾîñĝ ḿéḿɓéŕš). Ýöû çåñ åļšö åðð Qûéšţîöñš ţĥåţ þéöþļé ŵĥö ŕéQûéšţ ţö ĵöîñ ḿûšţ åñšŵéŕ ƒöŕ ýöû ţö åþþŕöVé ţĥéîŕ ḿéḿɓéŕšĥîþ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen] + [Å ƒŕéé-ƒöŕḿ ŕéšþöñšé ŵîţĥ å 1,000 çĥåŕåçţéŕ ļîḿîţ. Ļéţ ţĥéḿ ĝö ŵîļð. one two three four five six seven eight nine ten eleven twelve thirteen] [Þéñðîñĝ one two] [Þéñðîñĝ (»{count}«) one two] [Þéñðîñĝ - (»{count}«) one two] @@ -4552,6 +4554,7 @@ [Ŕéåšöñ šĥåŕéð ŵîţĥ ûšéŕ one two three] [Ŕéĵéçţéð one two] [Ŕéĵéçţéð - (»{count}«) one two] + [Ḿéḿɓéŕ ŔéQûîŕéḿéñţš one two three] [Ýöû åŕé ŕéVîéŵîñĝ åñ åþþļîçåţîöñ ƒŕöḿ šöḿéöñé ŵĥö ŵåñţš ţö ĵöîñ ýöûŕ šéŕVéŕ. Ûñţîļ ýöû åþþŕöVé ţĥéḿ, ţĥéý çåññöţ ĵöîñ öŕ ţåļķ îñ ţĥé šéŕVéŕ. one two three four five six seven eight nine ten eleven twelve thirteen] [ŔéVîéŵ Åþþļîçåţîöñ one two three] [»{count}« ÅþþŕöVéð Åþþļîçåţîöñš one two three] @@ -4563,6 +4566,7 @@ [Šöŕţ ɓý: Ñéŵéšţ one two three] [Šöŕţ ɓý: Öļðéšţ one two three] [Å ŵåý ţö šçŕééñ ḿéḿɓéŕš ĵöîñîñĝ ýöûŕ çöḿḿûñîţý, ƒŕöḿ šîḿþļé ŕûļé åĝŕééḿéñţš ţö ðéţåîļéð Qûéšţîöñš. one two three four five six seven eight nine ten eleven] + [Å ƒŕéé-ƒöŕḿ ŕéšþöñšé ŵîţĥ å 300 çĥåŕåçţéŕ ļîḿîţ. one two three four five six] [Åðð ŕöļé one two] [Ðîšþļåý ŕöļé: one two] [ŔéḿöVé ŕöļé ¡¡»{roleName}«¡¡ one two three] @@ -6078,7 +6082,7 @@ [Éхåḿþļé ŕûļéš (çļîçķ ţĥéḿ¡) one two three four] [Éхåḿþļé ŕûļéš one two] [Þļåçéĥöļðéŕ Ţéхţ (Öþţîöñåļ) one two three four] - [qûéšţîöñ one two] + [Éñţéŕ ýöûŕ Qûéšţîöñ one two three] [Ýöû ḿûšţ éñţéŕ å Qûéšţîöñ. one two three four] [Þéñðîñĝ Ĵöîñ ŔéQûéšţš one two three] [Ýöû çåñ öñļý åðð ûþ ţö »{number}« Qûéšţîöñš one two three four] @@ -6311,8 +6315,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] @@ -6969,8 +6973,6 @@ [Þéñðîñĝ Fŕîéñðš one two three] [Þéöþļé one two] [ŠéŕVéŕ ÅVåţåŕ one two] - [βé ŵĥö ýöû ŵåñţ åñð ûšé å ðéŕéñţ åVåţåŕ îñ éåçĥ öƒ ýöûŕ šéŕVéŕš. one two three four five six seven eight] - [Ḿûļţîþļé ÅVåţåŕš one two three] [βé ŵĥö ýöû ŵåñţ åñð ûšé å ðéŕéñţ åVåţåŕ îñ éåçĥ öƒ ýöûŕ šéŕVéŕš one two three four five six seven eight] [ŠéŕVéŕ Þŕöƒîļé ûþðåţéð¡ one two three] [βé ŵĥö ýöû ŵåñţ åñð ûšé å ðéŕéñţ åVåţåŕ, ɓåññéŕ, åñð ɓîö îñ éåçĥ öƒ ýöûŕ šéŕVéŕš. one two three four five six seven eight nine] diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index deadcb41ae..ea90e929e9 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -2154,7 +2154,6 @@ ¿Seguro que quieres deshabilitar tu cuenta? Se cerrará la sesión de inmediato y nadie podrá acceder a la cuenta. ¡Listo! ¡Te hemos deshabilitado las notificaciones de correo electrónico! Cuando se aísla temporalmente a un usuario, este no puede enviar mensajes en el chat, responder a hilos, reaccionar a mensajes ni hablar con voz o por canales de escenario. [Más información]({helpdeskArticle}) - El aislamiento temporal retira algunos permisos de forma provisional. [Más información]({helpdeskArticle}) Deshabilita la publicación o la reacción a los mensajes en el chat de texto. Evita que se conecten a los canales de escenario o de voz. Los desconecta automáticamente de un canal de escenario o de voz. @@ -6308,8 +6307,6 @@ Sugerencias pendientes Gente Avatar de servidor - Sé quien quieras ser y utiliza un avatar diferente en cada uno de tus servidores. - Múltiples avatares Sé quien quieras ser y utiliza un avatar diferente en cada uno de tus servidores ¡Perfil de servidor actualizado! Sé quien quieras ser y utiliza un avatar, un cartel y una biografía diferentes en cada uno de tus servidores. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index a01fd5999a..b4b5014705 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2199,7 +2199,6 @@ Haluatko varmasti poistaa tilisi käytöstä? Tämä kirjaa sinut välittömästi ulos ja kieltää jokaiselta pääsyn tilillesi. Onnistui! Poistimme sähköposti-ilmoitukset pois käytöstä! Kun asetat käyttäjän jäähylle, hän ei voi lähettää viestejä keskustelussa, vastata ketjuihin, reagoida viesteihin tai puhua puhe- tai esityskanavilla. [Lue lisää]({helpdeskArticle}) - Jäähy poistaa osan käyttäjän oikeuksista tilapäisesti. [Lue lisää]({helpdeskArticle}) Poistaa oikeuden julkaista viestejä tai reagoida viesteihin tekstikeskusteluissa Estää yhteyden muodostamisen puhe- tai esityskanaville Katkaisee automaattisesti yhteydet puhe- tai esityskanaviin @@ -6463,8 +6462,6 @@ Kaveripyynnöt Ihmiset Palvelinkohtainen avatar - Voit valita haluamasi avatarin erikseen kullekin palvelimellesi. - Useita avatareja Voit valita haluamasi avatarin erikseen kullekin palvelimellesi Palvelinprofiili on päivitetty. Voit valita haluamasi avatarin, bannerin ja biografian erikseen kullekin palvelimellesi diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 63ccf1ad68..a500cb414e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2204,7 +2204,6 @@ Tu es sûr(e) de vouloir désactiver ton compte ? Cette action te déconnectera immédiatement de ton compte et plus personne ne pourra y accéder. Ça marche ! Nous avons désactivé les notifications par e-mail rien que pour toi ! Un utilisateur temporairement exclu ne peut pas envoyer de messages dans la discussion, répondre à un fil, réagir aux messages ou parler dans un salon vocal ou un salon de conférence. [En savoir plus]({helpdeskArticle}) - L\'exclusion temporaire retire certaines permissions. [En savoir plus]({helpdeskArticle}) Empêche d\'envoyer des messages ou d\'y réagir dans le chat textuel Empêche l\'utilisateur de rejoindre des salons vocaux ou des salons de conférence Déconnecte automatiquement l\'utilisateur des salons vocaux ou des salons de conférence @@ -6467,8 +6466,6 @@ Demande d\'ami en attente Personnes Avatar de serveur - Affiche-toi comme tu veux et utilise un avatar différent sur chacun de tes serveurs. - Avatars multiples Affiche-toi comme tu veux et utilise un avatar différent sur chacun de tes serveurs Profil de serveur mis à jour ! Affiche-toi comme tu veux et utilise un avatar, une bannière et une description différents sur chacun de tes serveurs. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 75f1b241f2..fb33c0e8cc 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2199,7 +2199,6 @@ क्या आप वाकई में अपने अकाउंट को ऑफ करना चाहते हैं? यह तुरंत आपको लॉग आउट कर देगा और आपके अकाउंट को किसी को भी एक्सेस नहीं करने देगा. हो गया! हमने आपके लिए ई-मेल नोटिफिकेशन को ऑफ कर दिया है! जब आप किसी यूज़र को टाइम आउट में डालते हैं तो वे चैट में मैसेज भेजने, थ्रेड्स में रिप्लाई करने, मैसेज का जवाब देने, या वॉइस या स्टेज चैनल में बोलने जैसे काम नहीं कर पाएंगे. [और ज़्यादा जानें]({helpdeskArticle}) - टाइमआउट कुछ समय के लिए कुछ परमिशन रिमूव कर देता है. [और ज़्यादा जानें]({helpdeskArticle}) टैक्स्ट चैट में पोस्टिंग या मैसेज का जवाब देना बंद करता है उन्हें वॉइस या स्टेज चैनल से कनेक्ट करने से रोकता है उन्हें वॉइस या स्टेज चैनल से ऑटोमैटिक तरीके से डिस्कनेक्ट करता है @@ -6463,8 +6462,6 @@ पेंडिंग फ्रेंड्स लोग सर्वर अवतार - बनें वो जो आप बनना चाहते हैं और अपने हर सर्वर में अलग-अलग अवतार इस्तेमाल करें. - ढेर सारे अवतार वो बनें जो आप बनना चाहते हैं और अपने हर सर्वर में अलग-अलग अवतार का इस्तेमाल करें सर्वर प्रोफ़ाइल अपडेट कर दी गई! वो बनें जो आप बनना चाहते हैं और अपने हर सर्वर में अलग-अलग अवतार, बैनर और बायो का इस्तेमाल करें. diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 966e0072f4..2392454872 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -2199,7 +2199,6 @@ Jesi li siguran da želiš onemogućiti svoj račun? Ovo će te odmah odjaviti i učiniti vaš račun nedostupnim svima. Uspjeh! Ugasili smo ti e-mail obavijesti! Kada korisniku odrediš timeout, neće moći slati poruke u chatu, odgovarati unutar niti, reagirati na poruke ili govoriti u glasovnim kanalima ili kanalima s pozornicom. [Doznaj više]({helpdeskArticle}) - Timeout privremeno uklanja neke dozvole. [Saznaj više]({helpdeskArticle}) Onemogućuje objavljivanje ili reagiranje na poruke u tekstualnom chatu Sprječava povezivanje s glasovnim ili kanalima s pozornicom Automatski odvaja korisnika od glasovnog ili kanala s pozornicom @@ -6463,8 +6462,6 @@ Prijatelji na čekanju Ljudi Avatar za server - Budi tko god želiš i koristi drugi avatar u svakom od svojih servera. - Višestruki avatari Budi tko god želiš i koristi drugi avatar u svakom od svojih servera Profil servera je ažuriran! Budi ono što želiš i koristi drugačiji avatar, banner i bio na svakom od svojih servera. diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 30d4953b3a..c2f8de1100 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2199,7 +2199,6 @@ Biztos vagy benne, hogy deaktiválni szeretnéd a fiókod? Emiatt rögtön ki leszel jelentkeztetve a fiókodból, és mindenki számára elérhetetlen lesz. Siker! Letiltottuk az e-mail értesítéseket számodra! Ha eltávolítasz egy felhasználót, akkor nem küldhet üzeneteket a beszélgetésben, nem válaszolhat gondolatmeneteken, nem reagálhat üzenetekre vagy nem beszélhet a hang- és pódiumcsatornákon. [Tudj meg többet]({helpdeskArticle}) - A felfüggesztés ideiglenesen megszüntet bizonyos engedélyeket. [További tájékoztatás]({helpdeskArticle}) Letiltja a bejegyzések írását, illetve az üzenetekre reagálást a szöveges beszélgetésben Nem csatlakozhatnak hang- vagy pódiumcsatornához Automatikusan lekapcsolódnak a hang- vagy pódiumcsatornáról @@ -6462,8 +6461,6 @@ Függőben lévő barátok Emberek Szerverprofilkép - Legyél, aki csak szeretnél, és használj eltérő profilképet minden egyes szerveren. - Több profilkép Legyél, aki csak szeretnél, és használj eltérő profilképet minden egyes szervereden Szerverprofil frissítve! Legyél, aki csak szeretnél, és használj eltérő profilképet minden, bannert és bemutatkozást minden egyes szervereden! diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 54f17eb57a..003d8e63d2 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2204,7 +2204,6 @@ Sei sicuro di voler disattivare il tuo account? Verrai immediatamente disconnesso e renderai il tuo account inaccessibile a tutti. Ben fatto, hai disattivato le notifiche via e-mail! Quando metti un utente in Time out, questo non sarà in grado di inviare messaggi in chat, rispondere nei thread, reagire ai messaggi, parlare in sale conferenze o nei canali vocali. [Scopri di più]({helpdeskArticle}) - Il Time out revoca temporaneamente alcuni permessi. [Scopri di più]({helpdeskArticle}) Disattiva la pubblicazione di messaggi e le reazioni nella chat testuale Impedisce la connessione ai canali vocali e alle sale conferenze Disconnette automaticamente dai canali vocali e dalle sale conferenze @@ -6468,8 +6467,6 @@ Amici in attesa Persone Avatar del server - Puoi essere chi vuoi e utilizzare un avatar diverso in ognuno dei tuoi server. - Avatar multipli Puoi essere chi vuoi e utilizzare un avatar diverso in ognuno dei tuoi server Profilo del server aggiornato! Puoi essere chi vuoi e utilizzare avatar, banner e informazioni diversi in ognuno dei tuoi server. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 59abce4ff1..416a529307 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2209,7 +2209,6 @@ 本当にアカウントを削除してもよろしいですか？削除すると直ちにログアウトされ、誰もアカウントにアクセスすることができなくなります。 成功！メール通知を無効にしました。 ユーザーをタイムアウトすると、そのユーザーはチャットでメッセージを送ったり、スレッドで返信したり、メッセージにリアクションしたり、ボイス／ステージチャンネルで話したりできなくなります。[詳しくはこちら]({helpdeskArticle}) - タイムアウトされると、一時的に失われる権限があります。[詳細はこちら]({helpdeskArticle}) テキストチャットでの投稿およびメッセージへのリアクションが不可 ボイス／ステージチャンネルへの接続が不可 ボイス／ステージチャンネルから自動的に退出 @@ -6473,8 +6472,6 @@ 保留中のフレンド候補 人物 サーバーアバター - サーバーごとに使うアバターを変えて、なりたい自分になりましょう。 - 複数アバター サーバーごとに使うアバターを変えて、なりたい自分になりましょう サーバープロフィールが更新されました！ サーバーごとに使うアバター、バナー、プロフィールを変えて、なりたい自分になりましょう。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index ffdbc5ceb6..187b0412c7 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2204,7 +2204,6 @@ 정말로 계정을 비활성화하시겠어요? 즉시 계정에서 로그아웃 되며 그 누구도 사용할 수 없어요. 성공! 이메일 알림을 비활성화했어요! 타임아웃이 적용된 사용자는 채팅에서 메시지를 보내거나, 스레드에 답장을 작성하거나, 메시지에 반응하거나, 음성 및 무대 채널에서 발언을 할 수 없어요. [자세히 알아보기]({helpdeskArticle}) - 타임아웃을 적용하면 일부 권한이 박탈됩니다. [자세히 알아보기]({helpdeskArticle}) 텍스트 채팅에서 메시지를 게시하거나 메시지에 반응할 수 없음 음성 및 무대 채널에 접속할 수 없음 음성 및 무대 채널에서 자동으로 연결 해제 @@ -6468,8 +6467,6 @@ 대기 중인 친구 사람 서버 아바타 - 참가 중인 서버마다 다른 아바타를 사용해보세요. - 멀티 아바타 서버마다 다른 아바타를 사용하며 되고 싶은 내가 되어 보세요 서버 프로필이 업데이트되었어요! 서버마다 다른 아바타, 배너, 소개글을 사용해 되고 싶은 내가 되어 보세요. diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index d34e9cb896..8aae57c05a 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -2199,7 +2199,6 @@ Ar tu įsitikinęs, kad nori išjungti savo paskyrą? Tai iš karto tave atjunks ir padarys tavo paskyrą nebepasiekiamą niekam. Pavyko! Mes išjungėme el. pašto pranešimus! Kai naudotoją laikinai nutildai, jis nebegali siųsti pranešimų pokalbyje, atsakyti į žinutes gijose, reaguoti į pranešimus ir kalbėti balso ar scenos kanaluose. [Sužinoti daugiau]({helpdeskArticle}) - Laikinas nutildymas laikinai atima tam tikrus leidimus. [Sužinoti daugiau]({helpdeskArticle}) Išjungia dalijimąsi įrašais ir reagavimą į žinutes tekstiniuose pokalbiuose Neleidžia prisijungti prie balso ar scenos kanalų Automatiškai atjungia nuo balso ar scenos kanalų @@ -6463,8 +6462,6 @@ Laukiantys draugai Žmonės Serverio pseudoportretas - Būk, kuo nori būti, ir naudok skirtingus pseudoportretus kiekviename savo serveryje. - Keli pseudoportretai Būk, kuo nori būti, ir naudok skirtingus pseudoportretus kiekviename savo serveryje Serverio profilis atnaujintas! Būk, kuo nori būti, ir naudok skirtingus pseudoportretus, reklamjuostes ir aprašus kiekviename savo serveryje. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index bb5048ff59..49efd90430 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2204,7 +2204,6 @@ Weet je zeker dat je je account wilt uitschakelen? Hierdoor word je meteen afgemeld en wordt je account voor iedereen ontoegankelijk. Gelukt! We hebben e-mailmeldingen voor je uitgeschakeld! Wanneer je een gebruiker een time-out geeft, kan diegene geen berichten versturen in de chat, reageren binnen threads, reageren op berichten, of spreken op spraak- of podiumkanalen. [Meer informatie]({helpdeskArticle}) - De time-out verwijdert sommige machtigingen tijdelijk. [Meer informatie]({helpdeskArticle}) Je kunt geen berichten plaatsen of reageren op berichten in de tekstchat Je kunt geen verbinding maken met spraak- of podiumkanalen Je verbinding met een spraak- of podiumkanaal wordt automatisch verbroken @@ -6467,8 +6466,6 @@ Vrienden in afwachting Mensen Serveravatar - Wees wie je wil zijn met een andere avatar op al je servers. - Meerdere avatars Wees wie je wilt zijn met een andere avatar op al je servers Serverprofiel geüpdatet! Wees wie je wilt zijn met een andere avatar, banner en bio op al je servers. diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 8b8642daf3..bf82f88c2f 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -2149,7 +2149,6 @@ Er du sikker på at du vil deaktivere kontoen din? Dette logger deg av umiddelbart, og gjør kontoen din utilgjengelig for alle. Vellykket! Vi har deaktivert e-postvarsler for deg! Når du gir en bruker timeout, kan ikke vedkommende sende meldinger i chatter, svare i tråder, reagere på meldinger eller snakke i tale- eller scenekanaler. [Mer info]({helpdeskArticle}) - En timeout fjerner enkelte tillatelser midlertidig. [Mer info]({helpdeskArticle}) Fjerner muligheten for å legge ut eller reagere på meldinger i tekstchat Hindrer vedkommende i å koble seg til tale- eller scenekanaler Kobler vedkommende automatisk fra en tale- eller scenekanal @@ -6304,8 +6303,6 @@ Ventende venner Mennesker Serveravatar - Vær den du vil og bruk forskjellig avatar på hver server. - Flere avatarer Vær den du vil og bruk forskjellig avatar på hver server Serverprofilen er oppdatert! Vær den du vil med egen avatar, banner og bio på hver server. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index fc7b62c437..01a49eb01c 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2209,7 +2209,6 @@ Czy na pewno chcesz wyłączyć swoje konto? Zostaniesz natychmiast wylogowany(-a) ze swojego konta i nie będziesz w stanie zalogować się ponownie. Sukces! Wyłączyliśmy powiadomienia pocztą e-mail! Po zastosowaniu wobec użytkownika przerwy nie będzie mógł on wysyłać wiadomości na czacie, odpowiadać na wątki, reagować na wiadomości ani odzywać się na kanałach głosowych i kanałach podium. [Dowiedz się więcej]({helpdeskArticle}) - Przerwa oznacza tymczasowe usunięcie niektórych uprawnień. [Dowiedz się więcej]({helpdeskArticle}) Wyłącza możliwość publikowania wiadomości i reagowania na nie na czacie tekstowym Uniemożliwia dołączanie do kanałów głosowych i kanałów podium Automatycznie odłącza od kanałów głosowych i kanałów podium @@ -6472,8 +6471,6 @@ Oczekujący znajomi Osoby Awatar serwerowy - Bądź tym, kim chcesz, i używaj innego awatara na każdym ze swoich serwerów. - Wiele awatarów Bądź tym, kim chcesz, i używaj innego awatara na każdym ze swoich serwerów Profil serwerowy został zaktualizowany! Bądź tym, kim chcesz! Korzystaj z różnych awatarów, banerów oraz danych o użytkowniku na każdym ze swoich serwerów. diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 68cec17587..3777cdd7a5 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -2204,7 +2204,6 @@ Deseja mesmo desativar sua conta? Isso te desconectará dela imediatamente, e você não poderá mais entrar. Beleza! Desativamos as notificações no seu e-mail! Quando você coloca um usuário de castigo, ele/ela não poderá enviar mensagens no chat, responder tópicos, reagir a mensagens ou falar em canais palco. [Saiba mais]({helpdeskArticle}) - O castigo remove temporariamente algumas permissões. [Saiba Mais]({helpdeskArticle}) Desabilita postar ou reagir a mensagens em canais de texto Impede que se conectem com voz ou a canais palco Desconecta automaticamente de voz ou canal palco @@ -6415,8 +6414,6 @@ Amigos pendentes Pessoas Avatares de servidor - Seja quem você quiser e use um avatar diferente em cada um dos seus servidores. - Avatares múltiplos Seja quem você quiser e use um avatar diferente em cada um dos seus servidores Perfil do servidor atualizado! Seja quem você quiser e use avatar, faixa e bio diferentes em cada um dos seus servidores. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 826290607c..94547a5f8e 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2199,7 +2199,6 @@ Ești sigur că vrei să-ți dezactivezi contul? Această acțiune te va deconecta imediat și îți va face contul complet inaccesibil. Succes! Am dezactivat notificările prin e-mail pentru tine! Când pui un utilizator pe pauză, acesta nu va mai putea trimite mesaje pe chat, răspunde în cadrul firelor, reacționa la mesaje sau vorbi pe canalele de voce și canalele podium. [Află mai multe]({helpdeskArticle}) - Pauza elimină temporar anumite permisiuni. [Află mai multe]({helpdeskArticle}) Dezactivează posibilitatea de a posta și de a reacționa la mesaje în chatul scris Împiedică utilizatorul să se conecteze la canalele de voce sau podium Deconectează automat utilizatorul de la canalele de voce sau podium @@ -6463,8 +6462,6 @@ Prieteni în așteptare Persoane Avatar server - Fii cine vrei să fii și folosește câte un avatar diferit pe fiecare server. - Avataruri multiple Fii cine vrei să fii și folosește câte un avatar diferit pe fiecare server Profilul server-ului a fost actualizat! Fii cine vrei să fii și folosește câte un avatar, banner și profil diferit pe fiecare server. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 69043d5f01..a3ab40d912 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2209,7 +2209,6 @@ Вы уверены, что хотите отключить свою учётную запись? Это приведёт к мгновенному выходу из учётной записи и её недоступности для всех. Успех! Мы отключили для вас уведомления по электронной почте! Те, кого отправили думать о своём поведении, делают это молча. Они не могут отправлять сообщения в чат, отвечать в ветках, реагировать на сообщения и говорить в голосовом чате или на трибуне. [Узнать больше]({helpdeskArticle}) - Лишение голоса временно забирает у пользователя некоторые права. [Узнать больше]({helpdeskArticle}) Запрещает отправлять сообщения в текстовых чатах и реагировать на них Не даёт подключаться к голосовым каналам или трибунам Автоматически отключает участника от голосовых каналов или трибун @@ -6473,8 +6472,6 @@ Запросы дружбы Люди Аватар на сервере - Будьте, кем захотите, и используйте разные аватары на каждом из своих серверов. - Несколько аватаров Будьте, кем захотите, и используйте разные аватары на каждом из своих серверов. Профиль сервера обновлён! Используйте разные аватары, баннеры и биографии на каждом из своих серверов — самовыражайтесь в своё удовольствие! diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index 4d80a7afde..5aeba3bce2 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -2154,7 +2154,6 @@ Är du säker på att du vill inaktivera ditt konto? Detta kommer genast att logga ut dig och göra ditt konto otillgängligt för alla. Klart! Vi har inaktiverat e-postaviseringar åt dig! När du sätter en användare på timeout kommer användaren inte att kunna skicka meddelanden i chatten, svara i trådar, reagera på meddelanden eller prata i röst- eller podiekanaler. [Läs mer]({helpdeskArticle}) - En timeout tar tillfälligt bort vissa behörigheter. [Läs mer]({helpdeskArticle}) Inaktiverar möjligheten att posta eller reagera på meddelanden i textchatt Hindrar dem från att ansluta till röst- eller podiekanaler Kopplar automatiskt bort dem från en röst- eller podiekanal @@ -6308,8 +6307,6 @@ Väntande vänner Människor Serveravatar - Var den du vill vara och använd olika avatarer på var och en av dina servrar. - Flera avatarer Var den du vill vara och använd olika avatarer på var och en av dina servrar Serverprofil uppdaterad! Var den du vill vara och använd en särskild avatar, banner och biografi på var och en av dina servrar. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index a3c6ed7765..1504210ba3 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2199,7 +2199,6 @@ คุณแน่ใจหรือไม่ว่าจะระงับบัญชีผู้ใช้ของคุณ การกระทำนี้จะนำคุณออกจากระบบทันที จะไม่มีใครสามารถเข้าใช้บัญชีผู้ใช้ของคุณได้อีก สำเร็จ เราระงับการแจ้งเตือนด้วยอีเมลให้คุณแล้ว เมื่อคุณกำหนดการหมดเวลาให้ผู้ใช้ ผู้ใช้จะไม่สามารถส่งข้อความในแชท ตอบกลับเธรด แสดงความรู้สึกต่อข้อความ หรือพูดในช่องสำหรับพูดหรือช่องเวทีได้ [เรียนรู้เพิ่มเติม]({helpdeskArticle}) - การหมดเวลาลบการอนุญาตบางอย่างไปชั่วคราว [เรียนรู้เพิ่มเติม]({helpdeskArticle}) ปิดใช้งานการโพสต์หรือการตอบกลับข้อความในแชทข้อความ ป้องกันไม่ให้เชื่อมต่อไปยังช่องสำหรับพูดหรือช่องเวที ยกเลิกการเชื่อมต่อจากช่องสำหรับพูดหรือช่องเวทีโดยอัตโนมัติ @@ -6463,8 +6462,6 @@ เพื่อนที่รอการตอบรับ บุคคล สัญลักษณ์ประจำตัวในเซิร์ฟเวอร์ - เป็นตัวตนที่คุณต้องการและใช้สัญลักษณ์ประจำตัวที่แตกต่างกันในแต่ละเซิร์ฟเวอร์ของคุณ - สัญลักษณ์ประจำตัวหลายแบบ เป็นตัวตนที่คุณต้องการและใช้สัญลักษณ์ประจำตัวที่แตกต่างกันในแต่ละเซิร์ฟเวอร์ของคุณ อัปเดตโปรไฟล์เซิร์ฟเวอร์แล้ว! เป็นตัวตนที่คุณต้องการและใช้สัญลักษณ์ประจำตัว แบนเนอร์ และประวัติที่แตกต่างกันในแต่ละเซิร์ฟเวอร์ของคุณ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index c6aca27380..ef6dbd5467 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2209,7 +2209,6 @@ Hesabını devre dışı bırakmak istediğinden emin misin? Bu işlem, oturumunu derhal kapatacak ve hesabına hiç kimse erişemeyecek. Başarılı! Senin için e-posta bildirimlerini devre dışı bıraktık! Bir kullanıcıyı zamanaşımına soktuğunda sohbette mesaj gönderemez, alt başlıklarda yanıt veremez, mesajlara tepki ekleyemez ya da ses veya sahne kanallarında konuşamaz. [Daha fazla bilgi edin]({helpdeskArticle}) - Zamanaşımı geçici olarak bazı izinleri geri alır. [Daha Fazla Bilgi Edin]({helpdeskArticle}) Yazılı sohbette paylaşım yapılmasını veya mesajlara tepki verilmesini engeller Sahne veya ses kanallarına bağlanmalarını engeller Sahne veya ses kanallarından otomatik olarak çıkarır @@ -6472,8 +6471,6 @@ Bekleyen Arkadaşlar İnsanlar Sunucu Avatarı - Nasıl istiyorsan öyle görün; sunucularında farklı avatarlar kullan. - Birden Fazla Avatar Nasıl istiyorsan öyle görün; sunucularında farklı avatarlar kullan Sunucu profili güncellendi! Nasıl istiyorsan öyle görün; sunucularında farklı avatarlar, afişler ve biyografiler kullan. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 081b6786f2..37d649dd39 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2199,7 +2199,6 @@ Ти впевнений, що бажаєш вимкнути свій акаунт? Після цього ти негайно вийдеш з акаунту та зробиш його недоступним для всіх. Успіх! Ми вимкнули сповіщення електронною поштою для тебе! Коли ви тимчасово блокуєте користувача, він не зможе надсилати повідомлення у чат, відповідати в гілках, реагувати на повідомлення та говорити в голосових каналах та каналах трибун. [Детальніше]({helpdeskArticle}) - Тимчасовий блок на певний час забирає деякі дозволи. [Докладніше]({helpdeskArticle}) Не можна публікувати повідомлення в текстових чатах та реагувати на них Не можна приєднуватися до голосового каналу або каналу трибуни Автоматичне від\'єднання від голосового каналу або каналу трибуни @@ -6463,8 +6462,6 @@ Запити на дружбу, які очікують на розгляд Люди Аватар сервера - Будь ким завгодно та використовуй різні аватари на всіх своїх серверах. - Різні аватари Будьте ким завгодно та використовуйте різні аватари на всіх своїх серверах Профіль сервера оновлено! Будьте ким завгодно та використовуйте різні аватари, банери та біографії на всіх своїх серверах. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index e4271c3fd7..4c3a8e0870 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2199,7 +2199,6 @@ Có chắc là bạn muốn vô hiệu hóa tài khoản của mình không? Thao tác này sẽ ngay lập tức đăng xuất và không ai có thể truy cập vào nữa. Thành công! Chúng tôi đã vô hiệu hóa thông báo email của bạn! Khi bạn thiết lập thời gian chờ đối với một người dùng nào đó thì họ sẽ không thể gửi tin nhắn trong kênh trò chuyện, trả lời trong các chủ đề thảo luận, tương tác với các tin nhắn, hoặc phát biểu trong kênh thoại hoặc kênh sân khấu. [Tìm hiểu thêm]({helpdeskArticle}) - Hạn chế tạm thời loại bỏ một số quyền. [Tìm hiểu thêm]({helpdeskArticle}) Tắt tính năng đăng hoặc phản hồi tin nhắn trong trò chuyện văn bản Ngăn họ kết nối với kênh thoại hoặc kênh sân khấu Tự động ngắt kết nối với kênh thoại hoặc kênh sân khấu @@ -6463,8 +6462,6 @@ Bạn Bè Đang Chờ Xử Lý Mọi người Ảnh đại diện Máy chủ - Trở thành người bạn muốn và sử dụng ảnh đại diện khác nhau trong mỗi máy chủ. - Nhiều Ảnh Đại Diện Khác Nhau Trở thành người bạn muốn và sử dụng ảnh đại diện khác nhau trong mỗi máy chủ Đã cập nhật Hồ Sơ Máy Chủ! Trở thành người bạn muốn và sử dụng ảnh đại diện, biểu ngữ và tiểu sử khác nhau trong mỗi máy chủ. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 79d1be1d7b..26e0c7a9fc 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2204,7 +2204,6 @@ 确定要关闭您的帐户吗？这将立即退出您的账号，并且任何人都无法访问。 成功，我们已经对您关闭了邮件通知！ 当您对用户进行暂时禁言后，该用户将无法在聊天中发送消息、在子区中进行回复或对消息添加反应，也无法在语音频道或讲堂频道中发言。[了解更多]({helpdeskArticle}) - 暂时禁言将暂时移除某些权限。[了解更多]({helpdeskArticle}) 无法在文字聊天中发送消息或对消息添加反应 无法连接语音频道或讲堂频道 自动断开已连接的语音频道或讲堂频道 @@ -6467,8 +6466,6 @@ 待处理好友 人物 服务器头像 - 头像想换就换，在您的每个服务器使用不同的头像。 - 多个头像 头像想换就换，在您的每个服务器使用不同的头像 服务器个人资料已更新！ 做百变的自己，在每个服务器使用不同的头像、横幅和自我介绍。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 42197c31bb..8a1bdb3209 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2204,7 +2204,6 @@ 您確定要停用帳號嗎？這將會讓您立即登出，而且任何人都無法再登入這個帳號了。 成功！ 我們已經對您停用電子信箱通知！ 如果您將使用者禁言，該使用者將不能在聊天室中傳送訊息、回應討論串、對訊息反應，也不能在語音或舞台頻道中說話。[瞭解更多]({helpdeskArticle}) - 暫時禁言將會取消某些權限。[瞭解更多]({helpdeskArticle}) 禁止在文字頻道貼文或回覆訊息 禁止連線至語音及舞台頻道 自動中斷成員在語音及舞台頻道的連線 @@ -6467,8 +6466,6 @@ 待審中的好友 人物 伺服器頭像 - 隨心化身為您喜愛的形象，還能在各個伺服器使用不同的頭像。 - 多個頭像 隨心化身為您喜愛的形象，還能在各個伺服器使用不同的頭像 伺服器個人資料已更新！ 隨心化身為您喜愛的形象，還能在各個伺服器使用不同的頭像、橫幅與簡介。 diff --git a/app/src/main/res/values/plurals.xml b/app/src/main/res/values/plurals.xml index f91259f068..9e2e01e34f 100644 --- a/app/src/main/res/values/plurals.xml +++ b/app/src/main/res/values/plurals.xml @@ -524,6 +524,10 @@ You must unselect 1 friend. You must unselect {number} friends. + + boost + boosts + {#} {unit} {#} {unit}s diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml index 5c0b4097ae..533dbc5818 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -6435,3149 +6435,3146 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10805,275 +10802,276 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -15914,2178 +15912,2179 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -18513,639 +18512,639 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -19186,5950 +19185,5951 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 526ac8982e..7be063ebf1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1312,7 +1312,7 @@ Unlock with Nitro Trying to change your default profile? Go to your [User Profile](onUserProfileClick) page. Change Log - Accessibility and Safety {progress}\n======================\n\n* **New server time-out function.** Moderators and admins of a server can now temporarily prevent a user from interacting to help curb disruptive behavior. Also known as the \"yo dude stop you\'re being really weird.\" button.\n* **You can now directly report spam.** Added a prominent Report Spam button in DMs so you can give us a faster signal when you\'re being bothered. Also added a Roast Spam button for a faster way to make musubi. \n* **Beefed up our suspicious link warning.** This new system can also better warn you before you visit a malicious domain. Don\'t click suspicious links. Free Nitro for your login information is a lie. Discord employees don\'t want your password. We can barely remember our own.\n\nBefore We Go... {progress}\n======================\n\n* **Happy New Year <3** Thanks for choosing to use Discord to connect with your friends and communities. Almost 7 years ago, Discord was just this thing your friend told you to join and at first you refused because you \"didn\'t wanna download another app.\" And now you\'re the annoying friend making everyone download another app. Time flies, things change, but we hope the feeling of hanging out with the people you care about on Discord stays the same. Have a safe and happy new year, and see you in 2022.\n\n\n + Safety {progress}\n======================\n\n* **New server time-out function.** Moderators and admins of a server can now temporarily prevent a user from interacting to help curb disruptive behavior. Also known as the \"yo dude stop you\'re being really weird.\" button.\n* **You can now directly report spam.** Added a prominent Report Spam button in DMs so you can give us a faster signal when you\'re being bothered. Also added a Roast Spam button for a faster way to make musubi. \n* **Beefed up our suspicious link warning.** This new system can also better warn you before you visit a malicious domain. Don\'t click suspicious links. Free Nitro for your login information is a lie. Discord employees don\'t want your password. We can barely remember our own.\n\nBefore We Go... {progress}\n======================\n\n* **Happy New Year <3** Thanks for choosing to use Discord to connect with your friends and communities. Almost 7 years ago, Discord was just this thing your friend told you to join and at first you refused because you \"didn\'t wanna download another app.\" And now you\'re the annoying friend making everyone download another app. Time flies, things change, but we hope the feeling of hanging out with the people you care about on Discord stays the same. Have a safe and happy new year, and see you in 2022.\n\n\n 2021-12-20 en-US 1 @@ -1531,7 +1531,7 @@ Select a color Transparency Use Default - b502cef14e0940bbb2f10613245e49dc + 3b03d274c56b40939728e601428a2d9f Coming Soon Slash command application {applicationName} {applicationName} application @@ -2286,7 +2286,7 @@ 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 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}) - Timeout temporarily removes some permissions. [Learn more]({helpdeskArticle}) + Members who are in timeout are temporarily not allowed to chat or react in text channels. They are also not allowed to connect to voice or Stage channels. [Learn more.]({helpdeskArticle}) Disables posting or reacting to messages in text chat Prevents them from connecting to voice or stage channels Automatically disconnects them from a voice or stage channel @@ -3456,6 +3456,7 @@ Uh oh! Looks like something broke. Please refresh the application and try again. From the most recent week This is a preview. Boost to {targetLevelOrPlan} to use this GIF. + Do you want a sweet banner like this for your server? You only need **{boostsNeeded} more {boostsNeeded}!** You’ll also help unlock more customization features and utility upgrades for everyone in the server like: Boost your server to {targetLevelOrPlan} to apply your new animated server banner. Boost your server to the {targetLevelOrPlan} plan to apply your new animated server banner. @@ -3883,6 +3884,7 @@ Deferred Error Paid + Pending Rejected Under Review Scheduled @@ -4515,7 +4517,6 @@ By **{username}**#{discriminator} on {date} By $[](usernameHook) on {date} submitted on {date} - Applications Review Applications Approve Approved @@ -4556,6 +4557,7 @@ This means that new members will not be able to talk or join the server **until a server staff approves their application.** Warning: Switching to Manual Approval 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. + A free-form response with a 1,000 character limit. Let them go wild. Pending Pending ({count}) Pending - ({count}) @@ -4568,6 +4570,7 @@ Reason shared with user Rejected Rejected - ({count}) + Member Requirements You are reviewing an application from someone who wants to join your server. Until you approve them, they cannot join or talk in the server. Review Application {count} Approved Applications @@ -4579,6 +4582,7 @@ Sort by: Newest Sort by: Oldest A way to screen members joining your community, from simple rule agreements to detailed questions. + A free-form response with a 300 character limit. Add role Display role: Remove role !!{roleName}!! @@ -6097,7 +6101,7 @@ Example rules (click them!) Example rules Placeholder Text (Optional) - Question + Enter your question You must enter a question. Pending Join Requests You can only add up to {number} questions @@ -6330,8 +6334,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 @@ -6995,8 +6999,6 @@ Pending Friends People Server Avatar - Be who you want and use a different avatar in each of your servers. - Multiple Avatars Be who you want and use a different avatar in each of your servers Server Profile updated! Be who you want and use a different avatar, banner, and bio in each of your servers.