diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 6d58644023..3c78faa5a6 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1255.apk +apkFileName: com.discord-1256.apk compressionType: false doNotCompress: - resources.arsc @@ -3109,5 +3109,5 @@ usesFramework: tag: null version: 2.4.2-83a459-SNAPSHOT versionInfo: - versionCode: '1255' - versionName: '39.01' + versionCode: '1256' + versionName: '40.01' diff --git a/com.discord/lib/arm64-v8a/libapng-drawable.so b/com.discord/lib/arm64-v8a/libapng-drawable.so deleted file mode 100644 index 8892feb3a2..0000000000 Binary files a/com.discord/lib/arm64-v8a/libapng-drawable.so and /dev/null differ diff --git a/com.discord/lib/armeabi-v7a/libapng-drawable.so b/com.discord/lib/armeabi-v7a/libapng-drawable.so deleted file mode 100644 index f054f4f7ae..0000000000 Binary files a/com.discord/lib/armeabi-v7a/libapng-drawable.so and /dev/null differ diff --git a/com.discord/lib/x86/libapng-drawable.so b/com.discord/lib/x86/libapng-drawable.so deleted file mode 100644 index f4bae23c0b..0000000000 Binary files a/com.discord/lib/x86/libapng-drawable.so and /dev/null differ diff --git a/com.discord/lib/x86_64/libapng-drawable.so b/com.discord/lib/x86_64/libapng-drawable.so deleted file mode 100644 index a90d0b6777..0000000000 Binary files a/com.discord/lib/x86_64/libapng-drawable.so and /dev/null differ diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index d2c2b27533..e03bf85753 100644 Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ diff --git a/com.discord/res/drawable-hdpi/ic_members_24dp.png b/com.discord/res/drawable-hdpi/ic_members_24dp.png index e7028f18c3..54edaaed43 100644 Binary files a/com.discord/res/drawable-hdpi/ic_members_24dp.png and b/com.discord/res/drawable-hdpi/ic_members_24dp.png differ diff --git a/com.discord/res/drawable-ldpi/ic_members_24dp.png b/com.discord/res/drawable-ldpi/ic_members_24dp.png index 81f2fb36ed..8605c4d1dc 100644 Binary files a/com.discord/res/drawable-ldpi/ic_members_24dp.png and b/com.discord/res/drawable-ldpi/ic_members_24dp.png differ diff --git a/com.discord/res/drawable-mdpi/ic_members_24dp.png b/com.discord/res/drawable-mdpi/ic_members_24dp.png index 58f7d91ee7..48f8c64b55 100644 Binary files a/com.discord/res/drawable-mdpi/ic_members_24dp.png and b/com.discord/res/drawable-mdpi/ic_members_24dp.png differ diff --git a/com.discord/res/drawable-xhdpi/ic_members_24dp.png b/com.discord/res/drawable-xhdpi/ic_members_24dp.png index 7873b36c19..b6b9964031 100644 Binary files a/com.discord/res/drawable-xhdpi/ic_members_24dp.png and b/com.discord/res/drawable-xhdpi/ic_members_24dp.png differ diff --git a/com.discord/res/drawable-xxhdpi/ic_members_24dp.png b/com.discord/res/drawable-xxhdpi/ic_members_24dp.png index 90ad06fd31..cbe776ff85 100644 Binary files a/com.discord/res/drawable-xxhdpi/ic_members_24dp.png and b/com.discord/res/drawable-xxhdpi/ic_members_24dp.png differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_members_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_members_24dp.png index 42f96389ca..94f62021c6 100644 Binary files a/com.discord/res/drawable-xxxhdpi/ic_members_24dp.png and b/com.discord/res/drawable-xxxhdpi/ic_members_24dp.png differ diff --git a/com.discord/res/drawable/ic_emoji_placeholder_primary_100.xml b/com.discord/res/drawable/ic_expression_picker_item_placeholder_primary_100.xml similarity index 100% rename from com.discord/res/drawable/ic_emoji_placeholder_primary_100.xml rename to com.discord/res/drawable/ic_expression_picker_item_placeholder_primary_100.xml diff --git a/com.discord/res/drawable/ic_emoji_placeholder_primary_500.xml b/com.discord/res/drawable/ic_expression_picker_item_placeholder_primary_500.xml similarity index 100% rename from com.discord/res/drawable/ic_emoji_placeholder_primary_500.xml rename to com.discord/res/drawable/ic_expression_picker_item_placeholder_primary_500.xml diff --git a/com.discord/res/drawable/ic_help_outline_24dp.xml b/com.discord/res/drawable/ic_help_outline_24dp.xml deleted file mode 100644 index e6e16596d0..0000000000 --- a/com.discord/res/drawable/ic_help_outline_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_recent_24dp.xml b/com.discord/res/drawable/ic_recent_24dp.xml similarity index 100% rename from com.discord/res/drawable/ic_emoji_recent_24dp.xml rename to com.discord/res/drawable/ic_recent_24dp.xml diff --git a/com.discord/res/drawable/ic_removed_sticker_72dp.xml b/com.discord/res/drawable/ic_removed_sticker_72dp.xml new file mode 100644 index 0000000000..673feed230 --- /dev/null +++ b/com.discord/res/drawable/ic_removed_sticker_72dp.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_sticker_pack_store_32dp.xml b/com.discord/res/drawable/ic_sticker_pack_store_32dp.xml new file mode 100644 index 0000000000..66f431547e --- /dev/null +++ b/com.discord/res/drawable/ic_sticker_pack_store_32dp.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout-v22/emoji_picker_header_item.xml b/com.discord/res/layout-v22/expression_picker_header_item.xml similarity index 100% rename from com.discord/res/layout-v22/emoji_picker_header_item.xml rename to com.discord/res/layout-v22/expression_picker_header_item.xml diff --git a/com.discord/res/layout-v22/widget_emoji_picker.xml b/com.discord/res/layout-v22/widget_emoji_picker.xml index 6c4634ae42..e675f21883 100644 --- a/com.discord/res/layout-v22/widget_emoji_picker.xml +++ b/com.discord/res/layout-v22/widget_emoji_picker.xml @@ -11,14 +11,14 @@ - + - - + + - - + + \ No newline at end of file diff --git a/com.discord/res/layout-v22/widget_expression_tray.xml b/com.discord/res/layout-v22/widget_expression_tray.xml index 03f536f65a..0662be6c37 100644 --- a/com.discord/res/layout-v22/widget_expression_tray.xml +++ b/com.discord/res/layout-v22/widget_expression_tray.xml @@ -7,10 +7,13 @@ - + - + + + + @@ -23,6 +26,7 @@ + diff --git a/com.discord/res/layout-v22/widget_sticker_picker.xml b/com.discord/res/layout-v22/widget_sticker_picker.xml new file mode 100644 index 0000000000..3bca39e71b --- /dev/null +++ b/com.discord/res/layout-v22/widget_sticker_picker.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/emoji_category_item_guild.xml b/com.discord/res/layout/emoji_category_item_guild.xml index df056ae37e..5e14a32da8 100644 --- a/com.discord/res/layout/emoji_category_item_guild.xml +++ b/com.discord/res/layout/emoji_category_item_guild.xml @@ -1,6 +1,6 @@ - - - + + \ No newline at end of file diff --git a/com.discord/res/layout/emoji_category_item_standard.xml b/com.discord/res/layout/emoji_category_item_standard.xml index 42e58a8052..412fb920d2 100644 --- a/com.discord/res/layout/emoji_category_item_standard.xml +++ b/com.discord/res/layout/emoji_category_item_standard.xml @@ -1,6 +1,6 @@ - - + \ No newline at end of file diff --git a/com.discord/res/layout/emoji_category_selection_overline_view.xml b/com.discord/res/layout/emoji_category_selection_overline_view.xml deleted file mode 100644 index 0065618c3c..0000000000 --- a/com.discord/res/layout/emoji_category_selection_overline_view.xml +++ /dev/null @@ -1,3 +0,0 @@ - - \ No newline at end of file diff --git a/com.discord/res/layout/emoji_picker_emoji_item.xml b/com.discord/res/layout/emoji_picker_emoji_item.xml index d786a4e2fa..fbd31a4f33 100644 --- a/com.discord/res/layout/emoji_picker_emoji_item.xml +++ b/com.discord/res/layout/emoji_picker_emoji_item.xml @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/com.discord/res/layout/expression_picker_category_selection_overline_view.xml b/com.discord/res/layout/expression_picker_category_selection_overline_view.xml new file mode 100644 index 0000000000..43d2019efa --- /dev/null +++ b/com.discord/res/layout/expression_picker_category_selection_overline_view.xml @@ -0,0 +1,3 @@ + + \ No newline at end of file diff --git a/com.discord/res/layout/emoji_picker_header_item.xml b/com.discord/res/layout/expression_picker_header_item.xml similarity index 100% rename from com.discord/res/layout/emoji_picker_header_item.xml rename to com.discord/res/layout/expression_picker_header_item.xml diff --git a/com.discord/res/layout/sticker_category_item_pack.xml b/com.discord/res/layout/sticker_category_item_pack.xml new file mode 100644 index 0000000000..72cf5cfe20 --- /dev/null +++ b/com.discord/res/layout/sticker_category_item_pack.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/sticker_category_item_recent.xml b/com.discord/res/layout/sticker_category_item_recent.xml new file mode 100644 index 0000000000..2c272dac5f --- /dev/null +++ b/com.discord/res/layout/sticker_category_item_recent.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/sticker_picker_apng_item.xml b/com.discord/res/layout/sticker_picker_apng_item.xml new file mode 100644 index 0000000000..d270d95d7d --- /dev/null +++ b/com.discord/res/layout/sticker_picker_apng_item.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/sticker_picker_lottie_item.xml b/com.discord/res/layout/sticker_picker_lottie_item.xml new file mode 100644 index 0000000000..ea9c42b23f --- /dev/null +++ b/com.discord/res/layout/sticker_picker_lottie_item.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/sticker_picker_store_buy_button.xml b/com.discord/res/layout/sticker_picker_store_buy_button.xml new file mode 100644 index 0000000000..9cac06a8f3 --- /dev/null +++ b/com.discord/res/layout/sticker_picker_store_buy_button.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/sticker_store_header_item.xml b/com.discord/res/layout/sticker_store_header_item.xml new file mode 100644 index 0000000000..095b49eff6 --- /dev/null +++ b/com.discord/res/layout/sticker_store_header_item.xml @@ -0,0 +1,11 @@ + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_auth_birthday.xml b/com.discord/res/layout/widget_auth_birthday.xml index f407238984..fcf93e1f0b 100644 --- a/com.discord/res/layout/widget_auth_birthday.xml +++ b/com.discord/res/layout/widget_auth_birthday.xml @@ -5,7 +5,7 @@ - + diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_dsti_lottie.xml b/com.discord/res/layout/widget_chat_list_adapter_item_dsti_lottie.xml index bbcc6ef357..b0bdb16d7a 100644 --- a/com.discord/res/layout/widget_chat_list_adapter_item_dsti_lottie.xml +++ b/com.discord/res/layout/widget_chat_list_adapter_item_dsti_lottie.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_dsti_png.xml b/com.discord/res/layout/widget_chat_list_adapter_item_dsti_png.xml index b71838423a..d2295884d5 100644 --- a/com.discord/res/layout/widget_chat_list_adapter_item_dsti_png.xml +++ b/com.discord/res/layout/widget_chat_list_adapter_item_dsti_png.xml @@ -1,5 +1,6 @@ - + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_text.xml b/com.discord/res/layout/widget_chat_list_adapter_item_text.xml index 5b54210c31..a6d5dbfa0b 100644 --- a/com.discord/res/layout/widget_chat_list_adapter_item_text.xml +++ b/com.discord/res/layout/widget_chat_list_adapter_item_text.xml @@ -4,7 +4,7 @@ - + diff --git a/com.discord/res/layout/widget_emoji_picker.xml b/com.discord/res/layout/widget_emoji_picker.xml index b31fb72ccc..1f52aa4c8d 100644 --- a/com.discord/res/layout/widget_emoji_picker.xml +++ b/com.discord/res/layout/widget_emoji_picker.xml @@ -11,14 +11,14 @@ - + - - + + - - + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_expression_tray.xml b/com.discord/res/layout/widget_expression_tray.xml index 4d3ae624c1..e5676d34b5 100644 --- a/com.discord/res/layout/widget_expression_tray.xml +++ b/com.discord/res/layout/widget_expression_tray.xml @@ -7,10 +7,13 @@ - + - + + + + @@ -23,6 +26,7 @@ + diff --git a/com.discord/res/layout/widget_oauth_authorize.xml b/com.discord/res/layout/widget_oauth_authorize.xml index bca733a780..be7fc42019 100644 --- a/com.discord/res/layout/widget_oauth_authorize.xml +++ b/com.discord/res/layout/widget_oauth_authorize.xml @@ -27,7 +27,7 @@ - + diff --git a/com.discord/res/layout/widget_search.xml b/com.discord/res/layout/widget_search.xml index e056b76388..43f241113c 100644 --- a/com.discord/res/layout/widget_search.xml +++ b/com.discord/res/layout/widget_search.xml @@ -8,5 +8,5 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_server_settings_emojis_item.xml b/com.discord/res/layout/widget_server_settings_emojis_item.xml index 62aae952fc..9b54f06f46 100644 --- a/com.discord/res/layout/widget_server_settings_emojis_item.xml +++ b/com.discord/res/layout/widget_server_settings_emojis_item.xml @@ -1,7 +1,7 @@ - + diff --git a/com.discord/res/layout/widget_settings_media.xml b/com.discord/res/layout/widget_settings_media.xml index d4f355d259..5db37b8c09 100644 --- a/com.discord/res/layout/widget_settings_media.xml +++ b/com.discord/res/layout/widget_settings_media.xml @@ -9,7 +9,14 @@ + + + + + + + diff --git a/com.discord/res/layout/widget_sticker_picker.xml b/com.discord/res/layout/widget_sticker_picker.xml new file mode 100644 index 0000000000..c61d11b400 --- /dev/null +++ b/com.discord/res/layout/widget_sticker_picker.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_sticker_picker_sheet.xml b/com.discord/res/layout/widget_sticker_picker_sheet.xml new file mode 100644 index 0000000000..10e7046f13 --- /dev/null +++ b/com.discord/res/layout/widget_sticker_picker_sheet.xml @@ -0,0 +1,3 @@ + + \ No newline at end of file diff --git a/com.discord/res/values/attrs.xml b/com.discord/res/values/attrs.xml index cb7f053158..38e04bf895 100644 --- a/com.discord/res/values/attrs.xml +++ b/com.discord/res/values/attrs.xml @@ -1480,6 +1480,8 @@ + + @@ -2150,8 +2152,8 @@ - + diff --git a/com.discord/res/values/dimens.xml b/com.discord/res/values/dimens.xml index ea49a7e4cc..639a921563 100644 --- a/com.discord/res/values/dimens.xml +++ b/com.discord/res/values/dimens.xml @@ -112,6 +112,7 @@ 600.0dip 128.0dip 44.0dip + 64.0dip 136.0dip 24.0dip 64.0dip @@ -194,11 +195,11 @@ 48.0dip 16.0dip 48.0dip - 48.0dip 32.0dip 32.0dip 52.0dip 71.0dip + 48.0dip 8.0dip 0.0dip 50.0dip diff --git a/com.discord/res/values/ids.xml b/com.discord/res/values/ids.xml index ccb2fc9b7c..d1407c334a 100644 --- a/com.discord/res/values/ids.xml +++ b/com.discord/res/values/ids.xml @@ -182,7 +182,7 @@ - + @@ -485,6 +485,12 @@ + + + + + + @@ -504,8 +510,8 @@ - + @@ -750,7 +756,6 @@ - @@ -813,6 +818,7 @@ + @@ -827,6 +833,9 @@ + + + @@ -2170,6 +2179,10 @@ + + + + @@ -2226,6 +2239,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/com.discord/res/values/plurals.xml b/com.discord/res/values/plurals.xml index f3726ec899..53934ccd43 100644 --- a/com.discord/res/values/plurals.xml +++ b/com.discord/res/values/plurals.xml @@ -1041,6 +1041,11 @@ Listeners Listener + + %s stickers + %s stickers + %s sticker + %s people are in this thread No one is in this thread diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml index 5042471ed1..2a319f158e 100644 --- a/com.discord/res/values/public.xml +++ b/com.discord/res/values/public.xml @@ -1062,632 +1062,634 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2517,407 +2519,408 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3384,203 +3387,203 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3618,178 +3621,179 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3899,49 +3903,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3954,88 +3958,88 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4089,11 +4093,11 @@ - - - - - + + + + + @@ -4112,37 +4116,37 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -4151,55 +4155,55 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4209,20 +4213,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -4478,7 +4482,7 @@ - + @@ -4805,2326 +4809,2363 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7244,17 +7285,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -7393,468 +7434,476 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8149,24 +8198,25 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -11931,5598 +11981,5649 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -17806,17 +17907,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index c9fcb03108..57805ed51e 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -241,7 +241,7 @@ Community Updates Answer App Information - SimpleAST-Core + KAPNG The Discord app could not be opened. "We've beamed the info to your Discord app. You can close this browser tab or continue with the web version." Discord App Launched @@ -720,6 +720,9 @@ Uh oh! Looks like there is an issue with this address. Please fix the fields and try again! Uh oh! Looks like there is an issue with this card. Please fix the fields and try again! An unknown payment source was specified. Select another and try again. + %1$s transactions will not be listed below. To view %1$s transaction history or to change your %1$s payment method, [visit your %1$s Billing settings](%2$s). + You subscribed through %1$s + This is not supported for %1$s subscriptions. To manage your subscription, please [visit your %1$s Billing settings](%2$s). Copied! Gift Link This was a gift @@ -728,6 +731,7 @@ Billing History Gift %1$s Subscription Credit applied! + Tax "**Today's Total**" "**Today's Total** (Tax Included)" Is this a gift? @@ -737,6 +741,7 @@ Change Payment Method Manage Subscription Your subscription is handled by Apple. + Your subscription is handled by %1$s No payment method saved Checkout faster by saving a payment method Pay for it With @@ -890,6 +895,11 @@ "Build isn't available" Link Copied! Copy Link + "Okay let's try it!" + expires in %1$s + This link is no longer valid. + Continue to Discord + You have been invited to try a test build of Discord Restart Discord for some improvements! Not now Restart @@ -1136,7 +1146,7 @@ We’re here to make a good impression." Presets Select a color Transparency - e2bfba9698b448c28eb75b269e18fa49 + d573775c72254e50a93f50e510535f28 Coming Soon Search Animated GIFs on the Web Displays text with emphasis. @@ -1175,6 +1185,7 @@ We’re here to make a good impression." "By setting your server as a Community server, you agree that your server complies with our [Community Guidelines](%1$s), and that Discord may check the contents of your server to make sure it's safe." Abide by the guidelines Compact: Fit more messages on screen at one time. #IRC + Competing in **%1$s** Completed Configure Confirm @@ -1644,6 +1655,7 @@ We’re here to make a good impression." Error Unable to copy image preview. Error + Error loading sticker Unable to save image preview. "We've tracked the error and will get right on it." Reload @@ -1720,6 +1732,8 @@ We’re here to make a good impression." NEW! GIF and Emoji Picker Open Emoji Picker Open GIF Picker + Open Sticker Picker + Stickers +%1$s com.google.android.material.transformation.FabTransformationScrimBehavior com.google.android.material.transformation.FabTransformationSheetBehavior @@ -2957,6 +2971,7 @@ You just Boosted the server **%1$s**." You just Boosted %1$s **%2$s**. "Sorry, we don't currently support buying Boosts with a [subscription through Apple](%1$s)." Server Boost(s) + "Sorry, we don't currently support buying Boosts with a subscription through %1$s." You get a discount as part of your **%1$s** subscription! You could be paying **%1$s%% less** for each Boost, and get an additional %2$s Boosts with [Discord Nitro](onPremiumSubscriptionClick)! Claim your free month to get %1$s Boosts, and save **%2$s%%** on additional Boosts with [Discord Nitro](onPremiumSubscriptionClick)! @@ -4130,6 +4145,7 @@ Want to know more about Discord?" No Reactions Start up some conversations, then keep track of them here! You do not have permission to send messages in this channel. + No stickers match your search No System Messages No No thanks @@ -4646,6 +4662,7 @@ Want to know more about Discord?" Sorry :( Gift Nitro to a friend Boost This Server + "We don't currently support upgrades to Nitro for subscriptions through %1$s. You can cancel your subscription through [%1$s's Subscription Management](%2$s), but the subscription will remain active until its expiration date." "We don't currently support upgrades to Nitro for subscriptions through Apple. You can cancel your subscription through [Apple's Subscription Management](%1$s), but the subscription will remain active until its expiration date." Gift Nitro Server Boost Status @@ -4691,6 +4708,7 @@ Want to know more about Discord?" Boost Active Server Boosts %1$s Available + "Sorry, we don't currently support canceling boosts purchased through %1$s. You can cancel your boost through [%1$s's Subscription Management](%2$s)." Are you sure you want to cancel this Server Boost? We’ll smash this gem to pieces. It will be removed from associated servers and cancelled from your subscription at the end of your billing period: **%1$s**. Are you sure you want to cancel a Server Boost from your Inventory? We’ll smash this gem to pieces. It will be removed from associated servers and cancelled from your subscription at the end of your billing period: **%1$s**. Yes, Cancel Boost @@ -4917,6 +4935,7 @@ The changes to your subscription are reflected below:" Your files are too powerful! Max file size is %1$s. Upgrade to **Discord Nitro** for %2$s file limit! Upload higher quality memes + %1$s with Nitro %1$s (Preorder) Priority Speaker Users with this permission have the ability to be more easily heard when talking. When activated, the volume of others without this permission will be automatically lowered. @@ -5277,6 +5296,8 @@ Good news though, it does work on your mobile web browser! So please open it the mentions on Find the perfect emoji + Find the perfect sticker + Search stickers Search For: **%1$s** Search for %1$s Search GIFs @@ -5311,6 +5332,7 @@ Good news though, it does work on your mobile web browser! So please open it the week year yesterday + Search Stickers %1$s indexed so far. We’re still indexing older messages. Search Tenor Search with Google @@ -5464,6 +5486,7 @@ Good news though, it does work on your mobile web browser! So please open it the Spectators - %1$s Spellcheck Spoiler + spoiler, hidden Mark as spoiler Click to reveal spoiler "To enable Spotify Status on Android, be sure to enable **Device Broadcast Status** within the Spotify app's settings. This will not update your status while the Discord app is in the background." @@ -5501,6 +5524,33 @@ Good news though, it does work on your mobile web browser! So please open it the Streaming Unknown Step %1$s + Open sticker picker + Frequently Used + from **%1$s** + Sent a sticker: %1$s + %1$s + Frequently used + Shop + Browse and buy stickers + Click the shop icon below to start browsing stickers for purchase + You don’t have any stickers yet! + Hover on stickers to see them animate + You own this pack + Unknown price + %1$s with Nitro + Sweet! + The %1$s sticker pack has been added to your stickers drawer. + Yay stickers! + Purchase Sticker Pack + This is a one-time purchase of a sticker pack. + Purchase + Always animate + Animate on interaction + On the desktop client, stickers will animate on hover or focus. On mobile clients, stickers will animate on long-press. + Stickers + This controls when stickers animate. + This controls when stickers animate. This is currently overridden by your reduced motion preferences. + Never animate Indexing Stop Stop Ringing @@ -5985,6 +6035,7 @@ You cannot take any moderation actions until you enable it." Listen along with someone else, not yourself. **%1$s** supports game invites. [Dismiss](dismissOnClick) Connect %1$s + Competing in %1$s Listening to %1$s Live on %1$s Playing a game diff --git a/com.discord/res/values/styles.xml b/com.discord/res/values/styles.xml index 8347340871..6a5f49f35f 100644 --- a/com.discord/res/values/styles.xml +++ b/com.discord/res/values/styles.xml @@ -410,8 +410,8 @@ @color/primary_700 @color/white_alpha_10 @color/primary_600 - @drawable/ic_emoji_placeholder_primary_500 @drawable/img_empty_server_settings_emoji_dark + @drawable/ic_expression_picker_item_placeholder_primary_500 @drawable/ic_expression_search_empty_dark #ff303337 @drawable/img_empty_friends_none_blocked_dark @@ -645,8 +645,8 @@ @color/primary_300 @color/black_alpha_10 @color/primary_300 - @drawable/ic_emoji_placeholder_primary_100 @drawable/img_empty_server_settings_emoji_light + @drawable/ic_expression_picker_item_placeholder_primary_100 @drawable/ic_expression_search_empty_light @color/white_6 @drawable/img_empty_friends_none_blocked_light @@ -2572,19 +2572,6 @@ - - + +