diff --git a/app/build.gradle b/app/build.gradle index 4661f78208..afa0a2de0b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 116202 - versionName "116.2 - Alpha" + versionCode 116203 + versionName "116.3 - Alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index aa4035d6bb..e04ca4e368 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/TrackFeedItemSeenBatch.java b/app/src/main/java/com/discord/analytics/generated/events/TrackFeedItemSeenBatch.java new file mode 100644 index 0000000000..6c188caa8d --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackFeedItemSeenBatch.java @@ -0,0 +1,54 @@ +package com.discord.analytics.generated.events; + +import b.d.b.a.a; +import com.discord.analytics.generated.traits.TrackBase; +import com.discord.analytics.generated.traits.TrackBaseReceiver; +import com.discord.api.science.AnalyticsSchema; +import d0.z.d.m; +import java.util.List; +/* compiled from: TrackFeedItemSeenBatch.kt */ +public final class TrackFeedItemSeenBatch implements AnalyticsSchema, TrackBaseReceiver { + private final List additionalSeenTimeMillis = null; + private final transient String analyticsSchemaTypeName = "feed_item_seen_batch"; + private final List feedItemIds = null; + private final CharSequence loadId = null; + private TrackBase trackBase; + + @Override // com.discord.api.science.AnalyticsSchema + public String b() { + return this.analyticsSchemaTypeName; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof TrackFeedItemSeenBatch)) { + return false; + } + TrackFeedItemSeenBatch trackFeedItemSeenBatch = (TrackFeedItemSeenBatch) obj; + return m.areEqual(this.loadId, trackFeedItemSeenBatch.loadId) && m.areEqual(this.feedItemIds, trackFeedItemSeenBatch.feedItemIds) && m.areEqual(this.additionalSeenTimeMillis, trackFeedItemSeenBatch.additionalSeenTimeMillis); + } + + public int hashCode() { + CharSequence charSequence = this.loadId; + int i = 0; + int hashCode = (charSequence != null ? charSequence.hashCode() : 0) * 31; + List list = this.feedItemIds; + int hashCode2 = (hashCode + (list != null ? list.hashCode() : 0)) * 31; + List list2 = this.additionalSeenTimeMillis; + if (list2 != null) { + i = list2.hashCode(); + } + return hashCode2 + i; + } + + public String toString() { + StringBuilder R = a.R("TrackFeedItemSeenBatch(loadId="); + R.append(this.loadId); + R.append(", feedItemIds="); + R.append(this.feedItemIds); + R.append(", additionalSeenTimeMillis="); + return a.K(R, this.additionalSeenTimeMillis, ")"); + } +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackFeedItemSeenBatchReceiver.java b/app/src/main/java/com/discord/analytics/generated/events/TrackFeedItemSeenBatchReceiver.java new file mode 100644 index 0000000000..211c45c1c4 --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackFeedItemSeenBatchReceiver.java @@ -0,0 +1,6 @@ +package com.discord.analytics.generated.events; + +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackFeedItemSeenBatch.kt */ +public interface TrackFeedItemSeenBatchReceiver extends AnalyticsSchema { +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackPaymentFlowFailed.java b/app/src/main/java/com/discord/analytics/generated/events/TrackPaymentFlowFailed.java index 0d241cf0de..105bb139c3 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/TrackPaymentFlowFailed.java +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackPaymentFlowFailed.java @@ -7,6 +7,8 @@ import com.discord.analytics.generated.traits.TrackLocationMetadata; import com.discord.analytics.generated.traits.TrackLocationMetadataReceiver; import com.discord.analytics.generated.traits.TrackPaymentMetadata; import com.discord.analytics.generated.traits.TrackPaymentMetadataReceiver; +import com.discord.analytics.generated.traits.TrackSourceMetadata; +import com.discord.analytics.generated.traits.TrackSourceMetadataReceiver; import com.discord.analytics.generated.traits.TrackStoreSkuMetadata; import com.discord.analytics.generated.traits.TrackStoreSkuMetadataReceiver; import com.discord.analytics.generated.traits.TrackSubscriptionMetadata; @@ -14,7 +16,7 @@ import com.discord.analytics.generated.traits.TrackSubscriptionMetadataReceiver; import com.discord.api.science.AnalyticsSchema; import d0.z.d.m; /* compiled from: TrackPaymentFlowFailed.kt */ -public final class TrackPaymentFlowFailed implements AnalyticsSchema, TrackBaseReceiver, TrackLocationMetadataReceiver, TrackStoreSkuMetadataReceiver, TrackSubscriptionMetadataReceiver, TrackPaymentMetadataReceiver { +public final class TrackPaymentFlowFailed implements AnalyticsSchema, TrackBaseReceiver, TrackLocationMetadataReceiver, TrackStoreSkuMetadataReceiver, TrackSubscriptionMetadataReceiver, TrackPaymentMetadataReceiver, TrackSourceMetadataReceiver { private final transient String analyticsSchemaTypeName = "payment_flow_failed"; private final Long durationMs = null; private final Boolean eligibleForTrial = null; @@ -25,6 +27,7 @@ public final class TrackPaymentFlowFailed implements AnalyticsSchema, TrackBaseR private TrackBase trackBase; private TrackLocationMetadata trackLocationMetadata; private TrackPaymentMetadata trackPaymentMetadata; + private TrackSourceMetadata trackSourceMetadata; private TrackStoreSkuMetadata trackStoreSkuMetadata; private TrackSubscriptionMetadata trackSubscriptionMetadata; diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackPaymentFlowOpened.java b/app/src/main/java/com/discord/analytics/generated/events/TrackPaymentFlowOpened.java index f2413caeee..cd9f0ea15f 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/TrackPaymentFlowOpened.java +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackPaymentFlowOpened.java @@ -6,15 +6,18 @@ import com.discord.analytics.generated.traits.TrackLocationMetadata; import com.discord.analytics.generated.traits.TrackLocationMetadataReceiver; import com.discord.analytics.generated.traits.TrackPaymentMetadata; import com.discord.analytics.generated.traits.TrackPaymentMetadataReceiver; +import com.discord.analytics.generated.traits.TrackSourceMetadata; +import com.discord.analytics.generated.traits.TrackSourceMetadataReceiver; import com.discord.analytics.generated.traits.TrackSubscriptionMetadata; import com.discord.analytics.generated.traits.TrackSubscriptionMetadataReceiver; import com.discord.api.science.AnalyticsSchema; /* compiled from: TrackPaymentFlowOpened.kt */ -public final class TrackPaymentFlowOpened implements AnalyticsSchema, TrackBaseReceiver, TrackLocationMetadataReceiver, TrackSubscriptionMetadataReceiver, TrackPaymentMetadataReceiver { +public final class TrackPaymentFlowOpened implements AnalyticsSchema, TrackBaseReceiver, TrackLocationMetadataReceiver, TrackSubscriptionMetadataReceiver, TrackPaymentMetadataReceiver, TrackSourceMetadataReceiver { private final transient String analyticsSchemaTypeName = "payment_flow_opened"; private TrackBase trackBase; private TrackLocationMetadata trackLocationMetadata; private TrackPaymentMetadata trackPaymentMetadata; + private TrackSourceMetadata trackSourceMetadata; private TrackSubscriptionMetadata trackSubscriptionMetadata; @Override // com.discord.api.science.AnalyticsSchema 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 232674aa35..246e32ced8 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 @@ -7,6 +7,8 @@ import com.discord.analytics.generated.traits.TrackLocationMetadata; import com.discord.analytics.generated.traits.TrackLocationMetadataReceiver; import com.discord.analytics.generated.traits.TrackPaymentMetadata; import com.discord.analytics.generated.traits.TrackPaymentMetadataReceiver; +import com.discord.analytics.generated.traits.TrackSourceMetadata; +import com.discord.analytics.generated.traits.TrackSourceMetadataReceiver; import com.discord.analytics.generated.traits.TrackStoreSkuMetadata; import com.discord.analytics.generated.traits.TrackStoreSkuMetadataReceiver; import com.discord.analytics.generated.traits.TrackSubscriptionMetadata; @@ -14,7 +16,7 @@ import com.discord.analytics.generated.traits.TrackSubscriptionMetadataReceiver; import com.discord.api.science.AnalyticsSchema; import d0.z.d.m; /* compiled from: TrackPaymentFlowStep.kt */ -public final class TrackPaymentFlowStep implements AnalyticsSchema, TrackBaseReceiver, TrackLocationMetadataReceiver, TrackStoreSkuMetadataReceiver, TrackSubscriptionMetadataReceiver, TrackPaymentMetadataReceiver { +public final class TrackPaymentFlowStep implements AnalyticsSchema, TrackBaseReceiver, TrackLocationMetadataReceiver, TrackStoreSkuMetadataReceiver, TrackSubscriptionMetadataReceiver, TrackPaymentMetadataReceiver, TrackSourceMetadataReceiver { private final transient String analyticsSchemaTypeName = "payment_flow_step"; private final Boolean eligibleForTrial = null; private final Long flowDurationMs = null; @@ -26,6 +28,7 @@ public final class TrackPaymentFlowStep implements AnalyticsSchema, TrackBaseRec private TrackBase trackBase; private TrackLocationMetadata trackLocationMetadata; private TrackPaymentMetadata trackPaymentMetadata; + private TrackSourceMetadata trackSourceMetadata; private TrackStoreSkuMetadata trackStoreSkuMetadata; private TrackSubscriptionMetadata trackSubscriptionMetadata; diff --git a/app/src/main/java/com/discord/analytics/generated/events/activity_internal/TrackActivityInternalClientStatus.java b/app/src/main/java/com/discord/analytics/generated/events/activity_internal/TrackActivityInternalClientStatus.java index 975e26b10c..c464a6d342 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/activity_internal/TrackActivityInternalClientStatus.java +++ b/app/src/main/java/com/discord/analytics/generated/events/activity_internal/TrackActivityInternalClientStatus.java @@ -12,6 +12,7 @@ public final class TrackActivityInternalClientStatus implements AnalyticsSchema, private final Long activityHeight = null; private final Long activityWidth = null; private final transient String analyticsSchemaTypeName = "activity_internal_client_status"; + private final Float fpsAvg = null; private final Long intervalRateMs = null; private final Long networkAttempts = null; private final Long networkLatencyMs = null; @@ -31,7 +32,7 @@ public final class TrackActivityInternalClientStatus implements AnalyticsSchema, return false; } TrackActivityInternalClientStatus trackActivityInternalClientStatus = (TrackActivityInternalClientStatus) obj; - return m.areEqual(this.activityWidth, trackActivityInternalClientStatus.activityWidth) && m.areEqual(this.activityHeight, trackActivityInternalClientStatus.activityHeight) && m.areEqual(this.networkLatencyMs, trackActivityInternalClientStatus.networkLatencyMs) && m.areEqual(this.networkAttempts, trackActivityInternalClientStatus.networkAttempts) && m.areEqual(this.intervalRateMs, trackActivityInternalClientStatus.intervalRateMs); + return m.areEqual(this.activityWidth, trackActivityInternalClientStatus.activityWidth) && m.areEqual(this.activityHeight, trackActivityInternalClientStatus.activityHeight) && m.areEqual(this.networkLatencyMs, trackActivityInternalClientStatus.networkLatencyMs) && m.areEqual(this.networkAttempts, trackActivityInternalClientStatus.networkAttempts) && m.areEqual(this.intervalRateMs, trackActivityInternalClientStatus.intervalRateMs) && m.areEqual(this.fpsAvg, trackActivityInternalClientStatus.fpsAvg); } public int hashCode() { @@ -45,10 +46,12 @@ public final class TrackActivityInternalClientStatus implements AnalyticsSchema, Long l4 = this.networkAttempts; int hashCode4 = (hashCode3 + (l4 != null ? l4.hashCode() : 0)) * 31; Long l5 = this.intervalRateMs; - if (l5 != null) { - i = l5.hashCode(); + int hashCode5 = (hashCode4 + (l5 != null ? l5.hashCode() : 0)) * 31; + Float f = this.fpsAvg; + if (f != null) { + i = f.hashCode(); } - return hashCode4 + i; + return hashCode5 + i; } public String toString() { @@ -61,6 +64,10 @@ public final class TrackActivityInternalClientStatus implements AnalyticsSchema, R.append(", networkAttempts="); R.append(this.networkAttempts); R.append(", intervalRateMs="); - return a.F(R, this.intervalRateMs, ")"); + R.append(this.intervalRateMs); + R.append(", fpsAvg="); + R.append(this.fpsAvg); + R.append(")"); + return R.toString(); } } 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 509155cd6f..67a16427f2 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 + " - 116.2 - Alpha (116202)"); + textView.setText(string + " - 116.3 - Alpha (116203)"); 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/res/values-ar-rXB/strings.xml b/app/src/main/res/values-ar-rXB/strings.xml index bc25c2ee83..90334d98a6 100644 --- a/app/src/main/res/values-ar-rXB/strings.xml +++ b/app/src/main/res/values-ar-rXB/strings.xml @@ -331,6 +331,7 @@ ‏‮Categories‬‏ ‏‮Popular‬‏ ‏‮Slash‬‏ ‏‮Commands‬‏ ‏‮Overview‬‏ + ‏‮Granted‬‏ ‏‮Permissions‬‏ ‏‮Supported‬‏ ‏‮Languages‬‏ ‏‮Links‬‏ ‏‮Privacy‬‏ ‏‮Policy‬‏ @@ -2115,6 +2116,7 @@ ‏‮Cancel‬‏ ‏‮Event‬‏ ‏‮This‬‏ ‏‮message‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮deleted‬‏ ‏‮in‬‏ ‏‮all‬‏ ‏‮servers‬‏ ‏‮following‬‏ ‏‮this‬‏ ‏‮channel.‬‏ ‏‮It‬‏ ‏‮may‬‏ ‏‮take‬‏ ‏‮some‬‏ ‏‮time‬‏ ‏‮before‬‏ ‏‮it’s‬‏ ‏‮removed‬‏ ‏‮from‬‏ ‏‮all‬‏ ‏‮servers.‬‏ ‏‮Delete‬‏ ‏‮Post‬‏ + ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮delete‬‏ ‏‮this‬‏ ‏‮post?‬‏ ‏‮Delete‬‏ ‏‮Message‬‏ ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮delete‬‏ ‏‮this‬‏ ‏‮message?‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮hold‬‏ ‏‮down‬‏ ‏‮shift‬‏ ‏‮when‬‏ ‏‮clicking‬‏ ‏‮**delete‬‏ ‏‮message**‬‏ ‏‮to‬‏ ‏‮bypass‬‏ ‏‮this‬‏ ‏‮confirmation‬‏ ‏‮entirely.‬‏ @@ -2356,6 +2358,7 @@ ‏‮Have‬‏ ‏‮feedback?‬‏ ‏‮[Take‬‏ ‏‮the‬‏ ‏‮survey](‬‏‏‮{surveyURL}‬‏‏‮)‬‏ ‏‮Catch‬‏ ‏‮some‬‏ ‏‮fish‬‏ ‏‮with‬‏ ‏‮your‬‏ ‏‮friends‬‏ ‏‮in‬‏ ‏‮our‬‏ ‏‮new‬‏ ‏‮game‬‏ ‏‮Fishington.io!‬‏ ‏‮Play‬‏ ‏‮Fishington‬‏ ‏‮with‬‏ ‏‮your‬‏ ‏‮friends!‬‏ + ‏‮Preview‬‏ ‏‮In‬‏ ‏‮Activity‬‏ ‏‮In‬‏ ‏‮!!‬‏‏‮{applicationName}‬‏‏‮!!‬‏ ‏‮Coming‬‏ ‏‮soon‬‏ ‏‮to‬‏ ‏‮mobile‬‏ @@ -3372,6 +3375,10 @@ ‏‮Filter‬‏ ‏‮messages‬‏ ‏‮containing‬‏ ‏‮malicious‬‏ ‏‮links‬‏ ‏‮from‬‏ ‏‮your‬‏ ‏‮server.‬‏ ‏‮Spam‬‏ ‏‮Link‬‏ ‏‮Filter‬‏ ‏‮If‬‏ ‏‮harmful‬‏ ‏‮links‬‏ ‏‮are‬‏ ‏‮detected…‬‏ + ‏‮Channel:‬‏ ‏‮{channelName}‬‏ + ‏‮Rule:‬‏ ‏‮{ruleName}‬‏ + ‏‮has‬‏ ‏‮blocked‬‏ ‏‮a‬‏ ‏‮message‬‏ + ‏‮Automod‬‏ ‏‮Want‬‏ ‏‮this‬‏ ‏‮server‬‏ ‏‮to‬‏ ‏‮feel‬‏ ‏‮unique?‬‏ ‏‮Unlock‬‏ ‏‮custom‬‏ ‏‮server‬‏ ‏‮banners‬‏ ‏‮with‬‏ ‏‮**‬‏‏‮{boostsNeeded}‬‏ ‏‮more‬‏ ‏‮{boostsNeeded}‬‏‏‮.**‬‏ ‏‮Boost‬‏ ‏‮This‬‏ ‏‮Server‬‏ ‏‮You’ll‬‏ ‏‮also‬‏ ‏‮help‬‏ ‏‮unlock‬‏ ‏‮more‬‏ ‏‮customization‬‏ ‏‮features‬‏ ‏‮and‬‏ ‏‮utility‬‏ ‏‮upgrades‬‏ ‏‮for‬‏ ‏‮everyone‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮like:‬‏ @@ -5236,6 +5243,9 @@ ‏‮Uh-oh.‬‏ ‏‮Looks‬‏ ‏‮like‬‏ ‏‮you\'ve‬‏ ‏‮been‬‏ ‏‮banned.‬‏ ‏‮Accepting‬‏ ‏‮this‬‏ ‏‮invite‬‏ ‏‮will‬‏ ‏‮add‬‏ ‏‮**!!‬‏‏‮{username}‬‏‏‮!!**‬‏ ‏‮as‬‏ ‏‮your‬‏ ‏‮friend‬‏ ‏‮on‬‏ ‏‮Discord.‬‏ ‏‮Create‬‏ ‏‮an‬‏ ‏‮account‬‏ ‏‮and‬‏ ‏‮add‬‏ ‏‮**!!‬‏‏‮{username}‬‏‏‮!!**‬‏ ‏‮as‬‏ ‏‮your‬‏ ‏‮friend‬‏ ‏‮on‬‏ ‏‮Discord.‬‏ + ‏‮Download‬‏ ‏‮the‬‏ ‏‮Android‬‏ ‏‮App‬‏ + ‏‮Download‬‏ ‏‮the‬‏ ‏‮App‬‏ + ‏‮Download‬‏ ‏‮the‬‏ ‏‮iOS‬‏ ‏‮App‬‏ ‏‮The‬‏ ‏‮invite‬‏ ‏‮is‬‏ ‏‮invalid‬‏ ‏‮or‬‏ ‏‮has‬‏ ‏‮expired.‬‏ ‏‮Expires‬‏ ‏‮Failed‬‏ ‏‮to‬‏ ‏‮make‬‏ ‏‮an‬‏ ‏‮invite‬‏ ‏‮link.‬‏ @@ -5248,6 +5258,7 @@ ‏‮Invite‬‏ ‏‮Code‬‏ ‏‮Inviter‬‏ ‏‮Looks‬‏ ‏‮like‬‏ ‏‮you‬‏ ‏‮can\'t‬‏ ‏‮make‬‏ ‏‮an‬‏ ‏‮invite‬‏ ‏‮for‬‏ ‏‮this‬‏ ‏‮server.‬‏ + ‏‮You‬‏ ‏‮successfully‬‏ ‏‮created‬‏ ‏‮an‬‏ ‏‮account‬‏ ‏‮and‬‏ ‏‮joined‬‏ ‏‮**‬‏‏‮{guildName}‬‏‏‮**.‬‏ ‏‮Why,‬‏ ‏‮hello‬‏ ‏‮there.‬‏ ‏‮Resolving‬‏ ‏‮Invite‬‏ ‏‮Uses‬‏ @@ -6173,8 +6184,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‬‏ @@ -6280,7 +6291,7 @@ ‏‮I‬‏ ‏‮understand‬‏ ‏‮and‬‏ ‏‮agree‬‏ ‏‮with‬‏ ‏‮these‬‏ ‏‮terms.‬‏ ‏‮Continue‬‏ ‏‮to‬‏ ‏‮Discord‬‏ ‏‮To‬‏ ‏‮continue‬‏ ‏‮using‬‏ ‏‮Discord,‬‏ ‏‮please‬‏ ‏‮read‬‏ ‏‮and‬‏ ‏‮agree‬‏ ‏‮to‬‏ ‏‮our‬‏ ‏‮updated‬‏ ‏‮Terms‬‏ ‏‮of‬‏ ‏‮Service‬‏ ‏‮and‬‏ ‏‮Privacy‬‏ ‏‮Policy.‬‏ - ‏‮Terms‬‏ ‏‮of‬‏ ‏‮Service‬‏ ‏‮and‬‏ ‏‮Privacy‬‏ ‏‮Update‬‏ + ‏‮Terms‬‏ ‏‮of‬‏ ‏‮Service‬‏ ‏‮and‬‏ ‏‮Privacy‬‏ ‏‮Updates‬‏ ‏‮New‬‏ ‏‮Thread‬‏ ‏‮New‬‏ ‏‮Unreads‬‏ ‏‮Announcement‬‏ ‏‮Channel‬‏ @@ -7245,7 +7256,9 @@ ‏‮Manage‬‏ ‏‮Nitro‬‏ ‏‮Your‬‏ ‏‮**!!‬‏‏‮{price}‬‏‏‮!!**‬‏ ‏‮subscription‬‏ ‏‮is‬‏ ‏‮past‬‏ ‏‮due.‬‏ ‏‮Please‬‏ ‏‮update‬‏ ‏‮your‬‏ ‏‮payment‬‏ ‏‮info‬‏ ‏‮or‬‏ ‏‮your‬‏ ‏‮subscription‬‏ ‏‮will‬‏ ‏‮end‬‏ ‏‮on‬‏ ‏‮**‬‏‏‮{endDate}‬‏‏‮**.‬‏ ‏‮Your‬‏ ‏‮subscription‬‏ ‏‮is‬‏ ‏‮past‬‏ ‏‮due.‬‏ ‏‮Please‬‏ ‏‮[update‬‏ ‏‮your‬‏ ‏‮payment‬‏ ‏‮info‬‏ ‏‮for‬‏ ‏‮!!‬‏‏‮{paymentGatewayName}‬‏‏‮!!](‬‏‏‮{paymentSourceLink}‬‏‏‮)‬‏ ‏‮or‬‏ ‏‮your‬‏ ‏‮subscription‬‏ ‏‮will‬‏ ‏‮end‬‏ ‏‮on‬‏ ‏‮**‬‏‏‮{endDate}‬‏‏‮**.‬‏ + ‏‮**Your‬‏ ‏‮payment‬‏ ‏‮is‬‏ ‏‮processesing.**‬‏ ‏‮Please‬‏ ‏‮be‬‏ ‏‮patient,‬‏ ‏‮this‬‏ ‏‮can‬‏ ‏‮take‬‏ ‏‮up‬‏ ‏‮to‬‏ ‏‮{maxProcessingTimeInDays}‬‏ ‏‮days.‬‏ ‏‮We‬‏ ‏‮will‬‏ ‏‮email‬‏ ‏‮you‬‏ ‏‮a‬‏ ‏‮confirmation‬‏ ‏‮when‬‏ ‏‮it’s‬‏ ‏‮complete.‬‏ ‏‮Boosts‬‏ + ‏‮Your‬‏ ‏‮**Nitro**‬‏ ‏‮subscription‬‏ ‏‮is‬‏ ‏‮prepaid‬‏ ‏‮through‬‏ ‏‮**‬‏‏‮{prepaidEndDate}‬‏‏‮**.‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮extend‬‏ ‏‮your‬‏ ‏‮plan‬‏ ‏‮by‬‏ ‏‮editing‬‏ ‏‮your‬‏ ‏‮payment‬‏ ‏‮method.‬‏ ‏‮Your‬‏ ‏‮subscriptions‬‏ ‏‮will‬‏ ‏‮automatically‬‏ ‏‮renew‬‏ ‏‮on‬‏ ‏‮**‬‏‏‮{renewalDate}‬‏‏‮**‬‏ ‏‮and‬‏ ‏‮you\'ll‬‏ ‏‮be‬‏ ‏‮charged‬‏ ‏‮**!!‬‏‏‮{price}‬‏‏‮!!**.‬‏ ‏‮Your‬‏ ‏‮subscriptions‬‏ ‏‮will‬‏ ‏‮automatically‬‏ ‏‮renew‬‏ ‏‮on‬‏ ‏‮**‬‏‏‮{renewalDate}‬‏‏‮**.‬‏ ‏‮Please‬‏ ‏‮[visit‬‏ ‏‮your‬‏ ‏‮!!‬‏‏‮{paymentGatewayName}‬‏‏‮!!‬‏ ‏‮Subscription‬‏ ‏‮settings](‬‏‏‮{subscriptionManagementLink}‬‏‏‮)‬‏ ‏‮for‬‏ ‏‮more‬‏ ‏‮details.‬‏ ‏‮Your‬‏ ‏‮subscription‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮upgraded‬‏ ‏‮on‬‏ ‏‮**‬‏‏‮{upgradeDate}‬‏‏‮**‬‏ ‏‮and‬‏ ‏‮you\'ll‬‏ ‏‮be‬‏ ‏‮charged‬‏ ‏‮an‬‏ ‏‮estimated‬‏ ‏‮price‬‏ ‏‮**!!‬‏‏‮{upgradePrice}‬‏‏‮!!**.‬‏ ‏‮After,‬‏ ‏‮it‬‏ ‏‮will‬‏ ‏‮renew‬‏ ‏‮on‬‏ ‏‮**‬‏‏‮{renewalDate}‬‏‏‮**‬‏ ‏‮and‬‏ ‏‮you\'ll‬‏ ‏‮be‬‏ ‏‮charged‬‏ ‏‮**!!‬‏‏‮{renewalPrice}‬‏‏‮!!**.‬‏ @@ -9153,6 +9166,7 @@ ‏‮Friend‬‏ ‏‮requests‬‏ ‏‮sent!‬‏ ‏‮Copied‬‏ ‏‮Command‬‏ ‏‮Feedback‬‏ ‏‮Sent!‬‏ + ‏‮Copied‬‏ ‏‮Post‬‏ ‏‮ID‬‏ ‏‮Friend‬‏ ‏‮invites‬‏ ‏‮revoked‬‏ ‏‮Gif‬‏ ‏‮Saved‬‏ ‏‮Copied‬‏ ‏‮ID‬‏ diff --git a/app/src/main/res/values-en-rXA/strings.xml b/app/src/main/res/values-en-rXA/strings.xml index 3c2a564f9c..4deefd6306 100644 --- a/app/src/main/res/values-en-rXA/strings.xml +++ b/app/src/main/res/values-en-rXA/strings.xml @@ -331,6 +331,7 @@ [Çåţéĝöŕîéš one two] [Þöþûļåŕ Šļåšĥ Çöḿḿåñðš one two three] [ÖVéŕVîéŵ one two] + [Ĝŕåñţéð Þéŕḿîššîöñš one two three] [Šûþþöŕţéð Ļåñĝûåĝéš one two three] [Ļîñķš one] [ÞŕîVåçý Þöļîçý one two three] @@ -2115,6 +2116,7 @@ [Çåñçéļ ÉVéñţ one two] [Ţĥîš ḿéššåĝé ŵîļļ ɓé ðéļéţéð îñ åļļ šéŕVéŕš ƒöļļöŵîñĝ ţĥîš çĥåññéļ. Îţ ḿåý ţåķé šöḿé ţîḿé ɓéƒöŕé îţ’š ŕéḿöVéð ƒŕöḿ åļļ šéŕVéŕš. one two three four five six seven eight nine ten eleven twelve thirteen] [Ðéļéţé Þöšţ one two] + [Åŕé ýöû šûŕé ýöû ŵåñţ ţö ðéļéţé ţĥîš þöšţ¿ one two three four five] [Ðéļéţé Ḿéššåĝé one two three] [Åŕé ýöû šûŕé ýöû ŵåñţ ţö ðéļéţé ţĥîš ḿéššåĝé¿ one two three four five] [Ýöû çåñ ĥöļð ðöŵñ šĥîƒţ ŵĥéñ çļîçķîñĝ **ðéļéţé ḿéššåĝé** ţö ɓýþåšš ţĥîš çöñƒîŕḿåţîöñ éñţîŕéļý. one two three four five six seven eight nine ten] @@ -2356,6 +2358,7 @@ [ĤåVé ƒééðɓåçķ¿ [Ţåķé ţĥé šûŕVéý](»{surveyURL}«) one two three four] [Çåţçĥ šöḿé ƒîšĥ ŵîţĥ ýöûŕ ƒŕîéñðš îñ öûŕ ñéŵ ĝåḿé Fîšĥîñĝţöñ.îö¡ one two three four five six seven] [Þļåý Fîšĥîñĝţöñ ŵîţĥ ýöûŕ ƒŕîéñðš¡ one two three four] + [ÞŕéVîéŵ one two] [Îñ ÅçţîVîţý one two] [Îñ ¡¡»{applicationName}«¡¡ one two] [Çöḿîñĝ šööñ ţö ḿöɓîļé one two three] @@ -3372,6 +3375,10 @@ [Fîļţéŕ ḿéššåĝéš çöñţåîñîñĝ ḿåļîçîöûš ļîñķš ƒŕöḿ ýöûŕ šéŕVéŕ. one two three four five six seven] [Šþåḿ Ļîñķ Fîļţéŕ one two three] [΃ ĥåŕḿƒûļ ļîñķš åŕé ðéţéçţéð… one two three four] + [Çĥåññéļ: »{channelName}« one two] + [Ŕûļé: »{ruleName}« one two] + [ĥåš ɓļöçķéð å ḿéššåĝé one two three] + [Åûţöḿöð one two] [Ŵåñţ ţĥîš šéŕVéŕ ţö ƒééļ ûñîQûé¿ Ûñļöçķ çûšţöḿ šéŕVéŕ ɓåññéŕš ŵîţĥ **»{boostsNeeded}« ḿöŕé »{boostsNeeded}«.** one two three four five six seven eight nine] [βööšţ Ţĥîš ŠéŕVéŕ one two three] [Ýöû’ļļ åļšö ĥéļþ ûñļöçķ ḿöŕé çûšţöḿîžåţîöñ ƒéåţûŕéš åñð ûţîļîţý ûþĝŕåðéš ƒöŕ éVéŕýöñé îñ ţĥé šéŕVéŕ ļîķé: one two three four five six seven eight nine ten eleven] @@ -5236,6 +5243,9 @@ [Ûĥ-öĥ. Ļööķš ļîķé ýöû\'Vé ɓééñ ɓåññéð. one two three four five] [Åççéþţîñĝ ţĥîš îñVîţé ŵîļļ åðð **¡¡»{username}«¡¡** åš ýöûŕ ƒŕîéñð öñ Ðîšçöŕð. one two three four five six seven eight] [Çŕéåţé åñ åççöûñţ åñð åðð **¡¡»{username}«¡¡** åš ýöûŕ ƒŕîéñð öñ Ðîšçöŕð. one two three four five six seven] + [Ðöŵñļöåð ţĥé Åñðŕöîð Åþþ one two three] + [Ðöŵñļöåð ţĥé Åþþ one two three] + [Ðöŵñļöåð ţĥé îÖŠ Åþþ one two three] [Ţĥé îñVîţé îš îñVåļîð öŕ ĥåš éхþîŕéð. one two three four five] [Éхþîŕéš one two] [Fåîļéð ţö ḿåķé åñ îñVîţé ļîñķ. one two three four] @@ -5248,6 +5258,7 @@ [ÎñVîţé Çöðé one two] [ÎñVîţéŕ one two] [Ļööķš ļîķé ýöû çåñ\'ţ ḿåķé åñ îñVîţé ƒöŕ ţĥîš šéŕVéŕ. one two three four five six] + [Ýöû šûççéššƒûļļý çŕéåţéð åñ åççöûñţ åñð ĵöîñéð **»{guildName}«**. one two three four five six] [Ŵĥý, ĥéļļö ţĥéŕé. one two three] [ŔéšöļVîñĝ ÎñVîţé one two three] [Ûšéš one] @@ -6173,8 +6184,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] @@ -6280,7 +6291,7 @@ [Î ûñðéŕšţåñð åñð åĝŕéé ŵîţĥ ţĥéšé ţéŕḿš. one two three four five] [Çöñţîñûé ţö Ðîšçöŕð one two three] [Ţö çöñţîñûé ûšîñĝ Ðîšçöŕð, þļéåšé ŕéåð åñð åĝŕéé ţö öûŕ ûþðåţéð Ţéŕḿš öƒ ŠéŕVîçé åñð ÞŕîVåçý Þöļîçý. one two three four five six seven eight nine ten eleven] - [Ţéŕḿš öƒ ŠéŕVîçé åñð ÞŕîVåçý Ûþðåţé one two three four] + [Ţéŕḿš öƒ ŠéŕVîçé åñð ÞŕîVåçý Ûþðåţéš one two three four five] [Ñéŵ Ţĥŕéåð one two] [Ñéŵ Ûñŕéåðš one two] [Åññöûñçéḿéñţ Çĥåññéļ one two three] @@ -7245,7 +7256,9 @@ [Ḿåñåĝé Ñîţŕö one two] [Ýöûŕ **¡¡»{price}«¡¡** šûɓšçŕîþţîöñ îš þåšţ ðûé. Þļéåšé ûþðåţé ýöûŕ þåýḿéñţ îñƒö öŕ ýöûŕ šûɓšçŕîþţîöñ ŵîļļ éñð öñ **»{endDate}«**. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen] [Ýöûŕ šûɓšçŕîþţîöñ îš þåšţ ðûé. Þļéåšé [ûþðåţé ýöûŕ þåýḿéñţ îñƒö ƒöŕ ¡¡»{paymentGatewayName}«¡¡](»{paymentSourceLink}«) öŕ ýöûŕ šûɓšçŕîþţîöñ ŵîļļ éñð öñ **»{endDate}«**. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen] + [**Ýöûŕ þåýḿéñţ îš þŕöçéššéšîñĝ.** Þļéåšé ɓé þåţîéñţ, ţĥîš çåñ ţåķé ûþ ţö »{maxProcessingTimeInDays}« ðåýš. Ŵé ŵîļļ éḿåîļ ýöû å çöñƒîŕḿåţîöñ ŵĥéñ îţ’š çöḿþļéţé. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three] [βööšţš one two] + [Ýöûŕ **Ñîţŕö** šûɓšçŕîþţîöñ îš þŕéþåîð ţĥŕöûĝĥ **»{prepaidEndDate}«**. Ýöû çåñ éхţéñð ýöûŕ þļåñ ɓý éðîţîñĝ ýöûŕ þåýḿéñţ ḿéţĥöð. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen] [Ýöûŕ šûɓšçŕîþţîöñš ŵîļļ åûţöḿåţîçåļļý ŕéñéŵ öñ **»{renewalDate}«** åñð ýöû\'ļļ ɓé çĥåŕĝéð **¡¡»{price}«¡¡**. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] [Ýöûŕ šûɓšçŕîþţîöñš ŵîļļ åûţöḿåţîçåļļý ŕéñéŵ öñ **»{renewalDate}«**. Þļéåšé [Vîšîţ ýöûŕ ¡¡»{paymentGatewayName}«¡¡ Šûɓšçŕîþţîöñ šéţţîñĝš](»{subscriptionManagementLink}«) ƒöŕ ḿöŕé ðéţåîļš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty] [Ýöûŕ šûɓšçŕîþţîöñ ŵîļļ ɓé ûþĝŕåðéð öñ **»{upgradeDate}«** åñð ýöû\'ļļ ɓé çĥåŕĝéð åñ éšţîḿåţéð þŕîçé **¡¡»{upgradePrice}«¡¡**. Ńţéŕ, îţ ŵîļļ ŕéñéŵ öñ **»{renewalDate}«** åñð ýöû\'ļļ ɓé çĥåŕĝéð **¡¡»{renewalPrice}«¡¡**. 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] @@ -9153,6 +9166,7 @@ [Fŕîéñð ŕéQûéšţš šéñţ¡ one two three] [Çöþîéð Çöḿḿåñð one two three] [Fééðɓåçķ Šéñţ¡ one two three] + [Çöþîéð Þöšţ ÎÐ one two three] [Fŕîéñð îñVîţéš ŕéVöķéð one two three] [Ĝîƒ ŠåVéð one two] [Çöþîéð ÎÐ one two] diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml index a4fc1026f6..16b8fee995 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -14961,9637 +14961,9651 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dfec1342e8..d52b1a2768 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -331,6 +331,7 @@ Categories Popular Slash Commands Overview + Granted Permissions Supported Languages Links Privacy Policy @@ -1485,7 +1486,7 @@ Custom Presets Use Default - 1dc2dd74be294fa2a9890f5c495225f1 + 890905c898ba49aaa7483d035bcac8c6 Slash command application {applicationName} {applicationName} application {applicationName} application selected @@ -2120,6 +2121,7 @@ Cancel Event This message will be deleted in all servers following this channel. It may take some time before it’s removed from all servers. Delete Post + Are you sure you want to delete this post? Delete Message Are you sure you want to delete this message? You can hold down shift when clicking **delete message** to bypass this confirmation entirely. @@ -2362,6 +2364,7 @@ Have feedback? [Take the survey]({surveyURL}) Catch some fish with your friends in our new game Fishington.io! Play Fishington with your friends! + Preview In Activity In !!{applicationName}!! Coming soon to mobile @@ -3388,6 +3391,10 @@ Filter messages containing malicious links from your server. Spam Link Filter If harmful links are detected… + Channel: {channelName} + Rule: {ruleName} + has blocked a message + Automod Want this server to feel unique? Unlock custom server banners with **{boostsNeeded} more {boostsNeeded}.** Boost This Server You’ll also help unlock more customization features and utility upgrades for everyone in the server like: @@ -5253,6 +5260,9 @@ Uh-oh. Looks like you\'ve been banned. Accepting this invite will add **!!{username}!!** as your friend on Discord. Create an account and add **!!{username}!!** as your friend on Discord. + Download the Android App + Download the App + Download the iOS App The invite is invalid or has expired. Expires Failed to make an invite link. @@ -5265,6 +5275,7 @@ Invite Code Inviter Looks like you can\'t make an invite for this server. + You successfully created an account and joined **{guildName}**. Why, hello there. Resolving Invite Uses @@ -6192,8 +6203,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 @@ -6302,7 +6313,7 @@ I understand and agree with these terms. Continue to Discord To continue using Discord, please read and agree to our updated Terms of Service and Privacy Policy. - Terms of Service and Privacy Update + Terms of Service and Privacy Updates New Thread New Unreads Announcement Channel @@ -7271,7 +7282,9 @@ Manage Nitro Your **!!{price}!!** subscription is past due. Please update your payment info or your subscription will end on **{endDate}**. Your subscription is past due. Please [update your payment info for !!{paymentGatewayName}!!]({paymentSourceLink}) or your subscription will end on **{endDate}**. + **Your payment is processesing.** Please be patient, this can take up to {maxProcessingTimeInDays} days. We will email you a confirmation when it’s complete. Boosts + Your **Nitro** subscription is prepaid through **{prepaidEndDate}**. You can extend your plan by editing your payment method. Your subscriptions will automatically renew on **{renewalDate}** and you\'ll be charged **!!{price}!!**. Your subscriptions will automatically renew on **{renewalDate}**. Please [visit your !!{paymentGatewayName}!! Subscription settings]({subscriptionManagementLink}) for more details. Your subscription will be upgraded on **{upgradeDate}** and you\'ll be charged an estimated price **!!{upgradePrice}!!**. After, it will renew on **{renewalDate}** and you\'ll be charged **!!{renewalPrice}!!**. @@ -9180,6 +9193,7 @@ Friend requests sent! Copied Command Feedback Sent! + Copied Post ID Friend invites revoked Gif Saved Copied ID