From e98e40854f292f61d83d0e74cee8b7444688bb2d Mon Sep 17 00:00:00 2001 From: Juby210 Date: Sat, 8 Jan 2022 08:30:54 +0100 Subject: [PATCH] 110.4 - Alpha (110204) --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 2 +- .../widgets/settings/WidgetSettings.java | 2 +- .../oauth_token_permission_list_item.xml | 2 +- app/src/main/res/values-ar-rXB/plurals.xml | 28 +- app/src/main/res/values-ar-rXB/strings.xml | 20 +- app/src/main/res/values-en-rXA/plurals.xml | 28 +- app/src/main/res/values-en-rXA/strings.xml | 20 +- app/src/main/res/values/plurals.xml | 28 +- app/src/main/res/values/public.xml | 19854 ++++++++-------- app/src/main/res/values/strings.xml | 22 +- 11 files changed, 10072 insertions(+), 9938 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4622b2c4cf..b45ef30e0d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 110203 - versionName "110.3 - Alpha" + versionCode 110204 + versionName "110.4 - Alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0df01bbcab..2a447f0121 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/widgets/settings/WidgetSettings.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java index 8934d3da4a..9754768ef6 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 + " - 110.3 - Alpha (110203)"); + textView.setText(string + " - 110.4 - Alpha (110204)"); 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/layout/oauth_token_permission_list_item.xml b/app/src/main/res/layout/oauth_token_permission_list_item.xml index 8228721ff8..f4e850c7e4 100644 --- a/app/src/main/res/layout/oauth_token_permission_list_item.xml +++ b/app/src/main/res/layout/oauth_token_permission_list_item.xml @@ -1,2 +1,2 @@ - + diff --git a/app/src/main/res/values-ar-rXB/plurals.xml b/app/src/main/res/values-ar-rXB/plurals.xml index 45cab6ee32..5cd9f1e36a 100644 --- a/app/src/main/res/values-ar-rXB/plurals.xml +++ b/app/src/main/res/values-ar-rXB/plurals.xml @@ -320,6 +320,14 @@ ‏‮Rewind‬‏ %d ‏‮second‬‏ ‏‮Rewind‬‏ %d ‏‮seconds‬‏ + + ‏‮1‬‏ ‏‮day‬‏ + ‏‮{days}‬‏ ‏‮days‬‏ + + + ‏‮1‬‏ ‏‮member‬‏ + ‏‮{members}‬‏ ‏‮members‬‏ + ‏‮1‬‏ ‏‮day‬‏ ‏‮{days}‬‏ ‏‮days‬‏ @@ -328,6 +336,14 @@ ‏‮1‬‏ ‏‮member‬‏ ‏‮{members}‬‏ ‏‮members‬‏ + + ‏‮1‬‏ ‏‮day‬‏ + ‏‮{days}‬‏ ‏‮days‬‏ + + + ‏‮1‬‏ ‏‮member‬‏ + ‏‮{members}‬‏ ‏‮members‬‏ + ‏‮1‬‏ ‏‮day‬‏ ‏‮{days}‬‏ ‏‮days‬‏ @@ -717,8 +733,8 @@ ‏‮{#}‬‏ ‏‮more‬‏ ‏‮boosts‬‏ - ‏‮{#}‬‏ ‏‮extremely‬‏ ‏‮cool‬‏ ‏‮person‬‏ ‏‮has‬‏ - ‏‮{#}‬‏ ‏‮extremely‬‏ ‏‮cool‬‏ ‏‮people‬‏ ‏‮have‬‏ + ‏‮**‬‏‏‮{#}‬‏ ‏‮extremely‬‏ ‏‮cool‬‏ ‏‮person**‬‏ ‏‮has‬‏ + ‏‮**‬‏‏‮{#}‬‏ ‏‮extremely‬‏ ‏‮cool‬‏ ‏‮people**‬‏ ‏‮have‬‏ ‏‮{#}‬‏ ‏‮Boost‬‏ @@ -1300,10 +1316,18 @@ ‏‮1‬‏ ‏‮other‬‏ ‏‮{n}‬‏ ‏‮others‬‏ + + ‏‮1‬‏ ‏‮other‬‏ + ‏‮[‬‏‏‮{n}‬‏ ‏‮others](onClick)‬‏ + ‏‮1‬‏ ‏‮other‬‏ ‏‮{n}‬‏ ‏‮others‬‏ + + ‏‮1‬‏ ‏‮person‬‏ + ‏‮[‬‏‏‮{n}‬‏ ‏‮people](onClick)‬‏ + ‏‮1‬‏ ‏‮person‬‏ ‏‮{n}‬‏ ‏‮people‬‏ diff --git a/app/src/main/res/values-ar-rXB/strings.xml b/app/src/main/res/values-ar-rXB/strings.xml index c25a2bcd4c..5cba00d8d3 100644 --- a/app/src/main/res/values-ar-rXB/strings.xml +++ b/app/src/main/res/values-ar-rXB/strings.xml @@ -49,6 +49,7 @@ ‏‮No.‬‏ ‏‮Keep‬‏ ‏‮this‬‏ ‏‮off.‬‏ ‏‮Quick‬‏ ‏‮Question!‬‏ ‏‮Learn‬‏ ‏‮more‬‏ ‏‮about‬‏ ‏‮how‬‏ ‏‮we‬‏ ‏‮use‬‏ ‏‮this‬‏ ‏‮information.‬‏ + ‏‮Example‬‏ ‏‮Button‬‏ ‏‮Chat‬‏ ‏‮font‬‏ ‏‮scaling‬‏ ‏‮Currently‬‏ ‏‮using‬‏ ‏‮the‬‏ ‏‮Discord-specific‬‏ ‏‮font‬‏ ‏‮scale.‬‏ ‏‮Currently‬‏ ‏‮using‬‏ ‏‮your‬‏ ‏‮device\'s‬‏ ‏‮font‬‏ ‏‮scale.‬‏ @@ -317,6 +318,7 @@ ‏‮Try‬‏ ‏‮slash‬‏ ‏‮commands!‬‏ ‏‮A‬‏ ‏‮new‬‏ ‏‮way‬‏ ‏‮to‬‏ ‏‮use‬‏ ‏‮bots‬‏ ‏‮by‬‏ ‏‮typing‬‏ ‏‮slash.‬‏ ‏‮[Dismiss](dismissOnClick)‬‏ ‏‮This‬‏ ‏‮interaction‬‏ ‏‮failed‬‏ ‏‮Sending‬‏ ‏‮command…‬‏ + ‏‮The‬‏ ‏‮application‬‏ ‏‮did‬‏ ‏‮not‬‏ ‏‮respond‬‏ ‏‮$[](userHook)‬‏ ‏‮used‬‏ ‏‮$[](commandHook)‬‏ ‏‮with‬‏ ‏‮$[](applicationHook)‬‏ ‏‮[!!‬‏‏‮{username}‬‏‏‮!!](handleTapUsername)‬‏ ‏‮used‬‏ ‏‮[!!‬‏‏‮{commandName}‬‏‏‮!!](handleTapCommandName)‬‏ ‏‮$[](userHook)‬‏ ‏‮used‬‏ ‏‮$[](commandHook)‬‏ @@ -675,6 +677,7 @@ ‏‮Upload‬‏ ‏‮Attachment‬‏ ‏‮Utilities‬‏ ‏‮Modify‬‏ ‏‮Attachment‬‏ ‏‮Remove‬‏ ‏‮Attachment‬‏ + ‏‮Spoiler‬‏ ‏‮Attachment‬‏ ‏‮When‬‏ ‏‮others‬‏ ‏‮speak‬‏ ‏‮When‬‏ ‏‮I‬‏ ‏‮speak‬‏ ‏‮!!‬‏‏‮{name}‬‏‏‮!!‬‏ ‏‮-‬‏ ‏‮Audience‬‏ @@ -2096,6 +2099,8 @@ ‏‮Enable‬‏ ‏‮Desktop‬‏ ‏‮Notifications‬‏ ‏‮If‬‏ ‏‮you\'re‬‏ ‏‮looking‬‏ ‏‮for‬‏ ‏‮per-channel‬‏ ‏‮or‬‏ ‏‮per-server‬‏ ‏‮notifications,‬‏ ‏‮right-click‬‏ ‏‮the‬‏ ‏‮desired‬‏ ‏‮server‬‏ ‏‮icon‬‏ ‏‮and‬‏ ‏‮select‬‏ ‏‮Notification‬‏ ‏‮Settings.‬‏ ‏‮Automatically‬‏ ‏‮detect‬‏ ‏‮accounts‬‏ ‏‮from‬‏ ‏‮other‬‏ ‏‮platforms‬‏ ‏‮on‬‏ ‏‮this‬‏ ‏‮computer.‬‏ + ‏‮Local‬‏ ‏‮development‬‏ ‏‮mode‬‏ + ‏‮Staging‬‏ ‏‮{buildNumber}‬‏ ‏‮Application‬‏ ‏‮Test‬‏ ‏‮Mode‬‏ ‏‮Activate‬‏ ‏‮Clear‬‏ @@ -2202,6 +2207,7 @@ ‏‮Never‬‏ ‏‮Only‬‏ ‏‮While‬‏ ‏‮Speaking‬‏ ‏‮Show‬‏ ‏‮a‬‏ ‏‮warning‬‏ ‏‮when‬‏ ‏‮Discord‬‏ ‏‮is‬‏ ‏‮not‬‏ ‏‮detecting‬‏ ‏‮audio‬‏ ‏‮from‬‏ ‏‮your‬‏ ‏‮mic‬‏ + ‏‮Show‬‏ ‏‮Send‬‏ ‏‮Message‬‏ ‏‮button‬‏ ‏‮Direct‬‏ ‏‮Message‬‏ ‏‮Find‬‏ ‏‮or‬‏ ‏‮start‬‏ ‏‮a‬‏ ‏‮conversation‬‏ ‏‮Message‬‏ ‏‮!!‬‏‏‮{channel}‬‏‏‮!!‬‏ @@ -2637,7 +2643,9 @@ ‏‮Hardware‬‏ ‏‮acceleration‬‏ ‏‮uses‬‏ ‏‮your‬‏ ‏‮GPU‬‏ ‏‮for‬‏ ‏‮efficient‬‏ ‏‮video‬‏ ‏‮encoding‬‏ ‏‮and‬‏ ‏‮decoding,‬‏ ‏‮if‬‏ ‏‮available.‬‏ ‏‮If‬‏ ‏‮a‬‏ ‏‮channel‬‏ ‏‮is‬‏ ‏‮selected‬‏ ‏‮then‬‏ ‏‮an‬‏ ‏‮invite‬‏ ‏‮link‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮generated‬‏ ‏‮with‬‏ ‏‮the‬‏ ‏‮widget,‬‏ ‏‮otherwise‬‏ ‏‮only‬‏ ‏‮online‬‏ ‏‮members‬‏ ‏‮and‬‏ ‏‮voice‬‏ ‏‮channels‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮provided.‬‏ ‏‮Pruning‬‏ ‏‮will‬‏ ‏‮kick‬‏ ‏‮**‬‏‏‮{members}‬‏‏‮**‬‏ ‏‮who‬‏ ‏‮have‬‏ ‏‮not‬‏ ‏‮been‬‏ ‏‮seen‬‏ ‏‮in‬‏ ‏‮**‬‏‏‮{days}‬‏‏‮**‬‏ ‏‮and‬‏ ‏‮are‬‏ ‏‮not‬‏ ‏‮assigned‬‏ ‏‮to‬‏ ‏‮any‬‏ ‏‮roles.‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮rejoin‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮using‬‏ ‏‮a‬‏ ‏‮new‬‏ ‏‮invite.‬‏ + ‏‮Pruning‬‏ ‏‮will‬‏ ‏‮kick‬‏ ‏‮**‬‏‏‮{members}‬‏‏‮**‬‏ ‏‮who‬‏ ‏‮have‬‏ ‏‮not‬‏ ‏‮been‬‏ ‏‮seen‬‏ ‏‮on‬‏ ‏‮Discord‬‏ ‏‮in‬‏ ‏‮**‬‏‏‮{days}‬‏‏‮**‬‏ ‏‮and‬‏ ‏‮are‬‏ ‏‮not‬‏ ‏‮assigned‬‏ ‏‮to‬‏ ‏‮any‬‏ ‏‮roles.‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮rejoin‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮using‬‏ ‏‮a‬‏ ‏‮new‬‏ ‏‮invite.‬‏ ‏‮Pruning‬‏ ‏‮will‬‏ ‏‮kick‬‏ ‏‮**‬‏‏‮{members}‬‏‏‮**‬‏ ‏‮who‬‏ ‏‮have‬‏ ‏‮not‬‏ ‏‮been‬‏ ‏‮seen‬‏ ‏‮in‬‏ ‏‮**‬‏‏‮{days}‬‏‏‮**‬‏ ‏‮and‬‏ ‏‮assigned‬‏ ‏‮to‬‏ ‏‮just‬‏ ‏‮the‬‏ ‏‮roles‬‏ ‏‮you\'ve‬‏ ‏‮selected.‬‏ ‏‮Members‬‏ ‏‮who‬‏ ‏‮are‬‏ ‏‮not‬‏ ‏‮assigned‬‏ ‏‮to‬‏ ‏‮any‬‏ ‏‮roles‬‏ ‏‮are‬‏ ‏‮still‬‏ ‏‮included.‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮rejoin‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮using‬‏ ‏‮a‬‏ ‏‮new‬‏ ‏‮invite.‬‏ + ‏‮Pruning‬‏ ‏‮will‬‏ ‏‮kick‬‏ ‏‮**‬‏‏‮{members}‬‏‏‮**‬‏ ‏‮who‬‏ ‏‮have‬‏ ‏‮not‬‏ ‏‮been‬‏ ‏‮seen‬‏ ‏‮on‬‏ ‏‮Discord‬‏ ‏‮in‬‏ ‏‮**‬‏‏‮{days}‬‏‏‮**‬‏ ‏‮and‬‏ ‏‮are‬‏ ‏‮assigned‬‏ ‏‮to‬‏ ‏‮just‬‏ ‏‮the‬‏ ‏‮roles‬‏ ‏‮you\'ve‬‏ ‏‮selected.‬‏ ‏‮Members‬‏ ‏‮who‬‏ ‏‮are‬‏ ‏‮not‬‏ ‏‮assigned‬‏ ‏‮to‬‏ ‏‮any‬‏ ‏‮roles‬‏ ‏‮are‬‏ ‏‮still‬‏ ‏‮included.‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮rejoin‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮using‬‏ ‏‮a‬‏ ‏‮new‬‏ ‏‮invite.‬‏ ‏‮Post‬‏ ‏‮messages‬‏ ‏‮that‬‏ ‏‮reach‬‏ ‏‮servers‬‏ ‏‮outside‬‏ ‏‮your‬‏ ‏‮own.‬‏ ‏‮Users‬‏ ‏‮can‬‏ ‏‮opt‬‏ ‏‮into‬‏ ‏‮Following‬‏ ‏‮this‬‏ ‏‮channel,‬‏ ‏‮so‬‏ ‏‮select‬‏ ‏‮posts‬‏ ‏‮you‬‏ ‏‮Publish‬‏ ‏‮from‬‏ ‏‮here‬‏ ‏‮will‬‏ ‏‮appear‬‏ ‏‮directly‬‏ ‏‮in‬‏ ‏‮their‬‏ ‏‮own‬‏ ‏‮servers.‬‏ ‏‮Announcement‬‏ ‏‮channels‬‏ ‏‮will‬‏ ‏‮not‬‏ ‏‮receive‬‏ ‏‮messages‬‏ ‏‮from‬‏ ‏‮other‬‏ ‏‮Announcement‬‏ ‏‮channels.‬‏ ‏‮[Learn‬‏ ‏‮more.](‬‏‏‮{documentationLink}‬‏‏‮)‬‏ ‏‮Post‬‏ ‏‮messages‬‏ ‏‮that‬‏ ‏‮reach‬‏ ‏‮servers‬‏ ‏‮outside‬‏ ‏‮your‬‏ ‏‮own.‬‏ ‏‮Users‬‏ ‏‮can‬‏ ‏‮opt‬‏ ‏‮into‬‏ ‏‮Following‬‏ ‏‮this‬‏ ‏‮channel,‬‏ ‏‮so‬‏ ‏‮select‬‏ ‏‮posts‬‏ ‏‮you‬‏ ‏‮Publish‬‏ ‏‮from‬‏ ‏‮here‬‏ ‏‮will‬‏ ‏‮appear‬‏ ‏‮directly‬‏ ‏‮in‬‏ ‏‮their‬‏ ‏‮own‬‏ ‏‮servers.‬‏ ‏‮[Learn‬‏ ‏‮more.](‬‏‏‮{documentationLink}‬‏‏‮)‬‏ ‏‮Users‬‏ ‏‮will‬‏ ‏‮need‬‏ ‏‮to‬‏ ‏‮confirm‬‏ ‏‮they‬‏ ‏‮are‬‏ ‏‮of‬‏ ‏‮over‬‏ ‏‮legal‬‏ ‏‮age‬‏ ‏‮to‬‏ ‏‮view‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮content‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮channel.‬‏ ‏‮NSFW‬‏ ‏‮channels‬‏ ‏‮are‬‏ ‏‮exempt‬‏ ‏‮from‬‏ ‏‮the‬‏ ‏‮explicit‬‏ ‏‮content‬‏ ‏‮filter.‬‏ @@ -2660,6 +2668,7 @@ ‏‮Members‬‏ ‏‮of‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮must‬‏ ‏‮meet‬‏ ‏‮the‬‏ ‏‮following‬‏ ‏‮criteria‬‏ ‏‮before‬‏ ‏‮they‬‏ ‏‮can‬‏ ‏‮send‬‏ ‏‮messages‬‏ ‏‮in‬‏ ‏‮text‬‏ ‏‮channels‬‏ ‏‮or‬‏ ‏‮initiate‬‏ ‏‮a‬‏ ‏‮direct‬‏ ‏‮message‬‏ ‏‮conversation.‬‏ ‏‮If‬‏ ‏‮a‬‏ ‏‮member‬‏ ‏‮has‬‏ ‏‮an‬‏ ‏‮assigned‬‏ ‏‮role‬‏ ‏‮this‬‏ ‏‮does‬‏ ‏‮not‬‏ ‏‮apply.‬‏ ‏‮**We‬‏ ‏‮recommend‬‏ ‏‮setting‬‏ ‏‮a‬‏ ‏‮verification‬‏ ‏‮level‬‏ ‏‮for‬‏ ‏‮a‬‏ ‏‮public‬‏ ‏‮Discord.**‬‏ ‏‮Sets‬‏ ‏‮camera‬‏ ‏‮video‬‏ ‏‮quality‬‏ ‏‮for‬‏ ‏‮all‬‏ ‏‮channel‬‏ ‏‮participants.‬‏ ‏‮Choose‬‏ ‏‮**Auto**‬‏ ‏‮for‬‏ ‏‮optimal‬‏ ‏‮performance.‬‏ ‏‮Need‬‏ ‏‮help‬‏ ‏‮with‬‏ ‏‮voice‬‏ ‏‮or‬‏ ‏‮video?‬‏ ‏‮Check‬‏ ‏‮out‬‏ ‏‮our‬‏ ‏‮[troubleshooting‬‏ ‏‮guide](‬‏‏‮{guideURL}‬‏‏‮).‬‏ + ‏‮Chat‬‏ ‏‮Input‬‏ ‏‮Account‬‏ ‏‮Information‬‏ ‏‮Inactive‬‏ ‏‮Channel‬‏ ‏‮Inactive‬‏ ‏‮Timeout‬‏ @@ -4310,7 +4319,7 @@ ‏‮You‬‏ ‏‮must‬‏ ‏‮verify‬‏ ‏‮your‬‏ ‏‮email‬‏ ‏‮before‬‏ ‏‮you‬‏ ‏‮can‬‏ ‏‮see‬‏ ‏‮the‬‏ ‏‮requirements.‬‏ ‏‮Members‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮can‬‏ ‏‮help‬‏ ‏‮unlock‬‏ ‏‮levels‬‏ ‏‮by‬‏ ‏‮bestowing‬‏ ‏‮Boosts.‬‏ ‏‮For‬‏ ‏‮every‬‏ ‏‮level‬‏ ‏‮achieved,‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮will‬‏ ‏‮help‬‏ ‏‮unlock‬‏ ‏‮perks‬‏ ‏‮for‬‏ ‏‮everyone.‬‏ ‏‮Members‬‏ ‏‮can‬‏ ‏‮revoke‬‏ ‏‮their‬‏ ‏‮boost‬‏ ‏‮at‬‏ ‏‮any‬‏ ‏‮time.‬‏ ‏‮**Your‬‏ ‏‮server‬‏ ‏‮will‬‏ ‏‮keep‬‏ ‏‮perks‬‏ ‏‮for‬‏ ‏‮three‬‏ ‏‮days‬‏ ‏‮if‬‏ ‏‮a‬‏ ‏‮level‬‏ ‏‮is‬‏ ‏‮lost**.‬‏ ‏‮[Learn‬‏ ‏‮more‬‏ ‏‮about‬‏ ‏‮Server‬‏ ‏‮Boosting](‬‏‏‮{helpdeskArticle}‬‏‏‮).‬‏ ‏‮Only‬‏ ‏‮{numLeft}‬‏ ‏‮until‬‏ ‏‮the‬‏ ‏‮next‬‏ ‏‮level!‬‏ - ‏‮**‬‏‏‮{count}‬‏‏‮**‬‏ ‏‮boosted‬‏ ‏‮this‬‏ ‏‮server‬‏ + ‏‮{count}‬‏ ‏‮boosted‬‏ ‏‮this‬‏ ‏‮server‬‏ ‏‮{required}‬‏ ‏‮Server‬‏ ‏‮Boost‬‏ ‏‮Status‬‏ ‏‮Unlocked‬‏ @@ -5879,8 +5888,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‬‏ @@ -7209,7 +7218,9 @@ ‏‮!!‬‏‏‮{a}‬‏‏‮!!,‬‏ ‏‮!!‬‏‏‮{b}‬‏‏‮!!,‬‏ ‏‮and‬‏ ‏‮{n}‬‏ ‏‮reacted‬‏ ‏‮with‬‏ ‏‮!!‬‏‏‮{emojiName}‬‏‏‮!!‬‏ ‏‮!!‬‏‏‮{a}‬‏‏‮!!,‬‏ ‏‮!!‬‏‏‮{b}‬‏‏‮!!‬‏ ‏‮and‬‏ ‏‮!!‬‏‏‮{c}‬‏‏‮!!‬‏ ‏‮reacted‬‏ ‏‮with‬‏ ‏‮!!‬‏‏‮{emojiName}‬‏‏‮!!‬‏ ‏‮!!‬‏‏‮{a}‬‏‏‮!!,‬‏ ‏‮!!‬‏‏‮{b}‬‏‏‮!!,‬‏ ‏‮!!‬‏‏‮{c}‬‏‏‮!!,‬‏ ‏‮and‬‏ ‏‮{n}‬‏ ‏‮reacted‬‏ ‏‮with‬‏ ‏‮!!‬‏‏‮{emojiName}‬‏‏‮!!‬‏ + ‏‮!!‬‏‏‮{a}‬‏‏‮!!,‬‏ ‏‮!!‬‏‏‮{b}‬‏‏‮!!,‬‏ ‏‮!!‬‏‏‮{c}‬‏‏‮!!,‬‏ ‏‮and‬‏ ‏‮{n}‬‏ ‏‮reacted‬‏ ‏‮with‬‏ ‏‮!!‬‏‏‮{emojiName}‬‏‏‮!!‬‏ ‏‮{n}‬‏ ‏‮reacted‬‏ ‏‮with‬‏ ‏‮!!‬‏‏‮{emojiName}‬‏‏‮!!‬‏ + ‏‮{n}‬‏ ‏‮reacted‬‏ ‏‮with‬‏ ‏‮!!‬‏‏‮{emojiName}‬‏‏‮!!‬‏ ‏‮Reactions‬‏ ‏‮Add‬‏ ‏‮reaction‬‏ ‏‮**!!‬‏‏‮{prefix}‬‏‏‮!!**‬‏ ‏‮Read‬‏ ‏‮Message‬‏ ‏‮History‬‏ @@ -8353,6 +8364,7 @@ ‏‮Press‬‏ ‏‮Start‬‏ ‏‮the‬‏ ‏‮Stage,‬‏ ‏‮and‬‏ ‏‮pick‬‏ ‏‮a‬‏ ‏‮topic‬‏ ‏‮to‬‏ ‏‮start‬‏ ‏‮the‬‏ ‏‮conversation.‬‏ ‏‮Waiting‬‏ ‏‮for‬‏ ‏‮the‬‏ ‏‮Stage‬‏ ‏‮to‬‏ ‏‮start…‬‏ ‏‮Any‬‏ ‏‮day‬‏ ‏‮now.‬‏ ‏‮Waiting‬‏ ‏‮for‬‏ ‏‮the‬‏ ‏‮Stage‬‏ ‏‮to‬‏ ‏‮start.‬‏ + ‏‮Click‬‏ ‏‮Start‬‏ ‏‮the‬‏ ‏‮Stage,‬‏ ‏‮and‬‏ ‏‮pick‬‏ ‏‮a‬‏ ‏‮topic‬‏ ‏‮to‬‏ ‏‮start‬‏ ‏‮the‬‏ ‏‮conversation.‬‏ ‏‮!!‬‏‏‮{username}‬‏‏‮!!:‬‏ ‏‮@everyone‬‏ ‏‮!!‬‏‏‮{topic}‬‏‏‮!!‬‏ ‏‮is‬‏ ‏‮starting.‬‏ ‏‮Listen‬‏ ‏‮in!‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏ ‏‮is‬‏ ‏‮hosting‬‏ ‏‮a‬‏ ‏‮live‬‏ ‏‮Stage‬‏ ‏‮Stage‬‏ ‏‮Channel‬‏ @@ -8775,6 +8787,7 @@ ‏‮Standard‬‏ ‏‮message‬‏ ‏‮and‬‏ ‏‮data‬‏ ‏‮rates‬‏ ‏‮apply.‬‏ ‏‮Text‬‏ ‏‮Permissions‬‏ ‏‮Text‬‏ ‏‮area‬‏ ‏‮Actions‬‏ + ‏‮Submit‬‏ ‏‮Button‬‏ ‏‮Message‬‏ ‏‮!!‬‏‏‮{channel}‬‏‏‮!!‬‏ ‏‮Thai‬‏ ‏‮Theme‬‏ @@ -9082,6 +9095,7 @@ ‏‮Upload‬‏ ‏‮Successful‬‏ ‏‮Upload‬‏ ‏‮debug‬‏ ‏‮logs‬‏ ‏‮to‬‏ ‏‮Discord‬‏ ‏‮Support‬‏ ‏‮Upload‬‏ ‏‮Emoji‬‏ + ‏‮Drop‬‏ ‏‮emojis‬‏ ‏‮to‬‏ ‏‮upload‬‏ ‏‮them.‬‏ ‏‮Tip:‬‏ ‏‮Double‬‏ ‏‮click‬‏ ‏‮the‬‏ ‏‮$[](icon)‬‏ ‏‮Upload‬‏ ‏‮Server‬‏ ‏‮Avatar‬‏ ‏‮Upload‬‏ ‏‮Image‬‏ diff --git a/app/src/main/res/values-en-rXA/plurals.xml b/app/src/main/res/values-en-rXA/plurals.xml index b89961bacd..b479c93344 100644 --- a/app/src/main/res/values-en-rXA/plurals.xml +++ b/app/src/main/res/values-en-rXA/plurals.xml @@ -320,6 +320,14 @@ [Ŕéŵîñð %d šéçöñð one two three] [Ŕéŵîñð %d šéçöñðš one two three] + + [1 ðåý one] + [»{days}« ðåýš one] + + + [1 ḿéḿɓéŕ one two] + [»{members}« ḿéḿɓéŕš one two] + [1 ðåý one] [»{days}« ðåýš one] @@ -328,6 +336,14 @@ [1 ḿéḿɓéŕ one two] [»{members}« ḿéḿɓéŕš one two] + + [1 ðåý one] + [»{days}« ðåýš one] + + + [1 ḿéḿɓéŕ one two] + [»{members}« ḿéḿɓéŕš one two] + [1 ðåý one] [»{days}« ðåýš one] @@ -717,8 +733,8 @@ [»{#}« ḿöŕé ɓööšţš one two] - [»{#}« éхţŕéḿéļý çööļ þéŕšöñ ĥåš one two three four] - [»{#}« éхţŕéḿéļý çööļ þéöþļé ĥåVé one two three four] + [**»{#}« éхţŕéḿéļý çööļ þéŕšöñ** ĥåš one two three four] + [**»{#}« éхţŕéḿéļý çööļ þéöþļé** ĥåVé one two three four] [»{#}« βööšţ one two] @@ -1300,10 +1316,18 @@ [1 öţĥéŕ one two] [»{n}« öţĥéŕš one two] + + [1 öţĥéŕ one two] + [[»{n}« öţĥéŕš](öñÇļîçķ) one two three] + [1 öţĥéŕ one two] [»{n}« öţĥéŕš one two] + + [1 þéŕšöñ one two] + [[»{n}« þéöþļé](öñÇļîçķ) one two three] + [1 þéŕšöñ one two] [»{n}« þéöþļé one two] diff --git a/app/src/main/res/values-en-rXA/strings.xml b/app/src/main/res/values-en-rXA/strings.xml index 4080340bcd..21608af0a9 100644 --- a/app/src/main/res/values-en-rXA/strings.xml +++ b/app/src/main/res/values-en-rXA/strings.xml @@ -49,6 +49,7 @@ [Ñö. Ķééþ ţĥîš öƒƒ. one two three] [qûîçķ qûéšţîöñ¡ one two three] [Ļéåŕñ ḿöŕé åɓöûţ ĥöŵ ŵé ûšé ţĥîš îñƒöŕḿåţîöñ. one two three four five] + [Éхåḿþļé βûţţöñ one two three] [Çĥåţ ƒöñţ šçåļîñĝ one two three] [Çûŕŕéñţļý ûšîñĝ ţĥé Ðîšçöŕð-šþéçîƒîç ƒöñţ šçåļé. one two three four five six] [Çûŕŕéñţļý ûšîñĝ ýöûŕ ðéVîçé\'š ƒöñţ šçåļé. one two three four five] @@ -317,6 +318,7 @@ [Ţŕý šļåšĥ çöḿḿåñðš¡ Å ñéŵ ŵåý ţö ûšé ɓöţš ɓý ţýþîñĝ šļåšĥ. [Ðîšḿîšš](ðîšḿîššÖñÇļîçķ) one two three four five six seven eight nine] [Ţĥîš îñţéŕåçţîöñ ƒåîļéð one two three] [Šéñðîñĝ çöḿḿåñð… one two three] + [Ţĥé åþþļîçåţîöñ ðîð ñöţ ŕéšþöñð one two three four] [€[](ûšéŕĤööķ) ûšéð €[](çöḿḿåñðĤööķ) ŵîţĥ €[](åþþļîçåţîöñĤööķ) one two three four five six seven] [[¡¡»{username}«¡¡](ĥåñðļéŢåþÛšéŕñåḿé) ûšéð [¡¡»{commandName}«¡¡](ĥåñðļéŢåþÇöḿḿåñðÑåḿé) one two three four five six seven eight nine ten eleven twelve] [€[](ûšéŕĤööķ) ûšéð €[](çöḿḿåñðĤööķ) one two three four] @@ -675,6 +677,7 @@ [Ûþļöåð Åţţåçĥḿéñţ Ûţîļîţîéš one two three four] [Ḿöðîƒý Åţţåçĥḿéñţ one two three] [ŔéḿöVé Åţţåçĥḿéñţ one two three] + [Šþöîļéŕ Åţţåçĥḿéñţ one two three] [Ŵĥéñ öţĥéŕš šþéåķ one two three] [Ŵĥéñ Î šþéåķ one two] [¡¡»{name}«¡¡ - Åûðîéñçé one two three] @@ -2096,6 +2099,8 @@ [Éñåɓļé Ðéšķţöþ Ñöţîƒîçåţîöñš one two three four] [΃ ýöû\'ŕé ļööķîñĝ ƒöŕ þéŕ-çĥåññéļ öŕ þéŕ-šéŕVéŕ ñöţîƒîçåţîöñš, ŕîĝĥţ-çļîçķ ţĥé ðéšîŕéð šéŕVéŕ îçöñ åñð šéļéçţ Ñöţîƒîçåţîöñ Šéţţîñĝš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three] [Åûţöḿåţîçåļļý ðéţéçţ åççöûñţš ƒŕöḿ öţĥéŕ þļåţƒöŕḿš öñ ţĥîš çöḿþûţéŕ. one two three four five six seven eight] + [Ļöçåļ ðéVéļöþḿéñţ ḿöðé one two three] + [Šţåĝîñĝ »{buildNumber}« one two] [Åþþļîçåţîöñ Ţéšţ Ḿöðé one two three] [ÅçţîVåţé one two] [Çļéåŕ one] @@ -2202,6 +2207,7 @@ [ÑéVéŕ one] [Öñļý Ŵĥîļé Šþéåķîñĝ one two three] [Šĥöŵ å ŵåŕñîñĝ ŵĥéñ Ðîšçöŕð îš ñöţ ðéţéçţîñĝ åûðîö ƒŕöḿ ýöûŕ ḿîç one two three four five six seven] + [Šĥöŵ Šéñð Ḿéššåĝé ɓûţţöñ one two three] [Ðîŕéçţ Ḿéššåĝé one two three] [Fîñð öŕ šţåŕţ å çöñVéŕšåţîöñ one two three four] [Ḿéššåĝé ¡¡»{channel}«¡¡ one two] @@ -2637,7 +2643,9 @@ [Ĥåŕðŵåŕé åççéļéŕåţîöñ ûšéš ýöûŕ ĜÞÛ ƒöŕ 郃îçîéñţ Vîðéö éñçöðîñĝ åñð ðéçöðîñĝ, îƒ åVåîļåɓļé. one two three four five six seven eight nine ten] [΃ å çĥåññéļ îš šéļéçţéð ţĥéñ åñ îñVîţé ļîñķ ŵîļļ ɓé ĝéñéŕåţéð ŵîţĥ ţĥé ŵîðĝéţ, öţĥéŕŵîšé öñļý öñļîñé ḿéḿɓéŕš åñð Vöîçé çĥåññéļš ŵîļļ ɓé þŕöVîðéð. one two three four five six seven eight nine ten eleven twelve thirteen fourteen] [Þŕûñîñĝ ŵîļļ ķîçķ **»{members}«** ŵĥö ĥåVé ñöţ ɓééñ šééñ îñ **»{days}«** åñð åŕé ñöţ åššîĝñéð ţö åñý ŕöļéš. Ţĥéý çåñ ŕéĵöîñ ţĥé šéŕVéŕ ûšîñĝ å ñéŵ îñVîţé. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three] + [Þŕûñîñĝ ŵîļļ ķîçķ **»{members}«** ŵĥö ĥåVé ñöţ ɓééñ šééñ öñ Ðîšçöŕð îñ **»{days}«** åñð åŕé ñöţ åššîĝñéð ţö åñý ŕöļéš. Ţĥéý çåñ ŕéĵöîñ ţĥé šéŕVéŕ ûšîñĝ å ñéŵ îñVîţé. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five] [Þŕûñîñĝ ŵîļļ ķîçķ **»{members}«** ŵĥö ĥåVé ñöţ ɓééñ šééñ îñ **»{days}«** åñð åššîĝñéð ţö ĵûšţ ţĥé ŕöļéš ýöû\'Vé šéļéçţéð. Ḿéḿɓéŕš ŵĥö åŕé ñöţ åššîĝñéð ţö åñý ŕöļéš åŕé šţîļļ îñçļûðéð. Ţĥéý çåñ ŕéĵöîñ ţĥé šéŕVéŕ ûšîñĝ å ñéŵ îñVîţé. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] + [Þŕûñîñĝ ŵîļļ ķîçķ **»{members}«** ŵĥö ĥåVé ñöţ ɓééñ šééñ öñ Ðîšçöŕð îñ **»{days}«** åñð åŕé åššîĝñéð ţö ĵûšţ ţĥé ŕöļéš ýöû\'Vé šéļéçţéð. Ḿéḿɓéŕš ŵĥö åŕé ñöţ åššîĝñéð ţö åñý ŕöļéš åŕé šţîļļ îñçļûðéð. Ţĥéý çåñ ŕéĵöîñ ţĥé šéŕVéŕ ûšîñĝ å ñéŵ îñVîţé. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen] [Þöšţ ḿéššåĝéš ţĥåţ ŕéåçĥ šéŕVéŕš öûţšîðé ýöûŕ öŵñ. Ûšéŕš çåñ öþţ îñţö Föļļöŵîñĝ ţĥîš çĥåññéļ, šö šéļéçţ þöšţš ýöû Þûɓļîšĥ ƒŕöḿ ĥéŕé ŵîļļ åþþéåŕ ðîŕéçţļý îñ ţĥéîŕ öŵñ šéŕVéŕš. Åññöûñçéḿéñţ çĥåññéļš ŵîļļ ñöţ ŕéçéîVé ḿéššåĝéš ƒŕöḿ öţĥéŕ Åññöûñçéḿéñţ çĥåññéļš. [Ļéåŕñ ḿöŕé.](»{documentationLink}«) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six] [Þöšţ ḿéššåĝéš ţĥåţ ŕéåçĥ šéŕVéŕš öûţšîðé ýöûŕ öŵñ. Ûšéŕš çåñ öþţ îñţö Föļļöŵîñĝ ţĥîš çĥåññéļ, šö šéļéçţ þöšţš ýöû Þûɓļîšĥ ƒŕöḿ ĥéŕé ŵîļļ åþþéåŕ ðîŕéçţļý îñ ţĥéîŕ öŵñ šéŕVéŕš. [Ļéåŕñ ḿöŕé.](»{documentationLink}«) 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] [Ûšéŕš ŵîļļ ñééð ţö çöñƒîŕḿ ţĥéý åŕé öƒ öVéŕ ļéĝåļ åĝé ţö Vîéŵ îñ ţĥé çöñţéñţ îñ ţĥîš çĥåññéļ. ÑŠFŴ çĥåññéļš åŕé éхéḿþţ ƒŕöḿ ţĥé éхþļîçîţ çöñţéñţ ƒîļţéŕ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen] @@ -2660,6 +2668,7 @@ [Ḿéḿɓéŕš öƒ ţĥé šéŕVéŕ ḿûšţ ḿééţ ţĥé ƒöļļöŵîñĝ çŕîţéŕîå ɓéƒöŕé ţĥéý çåñ šéñð ḿéššåĝéš îñ ţéхţ çĥåññéļš öŕ îñîţîåţé å ðîŕéçţ ḿéššåĝé çöñVéŕšåţîöñ. ΃ å ḿéḿɓéŕ ĥåš åñ åššîĝñéð ŕöļé ţĥîš ðöéš ñöţ åþþļý. **Ŵé ŕéçöḿḿéñð šéţţîñĝ å Véŕîƒîçåţîöñ ļéVéļ ƒöŕ å þûɓļîç Ðîšçöŕð.** one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five] [Šéţš çåḿéŕå Vîðéö Qûåļîţý ƒöŕ åļļ çĥåññéļ þåŕţîçîþåñţš. Çĥööšé **Åûţö** ƒöŕ öþţîḿåļ þéŕƒöŕḿåñçé. one two three four five six seven eight nine ten eleven] [Ñééð ĥéļþ ŵîţĥ Vöîçé öŕ Vîðéö¿ Çĥéçķ öûţ öûŕ [ţŕöûɓļéšĥööţîñĝ ĝûîðé](»{guideURL}«). one two three four five six seven eight] + [Çĥåţ Îñþûţ one two] [Åççöûñţ Îñƒöŕḿåţîöñ one two three] [ÎñåçţîVé Çĥåññéļ one two three] [ÎñåçţîVé Ţîḿéöûţ one two three] @@ -4310,7 +4319,7 @@ [Ýöû ḿûšţ Véŕîƒý ýöûŕ éḿåîļ ɓéƒöŕé ýöû çåñ šéé ţĥé ŕéQûîŕéḿéñţš. one two three four five six seven] [Ḿéḿɓéŕš öƒ ýöûŕ šéŕVéŕ çåñ ĥéļþ ûñļöçķ ļéVéļš ɓý ɓéšţöŵîñĝ βööšţš. Föŕ éVéŕý ļéVéļ åçĥîéVéð, ýöûŕ šéŕVéŕ ŵîļļ ĥéļþ ûñļöçķ þéŕķš ƒöŕ éVéŕýöñé. Ḿéḿɓéŕš çåñ ŕéVöķé ţĥéîŕ ɓööšţ åţ åñý ţîḿé. **Ýöûŕ šéŕVéŕ ŵîļļ ķééþ þéŕķš ƒöŕ ţĥŕéé ðåýš îƒ å ļéVéļ îš ļöšţ**. [Ļéåŕñ ḿöŕé åɓöûţ ŠéŕVéŕ βööšţîñĝ](»{helpdeskArticle}«). one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine] [Öñļý »{numLeft}« ûñţîļ ţĥé ñéхţ ļéVéļ¡ one two three four] - [**»{count}«** ɓööšţéð ţĥîš šéŕVéŕ one two three] + [»{count}« ɓööšţéð ţĥîš šéŕVéŕ one two three] [»{required}«] [ŠéŕVéŕ βööšţ Šţåţûš one two three] [Ûñļöçķéð one two] @@ -5879,8 +5888,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] @@ -7209,7 +7218,9 @@ [¡¡»{a}«¡¡, ¡¡»{b}«¡¡, åñð »{n}« ŕéåçţéð ŵîţĥ ¡¡»{emojiName}«¡¡ one two three four] [¡¡»{a}«¡¡, ¡¡»{b}«¡¡ åñð ¡¡»{c}«¡¡ ŕéåçţéð ŵîţĥ ¡¡»{emojiName}«¡¡ one two three four five] [¡¡»{a}«¡¡, ¡¡»{b}«¡¡, ¡¡»{c}«¡¡, åñð »{n}« ŕéåçţéð ŵîţĥ ¡¡»{emojiName}«¡¡ one two three four five] + [¡¡»{a}«¡¡, ¡¡»{b}«¡¡, ¡¡»{c}«¡¡, åñð »{n}« ŕéåçţéð ŵîţĥ ¡¡»{emojiName}«¡¡ one two three four five] [»{n}« ŕéåçţéð ŵîţĥ ¡¡»{emojiName}«¡¡ one two three] + [»{n}« ŕéåçţéð ŵîţĥ ¡¡»{emojiName}«¡¡ one two three] [Ŕéåçţîöñš one two] [Åðð ŕéåçţîöñ **¡¡»{prefix}«¡¡** one two three] [Ŕéåð Ḿéššåĝé Ĥîšţöŕý one two three] @@ -8353,6 +8364,7 @@ [Þŕéšš Šţåŕţ ţĥé Šţåĝé, åñð þîçķ å ţöþîç ţö šţåŕţ ţĥé çöñVéŕšåţîöñ. one two three four five six seven eight] [Ŵåîţîñĝ ƒöŕ ţĥé Šţåĝé ţö šţåŕţ… Åñý ðåý ñöŵ. one two three four five] [Ŵåîţîñĝ ƒöŕ ţĥé Šţåĝé ţö šţåŕţ. one two three four] + [Çļîçķ Šţåŕţ ţĥé Šţåĝé, åñð þîçķ å ţöþîç ţö šţåŕţ ţĥé çöñVéŕšåţîöñ. one two three four five six seven eight] [¡¡»{username}«¡¡: @éVéŕýöñé ¡¡»{topic}«¡¡ îš šţåŕţîñĝ. Ļîšţéñ îñ¡ one two three four five] [¡¡»{guildName}«¡¡ îš ĥöšţîñĝ å ļîVé Šţåĝé one two three four] [Šţåĝé Çĥåññéļ one two] @@ -8775,6 +8787,7 @@ [Šţåñðåŕð ḿéššåĝé åñð ðåţå ŕåţéš åþþļý. one two three four five] [Ţéхţ Þéŕḿîššîöñš one two three] [Ţéхţ åŕéå Åçţîöñš one two three] + [Šûɓḿîţ βûţţöñ one two] [Ḿéššåĝé ¡¡»{channel}«¡¡ one two] [Ţĥåî one] [Ţĥéḿé one] @@ -9082,6 +9095,7 @@ [Ûþļöåð Šûççéššƒûļ one two three] [Ûþļöåð ðéɓûĝ ļöĝš ţö Ðîšçöŕð Šûþþöŕţ one two three four five] [Ûþļöåð Éḿöĵî one two] + [Ðŕöþ éḿöĵîš ţö ûþļöåð ţĥéḿ. one two three four] [Ţîþ: Ðöûɓļé çļîçķ ţĥé €[](îçöñ) one two three four] [Ûþļöåð ŠéŕVéŕ ÅVåţåŕ one two three] [Ûþļöåð Îḿåĝé one two] diff --git a/app/src/main/res/values/plurals.xml b/app/src/main/res/values/plurals.xml index ed9d72cda4..1c790a3044 100644 --- a/app/src/main/res/values/plurals.xml +++ b/app/src/main/res/values/plurals.xml @@ -320,6 +320,14 @@ Rewind %d second Rewind %d seconds + + 1 day + {days} days + + + 1 member + {members} members + 1 day {days} days @@ -328,6 +336,14 @@ 1 member {members} members + + 1 day + {days} days + + + 1 member + {members} members + 1 day {days} days @@ -717,8 +733,8 @@ {#} more boosts - {#} extremely cool person has - {#} extremely cool people have + **{#} extremely cool person** has + **{#} extremely cool people** have {#} Boost @@ -1300,10 +1316,18 @@ 1 other {n} others + + 1 other + [{n} others](onClick) + 1 other {n} others + + 1 person + [{n} people](onClick) + 1 person {n} people diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml index f146da58d7..12972aa767 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -10751,308 +10751,314 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -14658,9621 +14664,9635 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5630c45572..d318966a84 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -49,6 +49,7 @@ No. Keep this off. Quick Question! Learn more about how we use this information. + Example Button Chat font scaling Currently using the Discord-specific font scale. Currently using your device\'s font scale. @@ -318,6 +319,7 @@ Try slash commands! A new way to use bots by typing slash. [Dismiss](dismissOnClick) This interaction failed Sending command… + The application did not respond $[](userHook) used $[](commandHook) with $[](applicationHook) [!!{username}!!](handleTapUsername) used [!!{commandName}!!](handleTapCommandName) $[](userHook) used $[](commandHook) @@ -676,6 +678,7 @@ Upload Attachment Utilities Modify Attachment Remove Attachment + Spoiler Attachment When others speak When I speak !!{name}!! - Audience @@ -1441,7 +1444,7 @@ Custom Presets Use Default - f7ffe6aa07b24863bf6912fff7fca975 + bb91b3ffc1ac4fc1beaf98d1027b5751 Slash command application {applicationName} {applicationName} application {applicationName} application selected @@ -2101,6 +2104,8 @@ Enable Desktop Notifications If you\'re looking for per-channel or per-server notifications, right-click the desired server icon and select Notification Settings. Automatically detect accounts from other platforms on this computer. + Local development mode + Staging {buildNumber} Application Test Mode Activate Clear @@ -2208,6 +2213,7 @@ Never Only While Speaking Show a warning when Discord is not detecting audio from your mic + Show Send Message button Direct Message Find or start a conversation Message !!{channel}!! @@ -2648,7 +2654,9 @@ Hardware acceleration uses your GPU for efficient video encoding and decoding, if available. If a channel is selected then an invite link will be generated with the widget, otherwise only online members and voice channels will be provided. Pruning will kick **{members}** who have not been seen in **{days}** and are not assigned to any roles. They can rejoin the server using a new invite. + Pruning will kick **{members}** who have not been seen on Discord in **{days}** and are not assigned to any roles. They can rejoin the server using a new invite. Pruning will kick **{members}** who have not been seen in **{days}** and assigned to just the roles you\'ve selected. Members who are not assigned to any roles are still included. They can rejoin the server using a new invite. + Pruning will kick **{members}** who have not been seen on Discord in **{days}** and are assigned to just the roles you\'ve selected. Members who are not assigned to any roles are still included. They can rejoin the server using a new invite. Post messages that reach servers outside your own. Users can opt into Following this channel, so select posts you Publish from here will appear directly in their own servers. Announcement channels will not receive messages from other Announcement channels. [Learn more.]({documentationLink}) Post messages that reach servers outside your own. Users can opt into Following this channel, so select posts you Publish from here will appear directly in their own servers. [Learn more.]({documentationLink}) Users will need to confirm they are of over legal age to view in the content in this channel. NSFW channels are exempt from the explicit content filter. @@ -2671,6 +2679,7 @@ Members of the server must meet the following criteria before they can send messages in text channels or initiate a direct message conversation. If a member has an assigned role this does not apply. **We recommend setting a verification level for a public Discord.** Sets camera video quality for all channel participants. Choose **Auto** for optimal performance. Need help with voice or video? Check out our [troubleshooting guide]({guideURL}). + Chat Input Account Information Inactive Channel Inactive Timeout @@ -4326,7 +4335,7 @@ You must verify your email before you can see the requirements. Members of your server can help unlock levels by bestowing Boosts. For every level achieved, your server will help unlock perks for everyone. Members can revoke their boost at any time. **Your server will keep perks for three days if a level is lost**. [Learn more about Server Boosting]({helpdeskArticle}). Only {numLeft} until the next level! - **{count}** boosted this server + {count} boosted this server {required} Server Boost Status Unlocked @@ -5898,8 +5907,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 @@ -7236,7 +7245,9 @@ !!{a}!!, !!{b}!!, and {n} reacted with !!{emojiName}!! !!{a}!!, !!{b}!! and !!{c}!! reacted with !!{emojiName}!! !!{a}!!, !!{b}!!, !!{c}!!, and {n} reacted with !!{emojiName}!! + !!{a}!!, !!{b}!!, !!{c}!!, and {n} reacted with !!{emojiName}!! {n} reacted with !!{emojiName}!! + {n} reacted with !!{emojiName}!! Reactions Add reaction **!!{prefix}!!** Read Message History @@ -8380,6 +8391,7 @@ Press Start the Stage, and pick a topic to start the conversation. Waiting for the Stage to start… Any day now. Waiting for the Stage to start. + Click Start the Stage, and pick a topic to start the conversation. !!{username}!!: @everyone !!{topic}!! is starting. Listen in! !!{guildName}!! is hosting a live Stage Stage Channel @@ -8802,6 +8814,7 @@ Standard message and data rates apply. Text Permissions Text area Actions + Submit Button Message !!{channel}!! Thai Theme @@ -9111,6 +9124,7 @@ Upload Successful Upload debug logs to Discord Support Upload Emoji + Drop emojis to upload them. Tip: Double click the $[](icon) Upload Server Avatar Upload Image