diff --git a/app/build.gradle b/app/build.gradle index 7f25e12d91..c13bd19b71 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 116200 - versionName "116.0 - Alpha" + versionCode 116201 + versionName "116.1 - Alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0f264da64b..c93bee06aa 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/stores/StoreMessageAck$ackGuild$1.java b/app/src/main/java/com/discord/stores/StoreMessageAck$ackGuild$1.java deleted file mode 100644 index c200ef01dd..0000000000 --- a/app/src/main/java/com/discord/stores/StoreMessageAck$ackGuild$1.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.discord.stores; - -import d0.z.d.o; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; -/* compiled from: StoreMessageAck.kt */ -public final class StoreMessageAck$ackGuild$1 extends o implements Function0 { - public static final StoreMessageAck$ackGuild$1 INSTANCE = new StoreMessageAck$ackGuild$1(); - - public StoreMessageAck$ackGuild$1() { - super(0); - } - - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public final void mo1invoke() { - } -} diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck$ackGuild$2.java b/app/src/main/java/com/discord/stores/StoreMessageAck$ackGuild$2.java deleted file mode 100644 index bd8cbdbdfa..0000000000 --- a/app/src/main/java/com/discord/stores/StoreMessageAck$ackGuild$2.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.discord.stores; - -import d0.z.d.o; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; -import kotlin.jvm.functions.Function1; -/* compiled from: StoreMessageAck.kt */ -public final class StoreMessageAck$ackGuild$2 extends o implements Function1 { - public final /* synthetic */ Function0 $onSuccess; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreMessageAck$ackGuild$2(Function0 function0) { - super(1); - this.$onSuccess = function0; - } - - /* Return type fixed from 'java.lang.Object' to match base method */ - /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ - @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Unit invoke(Void r1) { - invoke(r1); - return Unit.a; - } - - public final void invoke(Void r1) { - this.$onSuccess.mo1invoke(); - } -} diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck.java b/app/src/main/java/com/discord/stores/StoreMessageAck.java index a8886c96cc..c7df5a82d1 100644 --- a/app/src/main/java/com/discord/stores/StoreMessageAck.java +++ b/app/src/main/java/com/discord/stores/StoreMessageAck.java @@ -38,7 +38,6 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import kotlin.NoWhenBranchMatchedException; import kotlin.Pair; -import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; import kotlin.jvm.internal.DefaultConstructorMarker; @@ -374,15 +373,6 @@ public final class StoreMessageAck extends StoreV2 { storeMessageAck.ack(j, z2, z3); } - /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.stores.StoreMessageAck */ - /* JADX WARN: Multi-variable type inference failed */ - public static /* synthetic */ void ackGuild$default(StoreMessageAck storeMessageAck, Context context, long j, Function0 function0, int i, Object obj) { - if ((i & 4) != 0) { - function0 = StoreMessageAck$ackGuild$1.INSTANCE; - } - storeMessageAck.ackGuild(context, j, function0); - } - private final Observable getPendingAck(Observable observable, boolean z2, boolean z3) { Observable Y = observable.Y(new StoreMessageAck$getPendingAck$2(this, z2, new StoreMessageAck$getPendingAck$1(z3))); m.checkNotNullExpressionValue(Y, "switchMap { channelId ->…gAck.EMPTY)\n }\n }"); @@ -489,11 +479,6 @@ public final class StoreMessageAck extends StoreV2 { this.dispatcher.schedule(new StoreMessageAck$ack$1(this, j, z2, z3)); } - public final void ackGuild(Context context, long j, Function0 function0) { - m.checkNotNullParameter(function0, "onSuccess"); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.ackGuild(j), false, 1, null), context, "REST: ackGuild", (Function1) null, new StoreMessageAck$ackGuild$2(function0), (Function1) null, (Function0) null, (Function0) null, 116, (Object) null); - } - public final Map getAll() { return this.acksSnapshot; } diff --git a/app/src/main/java/com/discord/stores/StoreUserSettingsSystem$setTheme$1.java b/app/src/main/java/com/discord/stores/StoreUserSettingsSystem$setTheme$1.java new file mode 100644 index 0000000000..38ef84bb10 --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreUserSettingsSystem$setTheme$1.java @@ -0,0 +1,27 @@ +package com.discord.stores; + +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +/* compiled from: StoreUserSettingsSystem.kt */ +public final class StoreUserSettingsSystem$setTheme$1 extends o implements Function0 { + public final /* synthetic */ boolean $apiSync; + public final /* synthetic */ Function0 $onRequestApiSync; + public final /* synthetic */ String $theme; + public final /* synthetic */ StoreUserSettingsSystem this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreUserSettingsSystem$setTheme$1(StoreUserSettingsSystem storeUserSettingsSystem, String str, boolean z2, Function0 function0) { + super(0); + this.this$0 = storeUserSettingsSystem; + this.$theme = str; + this.$apiSync = z2; + this.$onRequestApiSync = function0; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + StoreUserSettingsSystem.access$setThemeInternal(this.this$0, this.$theme, this.$apiSync, this.$onRequestApiSync); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreUserSettingsSystem.java b/app/src/main/java/com/discord/stores/StoreUserSettingsSystem.java index 906c41217d..9c2294d10a 100644 --- a/app/src/main/java/com/discord/stores/StoreUserSettingsSystem.java +++ b/app/src/main/java/com/discord/stores/StoreUserSettingsSystem.java @@ -158,6 +158,10 @@ public final class StoreUserSettingsSystem extends StoreV2 { storeUserSettingsSystem.settings = settings; } + public static final /* synthetic */ void access$setThemeInternal(StoreUserSettingsSystem storeUserSettingsSystem, String str, boolean z2, Function0 function0) { + storeUserSettingsSystem.setThemeInternal(str, z2, function0); + } + @StoreThread private final void handleUserSettings(ModelUserSettings modelUserSettings) { handleUserSettingsThemeUpdate(modelUserSettings.getTheme()); @@ -173,7 +177,7 @@ public final class StoreUserSettingsSystem extends StoreV2 { @StoreThread private final void handleUserSettingsThemeUpdate(String str) { if (str != null && getIsThemeSyncEnabled()) { - setTheme$default(this, str, false, null, 4, null); + setThemeInternal$default(this, str, false, null, 4, null); } } @@ -195,6 +199,36 @@ public final class StoreUserSettingsSystem extends StoreV2 { storeUserSettingsSystem.setTheme(str, z2, function0); } + @StoreThread + private final void setThemeInternal(String str, boolean z2, Function0 function0) { + if (!getIsThemeSyncEnabled() || !z2 || !(function0 == null || function0.mo1invoke() == null)) { + if (m.areEqual(getTheme(), ModelUserSettings.THEME_PURE_EVIL) && m.areEqual(str, ModelUserSettings.THEME_DARK)) { + str = ModelUserSettings.THEME_PURE_EVIL; + } + Settings settings = this.settings; + if (settings == null) { + m.throwUninitializedPropertyAccessException("settings"); + } + this.settings = Settings.copy$default(settings, str, null, 0, 6, null); + SharedPreferences.Editor edit = getPrefsSessionDurable().edit(); + m.checkNotNullExpressionValue(edit, "editor"); + edit.putString("CACHE_KEY_THEME", str); + edit.apply(); + markChanged(); + return; + } + throw new IllegalArgumentException("API callback required."); + } + + /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.stores.StoreUserSettingsSystem */ + /* JADX WARN: Multi-variable type inference failed */ + public static /* synthetic */ void setThemeInternal$default(StoreUserSettingsSystem storeUserSettingsSystem, String str, boolean z2, Function0 function0, int i, Object obj) { + if ((i & 4) != 0) { + function0 = null; + } + storeUserSettingsSystem.setThemeInternal(str, z2, function0); + } + public final int getFontScale() { Settings settings = this.settings; if (settings == null) { @@ -323,22 +357,6 @@ public final class StoreUserSettingsSystem extends StoreV2 { public final void setTheme(String str, boolean z2, Function0 function0) { m.checkNotNullParameter(str, "theme"); - if (!getIsThemeSyncEnabled() || !z2 || !(function0 == null || function0.mo1invoke() == null)) { - if (m.areEqual(getTheme(), ModelUserSettings.THEME_PURE_EVIL) && m.areEqual(str, ModelUserSettings.THEME_DARK)) { - str = ModelUserSettings.THEME_PURE_EVIL; - } - Settings settings = this.settings; - if (settings == null) { - m.throwUninitializedPropertyAccessException("settings"); - } - this.settings = Settings.copy$default(settings, str, null, 0, 6, null); - SharedPreferences.Editor edit = getPrefsSessionDurable().edit(); - m.checkNotNullExpressionValue(edit, "editor"); - edit.putString("CACHE_KEY_THEME", str); - edit.apply(); - markChanged(); - return; - } - throw new IllegalArgumentException("API callback required."); + this.dispatcher.schedule(new StoreUserSettingsSystem$setTheme$1(this, str, z2, function0)); } } diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureGuildActions$1.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureGuildActions$1.java index 6d7e7071f8..021a3960c4 100644 --- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureGuildActions$1.java +++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$configureGuildActions$1.java @@ -13,6 +13,6 @@ public final class WidgetGuildProfileSheet$configureGuildActions$1 implements Vi @Override // android.view.View.OnClickListener public final void onClick(View view) { - WidgetGuildProfileSheet.access$getViewModel$p(this.this$0).onClickMarkAsRead(this.this$0.getContext(), this.$guildId); + WidgetGuildProfileSheet.access$getViewModel$p(this.this$0).onClickMarkAsRead(this.$guildId); } } diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$viewModel$2.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$viewModel$2.java index 23bbc254d8..1881285abc 100644 --- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$viewModel$2.java +++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$viewModel$2.java @@ -17,6 +17,6 @@ public final class WidgetGuildProfileSheet$viewModel$2 extends o implements Func @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final AppViewModel mo1invoke() { - return new WidgetGuildProfileSheetViewModel(null, null, null, WidgetGuildProfileSheet.access$getArgumentsOrDefault$p(this.this$0).getBoolean("com.discord.intent.extra.EXTRA_VIEWING_GUILD"), null, null, null, WidgetGuildProfileSheet.access$getArgumentsOrDefault$p(this.this$0).getLong("com.discord.intent.extra.EXTRA_GUILD_ID"), null, 375, null); + return new WidgetGuildProfileSheetViewModel(null, null, WidgetGuildProfileSheet.access$getArgumentsOrDefault$p(this.this$0).getBoolean("com.discord.intent.extra.EXTRA_VIEWING_GUILD"), null, null, null, WidgetGuildProfileSheet.access$getArgumentsOrDefault$p(this.this$0).getLong("com.discord.intent.extra.EXTRA_GUILD_ID"), null, 187, null); } } diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1.java index 149aa3e951..3f7aaa3d67 100644 --- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1.java +++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1.java @@ -4,21 +4,27 @@ import com.discord.R; import com.discord.widgets.guilds.profile.WidgetGuildProfileSheetViewModel; import d0.z.d.o; import kotlin.Unit; -import kotlin.jvm.functions.Function0; +import kotlin.jvm.functions.Function1; import rx.subjects.PublishSubject; /* compiled from: WidgetGuildProfileSheetViewModel.kt */ -public final class WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1 extends o implements Function0 { +public final class WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1 extends o implements Function1 { public final /* synthetic */ WidgetGuildProfileSheetViewModel this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1(WidgetGuildProfileSheetViewModel widgetGuildProfileSheetViewModel) { - super(0); + super(1); this.this$0 = widgetGuildProfileSheetViewModel; } - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public final void mo1invoke() { + /* Return type fixed from 'java.lang.Object' to match base method */ + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Unit invoke(Void r1) { + invoke(r1); + return Unit.a; + } + + public final void invoke(Void r3) { PublishSubject access$getEventSubject$p = WidgetGuildProfileSheetViewModel.access$getEventSubject$p(this.this$0); access$getEventSubject$p.k.onNext(new WidgetGuildProfileSheetViewModel.Event.DismissAndShowToast(R.string.marked_as_read)); } diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.java index 0851cd3873..37b3c24a8b 100644 --- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.java +++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.java @@ -22,7 +22,6 @@ import com.discord.stores.StoreAnalytics; import com.discord.stores.StoreEmoji; import com.discord.stores.StoreGuildProfiles; import com.discord.stores.StoreLurking; -import com.discord.stores.StoreMessageAck; import com.discord.stores.StoreStream; import com.discord.stores.StoreUser; import com.discord.stores.StoreUserGuildSettings; @@ -51,7 +50,6 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel eventSubject; private final long guildId; private boolean isEmojiSectionExpanded; - private final StoreMessageAck messageAck; private final RestAPI restAPI; private final StoreLurking storeLurking; private final StoreUserGuildSettings storeUserGuildSettings; @@ -1292,18 +1290,16 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel observable) { + public WidgetGuildProfileSheetViewModel(StoreUserSettings storeUserSettings, StoreUserGuildSettings storeUserGuildSettings, boolean z2, RestAPI restAPI, StoreLurking storeLurking, StoreAnalytics storeAnalytics, long j, Observable observable) { super(ViewState.Loading.INSTANCE); m.checkNotNullParameter(storeUserSettings, "storeUserSettings"); m.checkNotNullParameter(storeUserGuildSettings, "storeUserGuildSettings"); - m.checkNotNullParameter(storeMessageAck, "messageAck"); m.checkNotNullParameter(restAPI, "restAPI"); m.checkNotNullParameter(storeLurking, "storeLurking"); m.checkNotNullParameter(storeAnalytics, "storeAnalytics"); m.checkNotNullParameter(observable, "storeObservable"); this.storeUserSettings = storeUserSettings; this.storeUserGuildSettings = storeUserGuildSettings; - this.messageAck = storeMessageAck; this.viewingGuild = z2; this.restAPI = restAPI; this.storeLurking = storeLurking; @@ -1314,8 +1310,8 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel function0) { 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 ba597991e2..81887cd52d 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.0 - Alpha (116200)"); + textView.setText(string + " - 116.1 - Alpha (116201)"); 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 349ec3f267..d1f7f304a0 100644 --- a/app/src/main/res/values-ar-rXB/strings.xml +++ b/app/src/main/res/values-ar-rXB/strings.xml @@ -1104,10 +1104,13 @@ ‏‮Swoosh.‬‏ ‏‮Notifications‬‏ ‏‮are‬‏ ‏‮a‬‏ ‏‮go!‬‏ ‏‮Output‬‏ ‏‮devices‬‏ ‏‮cannot‬‏ ‏‮be‬‏ ‏‮changed‬‏ ‏‮while‬‏ ‏‮using‬‏ ‏‮the‬‏ ‏‮browser.‬‏ ‏‮[Download](onDownloadClick)‬‏ ‏‮the‬‏ ‏‮desktop‬‏ ‏‮application‬‏ ‏‮to‬‏ ‏‮get‬‏ ‏‮full‬‏ ‏‮control‬‏ ‏‮over‬‏ ‏‮output‬‏ ‏‮devices.‬‏ ‏‮Discord‬‏ ‏‮Bug‬‏ ‏‮Hunter‬‏ + ‏‮Bug‬‏ ‏‮submitted‬‏ ‏‮Detailed‬‏ ‏‮description‬‏ ‏‮(optional)‬‏ ‏‮Issue‬‏ ‏‮name‬‏ ‏‮required‬‏ ‏‮Priority‬‏ ‏‮required‬‏ + ‏‮Failed‬‏ ‏‮to‬‏ ‏‮submit‬‏ ‏‮report‬‏ ‏‮Feature‬‏ ‏‮area‬‏ + ‏‮Bug‬‏ ‏‮reporter‬‏ ‏‮turned‬‏ ‏‮off‬‏ ‏‮What\'s‬‏ ‏‮the‬‏ ‏‮issue?‬‏ ‏‮Screenshot‬‏ ‏‮removed‬‏ ‏‮from‬‏ ‏‮report‬‏ ‏‮Priority‬‏ @@ -1119,10 +1122,16 @@ ‏‮Low‬‏ ‏‮(P2)‬‏ ‏‮**Not‬‏ ‏‮urgent‬‏ ‏‮and‬‏ ‏‮not‬‏ ‏‮important.**‬‏ ‏‮P3‬‏ ‏‮allows‬‏ ‏‮us‬‏ ‏‮to‬‏ ‏‮acknowledge‬‏ ‏‮that‬‏ ‏‮something‬‏ ‏‮is‬‏ ‏‮an‬‏ ‏‮issue,‬‏ ‏‮but‬‏ ‏‮these‬‏ ‏‮kinds‬‏ ‏‮of‬‏ ‏‮issues‬‏ ‏‮do‬‏ ‏‮not‬‏ ‏‮need‬‏ ‏‮to‬‏ ‏‮be‬‏ ‏‮fixed‬‏ ‏‮until‬‏ ‏‮other‬‏ ‏‮more‬‏ ‏‮pressing‬‏ ‏‮concerns‬‏ ‏‮are‬‏ ‏‮dealt‬‏ ‏‮with.‬‏ ‏‮Very‬‏ ‏‮Low‬‏ ‏‮(P3)‬‏ + ‏‮Remove‬‏ ‏‮screenshot‬‏ ‏‮Select‬‏ ‏‮Feature‬‏ ‏‮Area‬‏ + ‏‮Something‬‏ ‏‮is‬‏ ‏‮broken‬‏ ‏‮on‬‏ ‏‮this‬‏ ‏‮screen‬‏ ‏‮Sending‬‏ ‏‮report‬‏ ‏‮Report‬‏ ‏‮sent‬‏ + ‏‮Submitting‬‏ + ‏‮Submitting‬‏ ‏‮Bug‬‏ ‏‮Submit‬‏ ‏‮a‬‏ ‏‮Bug‬‏ ‏‮Report‬‏ + ‏‮Turn‬‏ ‏‮this‬‏ ‏‮thing‬‏ ‏‮off‬‏ ‏‮for‬‏ ‏‮me‬‏ + ‏‮What‬‏ ‏‮did‬‏ ‏‮you‬‏ ‏‮expect‬‏ ‏‮to‬‏ ‏‮see?‬‏ ‏‮Build‬‏ ‏‮Override‬‏ ‏‮Apply‬‏ ‏‮Clear‬‏ @@ -2938,7 +2947,8 @@ ‏‮{count}‬‏ ‏‮New‬‏ ‏‮Enter‬‏ ‏‮a‬‏ ‏‮message…‬‏ ‏‮Post‬‏ ‏‮Settings‬‏ - ‏‮Enter‬‏ ‏‮a‬‏ ‏‮Title…‬‏ + ‏‮Start‬‏ ‏‮a‬‏ ‏‮conversation…‬‏ + ‏‮Title‬‏ ‏‮Typing…‬‏ ‏‮Older‬‏ ‏‮Posts‬‏ ‏‮Sort‬‏ ‏‮by:‬‏ ‏‮Latest‬‏ ‏‮Activity‬‏ @@ -4113,10 +4123,10 @@ ‏‮Set‬‏ ‏‮system‬‏ ‏‮channel‬‏ ‏‮flags‬‏ ‏‮to‬‏ ‏‮**!!‬‏‏‮{newValue}‬‏‏‮!!**‬‏ ‏‮Set‬‏ ‏‮the‬‏ ‏‮welcome‬‏ ‏‮notification‬‏ ‏‮channel‬‏ ‏‮to‬‏ ‏‮**!!‬‏‏‮{newValue}‬‏‏‮!!**‬‏ ‏‮**Disabled**‬‏ ‏‮the‬‏ ‏‮welcome‬‏ ‏‮notification‬‏ ‏‮messages‬‏ - ‏‮Set‬‏ ‏‮system‬‏ ‏‮channel‬‏ ‏‮welcome‬‏ ‏‮stickers‬‏ ‏‮to‬‏ ‏‮**!!‬‏‏‮{newValue}‬‏‏‮!!**‬‏ - ‏‮Set‬‏ ‏‮system‬‏ ‏‮channel‬‏ ‏‮welcome‬‏ ‏‮messages‬‏ ‏‮to‬‏ ‏‮**!!‬‏‏‮{newValue}‬‏‏‮!!**‬‏ - ‏‮Set‬‏ ‏‮system‬‏ ‏‮channel‬‏ ‏‮boost‬‏ ‏‮notifications‬‏ ‏‮to‬‏ ‏‮**!!‬‏‏‮{newValue}‬‏‏‮!!**‬‏ - ‏‮Set‬‏ ‏‮system‬‏ ‏‮channel‬‏ ‏‮server‬‏ ‏‮setup‬‏ ‏‮tips‬‏ ‏‮to‬‏ ‏‮**!!‬‏‏‮{newValue}‬‏‏‮!!**‬‏ + ‏‮Set‬‏ ‏‮system‬‏ ‏‮channel‬‏ ‏‮welcome‬‏ ‏‮stickers‬‏ ‏‮to‬‏ ‏‮**!!‬‏‏‮{newValue}‬‏‏‮!!**‬‏ + ‏‮Set‬‏ ‏‮system‬‏ ‏‮channel‬‏ ‏‮welcome‬‏ ‏‮messages‬‏ ‏‮to‬‏ ‏‮**!!‬‏‏‮{newValue}‬‏‏‮!!**‬‏ + ‏‮Set‬‏ ‏‮system‬‏ ‏‮channel‬‏ ‏‮boost‬‏ ‏‮notifications‬‏ ‏‮to‬‏ ‏‮**!!‬‏‏‮{newValue}‬‏‏‮!!**‬‏ + ‏‮Set‬‏ ‏‮system‬‏ ‏‮channel‬‏ ‏‮server‬‏ ‏‮setup‬‏ ‏‮tips‬‏ ‏‮to‬‏ ‏‮**!!‬‏‏‮{newValue}‬‏‏‮!!**‬‏ ‏‮$[**!!‬‏‏‮{user}‬‏‏‮!!**](userHook)‬‏ ‏‮made‬‏ ‏‮changes‬‏ ‏‮to‬‏ ‏‮$[**!!‬‏‏‮{target}‬‏‏‮!!**](targetHook)‬‏ ‏‮Set‬‏ ‏‮the‬‏ ‏‮Community‬‏ ‏‮server‬‏ ‏‮updates‬‏ ‏‮channel‬‏ ‏‮to‬‏ ‏‮**!!‬‏‏‮{newValue}‬‏‏‮!!**‬‏ ‏‮**Cleared**‬‏ ‏‮the‬‏ ‏‮Community‬‏ ‏‮server‬‏ ‏‮updates‬‏ ‏‮channel‬‏ @@ -5606,6 +5616,7 @@ ‏‮Hold‬‏ ‏‮to‬‏ ‏‮temporarily‬‏ ‏‮enable‬‏ ‏‮your‬‏ ‏‮microphone‬‏ ‏‮while‬‏ ‏‮in‬‏ ‏‮Push‬‏ ‏‮to‬‏ ‏‮Talk‬‏ ‏‮mode.‬‏ ‏‮Hold‬‏ ‏‮to‬‏ ‏‮temporarily‬‏ ‏‮enable‬‏ ‏‮your‬‏ ‏‮microphone‬‏ ‏‮while‬‏ ‏‮in‬‏ ‏‮Push‬‏ ‏‮to‬‏ ‏‮Talk‬‏ ‏‮mode.‬‏ ‏‮Other‬‏ ‏‮speakers‬‏ ‏‮who‬‏ ‏‮are‬‏ ‏‮not‬‏ ‏‮also‬‏ ‏‮transmitting‬‏ ‏‮with‬‏ ‏‮priority‬‏ ‏‮will‬‏ ‏‮temporarily‬‏ ‏‮have‬‏ ‏‮their‬‏ ‏‮volume‬‏ ‏‮lowered‬‏ ‏‮while‬‏ ‏‮you‬‏ ‏‮are‬‏ ‏‮speaking.‬‏ ‏‮Activate‬‏ ‏‮soundboard‬‏ ‏‮at‬‏ ‏‮mouse‬‏ ‏‮location‬‏ + ‏‮Hold‬‏ ‏‮to‬‏ ‏‮activate‬‏ ‏‮soundboard‬‏ ‏‮at‬‏ ‏‮mouse‬‏ ‏‮location‬‏ ‏‮Toggle‬‏ ‏‮your‬‏ ‏‮speaker\'s‬‏ ‏‮playback‬‏ ‏‮on‬‏ ‏‮and‬‏ ‏‮off.‬‏ ‏‮Also‬‏ ‏‮disables‬‏ ‏‮your‬‏ ‏‮microphone‬‏ ‏‮while‬‏ ‏‮deafened.‬‏ ‏‮Toggle‬‏ ‏‮to‬‏ ‏‮start/stop‬‏ ‏‮streaming‬‏ ‏‮in‬‏ ‏‮your‬‏ ‏‮current‬‏ ‏‮voice‬‏ ‏‮channel.‬‏ ‏‮Streams‬‏ ‏‮can‬‏ ‏‮only‬‏ ‏‮be‬‏ ‏‮started‬‏ ‏‮with‬‏ ‏‮this‬‏ ‏‮keybind‬‏ ‏‮if‬‏ ‏‮Discord‬‏ ‏‮recognizes‬‏ ‏‮the‬‏ ‏‮game‬‏ ‏‮you‬‏ ‏‮are‬‏ ‏‮currently‬‏ ‏‮playing.‬‏ ‏‮Toggle‬‏ ‏‮your‬‏ ‏‮microphone\'s‬‏ ‏‮transmission‬‏ ‏‮on‬‏ ‏‮and‬‏ ‏‮off.‬‏ @@ -5622,6 +5633,7 @@ ‏‮Push‬‏ ‏‮to‬‏ ‏‮Talk‬‏ ‏‮(Normal)‬‏ ‏‮Push‬‏ ‏‮to‬‏ ‏‮Talk‬‏ ‏‮(Priority)‬‏ ‏‮Activate‬‏ ‏‮Soundboard‬‏ + ‏‮Activate‬‏ ‏‮Soundboard‬‏ ‏‮(Hold)‬‏ ‏‮Toggle‬‏ ‏‮Deafen‬‏ ‏‮Toggle‬‏ ‏‮Screen‬‏ ‏‮Share‬‏ ‏‮Toggle‬‏ ‏‮Mute‬‏ @@ -5766,6 +5778,9 @@ ‏‮Select‬‏ ‏‮Language‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮change‬‏ ‏‮this‬‏ ‏‮later.‬‏ ‏‮Hi!‬‏ ‏‮Select‬‏ ‏‮language‬‏ + ‏‮We‬‏ ‏‮lowered‬‏ ‏‮prices‬‏ ‏‮in‬‏ ‏‮Australia‬‏ ‏‮and‬‏ ‏‮accept‬‏ ‏‮payments‬‏ ‏‮in‬‏ ‏‮$AU.‬‏ ‏‮[Learn‬‏ ‏‮More](‬‏‏‮{helpCenterLink}‬‏‏‮)‬‏ + ‏‮G’day,‬‏ ‏‮indeed‬‏ + ‏‮[Learn‬‏ ‏‮More](‬‏‏‮{helpCenterLink}‬‏‏‮)‬‏ ‏‮**Hooray!**‬‏ ‏‮As‬‏ ‏‮a‬‏ ‏‮resident‬‏ ‏‮of‬‏ ‏‮{country}‬‏‏‮,‬‏ ‏‮you\'re‬‏ ‏‮now‬‏ ‏‮paying‬‏ ‏‮the‬‏ ‏‮discounted‬‏ ‏‮price‬‏ ‏‮of‬‏ ‏‮{newPrice}‬‏ ‏‮for‬‏ ‏‮Nitro!‬‏ ‏‮[Learn‬‏ ‏‮More](‬‏‏‮{helpCenterLink}‬‏‏‮).‬‏ ‏‮**Hooray!**‬‏ ‏‮As‬‏ ‏‮a‬‏ ‏‮resident‬‏ ‏‮of‬‏ ‏‮{country}‬‏‏‮,‬‏ ‏‮you‬‏ ‏‮can‬‏ ‏‮now‬‏ ‏‮get‬‏ ‏‮Nitro‬‏ ‏‮for‬‏ ‏‮a‬‏ ‏‮discounted‬‏ ‏‮price‬‏ ‏‮of‬‏ ‏‮{newPrice}‬‏‏‮!‬‏ ‏‮[Learn‬‏ ‏‮More](‬‏‏‮{helpCenterLink}‬‏‏‮).‬‏ ‏‮Announcing‬‏ ‏‮new‬‏ ‏‮Nitro‬‏ ‏‮pricing‬‏ ‏‮for‬‏ ‏‮our‬‏ ‏‮Aussie‬‏ ‏‮friends!‬‏ @@ -6152,8 +6167,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‬‏ @@ -6399,6 +6414,7 @@ ‏‮We‬‏ ‏‮suggest‬‏ ‏‮adding‬‏ ‏‮a‬‏ ‏‮phone‬‏ ‏‮to‬‏ ‏‮your‬‏ ‏‮2‬‏ ‏‮factor‬‏ ‏‮authentication‬‏ ‏‮settings‬‏ ‏‮as‬‏ ‏‮a‬‏ ‏‮backup.‬‏ ‏‮Add‬‏ ‏‮Phone‬‏ ‏‮Want‬‏ ‏‮to‬‏ ‏‮take‬‏ ‏‮full‬‏ ‏‮advantage‬‏ ‏‮of‬‏ ‏‮Discord‬‏ ‏‮with‬‏ ‏‮better‬‏ ‏‮performance,‬‏ ‏‮in-game‬‏ ‏‮overlay,‬‏ ‏‮and‬‏ ‏‮more?‬‏ ‏‮Get‬‏ ‏‮the‬‏ ‏‮desktop‬‏ ‏‮app!‬‏ + ‏‮We‬‏ ‏‮updated‬‏ ‏‮prices‬‏ ‏‮in‬‏ ‏‮{countryName}‬‏‏‮.‬‏ ‏‮You’re‬‏ ‏‮now‬‏ ‏‮paying‬‏ ‏‮less‬‏ ‏‮for‬‏ ‏‮Nitro.‬‏ ‏‮Well,‬‏ ‏‮it‬‏ ‏‮looks‬‏ ‏‮like‬‏ ‏‮Discord‬‏ ‏‮is‬‏ ‏‮not‬‏ ‏‮detecting‬‏ ‏‮any‬‏ ‏‮input‬‏ ‏‮from‬‏ ‏‮your‬‏ ‏‮mic.‬‏ ‏‮Let\'s‬‏ ‏‮fix‬‏ ‏‮that…‬‏ ‏‮together.‬‏ ‏‮Help!‬‏ ‏‮Well,‬‏ ‏‮it‬‏ ‏‮looks‬‏ ‏‮like‬‏ ‏‮Discord‬‏ ‏‮is‬‏ ‏‮not‬‏ ‏‮detecting‬‏ ‏‮any‬‏ ‏‮input‬‏ ‏‮from‬‏ ‏‮your‬‏ ‏‮mic.‬‏ ‏‮Let\'s‬‏ ‏‮fix‬‏ ‏‮that!‬‏ @@ -6648,6 +6664,7 @@ ‏‮Page‬‏ ‏‮{pageNumber}‬‏ ‏‮Page‬‏ ‏‮{page}‬‏ ‏‮of‬‏ ‏‮{totalPages}‬‏ ‏‮Previous‬‏ + ‏‮Slide‬‏ ‏‮{pageNumber}‬‏ ‏‮Page‬‏ ‏‮!!‬‏‏‮{currentPage}‬‏‏‮!!‬‏ ‏‮Page‬‏ ‏‮!!‬‏‏‮{currentPage}‬‏‏‮!!‬‏ ‏‮of‬‏ ‏‮!!‬‏‏‮{numPages}‬‏‏‮!!‬‏ ‏‮{count}‬‏ @@ -6809,11 +6826,13 @@ ‏‮Discord‬‏ ‏‮is‬‏ ‏‮unable‬‏ ‏‮to‬‏ ‏‮pin‬‏ ‏‮that‬‏ ‏‮message.‬‏ ‏‮You‬‏ ‏‮may‬‏ ‏‮have‬‏ ‏‮hit‬‏ ‏‮the‬‏ ‏‮limit‬‏ ‏‮of‬‏ ‏‮{maxPins}‬‏ ‏‮pins‬‏ ‏‮in‬‏ ‏‮channel‬‏ ‏‮#!!‬‏‏‮{channelName}‬‏‏‮!!.‬‏ ‏‮Discord‬‏ ‏‮is‬‏ ‏‮unable‬‏ ‏‮to‬‏ ‏‮pin‬‏ ‏‮that‬‏ ‏‮message.‬‏ ‏‮You‬‏ ‏‮may‬‏ ‏‮have‬‏ ‏‮hit‬‏ ‏‮the‬‏ ‏‮limit‬‏ ‏‮of‬‏ ‏‮{maxPins}‬‏ ‏‮pins‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮channel.‬‏ ‏‮The‬‏ ‏‮Pin‬‏ ‏‮Broke‬‏ + ‏‮Pin‬‏ ‏‮Post‬‏ ‏‮Pinned‬‏ ‏‮Messages‬‏ ‏‮PROTIP:‬‏ ‏‮Users‬‏ ‏‮with‬‏ ‏‮\'Manage‬‏ ‏‮Messages\'‬‏ ‏‮can‬‏ ‏‮pin‬‏ ‏‮from‬‏ ‏‮the‬‏ ‏‮cog‬‏ ‏‮menu.‬‏ ‏‮You‬‏ ‏‮and‬‏ ‏‮!!‬‏‏‮{other}‬‏‏‮!!‬‏ ‏‮can‬‏ ‏‮pin‬‏ ‏‮a‬‏ ‏‮message‬‏ ‏‮from‬‏ ‏‮its‬‏ ‏‮cog‬‏ ‏‮menu.‬‏ ‏‮Any‬‏ ‏‮group‬‏ ‏‮member‬‏ ‏‮can‬‏ ‏‮pin‬‏ ‏‮a‬‏ ‏‮message‬‏ ‏‮from‬‏ ‏‮its‬‏ ‏‮cog‬‏ ‏‮menu.‬‏ + ‏‮Pinned‬‏ ‏‮Pins‬‏ ‏‮This‬‏ ‏‮channel‬‏ ‏‮is‬‏ ‏‮NSFW‬‏ ‏‮and‬‏ ‏‮due‬‏ ‏‮to‬‏ ‏‮its‬‏ ‏‮content‬‏ ‏‮its‬‏ ‏‮pins‬‏ ‏‮should‬‏ ‏‮not‬‏ ‏‮be‬‏ ‏‮viewed‬‏ ‏‮by‬‏ ‏‮anyone.‬‏ ‏‮Pins,‬‏ ‏‮unread‬‏ @@ -8755,6 +8774,8 @@ ‏‮This‬‏ ‏‮stream‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮hidden.‬‏ ‏‮Your‬‏ ‏‮network‬‏ ‏‮connection‬‏ ‏‮may‬‏ ‏‮be‬‏ ‏‮causing‬‏ ‏‮a‬‏ ‏‮decrease‬‏ ‏‮in‬‏ ‏‮video‬‏ ‏‮and‬‏ ‏‮audio‬‏ ‏‮quality.‬‏ ‏‮To‬‏ ‏‮improve‬‏ ‏‮voice‬‏ ‏‮audio,‬‏ ‏‮disable‬‏ ‏‮the‬‏ ‏‮stream.‬‏ ‏‮Stream‬‏ ‏‮just‬‏ ‏‮started.‬‏ ‏‮Get‬‏ ‏‮in‬‏ ‏‮here!‬‏ + ‏‮Sends‬‏ ‏‮a‬‏ ‏‮desktop‬‏ ‏‮and/or‬‏ ‏‮mobile‬‏ ‏‮push‬‏ ‏‮notification‬‏ ‏‮when‬‏ ‏‮someone‬‏ ‏‮starts‬‏ ‏‮sharing‬‏ ‏‮their‬‏ ‏‮screen‬‏ ‏‮in‬‏ ‏‮your‬‏ ‏‮servers.‬‏ + ‏‮Enable‬‏ ‏‮Notifications‬‏ ‏‮for‬‏ ‏‮Screen‬‏ ‏‮Share‬‏ ‏‮Activity‬‏ ‏‮Participants‬‏ ‏‮without‬‏ ‏‮video‬‏ ‏‮are‬‏ ‏‮currently‬‏ ‏‮hidden.‬‏ ‏‮Would‬‏ ‏‮you‬‏ ‏‮like‬‏ ‏‮to‬‏ ‏‮show‬‏ ‏‮them?‬‏ ‏‮Playing‬‏ ‏‮!!‬‏‏‮{game}‬‏‏‮!!‬‏ ‏‮Stream‬‏ ‏‮HD‬‏ ‏‮resolutions‬‏ ‏‮at‬‏ ‏‮60‬‏ ‏‮frames‬‏ ‏‮per‬‏ ‏‮second,‬‏ ‏‮get‬‏ ‏‮access‬‏ ‏‮to‬‏ ‏‮chat‬‏ ‏‮perks,‬‏ ‏‮[and‬‏ ‏‮more‬‏ ‏‮with‬‏ ‏‮Discord‬‏ ‏‮Nitro!](onPressMore)‬‏ @@ -9276,6 +9297,7 @@ ‏‮Discord‬‏ ‏‮failed‬‏ ‏‮to‬‏ ‏‮unpin‬‏ ‏‮that‬‏ ‏‮message‬‏ ‏‮for‬‏ ‏‮some‬‏ ‏‮reason.‬‏ ‏‮Sorry‬‏ ‏‮about‬‏ ‏‮that.‬‏ ‏‮The‬‏ ‏‮Pin‬‏ ‏‮Is‬‏ ‏‮Stuck!‬‏ ‏‮Unpin‬‏ ‏‮Message‬‏ + ‏‮Unpin‬‏ ‏‮Post‬‏ ‏‮This‬‏ ‏‮will‬‏ ‏‮mark‬‏ ‏‮all‬‏ ‏‮your‬‏ ‏‮unmuted‬‏ ‏‮channels‬‏ ‏‮as‬‏ ‏‮read.‬‏ ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮continue?‬‏ ‏‮Mark‬‏ ‏‮all‬‏ ‏‮as‬‏ ‏‮read?‬‏ ‏‮You\'re‬‏ ‏‮all‬‏ ‏‮caught‬‏ ‏‮up!‬‏ diff --git a/app/src/main/res/values-en-rXA/strings.xml b/app/src/main/res/values-en-rXA/strings.xml index 34ce8554a5..3a86f5a7a4 100644 --- a/app/src/main/res/values-en-rXA/strings.xml +++ b/app/src/main/res/values-en-rXA/strings.xml @@ -1104,10 +1104,13 @@ [Šŵööšĥ. Ñöţîƒîçåţîöñš åŕé å ĝö¡ one two three four] [Öûţþûţ ðéVîçéš çåññöţ ɓé çĥåñĝéð ŵĥîļé ûšîñĝ ţĥé ɓŕöŵšéŕ. [Ðöŵñļöåð](öñÐöŵñļöåðÇļîçķ) ţĥé ðéšķţöþ åþþļîçåţîöñ ţö ĝéţ ƒûļļ çöñţŕöļ öVéŕ öûţþûţ ðéVîçéš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen] [Ðîšçöŕð βûĝ Ĥûñţéŕ one two three] + [βûĝ šûɓḿîţţéð one two] [Ðéţåîļéð ðéšçŕîþţîöñ (öþţîöñåļ) one two three four] [Κšûé ñåḿé ŕéQûîŕéð one two three] [Þŕîöŕîţý ŕéQûîŕéð one two three] + [Fåîļéð ţö šûɓḿîţ ŕéþöŕţ one two three] [Féåţûŕé åŕéå one two] + [βûĝ ŕéþöŕţéŕ ţûŕñéð öƒƒ one two three] [Ŵĥåţ\'š ţĥé îššûé¿ one two three] [Šçŕééñšĥöţ ŕéḿöVéð ƒŕöḿ ŕéþöŕţ one two three four] [Þŕîöŕîţý one two] @@ -1119,10 +1122,16 @@ [Ļöŵ (Þ2) one two] [**Ñöţ ûŕĝéñţ åñð ñöţ îḿþöŕţåñţ.** Þ3 åļļöŵš ûš ţö åçķñöŵļéðĝé ţĥåţ šöḿéţĥîñĝ îš åñ îššûé, ɓûţ ţĥéšé ķîñðš öƒ îššûéš ðö ñöţ ñééð ţö ɓé ƒîхéð ûñţîļ öţĥéŕ ḿöŕé þŕéššîñĝ çöñçéŕñš åŕé ðéåļţ ŵîţĥ. 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] [νéŕý Ļöŵ (Þ3) one two] + [ŔéḿöVé šçŕééñšĥöţ one two three] [Šéļéçţ Féåţûŕé Åŕéå one two three] + [Šöḿéţĥîñĝ îš ɓŕöķéñ öñ ţĥîš šçŕééñ one two three four] [Šéñðîñĝ ŕéþöŕţ one two three] [Ŕéþöŕţ šéñţ one two] + [Šûɓḿîţţîñĝ one two] + [Šûɓḿîţţîñĝ βûĝ one two three] [Šûɓḿîţ å βûĝ Ŕéþöŕţ one two three] + [Ţûŕñ ţĥîš ţĥîñĝ öƒƒ ƒöŕ ḿé one two three four] + [Ŵĥåţ ðîð ýöû éхþéçţ ţö šéé¿ one two three four] [βûîļð ÖVéŕŕîðé one two three] [Åþþļý one] [Çļéåŕ one] @@ -2938,7 +2947,8 @@ [»{count}« Ñéŵ one] [Éñţéŕ å ḿéššåĝé… one two three] [Þöšţ Šéţţîñĝš one two] - [Éñţéŕ å Ţîţļé… one two three] + [Šţåŕţ å çöñVéŕšåţîöñ… one two three] + [Ţîţļé one] [Ţýþîñĝ… one two] [Öļðéŕ Þöšţš one two] [Šöŕţ ɓý: Ļåţéšţ ÅçţîVîţý one two three] @@ -4113,10 +4123,10 @@ [Šéţ šýšţéḿ çĥåññéļ ƒļåĝš ţö **¡¡»{newValue}«¡¡** one two three four five] [Šéţ ţĥé ŵéļçöḿé ñöţîƒîçåţîöñ çĥåññéļ ţö **¡¡»{newValue}«¡¡** one two three four five six] [**Ðîšåɓļéð** ţĥé ŵéļçöḿé ñöţîƒîçåţîöñ ḿéššåĝéš one two three four five six] - [Šéţ šýšţéḿ çĥåññéļ ŵéļçöḿé šţîçķéŕš ţö **¡¡»{newValue}«¡¡** one two three four five six] - [Šéţ šýšţéḿ çĥåññéļ ŵéļçöḿé ḿéššåĝéš ţö **¡¡»{newValue}«¡¡** one two three four five six] - [Šéţ šýšţéḿ çĥåññéļ ɓööšţ ñöţîƒîçåţîöñš ţö **¡¡»{newValue}«¡¡** one two three four five six] - [Šéţ šýšţéḿ çĥåññéļ šéŕVéŕ šéţûþ ţîþš ţö **¡¡»{newValue}«¡¡** one two three four five six] + [Šéţ šýšţéḿ çĥåññéļ ŵéļçöḿé šţîçķéŕš ţö **¡¡»{newValue}«¡¡** one two three four five six] + [Šéţ šýšţéḿ çĥåññéļ ŵéļçöḿé ḿéššåĝéš ţö **¡¡»{newValue}«¡¡** one two three four five six] + [Šéţ šýšţéḿ çĥåññéļ ɓööšţ ñöţîƒîçåţîöñš ţö **¡¡»{newValue}«¡¡** one two three four five six] + [Šéţ šýšţéḿ çĥåññéļ šéŕVéŕ šéţûþ ţîþš ţö **¡¡»{newValue}«¡¡** one two three four five six] [€[**¡¡»{user}«¡¡**](ûšéŕĤööķ) ḿåðé çĥåñĝéš ţö €[**¡¡»{target}«¡¡**](ţåŕĝéţĤööķ) one two three four five six seven eight nine ten eleven twelve] [Šéţ ţĥé Çöḿḿûñîţý šéŕVéŕ ûþðåţéš çĥåññéļ ţö **¡¡»{newValue}«¡¡** one two three four five six] [**Çļéåŕéð** ţĥé Çöḿḿûñîţý šéŕVéŕ ûþðåţéš çĥåññéļ one two three four five six] @@ -5606,6 +5616,7 @@ [Ĥöļð ţö ţéḿþöŕåŕîļý éñåɓļé ýöûŕ ḿîçŕöþĥöñé ŵĥîļé îñ Þûšĥ ţö Ţåļķ ḿöðé. one two three four five six seven eight] [Ĥöļð ţö ţéḿþöŕåŕîļý éñåɓļé ýöûŕ ḿîçŕöþĥöñé ŵĥîļé îñ Þûšĥ ţö Ţåļķ ḿöðé. Öţĥéŕ šþéåķéŕš ŵĥö åŕé ñöţ åļšö ţŕåñšḿîţţîñĝ ŵîţĥ þŕîöŕîţý ŵîļļ ţéḿþöŕåŕîļý ĥåVé ţĥéîŕ Vöļûḿé ļöŵéŕéð ŵĥîļé ýöû åŕé šþéåķîñĝ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen] [ÅçţîVåţé šöûñðɓöåŕð åţ ḿöûšé ļöçåţîöñ one two three four five] + [Ĥöļð ţö åçţîVåţé šöûñðɓöåŕð åţ ḿöûšé ļöçåţîöñ one two three four five] [Ţöĝĝļé ýöûŕ šþéåķéŕ\'š þļåýɓåçķ öñ åñð öƒƒ. Åļšö ðîšåɓļéš ýöûŕ ḿîçŕöþĥöñé ŵĥîļé ðéåƒéñéð. one two three four five six seven eight nine ten] [Ţöĝĝļé ţö šţåŕţ/šţöþ šţŕéåḿîñĝ îñ ýöûŕ çûŕŕéñţ Vöîçé çĥåññéļ. Šţŕéåḿš çåñ öñļý ɓé šţåŕţéð ŵîţĥ ţĥîš ķéýɓîñð îƒ Ðîšçöŕð ŕéçöĝñîžéš ţĥé ĝåḿé ýöû åŕé çûŕŕéñţļý þļåýîñĝ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] [Ţöĝĝļé ýöûŕ ḿîçŕöþĥöñé\'š ţŕåñšḿîššîöñ öñ åñð öƒƒ. one two three four five six] @@ -5622,6 +5633,7 @@ [Þûšĥ ţö Ţåļķ (Ñöŕḿåļ) one two three] [Þûšĥ ţö Ţåļķ (Þŕîöŕîţý) one two three] [ÅçţîVåţé Šöûñðɓöåŕð one two three] + [ÅçţîVåţé Šöûñðɓöåŕð (Ĥöļð) one two three four] [Ţöĝĝļé Ðéåƒéñ one two] [Ţöĝĝļé Šçŕééñ Šĥåŕé one two three] [Ţöĝĝļé Ḿûţé one two] @@ -5766,6 +5778,9 @@ [Šéļéçţ Ļåñĝûåĝé one two three] [Ýöû çåñ çĥåñĝé ţĥîš ļåţéŕ. one two three four] [Ĥî¡ Šéļéçţ ļåñĝûåĝé one two three] + [Ŵé ļöŵéŕéð þŕîçéš îñ Åûšţŕåļîå åñð åççéþţ þåýḿéñţš îñ €ÅÛ. [Ļéåŕñ Ḿöŕé](»{helpCenterLink}«) one two three four five six seven eight nine ten eleven twelve thirteen fourteen] + [Ĝ’ðåý, îñðééð one two] + [[Ļéåŕñ Ḿöŕé](»{helpCenterLink}«) one two three] [**Ĥööŕåý¡** Åš å ŕéšîðéñţ öƒ »{country}«, ýöû\'ŕé ñöŵ þåýîñĝ ţĥé ðîšçöûñţéð þŕîçé öƒ »{newPrice}« ƒöŕ Ñîţŕö¡ [Ļéåŕñ Ḿöŕé](»{helpCenterLink}«). one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen] [**Ĥööŕåý¡** Åš å ŕéšîðéñţ öƒ »{country}«, ýöû çåñ ñöŵ ĝéţ Ñîţŕö ƒöŕ å ðîšçöûñţéð þŕîçé öƒ »{newPrice}«¡ [Ļéåŕñ Ḿöŕé](»{helpCenterLink}«). one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen] [Åññöûñçîñĝ ñéŵ Ñîţŕö þŕîçîñĝ ƒöŕ öûŕ Åûššîé ƒŕîéñðš¡ one two three four five six] @@ -6152,8 +6167,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] @@ -6399,6 +6414,7 @@ [Ŵé šûĝĝéšţ åððîñĝ å þĥöñé ţö ýöûŕ 2 ƒåçţöŕ åûţĥéñţîçåţîöñ šéţţîñĝš åš å ɓåçķûþ. one two three four five six seven eight nine] [Åðð Þĥöñé one two] [Ŵåñţ ţö ţåķé ƒûļļ åðVåñţåĝé öƒ Ðîšçöŕð ŵîţĥ ɓéţţéŕ þéŕƒöŕḿåñçé, îñ-ĝåḿé öVéŕļåý, åñð ḿöŕé¿ Ĝéţ ţĥé ðéšķţöþ åþþ¡ one two three four five six seven eight nine ten eleven twelve] + [Ŵé ûþðåţéð þŕîçéš îñ »{countryName}«. Ýöû’ŕé ñöŵ þåýîñĝ ļéšš ƒöŕ Ñîţŕö. one two three four five six seven] [Ŵéļļ, îţ ļööķš ļîķé Ðîšçöŕð îš ñöţ ðéţéçţîñĝ åñý îñþûţ ƒŕöḿ ýöûŕ ḿîç. Ļéţ\'š ƒîх ţĥåţ… ţöĝéţĥéŕ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen] [Ĥéļþ¡ one] [Ŵéļļ, îţ ļööķš ļîķé Ðîšçöŕð îš ñöţ ðéţéçţîñĝ åñý îñþûţ ƒŕöḿ ýöûŕ ḿîç. Ļéţ\'š ƒîх ţĥåţ¡ one two three four five six seven eight nine] @@ -6648,6 +6664,7 @@ [Þåĝé »{pageNumber}« one] [Þåĝé »{page}« öƒ »{totalPages}« one two] [ÞŕéVîöûš one two] + [Šļîðé »{pageNumber}« one two] [Þåĝé ¡¡»{currentPage}«¡¡ one two] [Þåĝé ¡¡»{currentPage}«¡¡ öƒ ¡¡»{numPages}«¡¡ one two three] [»{count}«] @@ -6809,11 +6826,13 @@ [Ðîšçöŕð îš ûñåɓļé ţö þîñ ţĥåţ ḿéššåĝé. Ýöû ḿåý ĥåVé ĥîţ ţĥé ļîḿîţ öƒ »{maxPins}« þîñš îñ çĥåññéļ #¡¡»{channelName}«¡¡. one two three four five six seven eight nine ten] [Ðîšçöŕð îš ûñåɓļé ţö þîñ ţĥåţ ḿéššåĝé. Ýöû ḿåý ĥåVé ĥîţ ţĥé ļîḿîţ öƒ »{maxPins}« þîñš îñ ţĥîš çĥåññéļ. one two three four five six seven eight nine ten] [Ţĥé Þîñ βŕöķé one two] + [Þîñ Þöšţ one two] [Þîññéð Ḿéššåĝéš one two three] [ÞŔÖŢÎÞ: one two] [Ûšéŕš ŵîţĥ \'Ḿåñåĝé Ḿéššåĝéš\' çåñ þîñ ƒŕöḿ ţĥé çöĝ ḿéñû. one two three four five six seven] [Ýöû åñð ¡¡»{other}«¡¡ çåñ þîñ å ḿéššåĝé ƒŕöḿ îţš çöĝ ḿéñû. one two three four five six] [Åñý ĝŕöûþ ḿéḿɓéŕ çåñ þîñ å ḿéššåĝé ƒŕöḿ îţš çöĝ ḿéñû. one two three four five six] + [Þîññéð one two] [Þîñš one] [Ţĥîš çĥåññéļ îš ÑŠFŴ åñð ðûé ţö îţš çöñţéñţ îţš þîñš šĥöûļð ñöţ ɓé Vîéŵéð ɓý åñýöñé. one two three four five six seven eight nine] [Þîñš, ûñŕéåð one two] @@ -8755,6 +8774,8 @@ [Ţĥîš šţŕéåḿ ĥåš ɓééñ ĥîððéñ. one two three four] [Ýöûŕ ñéţŵöŕķ çöññéçţîöñ ḿåý ɓé çåûšîñĝ å ðéçŕéåšé îñ Vîðéö åñð åûðîö Qûåļîţý. Ţö îḿþŕöVé Vöîçé åûðîö, ðîšåɓļé ţĥé šţŕéåḿ. one two three four five six seven eight nine ten eleven twelve] [Šţŕéåḿ ĵûšţ šţåŕţéð. Ĝéţ îñ ĥéŕé¡ one two three four] + [Šéñðš å ðéšķţöþ åñð/öŕ ḿöɓîļé þûšĥ ñöţîƒîçåţîöñ ŵĥéñ šöḿéöñé šţåŕţš šĥåŕîñĝ ţĥéîŕ šçŕééñ îñ ýöûŕ šéŕVéŕš. one two three four five six seven eight nine ten eleven] + [Éñåɓļé Ñöţîƒîçåţîöñš ƒöŕ Šçŕééñ Šĥåŕé ÅçţîVîţý one two three four five six] [Þåŕţîçîþåñţš ŵîţĥöûţ Vîðéö åŕé çûŕŕéñţļý ĥîððéñ. Ŵöûļð ýöû ļîķé ţö šĥöŵ ţĥéḿ¿ one two three four five six seven eight] [Þļåýîñĝ ¡¡»{game}«¡¡ one two] [Šţŕéåḿ ĤÐ ŕéšöļûţîöñš åţ 60 ƒŕåḿéš þéŕ šéçöñð, ĝéţ åççéšš ţö çĥåţ þéŕķš, [åñð ḿöŕé ŵîţĥ Ðîšçöŕð Ñîţŕö¡](öñÞŕéššḾöŕé) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty] @@ -9276,6 +9297,7 @@ [Ðîšçöŕð ƒåîļéð ţö ûñþîñ ţĥåţ ḿéššåĝé ƒöŕ šöḿé ŕéåšöñ. Šöŕŕý åɓöûţ ţĥåţ. one two three four five six seven eight] [Ţĥé Þîñ Κ Šţûçķ¡ one two three] [Ûñþîñ Ḿéššåĝé one two] + [Ûñþîñ Þöšţ one two] [Ţĥîš ŵîļļ ḿåŕķ åļļ ýöûŕ ûñḿûţéð çĥåññéļš åš ŕéåð. Åŕé ýöû šûŕé ýöû ŵåñţ ţö çöñţîñûé¿ one two three four five six seven eight nine] [Ḿåŕķ åļļ åš ŕéåð¿ one two three] [Ýöû\'ŕé åļļ çåûĝĥţ ûþ¡ one two three] diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml index 15d7885423..94b0d708cb 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -15736,8827 +15736,8849 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f322116ca6..7b9f9c9f82 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1106,10 +1106,13 @@ Swoosh. Notifications are a go! Output devices cannot be changed while using the browser. [Download](onDownloadClick) the desktop application to get full control over output devices. Discord Bug Hunter + Bug submitted Detailed description (optional) Issue name required Priority required + Failed to submit report Feature area + Bug reporter turned off What\'s the issue? Screenshot removed from report Priority @@ -1121,10 +1124,16 @@ Low (P2) **Not urgent and not important.** P3 allows us to acknowledge that something is an issue, but these kinds of issues do not need to be fixed until other more pressing concerns are dealt with. Very Low (P3) + Remove screenshot Select Feature Area + Something is broken on this screen Sending report Report sent + Submitting + Submitting Bug Submit a Bug Report + Turn this thing off for me + What did you expect to see? Build Override Apply Clear @@ -1471,7 +1480,7 @@ Custom Presets Use Default - cd39356fc2754cf980987fedd5fe3df9 + e823b85126164ff49a1096e67978d527 Slash command application {applicationName} {applicationName} application {applicationName} application selected @@ -2949,7 +2958,8 @@ {count} New Enter a message… Post Settings - Enter a Title… + Start a conversation… + Title Typing… Older Posts Sort by: Latest Activity @@ -4129,10 +4139,10 @@ Set system channel flags to **!!{newValue}!!** Set the welcome notification channel to **!!{newValue}!!** **Disabled** the welcome notification messages - Set system channel welcome stickers to **!!{newValue}!!** - Set system channel welcome messages to **!!{newValue}!!** - Set system channel boost notifications to **!!{newValue}!!** - Set system channel server setup tips to **!!{newValue}!!** + Set system channel welcome stickers to **!!{newValue}!!** + Set system channel welcome messages to **!!{newValue}!!** + Set system channel boost notifications to **!!{newValue}!!** + Set system channel server setup tips to **!!{newValue}!!** $[**!!{user}!!**](userHook) made changes to $[**!!{target}!!**](targetHook) Set the Community server updates channel to **!!{newValue}!!** **Cleared** the Community server updates channel @@ -5623,6 +5633,7 @@ Hold to temporarily enable your microphone while in Push to Talk mode. Hold to temporarily enable your microphone while in Push to Talk mode. Other speakers who are not also transmitting with priority will temporarily have their volume lowered while you are speaking. Activate soundboard at mouse location + Hold to activate soundboard at mouse location Toggle your speaker\'s playback on and off. Also disables your microphone while deafened. Toggle to start/stop streaming in your current voice channel. Streams can only be started with this keybind if Discord recognizes the game you are currently playing. Toggle your microphone\'s transmission on and off. @@ -5639,6 +5650,7 @@ Push to Talk (Normal) Push to Talk (Priority) Activate Soundboard + Activate Soundboard (Hold) Toggle Deafen Toggle Screen Share Toggle Mute @@ -5783,6 +5795,9 @@ Select Language You can change this later. Hi! Select language + We lowered prices in Australia and accept payments in $AU. [Learn More]({helpCenterLink}) + G’day, indeed + [Learn More]({helpCenterLink}) **Hooray!** As a resident of {country}, you\'re now paying the discounted price of {newPrice} for Nitro! [Learn More]({helpCenterLink}). **Hooray!** As a resident of {country}, you can now get Nitro for a discounted price of {newPrice}! [Learn More]({helpCenterLink}). Announcing new Nitro pricing for our Aussie friends! @@ -6171,8 +6186,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 @@ -6421,6 +6436,7 @@ We suggest adding a phone to your 2 factor authentication settings as a backup. Add Phone Want to take full advantage of Discord with better performance, in-game overlay, and more? Get the desktop app! + We updated prices in {countryName}. You’re now paying less for Nitro. Well, it looks like Discord is not detecting any input from your mic. Let\'s fix that… together. Help! Well, it looks like Discord is not detecting any input from your mic. Let\'s fix that! @@ -6670,6 +6686,7 @@ Page {pageNumber} Page {page} of {totalPages} Previous + Slide {pageNumber} Page !!{currentPage}!! Page !!{currentPage}!! of !!{numPages}!! {count} @@ -6835,11 +6852,13 @@ Discord is unable to pin that message. You may have hit the limit of {maxPins} pins in channel #!!{channelName}!!. Discord is unable to pin that message. You may have hit the limit of {maxPins} pins in this channel. The Pin Broke + Pin Post Pinned Messages PROTIP: Users with \'Manage Messages\' can pin from the cog menu. You and !!{other}!! can pin a message from its cog menu. Any group member can pin a message from its cog menu. + Pinned Pins This channel is NSFW and due to its content its pins should not be viewed by anyone. Pins, unread @@ -8782,6 +8801,8 @@ This stream has been hidden. Your network connection may be causing a decrease in video and audio quality. To improve voice audio, disable the stream. Stream just started. Get in here! + Sends a desktop and/or mobile push notification when someone starts sharing their screen in your servers. + Enable Notifications for Screen Share Activity Participants without video are currently hidden. Would you like to show them? Playing !!{game}!! Stream HD resolutions at 60 frames per second, get access to chat perks, [and more with Discord Nitro!](onPressMore) @@ -9305,6 +9326,7 @@ Discord failed to unpin that message for some reason. Sorry about that. The Pin Is Stuck! Unpin Message + Unpin Post This will mark all your unmuted channels as read. Are you sure you want to continue? Mark all as read? You\'re all caught up!