diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 2c7a73ee09..1e96faa80d 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1248.apk +apkFileName: com.discord-1249.apk compressionType: false doNotCompress: - resources.arsc @@ -3106,5 +3106,5 @@ usesFramework: tag: null version: 2.4.2-83a459-SNAPSHOT versionInfo: - versionCode: '1248' - versionName: '37.1' + versionCode: '1249' + versionName: '38.0' diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index 32d04622a8..d65dd69944 100644 Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ diff --git a/com.discord/res/drawable-anydpi-v24/ic_start_stream_24dp.xml b/com.discord/res/drawable-anydpi-v24/ic_start_stream_24dp.xml deleted file mode 100644 index 1880ea6862..0000000000 --- a/com.discord/res/drawable-anydpi-v24/ic_start_stream_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable-hdpi/ic_start_stream_24dp.png b/com.discord/res/drawable-hdpi/ic_start_stream_24dp.png deleted file mode 100644 index 666e1d0a12..0000000000 Binary files a/com.discord/res/drawable-hdpi/ic_start_stream_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-ldpi/ic_start_stream_24dp.png b/com.discord/res/drawable-ldpi/ic_start_stream_24dp.png deleted file mode 100644 index 0f47aa984a..0000000000 Binary files a/com.discord/res/drawable-ldpi/ic_start_stream_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-mdpi/ic_start_stream_24dp.png b/com.discord/res/drawable-mdpi/ic_start_stream_24dp.png deleted file mode 100644 index 694779864a..0000000000 Binary files a/com.discord/res/drawable-mdpi/ic_start_stream_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/ic_start_stream_24dp.png b/com.discord/res/drawable-xhdpi/ic_start_stream_24dp.png deleted file mode 100644 index 6346098e04..0000000000 Binary files a/com.discord/res/drawable-xhdpi/ic_start_stream_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/ic_start_stream_24dp.png b/com.discord/res/drawable-xxhdpi/ic_start_stream_24dp.png deleted file mode 100644 index a975cc9370..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/ic_start_stream_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_start_stream_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_start_stream_24dp.png deleted file mode 100644 index 17bad6c1be..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/ic_start_stream_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable/bg_changelog_special_header.xml b/com.discord/res/drawable/bg_changelog_special_header.xml deleted file mode 100644 index 3a17c63dd8..0000000000 --- a/com.discord/res/drawable/bg_changelog_special_header.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/changelog_special_back.png b/com.discord/res/drawable/changelog_special_back.png deleted file mode 100644 index 1e461a4d46..0000000000 Binary files a/com.discord/res/drawable/changelog_special_back.png and /dev/null differ diff --git a/com.discord/res/drawable/changelog_special_close.png b/com.discord/res/drawable/changelog_special_close.png deleted file mode 100644 index f23dd42da1..0000000000 Binary files a/com.discord/res/drawable/changelog_special_close.png and /dev/null differ diff --git a/com.discord/res/drawable/changelog_special_cta_art.png b/com.discord/res/drawable/changelog_special_cta_art.png deleted file mode 100644 index 499accd515..0000000000 Binary files a/com.discord/res/drawable/changelog_special_cta_art.png and /dev/null differ diff --git a/com.discord/res/drawable/changelog_special_header_art.png b/com.discord/res/drawable/changelog_special_header_art.png deleted file mode 100644 index c93bf27e25..0000000000 Binary files a/com.discord/res/drawable/changelog_special_header_art.png and /dev/null differ diff --git a/com.discord/res/drawable/ic_stop_stream_24dp.xml b/com.discord/res/drawable/ic_stop_stream_24dp.xml deleted file mode 100644 index a9cb4eedc9..0000000000 --- a/com.discord/res/drawable/ic_stop_stream_24dp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/layout-v22/flex_input_widget.xml b/com.discord/res/layout-v22/flex_input_widget.xml new file mode 100644 index 0000000000..6f18ec4d4b --- /dev/null +++ b/com.discord/res/layout-v22/flex_input_widget.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout-v22/widget_chat_input_edit_text.xml b/com.discord/res/layout-v22/widget_chat_input_edit_text.xml deleted file mode 100644 index 80b14fe589..0000000000 --- a/com.discord/res/layout-v22/widget_chat_input_edit_text.xml +++ /dev/null @@ -1,3 +0,0 @@ - - \ No newline at end of file diff --git a/com.discord/res/layout-v22/widget_chat_list_adapter_item_call.xml b/com.discord/res/layout-v22/widget_chat_list_adapter_item_call.xml new file mode 100644 index 0000000000..fcf89ab7bc --- /dev/null +++ b/com.discord/res/layout-v22/widget_chat_list_adapter_item_call.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/anchored_voice_controls_view.xml b/com.discord/res/layout/anchored_voice_controls_view.xml index a3992f7ecd..3f1aaa2ef7 100644 --- a/com.discord/res/layout/anchored_voice_controls_view.xml +++ b/com.discord/res/layout/anchored_voice_controls_view.xml @@ -2,10 +2,10 @@ - + - + diff --git a/com.discord/res/layout/flex_input_widget.xml b/com.discord/res/layout/flex_input_widget.xml index 4b81c5d386..e2e1991707 100644 --- a/com.discord/res/layout/flex_input_widget.xml +++ b/com.discord/res/layout/flex_input_widget.xml @@ -12,7 +12,7 @@ - + diff --git a/com.discord/res/layout/user_profile_connections_view.xml b/com.discord/res/layout/user_profile_connections_view.xml index 8a555bfd00..3b54747c50 100644 --- a/com.discord/res/layout/user_profile_connections_view.xml +++ b/com.discord/res/layout/user_profile_connections_view.xml @@ -3,5 +3,5 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + \ No newline at end of file diff --git a/com.discord/res/layout/view_chat_list_actions_emoji_item_more.xml b/com.discord/res/layout/view_chat_list_actions_emoji_item_more.xml index a15e9219ed..6e7c6e2db7 100644 --- a/com.discord/res/layout/view_chat_list_actions_emoji_item_more.xml +++ b/com.discord/res/layout/view_chat_list_actions_emoji_item_more.xml @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/com.discord/res/layout/widget_auth_header.xml b/com.discord/res/layout/widget_auth_header.xml index e9c89c1053..aabd4efd54 100644 --- a/com.discord/res/layout/widget_auth_header.xml +++ b/com.discord/res/layout/widget_auth_header.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_change_log_special.xml b/com.discord/res/layout/widget_change_log_special.xml deleted file mode 100644 index d4aa40009a..0000000000 --- a/com.discord/res/layout/widget_change_log_special.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/layout/widget_chat_input_edit_text.xml b/com.discord/res/layout/widget_chat_input_edit_text.xml deleted file mode 100644 index c4b7a3b21c..0000000000 --- a/com.discord/res/layout/widget_chat_input_edit_text.xml +++ /dev/null @@ -1,3 +0,0 @@ - - \ No newline at end of file diff --git a/com.discord/res/layout/widget_chat_list_actions.xml b/com.discord/res/layout/widget_chat_list_actions.xml index 7925ffa5fd..544208a99d 100644 --- a/com.discord/res/layout/widget_chat_list_actions.xml +++ b/com.discord/res/layout/widget_chat_list_actions.xml @@ -2,7 +2,7 @@ - + diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_call.xml b/com.discord/res/layout/widget_chat_list_adapter_item_call.xml new file mode 100644 index 0000000000..b81a4e832b --- /dev/null +++ b/com.discord/res/layout/widget_chat_list_adapter_item_call.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_friends_list.xml b/com.discord/res/layout/widget_friends_list.xml index f7915a0fed..65bb74b293 100644 --- a/com.discord/res/layout/widget_friends_list.xml +++ b/com.discord/res/layout/widget_friends_list.xml @@ -7,6 +7,6 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_music_rich_presence.xml b/com.discord/res/layout/widget_music_rich_presence.xml index 7e16b5038a..39cf2920d9 100644 --- a/com.discord/res/layout/widget_music_rich_presence.xml +++ b/com.discord/res/layout/widget_music_rich_presence.xml @@ -20,7 +20,7 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_platform_rich_presence.xml b/com.discord/res/layout/widget_platform_rich_presence.xml index 36e5e74112..53177300fe 100644 --- a/com.discord/res/layout/widget_platform_rich_presence.xml +++ b/com.discord/res/layout/widget_platform_rich_presence.xml @@ -14,7 +14,7 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_settings.xml b/com.discord/res/layout/widget_settings.xml index 9a8662189b..3577164298 100644 --- a/com.discord/res/layout/widget_settings.xml +++ b/com.discord/res/layout/widget_settings.xml @@ -4,7 +4,7 @@ - + diff --git a/com.discord/res/layout/widget_settings_account.xml b/com.discord/res/layout/widget_settings_account.xml index 6e203e9c22..1e4ff6c508 100644 --- a/com.discord/res/layout/widget_settings_account.xml +++ b/com.discord/res/layout/widget_settings_account.xml @@ -12,7 +12,7 @@ - + diff --git a/com.discord/res/layout/widget_start_call_sheet.xml b/com.discord/res/layout/widget_start_call_sheet.xml new file mode 100644 index 0000000000..2d80c0dfb9 --- /dev/null +++ b/com.discord/res/layout/widget_start_call_sheet.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_user_rich_presence.xml b/com.discord/res/layout/widget_user_rich_presence.xml index 0a9f4a8315..1d2886e3f9 100644 --- a/com.discord/res/layout/widget_user_rich_presence.xml +++ b/com.discord/res/layout/widget_user_rich_presence.xml @@ -15,6 +15,9 @@ + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_user_sheet.xml b/com.discord/res/layout/widget_user_sheet.xml index eb4ef49d30..7bd3f25171 100644 --- a/com.discord/res/layout/widget_user_sheet.xml +++ b/com.discord/res/layout/widget_user_sheet.xml @@ -1,8 +1,8 @@ - - + @@ -26,8 +26,8 @@ - - + + diff --git a/com.discord/res/layout/widget_voice_bottom_sheet.xml b/com.discord/res/layout/widget_voice_bottom_sheet.xml index 7c7f1762c9..58ebd5e5c4 100644 --- a/com.discord/res/layout/widget_voice_bottom_sheet.xml +++ b/com.discord/res/layout/widget_voice_bottom_sheet.xml @@ -9,7 +9,7 @@ - + diff --git a/com.discord/res/layout/widget_voice_call_inline.xml b/com.discord/res/layout/widget_voice_call_inline.xml index faf3eb5339..0445a4edd5 100644 --- a/com.discord/res/layout/widget_voice_call_inline.xml +++ b/com.discord/res/layout/widget_voice_call_inline.xml @@ -4,8 +4,4 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/values-bg/strings.xml b/com.discord/res/values-bg/strings.xml index c48fde8a9c..b3fa0f673d 100644 --- a/com.discord/res/values-bg/strings.xml +++ b/com.discord/res/values-bg/strings.xml @@ -3357,7 +3357,6 @@ NSFW каналите нямат филтър за нецензурно съдъ Предложения за разговори в iOS Участниците без видео са скрити в момента. Искаш ли да ги покажеш? Покажи участници без видео - — Докосни, за да се присъединиш Виж всички IP адресът е защитен IP адресът е оторизиран diff --git a/com.discord/res/values-cs/strings.xml b/com.discord/res/values-cs/strings.xml index 46e35cbc38..d0fb8992b4 100644 --- a/com.discord/res/values-cs/strings.xml +++ b/com.discord/res/values-cs/strings.xml @@ -3337,7 +3337,6 @@ Chceš se o Discordu dozvědět víc?" Návrhy konverzací iOS Účastníci nevyužívající video jsou aktuálně skryti. Chceš je zobrazit? Zobrazit účastníky bez videa - — Připoj se klepnutím Zobrazit vše IP adresa zajištěna IP adresa autorizována diff --git a/com.discord/res/values-da/strings.xml b/com.discord/res/values-da/strings.xml index 7957733603..7ddde7d145 100644 --- a/com.discord/res/values-da/strings.xml +++ b/com.discord/res/values-da/strings.xml @@ -3305,7 +3305,6 @@ Vil du vide mere om Discord?" iOS samtaleforslag Deltagere der ikke deltager med videoopkald er pt. skjult.Vil du vise dem? Vis deltagere uden video - — Tryk for at tilmelde dig Se alt IP-adresse sikret IP-adresse autoriseret diff --git a/com.discord/res/values-de/strings.xml b/com.discord/res/values-de/strings.xml index 241c3087d7..dca53937a0 100644 --- a/com.discord/res/values-de/strings.xml +++ b/com.discord/res/values-de/strings.xml @@ -3322,7 +3322,6 @@ Willst du mehr über Discord erfahren?" Unterhaltungsvorschläge für iOS Teilnehmer ohne Video werden derzeit nicht angezeigt. Sollen sie angezeigt werden? Teilnehmer ohne Video anzeigen - – Tippe, um beizutreten Alles anzeigen IP-Adresse gesichert IP-Adresse autorisiert diff --git a/com.discord/res/values-el/strings.xml b/com.discord/res/values-el/strings.xml index d53a4946ab..23b74e98a6 100644 --- a/com.discord/res/values-el/strings.xml +++ b/com.discord/res/values-el/strings.xml @@ -3343,7 +3343,6 @@ Avatar" Προτάσεις Συζήτησης iOS Δεν εμφανίζονται οι συμμετέχοντες χωρίς βίντεο. Θέλεις να τους εμφανίσεις; Εμφάνιση συμμετεχόντων χωρίς βίντεο - — Κάνε κλικ για να γίνεις μέλος Προβολή όλων Η διεύθυνση IP ασφαλίστηκε Η διεύθυνση IP εξουσιοδοτήθηκε diff --git a/com.discord/res/values-es-rES/strings.xml b/com.discord/res/values-es-rES/strings.xml index 96a1859baf..7a3f3359c4 100644 --- a/com.discord/res/values-es-rES/strings.xml +++ b/com.discord/res/values-es-rES/strings.xml @@ -3263,7 +3263,6 @@ Cuando alguien use el enlace de tu plantilla de servidor, creará un nuevo servi Sugerencias de conversaciones de iOS Los participantes sin vídeo están ocultos. ¿Quieres mostrarlos? Mostrar participantes sin vídeo - — Toca para unirte Ver todo Dirección IP asegurada Dirección IP autorizada diff --git a/com.discord/res/values-fi/strings.xml b/com.discord/res/values-fi/strings.xml index 1632aa0973..b0d6ef9b87 100644 --- a/com.discord/res/values-fi/strings.xml +++ b/com.discord/res/values-fi/strings.xml @@ -3363,7 +3363,6 @@ Haluatko lisätietoja Discordista?" iOS-keskusteluehdotukset Osallistujat, jotka eivät käytä videokuvaa, ovat parhaillaan piilotettuina. Haluatko tuoda heidät näkyviin? Näytä videokuvattomat osallistujat - – Liity napauttamalla Näytä kaikki IP-osoite suojattu IP-osoite valtuutettu diff --git a/com.discord/res/values-fr/strings.xml b/com.discord/res/values-fr/strings.xml index 86d05dcd53..ada5c040bc 100644 --- a/com.discord/res/values-fr/strings.xml +++ b/com.discord/res/values-fr/strings.xml @@ -3352,7 +3352,6 @@ Tu veux en savoir plus sur Discord ?" Suggestions de conversation iOS Les participants dont la vidéo est désactivée sont actuellement cachés. Veux-tu les afficher ? Afficher les participants dont la vidéo est désactivée - — Tapote pour rejoindre Afficher tout Adresse IP sécurisée Adresse IP autorisée diff --git a/com.discord/res/values-hr/strings.xml b/com.discord/res/values-hr/strings.xml index 3849f147ac..6eccb7b542 100644 --- a/com.discord/res/values-hr/strings.xml +++ b/com.discord/res/values-hr/strings.xml @@ -3287,7 +3287,6 @@ Kad netko koristi poveznicu na tvoj predložak servera, tada stvara novi server Prijedlozi za iOS razgovore Sudionici bez videa trenutno su skriveni. Želiš li ih prikazati? Pokaži sudionike bez videa - – dodirni i pridruži se Prikaži sve IP adresa osigurana IP adresa ovlaštena diff --git a/com.discord/res/values-hu/strings.xml b/com.discord/res/values-hu/strings.xml index f48e840091..353d256ba3 100644 --- a/com.discord/res/values-hu/strings.xml +++ b/com.discord/res/values-hu/strings.xml @@ -3345,7 +3345,6 @@ Szeretnél többet megtudni a Discordról?" iOS beszélgetési javaslatok A videó nélküli résztvevők jelenleg el vannak rejtve. Megjeleníted őket? Videó nélküli résztvevők megjelenítése - — Koppints a csatlakozáshoz Minden megtekintése IP-cím biztosítva Az IP-cím engedélyezve diff --git a/com.discord/res/values-it/strings.xml b/com.discord/res/values-it/strings.xml index 7691243687..5d01b8a288 100644 --- a/com.discord/res/values-it/strings.xml +++ b/com.discord/res/values-it/strings.xml @@ -3330,7 +3330,6 @@ Vuoi saperne di più su Discord?" Suggerimenti conversazioni iOS Al momento i partecipanti senza video sono nascosti. Vuoi mostrarli? Mostra i partecipanti senza video - — Tocca per unirti Mostra tutto Indirizzo IP protetto Indirizzo IP autorizzato diff --git a/com.discord/res/values-ja/strings.xml b/com.discord/res/values-ja/strings.xml index 3ff63a9e62..a0359bdb47 100644 --- a/com.discord/res/values-ja/strings.xml +++ b/com.discord/res/values-ja/strings.xml @@ -3387,7 +3387,6 @@ Discordについて詳しい情報が必要ですか?" iOSでの会話の提案 現在、ビデオ不使用の参加者は非表示となっています。表示しますか? ビデオ不使用の参加者を表示 - — タップして参加 全て表示 IPアドレスは保護されています IPアドレスが認証されました diff --git a/com.discord/res/values-ko/strings.xml b/com.discord/res/values-ko/strings.xml index fcf042f747..8755d3179a 100644 --- a/com.discord/res/values-ko/strings.xml +++ b/com.discord/res/values-ko/strings.xml @@ -3376,7 +3376,6 @@ Discord에 대해 더 알고 싶으신가요?" iOS 대화 추천 영상이 없는 참여자가 현재 숨겨져 있어요. 표시할까요? 영상이 없는 참여자 목록 보여주기 - — 탭으로 입장 모두 보기 IP 주소 보호 중 IP 주소 승인됨 diff --git a/com.discord/res/values-lt/strings.xml b/com.discord/res/values-lt/strings.xml index b155ba1a76..5a850cc551 100644 --- a/com.discord/res/values-lt/strings.xml +++ b/com.discord/res/values-lt/strings.xml @@ -3348,7 +3348,6 @@ Nori daugiau sužinoti apie Discord?" iOS pokalbių pasiūlymai Dalyviai, kurie negali naudoti vaizdo funkcijos, šiuo metu slepiami. Norite, kad jie būtų rodomi? Rodyti dalyvius, negalinčius naudoti vaizdo funkcijos - – Spustelėk, kad prisijungtum Peržiūrėti viską IP Adresas Apsaugotas IP Adresas Leidžiamas diff --git a/com.discord/res/values-nl/strings.xml b/com.discord/res/values-nl/strings.xml index ce563ccc3c..c735d57eb5 100644 --- a/com.discord/res/values-nl/strings.xml +++ b/com.discord/res/values-nl/strings.xml @@ -3305,7 +3305,6 @@ Wil je meer weten over Discord?" Configuratiesuggesties iOS Deelnemers zonder beeld zijn momenteel verborgen. Wil je ze tonen? Toon deelnemers zonder beeld - — Tik om lid te worden Alles bekijken IP-adres veilig gesteld IP-adres geautoriseerd diff --git a/com.discord/res/values-no/strings.xml b/com.discord/res/values-no/strings.xml index 1f4c60dc6d..a0f4ee95c3 100644 --- a/com.discord/res/values-no/strings.xml +++ b/com.discord/res/values-no/strings.xml @@ -3217,7 +3217,6 @@ Har du lyst til å vite mer om Discord?" iOS-samtaleforslag Deltakere uten video er skjult. Vil du vise dem? Vis deltakere uten video - – Trykk for å bli med Vis alle IP-adressen er sikret IP-adressen er autorisert diff --git a/com.discord/res/values-pl/strings.xml b/com.discord/res/values-pl/strings.xml index b761784abc..3b792277d9 100644 --- a/com.discord/res/values-pl/strings.xml +++ b/com.discord/res/values-pl/strings.xml @@ -3359,7 +3359,6 @@ Czy chcesz dowiedzieć się więcej o Discordzie?" Propozycje rozmów iOS Obecnie uczestnicy bez wideo są ukryci. Czy chcesz, by ich pokazywać? Pokaż uczestników bez wideo - – Dotknij, aby dołączyć Wyświetl wszystkie Adres IP zabezpieczony Adres IP zautoryzowany diff --git a/com.discord/res/values-pt-rBR/strings.xml b/com.discord/res/values-pt-rBR/strings.xml index b7103b3eac..0db4704a87 100644 --- a/com.discord/res/values-pt-rBR/strings.xml +++ b/com.discord/res/values-pt-rBR/strings.xml @@ -3305,7 +3305,6 @@ Quer saber mais sobre o Discord?" Sugestões de conversas do iOS Os participantes sem vídeo estão ocultados. Deseja exibi-los? Mostrar participantes sem vídeo - — Toque para entrar Ver tudo Endereço IP protegido Endereço IP autorizado diff --git a/com.discord/res/values-ro/strings.xml b/com.discord/res/values-ro/strings.xml index 412c6b6421..9c7cccb099 100644 --- a/com.discord/res/values-ro/strings.xml +++ b/com.discord/res/values-ro/strings.xml @@ -3308,7 +3308,6 @@ Vrei să știi mai multe despre Discord?" Sugestii de conversații pe iOS Participanții fără video sunt momentan ascunși. Vrei să fie afișați? Afișează participanții fără video - — Atinge pentru a te alătura Vezi toate Adresă IP securizată Adresă IP autorizată diff --git a/com.discord/res/values-ru/strings.xml b/com.discord/res/values-ru/strings.xml index 35d9a2c10c..ae474846c3 100644 --- a/com.discord/res/values-ru/strings.xml +++ b/com.discord/res/values-ru/strings.xml @@ -3402,7 +3402,6 @@ Black Lives Matter {fixed} Предложения беседы на iOS Участники без видео сейчас скрыты. Хотите показать их? Показать участников без видео - — Коснитесь, чтобы присоединиться Посмотреть все IP-адрес защищён IP-адрес авторизован diff --git a/com.discord/res/values-sv-rSE/strings.xml b/com.discord/res/values-sv-rSE/strings.xml index 28dc0a7e4b..51558f89a2 100644 --- a/com.discord/res/values-sv-rSE/strings.xml +++ b/com.discord/res/values-sv-rSE/strings.xml @@ -3246,7 +3246,6 @@ Vill du veta mer om Discord?" Konversationsförslag för iOS Deltagare utan video är för närvarande dolda. Vill du visa dem? Visa deltagare utan video - – Tryck för att gå med Visa allt IP-adress säkrad IP-adress godkänd diff --git a/com.discord/res/values-th/strings.xml b/com.discord/res/values-th/strings.xml index b964195a0b..2ac8e013ed 100644 --- a/com.discord/res/values-th/strings.xml +++ b/com.discord/res/values-th/strings.xml @@ -3354,7 +3354,6 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร คำแนะนำการสนทนาใน iOS ผู้เข้าร่วมที่ไม่มีวิดีโอถูกซ่อนอยู่ในขณะนี้ คุณต้องการแสดงหรือไม่ แสดงผู้เข้าร่วมที่ไม่มีวิดีโอ - — แตะเพื่อเข้าร่วม ดูทั้งหมด IP Address เข้ารหัสแล้ว ที่อยู่ IP ได้รับอนุญาตแล้ว diff --git a/com.discord/res/values-tr/strings.xml b/com.discord/res/values-tr/strings.xml index ea908919c0..c5f2d061ea 100644 --- a/com.discord/res/values-tr/strings.xml +++ b/com.discord/res/values-tr/strings.xml @@ -3348,7 +3348,6 @@ Discord hakkında daha fazlasını öğrenmek ister misin?" iOS Konuşma Önerileri Görüntüsü olmayan katılımcılar şu anda gizli. Onları göstermek istiyor musun? Görüntüsü olmayan katılımcıları göster - - Katılmak için dokun Tümünü göster IP Adresi Güvenli IP adresi doğrulandı diff --git a/com.discord/res/values-uk/strings.xml b/com.discord/res/values-uk/strings.xml index 6aea859e0a..dcfaefb532 100644 --- a/com.discord/res/values-uk/strings.xml +++ b/com.discord/res/values-uk/strings.xml @@ -3369,7 +3369,6 @@ сумісного використання бесід iOS Ми приховали учасників без відео. Показати їх? Показати учасників без відео - — Натисни, щоб приєднатися! Дивитися все IP-адреса захищена IP-адресу авторизовано diff --git a/com.discord/res/values-vi/strings.xml b/com.discord/res/values-vi/strings.xml index 668ac78ee4..cfd26aefc7 100644 --- a/com.discord/res/values-vi/strings.xml +++ b/com.discord/res/values-vi/strings.xml @@ -3333,7 +3333,6 @@ Bạn có muốn biết thêm về Discord không?" Gợi Ý Cuộc Trò Chuyện trên iOS Các thành viên tham gia không có video hiện đang bị ẩn đi. Bạn có muốn hiển thị họ không? Hiển thị thành viên tham gia không có video - — Nhấn để tham gia Xem tất cả Địa Chỉ IP Đã Được Bảo Mật Địa Chỉ IP Đã Được Cho Phép diff --git a/com.discord/res/values-zh-rCN/strings.xml b/com.discord/res/values-zh-rCN/strings.xml index b87de53a0e..f1dde9d308 100644 --- a/com.discord/res/values-zh-rCN/strings.xml +++ b/com.discord/res/values-zh-rCN/strings.xml @@ -3367,7 +3367,6 @@ iOS 会话建议 目前已隐藏没开视频的参与者。您想显示他们吗? 显示未开启视频的参与者 - — 点击加入 查看所有 IP地址保护 IP地址授权 diff --git a/com.discord/res/values-zh-rTW/strings.xml b/com.discord/res/values-zh-rTW/strings.xml index 7645fd8c62..de5cc821a4 100644 --- a/com.discord/res/values-zh-rTW/strings.xml +++ b/com.discord/res/values-zh-rTW/strings.xml @@ -3369,7 +3369,6 @@ iOS 對話建議 目前已隱藏沒有視訊的參與者。您想顯示他們嗎? 顯示沒有視訊的參與者 - —加入 檢視全部 固定 IP 位址 IP 位址已授權 diff --git a/com.discord/res/values/dimens.xml b/com.discord/res/values/dimens.xml index 4416bd2d54..0974d0dc5f 100644 --- a/com.discord/res/values/dimens.xml +++ b/com.discord/res/values/dimens.xml @@ -229,7 +229,6 @@ 16.0dip 4.0sp 8.0sp - 16.0sp 16.0sp 20.0sp 20.0sp diff --git a/com.discord/res/values/ids.xml b/com.discord/res/values/ids.xml index 32907256d4..a0279cb5d1 100644 --- a/com.discord/res/values/ids.xml +++ b/com.discord/res/values/ids.xml @@ -295,12 +295,6 @@ - - - - - - @@ -309,8 +303,6 @@ - - @@ -498,6 +490,11 @@ + + + + + @@ -518,6 +515,7 @@ + @@ -1721,7 +1719,8 @@ - + + @@ -2163,6 +2162,8 @@ + + @@ -2452,8 +2453,6 @@ - - diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml index ebeb3f13d9..f5aaa0a57a 100644 --- a/com.discord/res/values/public.xml +++ b/com.discord/res/values/public.xml @@ -2503,284 +2503,283 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2833,1055 +2832,1048 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3929,19 +3921,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -3953,100 +3945,100 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4054,22 +4046,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -4447,2427 +4439,2426 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7266,290 +7257,290 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12670,4479 +12661,4484 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -17417,102 +17413,102 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -17619,631 +17615,632 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 5be5a04502..e9a0f7bdda 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -1131,7 +1131,7 @@ We’re here to make a good impression." Presets Select a color Transparency - 81819fc0e9e94eb9bbecedfcae806012 + 6bcd2ae96ad640c9b6ed6cb861aa8772 Coming Soon Search Animated GIFs on the Web Displays text with emphasis. @@ -1764,6 +1764,7 @@ We’re here to make a good impression." "What a nice addition to your server. Lookin' real nifty in here." "What a nice addition to your server. Lookin' real neato in here" "What a nice addition to your server. Lookin' real lively in here." + Follow us for more updates! Announcements Analytics Force Sync @@ -2401,9 +2402,10 @@ Analytics about Announcement Channels, Server Discovery, and Welcome Screen also Server Owner Which of the following categories best describes your server? Categories - Connect accounts where you create + Connect your social accounts Where do you primarily create content? Country + Connect accounts where you create Tell us about your server. What is it about? Who is it for? Server Description First Name @@ -2418,9 +2420,9 @@ Analytics about Announcement Channels, Server Discovery, and Welcome Screen also "What's your community about?" You can also select up to 5 subcategories. Submit Application - We usually follow up within X days. - Each Partner application is reviewed by Discord. Please note that applying does not guarantee Partnership. - "Just submit and you're done!" + We hope to follow up within 30 days. + Please note that acceptance into the program is not guaranteed, as many other factors are considered. Each Partner application is reviewed by the Discord team. + "Just click submit and you're done!" Having direct access to the Discord Community Team for assistance Aside from the upgraded server perks, what are you most looking forward to getting out of being a Partnered community? If you selected other, what have you got in mind? @@ -3512,7 +3514,6 @@ Want to know more about Discord?" iOS Conversation Suggestions Participants without video are currently hidden. Would you like to show them? Show participants without video - — Tap to join View all IP Address Secured IP Address Authorized @@ -3541,6 +3542,7 @@ Want to know more about Discord?" Join Stream Join thread Join Video Call + Join Video Join Voice Call Connect to this voice channel? Join Voice @@ -4061,7 +4063,7 @@ Want to know more about Discord?" No thanks No Limit No Video Devices - To turn on your video in this voice channel, ask your server admins to change your video permissions. + "This channel has special permissions. To use video in it, you'll need someone, like a server moderator or admin, to change your permissions." No Video Permission Noise Suppression Off Noise Suppression On @@ -4279,6 +4281,7 @@ Want to know more about Discord?" **%1$s** is typing… Ongoing Call Ongoing Call — %1$s Connected + — Tap to join Oh no, a big red bar. Your connection is struggling. "You're alone in this call. Others in this chat can join at any time." @@ -5247,7 +5250,7 @@ Good news though, it does work on your mobile web browser! So please open it the Members with this permission can send text-to-speech messages by starting a message with /tts. These messages can be heard by everyone focused on the channel. Server Deafen Server Deafened - To listen in this channel, ask your server admins to undeafen you. + "This channel has special permissions. To listen in it, you'll need someone, like a server moderator or admin, to undeafen you." Server Deafened Tell the world a bit about this server. Server Emoji @@ -5257,7 +5260,7 @@ Good news though, it does work on your mobile web browser! So please open it the Server Insights Server Mute Server Muted - To speak in this channel, ask your server admins to unmute you. + "This channel has special permissions. To speak in it, you'll need someone, like a server moderator or admin, to unmute you." Server Muted Server name is required. Server Options @@ -6086,7 +6089,7 @@ You cannot take any moderation actions until you enable it." Email Verified! Verifying your email Verified Bot - Verified Bot Developer + Early Verified Bot Developer Verify Verify Account Verify by @@ -6145,6 +6148,8 @@ You cannot take any moderation actions until you enable it." Show Names Hang out with your friends Get on a voice channel + Undeafened + Unmuted Voice Channels Got it Welcome to your first voice channel! diff --git a/com.discord/res/values/styles.xml b/com.discord/res/values/styles.xml index 48cbde4029..be4a7cf13f 100644 --- a/com.discord/res/values/styles.xml +++ b/com.discord/res/values/styles.xml @@ -2514,6 +2514,11 @@ @dimen/uikit_spacing_large ?colorBackgroundAccent + - @@ -3513,6 +3512,11 @@ +