From 3b44893d536f9fe38f0410e6ad89ea3b8b6abf1d Mon Sep 17 00:00:00 2001 From: Juby210 Date: Sat, 19 Feb 2022 09:57:40 +0000 Subject: [PATCH] 116.4 - Alpha (116204) --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 2 +- ...s$observeVerificationLevelTriggered$1.java | 17 +- .../guilds/GuildVerificationLevelUtils.java | 26 +- .../widgets/settings/WidgetSettings.java | 2 +- app/src/main/res/values-ar-rXB/strings.xml | 38 +- app/src/main/res/values-en-rXA/strings.xml | 38 +- app/src/main/res/values/public.xml | 19774 ++++++++-------- app/src/main/res/values/strings.xml | 40 +- 9 files changed, 10013 insertions(+), 9928 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index afa0a2de0b..1a51fc9609 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 116203 - versionName "116.3 - Alpha" + versionCode 116204 + versionName "116.4 - Alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e04ca4e368..f6b35ab1c1 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/utilities/guilds/GuildVerificationLevelUtils$observeVerificationLevelTriggered$1.java b/app/src/main/java/com/discord/utilities/guilds/GuildVerificationLevelUtils$observeVerificationLevelTriggered$1.java index 495dbe3aec..86fffcf4c4 100644 --- a/app/src/main/java/com/discord/utilities/guilds/GuildVerificationLevelUtils$observeVerificationLevelTriggered$1.java +++ b/app/src/main/java/com/discord/utilities/guilds/GuildVerificationLevelUtils$observeVerificationLevelTriggered$1.java @@ -1,34 +1,35 @@ package com.discord.utilities.guilds; import com.discord.api.guild.GuildVerificationLevel; +import com.discord.api.role.GuildRole; import com.discord.models.guild.Guild; import com.discord.models.member.GuildMember; import com.discord.models.user.MeUser; import com.discord.utilities.time.Clock; import d0.z.d.m; import java.util.Map; -import rx.functions.Func5; +import rx.functions.Func6; /* compiled from: GuildVerificationLevelUtils.kt */ -public final class GuildVerificationLevelUtils$observeVerificationLevelTriggered$1 implements Func5, MeUser, GuildVerificationLevel> { +public final class GuildVerificationLevelUtils$observeVerificationLevelTriggered$1 implements Func6, MeUser, Map, GuildVerificationLevel> { public final /* synthetic */ Clock $clock; public GuildVerificationLevelUtils$observeVerificationLevelTriggered$1(Clock clock) { this.$clock = clock; } - public final GuildVerificationLevel call(Long l, Guild guild, GuildVerificationLevel guildVerificationLevel, Map map, MeUser meUser) { + public final GuildVerificationLevel call(Long l, Guild guild, GuildVerificationLevel guildVerificationLevel, Map map, MeUser meUser, Map map2) { GuildVerificationLevelUtils guildVerificationLevelUtils = GuildVerificationLevelUtils.INSTANCE; m.checkNotNullExpressionValue(meUser, "me"); m.checkNotNullExpressionValue(map, "members"); m.checkNotNullExpressionValue(guildVerificationLevel, "verificationLevel"); m.checkNotNullExpressionValue(l, "joinedAt"); - return GuildVerificationLevelUtils.access$computeVerificationLevelTriggered(guildVerificationLevelUtils, meUser, guild, map.get(Long.valueOf(meUser.getId())), guildVerificationLevel, l.longValue(), this.$clock); + return GuildVerificationLevelUtils.access$computeVerificationLevelTriggered(guildVerificationLevelUtils, meUser, guild, map.get(Long.valueOf(meUser.getId())), guildVerificationLevel, l.longValue(), this.$clock, map2); } /* Return type fixed from 'java.lang.Object' to match base method */ - /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */ - @Override // rx.functions.Func5 - public /* bridge */ /* synthetic */ GuildVerificationLevel call(Long l, Guild guild, GuildVerificationLevel guildVerificationLevel, Map map, MeUser meUser) { - return call(l, guild, guildVerificationLevel, (Map) map, meUser); + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */ + @Override // rx.functions.Func6 + public /* bridge */ /* synthetic */ GuildVerificationLevel call(Long l, Guild guild, GuildVerificationLevel guildVerificationLevel, Map map, MeUser meUser, Map map2) { + return call(l, guild, guildVerificationLevel, (Map) map, meUser, (Map) map2); } } diff --git a/app/src/main/java/com/discord/utilities/guilds/GuildVerificationLevelUtils.java b/app/src/main/java/com/discord/utilities/guilds/GuildVerificationLevelUtils.java index 0e6509e720..936b7946b7 100644 --- a/app/src/main/java/com/discord/utilities/guilds/GuildVerificationLevelUtils.java +++ b/app/src/main/java/com/discord/utilities/guilds/GuildVerificationLevelUtils.java @@ -1,6 +1,7 @@ package com.discord.utilities.guilds; import com.discord.api.guild.GuildVerificationLevel; +import com.discord.api.role.GuildRole; import com.discord.models.guild.Guild; import com.discord.models.member.GuildMember; import com.discord.models.user.MeUser; @@ -14,6 +15,7 @@ import com.discord.utilities.time.ClockFactory; import com.discord.utilities.user.UserUtils; import d0.z.d.m; import j0.l.a.r; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -25,16 +27,25 @@ public final class GuildVerificationLevelUtils { private GuildVerificationLevelUtils() { } - public static final /* synthetic */ GuildVerificationLevel access$computeVerificationLevelTriggered(GuildVerificationLevelUtils guildVerificationLevelUtils, MeUser meUser, Guild guild, GuildMember guildMember, GuildVerificationLevel guildVerificationLevel, long j, Clock clock) { - return guildVerificationLevelUtils.computeVerificationLevelTriggered(meUser, guild, guildMember, guildVerificationLevel, j, clock); + public static final /* synthetic */ GuildVerificationLevel access$computeVerificationLevelTriggered(GuildVerificationLevelUtils guildVerificationLevelUtils, MeUser meUser, Guild guild, GuildMember guildMember, GuildVerificationLevel guildVerificationLevel, long j, Clock clock, Map map) { + return guildVerificationLevelUtils.computeVerificationLevelTriggered(meUser, guild, guildMember, guildVerificationLevel, j, clock, map); } - private final GuildVerificationLevel computeVerificationLevelTriggered(MeUser meUser, Guild guild, GuildMember guildMember, GuildVerificationLevel guildVerificationLevel, long j, Clock clock) { + private final GuildVerificationLevel computeVerificationLevelTriggered(MeUser meUser, Guild guild, GuildMember guildMember, GuildVerificationLevel guildVerificationLevel, long j, Clock clock, Map map) { List roles; + GuildRole guildRole; boolean z2 = false; boolean z3 = guild != null && guild.isOwner(meUser.getId()); - if (!(guildMember == null || (roles = guildMember.getRoles()) == null || !(!roles.isEmpty()))) { - z2 = true; + if (!(guildMember == null || (roles = guildMember.getRoles()) == null)) { + ArrayList arrayList = new ArrayList(); + for (Object obj : roles) { + if (!((map == null || (guildRole = map.get(Long.valueOf(((Number) obj).longValue()))) == null) ? true : guildRole.e())) { + arrayList.add(obj); + } + } + if (!arrayList.isEmpty()) { + z2 = true; + } } UserUtils userUtils = UserUtils.INSTANCE; boolean hasPhone = userUtils.getHasPhone(meUser); @@ -92,11 +103,12 @@ public final class GuildVerificationLevelUtils { Guild guild = storeGuilds.getGuild(j); Map map = storeGuilds.getMembers().get(Long.valueOf(j)); MeUser me2 = storeUser.getMe(); + Map map2 = storeGuilds.getRoles().get(Long.valueOf(j)); GuildMember guildMember = map != null ? map.get(Long.valueOf(me2.getId())) : null; if (guild == null || (guildVerificationLevel = guild.getVerificationLevel()) == null) { guildVerificationLevel = GuildVerificationLevel.NONE; } - return computeVerificationLevelTriggered(me2, guild, guildMember, guildVerificationLevel, GuildMemberUtilsKt.getJoinedAtOrNow(storeGuilds.getGuildsJoinedAt().get(Long.valueOf(j))), clock); + return computeVerificationLevelTriggered(me2, guild, guildMember, guildVerificationLevel, GuildMemberUtilsKt.getJoinedAtOrNow(storeGuilds.getGuildsJoinedAt().get(Long.valueOf(j))), clock, map2); } public final Observable observeVerificationLevelTriggered(long j, StoreGuilds storeGuilds, StoreUser storeUser, Clock clock) { @@ -107,7 +119,7 @@ public final class GuildVerificationLevelUtils { Observable observeGuild = storeGuilds.observeGuild(j); Observable observeVerificationLevel = storeGuilds.observeVerificationLevel(j); Observable> observeComputed = storeGuilds.observeComputed(j); - Observable q = Observable.g(observeJoinedAt, observeGuild, observeVerificationLevel, Observable.h0(new r(observeComputed.j, new LeadingEdgeThrottle(1500, TimeUnit.MILLISECONDS))), storeUser.observeMe(true), new GuildVerificationLevelUtils$observeVerificationLevelTriggered$1(clock)).q(); + Observable q = Observable.f(observeJoinedAt, observeGuild, observeVerificationLevel, Observable.h0(new r(observeComputed.j, new LeadingEdgeThrottle(1500, TimeUnit.MILLISECONDS))), storeUser.observeMe(true), storeGuilds.observeRoles(j), new GuildVerificationLevelUtils$observeVerificationLevelTriggered$1(clock)).q(); m.checkNotNullExpressionValue(q, "Observable\n .comb… .distinctUntilChanged()"); return q; } 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 67a16427f2..137600e8ce 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.3 - Alpha (116203)"); + textView.setText(string + " - 116.4 - Alpha (116204)"); 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 90334d98a6..556a7729d3 100644 --- a/app/src/main/res/values-ar-rXB/strings.xml +++ b/app/src/main/res/values-ar-rXB/strings.xml @@ -98,7 +98,8 @@ ‏‮com.discord.app.AppScrollingViewBehavior‬‏ ‏‮This‬‏ ‏‮may‬‏ ‏‮take‬‏ ‏‮a‬‏ ‏‮moment.‬‏ ‏‮Actions‬‏ - ‏‮No‬‏ ‏‮recent‬‏ ‏‮messages‬‏ + ‏‮Check‬‏ ‏‮back‬‏ ‏‮in‬‏ ‏‮a‬‏ ‏‮bit‬‏ + ‏‮All‬‏ ‏‮channels‬‏ ‏‮are‬‏ ‏‮chilling‬‏ ‏‮{count}‬‏ ‏‮Active‬‏ ‏‮Now‬‏ ‏‮Many‬‏ ‏‮recent‬‏ ‏‮messages‬‏ @@ -307,6 +308,7 @@ ‏‮All‬‏ ‏‮App‬‏ ‏‮Directory‬‏ ‏‮Home‬‏ ‏‮App‬‏ ‏‮Directory‬‏ ‏‮Search‬‏ + ‏‮{categoryName}‬‏ ‏‮Apps‬‏ ‏‮No‬‏ ‏‮matches‬‏ ‏‮found‬‏ ‏‮in‬‏ ‏‮{categoryName}‬‏ ‏‮Try‬‏ ‏‮another‬‏ ‏‮search‬‏ ‏‮or‬‏ ‏‮$[see‬‏ ‏‮results‬‏ ‏‮from‬‏ ‏‮all‬‏ ‏‮categories](viewAllHook)‬‏ ‏‮No‬‏ ‏‮matches‬‏ ‏‮found‬‏ @@ -316,7 +318,7 @@ ‏‮Developer‬‏ ‏‮Resources‬‏ ‏‮Customize‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮with‬‏ ‏‮apps‬‏ ‏‮Automate‬‏ ‏‮useful‬‏ ‏‮tasks‬‏ ‏‮or‬‏ ‏‮introduce‬‏ ‏‮a‬‏ ‏‮bit‬‏ ‏‮of‬‏ ‏‮delight‬‏ - ‏‮{categoryName}‬‏ ‏‮Apps‬‏ + ‏‮Top‬‏ ‏‮{categoryName}‬‏ ‏‮Apps‬‏ ‏‮Popular‬‏ ‏‮Now‬‏ ‏‮On‬‏ ‏‮the‬‏ ‏‮Rise‬‏ ‏‮Explore‬‏ ‏‮Collection‬‏ @@ -2948,6 +2950,13 @@ ‏‮This‬‏ ‏‮channel‬‏ ‏‮isn’t‬‏ ‏‮fully‬‏ ‏‮built‬‏ ‏‮yet‬‏ ‏‮for‬‏ ‏‮Android‬‏ ‏‮devices.‬‏ ‏‮Log‬‏ ‏‮on‬‏ ‏‮to‬‏ ‏‮your‬‏ ‏‮desktop‬‏ ‏‮client‬‏ ‏‮for‬‏ ‏‮the‬‏ ‏‮full‬‏ ‏‮experience.‬‏ ‏‮Forum‬‏ ‏‮Channel‬‏ ‏‮Start‬‏ ‏‮discussions‬‏ ‏‮by‬‏ ‏‮topics‬‏ + ‏‮Guidelines‬‏ + ‏‮Create‬‏ ‏‮Guidelines‬‏ + ‏‮Help‬‏ ‏‮your‬‏ ‏‮members‬‏ ‏‮understand‬‏ ‏‮what‬‏ ‏‮this‬‏ ‏‮channel‬‏ ‏‮is‬‏ ‏‮for,‬‏ ‏‮and‬‏ ‏‮set‬‏ ‏‮rules‬‏ ‏‮to‬‏ ‏‮keep‬‏ ‏‮it‬‏ ‏‮civil!‬‏ + ‏‮Create‬‏ ‏‮Guidelines‬‏ ‏‮for‬‏ ‏‮this‬‏ ‏‮channel!‬‏ + ‏‮Show‬‏ ‏‮More‬‏ + ‏‮There’s‬‏ ‏‮a‬‏ ‏‮post‬‏ ‏‮that’s‬‏ ‏‮pinned‬‏ ‏‮already.‬‏ ‏‮Pinning‬‏ ‏‮this‬‏ ‏‮post‬‏ ‏‮will‬‏ ‏‮remove‬‏ ‏‮the‬‏ ‏‮existing‬‏ ‏‮pinned‬‏ ‏‮post.‬‏ + ‏‮Pin‬‏ ‏‮this‬‏ ‏‮post?‬‏ ‏‮Post‬‏ ‏‮{title}‬‏‏‮,‬‏ ‏‮{count}‬‏ ‏‮This‬‏ ‏‮post‬‏ ‏‮was‬‏ ‏‮archived‬‏ ‏‮by‬‏ ‏‮a‬‏ ‏‮moderator.‬‏ ‏‮Only‬‏ ‏‮moderators‬‏ ‏‮can‬‏ ‏‮unarchive‬‏ ‏‮it.‬‏ ‏‮There’s‬‏ ‏‮no‬‏ ‏‮one‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮post.‬‏ @@ -3353,32 +3362,35 @@ ‏‮Anyone‬‏ ‏‮with‬‏ ‏‮access‬‏ ‏‮to‬‏ ‏‮this‬‏ ‏‮text‬‏ ‏‮channel‬‏ ‏‮will‬‏ ‏‮see‬‏ ‏‮the‬‏ ‏‮alert.‬‏ ‏‮Select‬‏ ‏‮a‬‏ ‏‮text‬‏ ‏‮channel‬‏ ‏‮Choose‬‏ ‏‮a‬‏ ‏‮channel‬‏ ‏‮to‬‏ ‏‮post‬‏ ‏‮the‬‏ ‏‮alert‬‏ ‏‮message‬‏ ‏‮to.‬‏ ‏‮The‬‏ ‏‮alert‬‏ ‏‮will‬‏ ‏‮contain‬‏ ‏‮the‬‏ ‏‮flagged‬‏ ‏‮message‬‏ ‏‮contents,‬‏ ‏‮user,‬‏ ‏‮and‬‏ ‏‮channel‬‏ ‏‮it‬‏ ‏‮was‬‏ ‏‮originally‬‏ ‏‮posted‬‏ ‏‮to.‬‏ + ‏‮Edit‬‏ ‏‮Channel‬‏ ‏‮Add‬‏ ‏‮Action‬‏ ‏‮Post‬‏ ‏‮Alert‬‏ ‏‮To‬‏ ‏‮Channel‬‏ ‏‮Then‬‏ ‏‮take‬‏ ‏‮these‬‏ ‏‮action(s)‬‏ - ‏‮Add‬‏ ‏‮Another‬‏ ‏‮Rule‬‏ + ‏‮Add‬‏ ‏‮Another‬‏ ‏‮{ruleName}‬‏ ‏‮Your‬‏ ‏‮message‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮prevented‬‏ ‏‮from‬‏ ‏‮editing‬‏ ‏‮because‬‏ ‏‮it‬‏ ‏‮triggered‬‏ ‏‮AutoMod‬‏ ‏‮filters‬‏ ‏‮this‬‏ ‏‮community‬‏ ‏‮uses.‬‏ ‏‮reverted‬‏ ‏‮•‬‏ ‏‮[Learn‬‏ ‏‮More](‬‏‏‮{helpUrl}‬‏‏‮)‬‏ ‏‮Your‬‏ ‏‮message‬‏ ‏‮was‬‏ ‏‮not‬‏ ‏‮sent‬‏ ‏‮because‬‏ ‏‮it‬‏ ‏‮triggered‬‏ ‏‮AutoMod‬‏ ‏‮filters‬‏ ‏‮this‬‏ ‏‮community‬‏ ‏‮uses.‬‏ ‏‮Please‬‏ ‏‮add‬‏ ‏‮at‬‏ ‏‮least‬‏ ‏‮one‬‏ ‏‮action‬‏ ‏‮to‬‏ ‏‮this‬‏ ‏‮rule.‬‏ + ‏‮Filter‬‏ ‏‮Name‬‏ ‏‮(Optional)‬‏ + ‏‮Enter‬‏ ‏‮a‬‏ ‏‮name‬‏ ‏‮for‬‏ ‏‮this‬‏ ‏‮filter‬‏ ‏‮(optional)‬‏ ‏‮Keywords‬‏ ‏‮must‬‏ ‏‮be‬‏ ‏‮comma‬‏ ‏‮separated‬‏ ‏‮(Ex:‬‏ ‏‮cat,‬‏ ‏‮dog,‬‏ ‏‮tiger…)‬‏ ‏‮{keyword}‬‏ ‏‮has‬‏ ‏‮an‬‏ ‏‮invalid‬‏ ‏‮length.‬‏ ‏‮Keywords‬‏ ‏‮must‬‏ ‏‮be‬‏ ‏‮between‬‏ ‏‮{min}‬‏ ‏‮and‬‏ ‏‮{max}‬‏ ‏‮characters.‬‏ ‏‮Please‬‏ ‏‮enter‬‏ ‏‮at‬‏ ‏‮least‬‏ ‏‮one‬‏ ‏‮keyword.‬‏ ‏‮Please‬‏ ‏‮enter‬‏ ‏‮no‬‏ ‏‮more‬‏ ‏‮than‬‏ ‏‮{limit}‬‏ ‏‮keywords.‬‏ ‏‮Filter‬‏ ‏‮messages‬‏ ‏‮containing‬‏ ‏‮these‬‏ ‏‮terms‬‏ ‏‮or‬‏ ‏‮phrases‬‏ ‏‮from‬‏ ‏‮your‬‏ ‏‮server.‬‏ ‏‮No‬‏ ‏‮keywords‬‏ ‏‮have‬‏ ‏‮been‬‏ ‏‮added.‬‏ - ‏‮Custom‬‏ ‏‮Keyword‬‏ ‏‮Filter‬‏ + ‏‮Keyword‬‏ ‏‮Filter‬‏ ‏‮If‬‏ ‏‮these‬‏ ‏‮keywords‬‏ ‏‮are‬‏ ‏‮sent…‬‏ ‏‮{count}‬‏ ‏‮words‬‏ ‏‮Enter‬‏ ‏‮your‬‏ ‏‮keywords‬‏ ‏‮here!‬‏ ‏‮Filter‬‏ ‏‮messages‬‏ ‏‮containing‬‏ ‏‮malicious‬‏ ‏‮links‬‏ ‏‮from‬‏ ‏‮your‬‏ ‏‮server.‬‏ - ‏‮Spam‬‏ ‏‮Link‬‏ ‏‮Filter‬‏ + ‏‮Harmful‬‏ ‏‮Link‬‏ ‏‮Filter‬‏ ‏‮If‬‏ ‏‮harmful‬‏ ‏‮links‬‏ ‏‮are‬‏ ‏‮detected…‬‏ - ‏‮Channel:‬‏ ‏‮{channelName}‬‏ + ‏‮Channel:‬‏ ‏‮$[**!!‬‏‏‮{channelName}‬‏‏‮!!**](channelHook)‬‏ ‏‮Rule:‬‏ ‏‮{ruleName}‬‏ ‏‮has‬‏ ‏‮blocked‬‏ ‏‮a‬‏ ‏‮message‬‏ - ‏‮Automod‬‏ + ‏‮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:‬‏ @@ -3871,6 +3883,11 @@ ‏‮Your‬‏ ‏‮membership‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮restarted!‬‏ ‏‮Search‬‏ ‏‮channels‬‏ ‏‮Monetize‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮by‬‏ ‏‮offering‬‏ ‏‮exclusive‬‏ ‏‮channels‬‏ ‏‮and‬‏ ‏‮benefits.‬‏ + ‏‮Apply‬‏ ‏‮for‬‏ ‏‮Access‬‏ + ‏‮Only‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮owner‬‏ ‏‮can‬‏ ‏‮apply‬‏ ‏‮for‬‏ ‏‮Premium‬‏ ‏‮Membership.‬‏ ‏‮Give‬‏ ‏‮’em‬‏ ‏‮a‬‏ ‏‮heads‬‏ ‏‮up!‬‏ + ‏‮Application‬‏ ‏‮Pending‬‏ + ‏‮To‬‏ ‏‮apply,‬‏ ‏‮refer‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮requirements‬‏ ‏‮below.‬‏ ‏‮Note‬‏ ‏‮that‬‏ ‏‮these‬‏ ‏‮are‬‏ ‏‮just‬‏ ‏‮the‬‏ ‏‮minimum‬‏ ‏‮requirements‬‏ ‏‮to‬‏ ‏‮apply,‬‏ ‏‮and‬‏ ‏‮acceptance‬‏ ‏‮is‬‏ ‏‮not‬‏ ‏‮guaranteed.‬‏ + ‏‮To‬‏ ‏‮learn‬‏ ‏‮more‬‏ ‏‮about‬‏ ‏‮Premium‬‏ ‏‮Membership,‬‏ ‏‮check‬‏ ‏‮out‬‏ ‏‮the‬‏ ‏‮FAQ.‬‏ ‏‮Get‬‏ ‏‮Started‬‏ ‏‮Advanced‬‏ ‏‮Basic‬‏ ‏‮Info‬‏ @@ -4266,7 +4283,7 @@ ‏‮With‬‏ ‏‮name‬‏ ‏‮**!!‬‏‏‮{newValue}‬‏‏‮!!**‬‏ ‏‮$[**!!‬‏‏‮{user}‬‏‏‮!!**](userHook)‬‏ ‏‮updated‬‏ ‏‮the‬‏ ‏‮webhook‬‏ ‏‮$[**!!‬‏‏‮{target}‬‏‏‮!!**](targetHook)‬‏ ‏‮Setup‬‏ ‏‮rules‬‏ ‏‮for‬‏ ‏‮moderation‬‏ ‏‮in‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮to‬‏ ‏‮automatically‬‏ ‏‮filter‬‏ ‏‮content‬‏ ‏‮and‬‏ ‏‮alert‬‏ ‏‮moderators‬‏ ‏‮so‬‏ ‏‮that‬‏ ‏‮you‬‏ ‏‮can‬‏ ‏‮keep‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮safe‬‏ ‏‮around-the-clock‬‏ - ‏‮Automod‬‏ + ‏‮AutoMod‬‏ ‏‮The‬‏ ‏‮recommended‬‏ ‏‮minimum‬‏ ‏‮size‬‏ ‏‮is‬‏ ‏‮960x540‬‏ ‏‮and‬‏ ‏‮recommended‬‏ ‏‮aspect‬‏ ‏‮ratio‬‏ ‏‮is‬‏ ‏‮16:9.‬‏ ‏‮[Learn‬‏ ‏‮more](‬‏‏‮{articleURL}‬‏‏‮).‬‏ ‏‮Community‬‏ ‏‮Settings‬‏ ‏‮Only‬‏ ‏‮server‬‏ ‏‮administrators‬‏ ‏‮are‬‏ ‏‮allowed‬‏ ‏‮to‬‏ ‏‮do‬‏ ‏‮this‬‏ @@ -6184,8 +6201,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‬‏ @@ -8500,6 +8517,7 @@ ‏‮Viewer‬‏ ‏‮Join‬‏ ‏‮Viewer‬‏ ‏‮Leave‬‏ ‏‮Voice‬‏ ‏‮Disconnected‬‏ + ‏‮Open‬‏ ‏‮Soundboard‬‏ ‏‮Discord‬‏ ‏‮Soundboard‬‏ ‏‮Add‬‏ ‏‮Sound‬‏ ‏‮Browse‬‏ diff --git a/app/src/main/res/values-en-rXA/strings.xml b/app/src/main/res/values-en-rXA/strings.xml index 4deefd6306..59ea83df7a 100644 --- a/app/src/main/res/values-en-rXA/strings.xml +++ b/app/src/main/res/values-en-rXA/strings.xml @@ -98,7 +98,8 @@ [çöḿ.ðîšçöŕð.åþþ.ÅþþŠçŕöļļîñĝνîéŵβéĥåVîöŕ one two three four five] [Ţĥîš ḿåý ţåķé å ḿöḿéñţ. one two three] [Åçţîöñš one two] - [Ñö ŕéçéñţ ḿéššåĝéš one two three] + [Çĥéçķ ɓåçķ îñ å ɓîţ one two three] + [Åļļ çĥåññéļš åŕé çĥîļļîñĝ one two three] [»{count}«] [ÅçţîVé Ñöŵ one two] [Ḿåñý ŕéçéñţ ḿéššåĝéš one two three] @@ -307,6 +308,7 @@ [Åļļ one] [Åþþ Ðîŕéçţöŕý Ĥöḿé one two three] [Åþþ Ðîŕéçţöŕý Šéåŕçĥ one two three] + [»{categoryName}« Åþþš one] [Ñö ḿåţçĥéš ƒöûñð îñ »{categoryName}« one two three] [Ţŕý åñöţĥéŕ šéåŕçĥ öŕ €[šéé ŕéšûļţš ƒŕöḿ åļļ çåţéĝöŕîéš](VîéŵÅļļĤööķ) one two three four five six seven eight] [Ñö ḿåţçĥéš ƒöûñð one two three] @@ -316,7 +318,7 @@ [ÐéVéļöþéŕ Ŕéšöûŕçéš one two three] [Çûšţöḿîžé ýöûŕ šéŕVéŕ ŵîţĥ åþþš one two three four] [Åûţöḿåţé ûšéƒûļ ţåšķš öŕ îñţŕöðûçé å ɓîţ öƒ ðéļîĝĥţ one two three four five six] - [»{categoryName}« Åþþš one] + [Ţöþ »{categoryName}« Åþþš one two] [Þöþûļåŕ Ñöŵ one two] [Öñ ţĥé Ŕîšé one two] [Éхþļöŕé Çöļļéçţîöñ one two three] @@ -2948,6 +2950,13 @@ [Ţĥîš çĥåññéļ îšñ’ţ ƒûļļý ɓûîļţ ýéţ ƒöŕ Åñðŕöîð ðéVîçéš. Ļöĝ öñ ţö ýöûŕ ðéšķţöþ çļîéñţ ƒöŕ ţĥé ƒûļļ éхþéŕîéñçé. one two three four five six seven eight nine ten eleven twelve] [Föŕûḿ Çĥåññéļ one two] [Šţåŕţ ðîšçûššîöñš ɓý ţöþîçš one two three four] + [Ĝûîðéļîñéš one two] + [Çŕéåţé Ĝûîðéļîñéš one two three] + [Ĥéļþ ýöûŕ ḿéḿɓéŕš ûñðéŕšţåñð ŵĥåţ ţĥîš çĥåññéļ îš ƒöŕ, åñð šéţ ŕûļéš ţö ķééþ îţ çîVîļ¡ one two three four five six seven eight nine] + [Çŕéåţé Ĝûîðéļîñéš ƒöŕ ţĥîš çĥåññéļ¡ one two three four] + [Šĥöŵ Ḿöŕé one two] + [Ţĥéŕé’š å þöšţ ţĥåţ’š þîññéð åļŕéåðý. Þîññîñĝ ţĥîš þöšţ ŵîļļ ŕéḿöVé ţĥé éхîšţîñĝ þîññéð þöšţ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen] + [Þîñ ţĥîš þöšţ¿ one two three] [Þöšţ »{title}«, »{count}« one two] [Ţĥîš þöšţ ŵåš åŕçĥîVéð ɓý å ḿöðéŕåţöŕ. Öñļý ḿöðéŕåţöŕš çåñ ûñåŕçĥîVé îţ. one two three four five six seven eight] [Ţĥéŕé’š ñö öñé îñ ţĥîš þöšţ. one two three four] @@ -3353,32 +3362,35 @@ [Åñýöñé ŵîţĥ åççéšš ţö ţĥîš ţéхţ çĥåññéļ ŵîļļ šéé ţĥé åļéŕţ. one two three four five six seven] [Šéļéçţ å ţéхţ çĥåññéļ one two three] [Çĥööšé å çĥåññéļ ţö þöšţ ţĥé åļéŕţ ḿéššåĝé ţö. Ţĥé åļéŕţ ŵîļļ çöñţåîñ ţĥé ƒļåĝĝéð ḿéššåĝé çöñţéñţš, ûšéŕ, åñð çĥåññéļ îţ ŵåš öŕîĝîñåļļý þöšţéð ţö. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five] + [Éðîţ Çĥåññéļ one two] [Åðð Åçţîöñ one two] [Þöšţ Åļéŕţ Ţö Çĥåññéļ one two three] [Ţĥéñ ţåķé ţĥéšé åçţîöñ(š) one two three] - [Åðð Åñöţĥéŕ Ŕûļé one two three] + [Åðð Åñöţĥéŕ »{ruleName}« one two] [Ýöûŕ ḿéššåĝé ĥåš ɓééñ þŕéVéñţéð ƒŕöḿ éðîţîñĝ ɓéçåûšé îţ ţŕîĝĝéŕéð ÅûţöḾöð ƒîļţéŕš ţĥîš çöḿḿûñîţý ûšéš. one two three four five six seven eight nine ten eleven] [ŕéVéŕţéð one two] [• [Ļéåŕñ Ḿöŕé](»{helpUrl}«) one two three four] [Ýöûŕ ḿéššåĝé ŵåš ñöţ šéñţ ɓéçåûšé îţ ţŕîĝĝéŕéð ÅûţöḾöð ƒîļţéŕš ţĥîš çöḿḿûñîţý ûšéš. one two three four five six seven eight nine] [Þļéåšé åðð åţ ļéåšţ öñé åçţîöñ ţö ţĥîš ŕûļé. one two three four five] + [Fîļţéŕ Ñåḿé (Öþţîöñåļ) one two three] + [Éñţéŕ å ñåḿé ƒöŕ ţĥîš ƒîļţéŕ (öþţîöñåļ) one two three four five] [Ķéýŵöŕðš ḿûšţ ɓé çöḿḿå šéþåŕåţéð (Éх: çåţ, ðöĝ, ţîĝéŕ…) one two three four five six seven eight nine ten eleven twelve] [»{keyword}« ĥåš åñ îñVåļîð ļéñĝţĥ. Ķéýŵöŕðš ḿûšţ ɓé ɓéţŵééñ »{min}« åñð »{max}« çĥåŕåçţéŕš. one two three four five six seven eight] [Þļéåšé éñţéŕ åţ ļéåšţ öñé ķéýŵöŕð. one two three four] [Þļéåšé éñţéŕ ñö ḿöŕé ţĥåñ »{limit}« ķéýŵöŕðš. one two three four five] [Fîļţéŕ ḿéššåĝéš çöñţåîñîñĝ ţĥéšé ţéŕḿš öŕ þĥŕåšéš ƒŕöḿ ýöûŕ šéŕVéŕ. one two three four five six seven eight] [Ñö ķéýŵöŕðš ĥåVé ɓééñ åððéð. one two three four] - [Çûšţöḿ Ķéýŵöŕð Fîļţéŕ one two three] + [Ķéýŵöŕð Fîļţéŕ one two three] [΃ ţĥéšé ķéýŵöŕðš åŕé šéñţ… one two three four] [»{count}« ŵöŕðš one two] [Éñţéŕ ýöûŕ ķéýŵöŕðš ĥéŕé¡ one two three] [Fîļţéŕ ḿéššåĝéš çöñţåîñîñĝ ḿåļîçîöûš ļîñķš ƒŕöḿ ýöûŕ šéŕVéŕ. one two three four five six seven] - [Šþåḿ Ļîñķ Fîļţéŕ one two three] + [Ĥåŕḿƒûļ Ļîñķ Fîļţéŕ one two three] [΃ ĥåŕḿƒûļ ļîñķš åŕé ðéţéçţéð… one two three four] - [Çĥåññéļ: »{channelName}« one two] + [Çĥåññéļ: €[**¡¡»{channelName}«¡¡**](çĥåññéļĤööķ) one two three four] [Ŕûļé: »{ruleName}« one two] [ĥåš ɓļöçķéð å ḿéššåĝé one two three] - [Åûţöḿöð one two] + [ÅûţöḾöð 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] @@ -3871,6 +3883,11 @@ [Ýöûŕ ḿéḿɓéŕšĥîþ ĥåš ɓééñ ŕéšţåŕţéð¡ one two three four] [Šéåŕçĥ çĥåññéļš one two three] [Ḿöñéţîžé ýöûŕ šéŕVéŕ ɓý öƒƒéŕîñĝ éхçļûšîVé çĥåññéļš åñð ɓéñéƒîţš. one two three four five six seven] + [Åþþļý ƒöŕ Åççéšš one two three] + [Öñļý ţĥé šéŕVéŕ öŵñéŕ çåñ åþþļý ƒöŕ Þŕéḿîûḿ Ḿéḿɓéŕšĥîþ. ĜîVé ’éḿ å ĥéåðš ûþ¡ one two three four five six seven eight] + [Åþþļîçåţîöñ Þéñðîñĝ one two three] + [Ţö åþþļý, ŕéƒéŕ ţö ţĥé ŕéQûîŕéḿéñţš ɓéļöŵ. Ñöţé ţĥåţ ţĥéšé åŕé ĵûšţ ţĥé ḿîñîḿûḿ ŕéQûîŕéḿéñţš ţö åþþļý, åñð åççéþţåñçé îš ñöţ ĝûåŕåñţééð. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three] + [Ţö ļéåŕñ ḿöŕé åɓöûţ Þŕéḿîûḿ Ḿéḿɓéŕšĥîþ, çĥéçķ öûţ ţĥé FÅq. one two three four five six seven] [Ĝéţ Šţåŕţéð one two] [ÅðVåñçéð one two] [βåšîç Îñƒö one two] @@ -4266,7 +4283,7 @@ [Ŵîţĥ ñåḿé **¡¡»{newValue}«¡¡** one two three] [€[**¡¡»{user}«¡¡**](ûšéŕĤööķ) ûþðåţéð ţĥé ŵéɓĥööķ €[**¡¡»{target}«¡¡**](ţåŕĝéţĤööķ) one two three four five six seven eight nine ten eleven twelve thirteen] [Šéţûþ ŕûļéš ƒöŕ ḿöðéŕåţîöñ îñ ýöûŕ šéŕVéŕ ţö åûţöḿåţîçåļļý ƒîļţéŕ çöñţéñţ åñð åļéŕţ ḿöðéŕåţöŕš šö ţĥåţ ýöû çåñ ķééþ ýöûŕ šéŕVéŕ šåƒé åŕöûñð-ţĥé-çļöçķ one two three four five six seven eight nine ten eleven twelve thirteen fourteen] - [Åûţöḿöð one two] + [ÅûţöḾöð one two] [Ţĥé ŕéçöḿḿéñðéð ḿîñîḿûḿ šîžé îš 960х540 åñð ŕéçöḿḿéñðéð åšþéçţ ŕåţîö îš 16:9. [Ļéåŕñ ḿöŕé](»{articleURL}«). one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen] [Çöḿḿûñîţý Šéţţîñĝš one two three] [Öñļý šéŕVéŕ åðḿîñîšţŕåţöŕš åŕé åļļöŵéð ţö ðö ţĥîš one two three four five six] @@ -6184,8 +6201,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] @@ -8500,6 +8517,7 @@ [νîéŵéŕ Ĵöîñ one two] [νîéŵéŕ ĻéåVé one two] [νöîçé Ðîšçöññéçţéð one two three] + [Öþéñ Šöûñðɓöåŕð one two three] [Ðîšçöŕð Šöûñðɓöåŕð one two three] [Åðð Šöûñð one two] [βŕöŵšé one two] diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml index 16b8fee995..3b2c11dcd5 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -14728,9884 +14728,9902 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d52b1a2768..750b606e95 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -98,7 +98,8 @@ com.discord.app.AppScrollingViewBehavior This may take a moment. Actions - No recent messages + Check back in a bit + All channels are chilling {count} Active Now Many recent messages @@ -307,6 +308,7 @@ All App Directory Home App Directory Search + {categoryName} Apps No matches found in {categoryName} Try another search or $[see results from all categories](viewAllHook) No matches found @@ -316,7 +318,7 @@ Developer Resources Customize your server with apps Automate useful tasks or introduce a bit of delight - {categoryName} Apps + Top {categoryName} Apps Popular Now On the Rise Explore Collection @@ -1486,7 +1488,7 @@ Custom Presets Use Default - 890905c898ba49aaa7483d035bcac8c6 + 2b103b8c5c0c4834b1c6b810f7110e0b Slash command application {applicationName} {applicationName} application {applicationName} application selected @@ -2959,6 +2961,13 @@ This channel isn’t fully built yet for Android devices. Log on to your desktop client for the full experience. Forum Channel Start discussions by topics + Guidelines + Create Guidelines + Help your members understand what this channel is for, and set rules to keep it civil! + Create Guidelines for this channel! + Show More + There’s a post that’s pinned already. Pinning this post will remove the existing pinned post. + Pin this post? Post {title}, {count} This post was archived by a moderator. Only moderators can unarchive it. There’s no one in this post. @@ -3369,32 +3378,35 @@ Anyone with access to this text channel will see the alert. Select a text channel Choose a channel to post the alert message to. The alert will contain the flagged message contents, user, and channel it was originally posted to. + Edit Channel Add Action Post Alert To Channel Then take these action(s) - Add Another Rule + Add Another {ruleName} Your message has been prevented from editing because it triggered AutoMod filters this community uses. reverted • [Learn More]({helpUrl}) Your message was not sent because it triggered AutoMod filters this community uses. Please add at least one action to this rule. + Filter Name (Optional) + Enter a name for this filter (optional) Keywords must be comma separated (Ex: cat, dog, tiger…) {keyword} has an invalid length. Keywords must be between {min} and {max} characters. Please enter at least one keyword. Please enter no more than {limit} keywords. Filter messages containing these terms or phrases from your server. No keywords have been added. - Custom Keyword Filter + Keyword Filter If these keywords are sent… {count} words Enter your keywords here! Filter messages containing malicious links from your server. - Spam Link Filter + Harmful Link Filter If harmful links are detected… - Channel: {channelName} + Channel: $[**!!{channelName}!!**](channelHook) Rule: {ruleName} has blocked a message - Automod + 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: @@ -3887,6 +3899,11 @@ Your membership has been restarted! Search channels Monetize your server by offering exclusive channels and benefits. + Apply for Access + Only the server owner can apply for Premium Membership. Give ’em a heads up! + Application Pending + To apply, refer to the requirements below. Note that these are just the minimum requirements to apply, and acceptance is not guaranteed. + To learn more about Premium Membership, check out the FAQ. Get Started Advanced Basic Info @@ -4282,7 +4299,7 @@ With name **!!{newValue}!!** $[**!!{user}!!**](userHook) updated the webhook $[**!!{target}!!**](targetHook) Setup rules for moderation in your server to automatically filter content and alert moderators so that you can keep your server safe around-the-clock - Automod + AutoMod The recommended minimum size is 960x540 and recommended aspect ratio is 16:9. [Learn more]({articleURL}). Community Settings Only server administrators are allowed to do this @@ -6203,8 +6220,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 @@ -8527,6 +8544,7 @@ Viewer Join Viewer Leave Voice Disconnected + Open Soundboard Discord Soundboard Add Sound Browse