diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 0e4abdf819..bb80a5d750 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1018.apk +apkFileName: com.discord-1019.apk compressionType: false doNotCompress: - arsc @@ -184,5 +184,5 @@ usesFramework: tag: null version: 2.4.1-197d46-SNAPSHOT versionInfo: - versionCode: '1018' - versionName: 10.1.8 + versionCode: '1019' + versionName: 10.1.9 diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index 8aa83eea8b..a3a30f43a1 100644 --- a/com.discord/assets/crashlytics-build.properties +++ b/com.discord/assets/crashlytics-build.properties @@ -3,9 +3,9 @@ # #Do NOT modify, delete, or commit to source control! # -#Tue Jan 07 21:42:58 UTC 2020 -version_name=10.1.8 +#Fri Jan 10 01:12:32 UTC 2020 +version_name=10.1.9 package_name=com.discord -build_id=1850c70b-5f40-4142-8749-d514535f6355 -version_code=1018 +build_id=3901acd1-c80f-461c-93c8-a2caa305af42 +version_code=1019 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index 444d3d490c..41202ab6f6 100644 Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ diff --git a/com.discord/res/color/channel_list_item_text_color.xml b/com.discord/res/color/channel_list_item_text_color.xml deleted file mode 100644 index 0b66fd8f15..0000000000 --- a/com.discord/res/color/channel_list_item_text_color.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/color/channel_list_item_voice_text_color_dark.xml b/com.discord/res/color/channel_list_item_voice_text_color_dark.xml deleted file mode 100644 index 0b66fd8f15..0000000000 --- a/com.discord/res/color/channel_list_item_voice_text_color_dark.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/ic_channel_text.xml b/com.discord/res/drawable-anydpi-v24/ic_channel_text.xml new file mode 100644 index 0000000000..3c4d5938f3 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/ic_channel_text.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/ic_channel_text_nsfw.xml b/com.discord/res/drawable-anydpi-v24/ic_channel_text_nsfw.xml new file mode 100644 index 0000000000..ab2374bff8 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/ic_channel_text_nsfw.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/ic_channel_voice.xml b/com.discord/res/drawable-anydpi-v24/ic_channel_voice.xml new file mode 100644 index 0000000000..06046e3ca0 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/ic_channel_voice.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/ic_channel_voice_locked.xml b/com.discord/res/drawable-anydpi-v24/ic_channel_voice_locked.xml new file mode 100644 index 0000000000..71191d1ffe --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/ic_channel_voice_locked.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/ic_mobile.xml b/com.discord/res/drawable-anydpi-v24/ic_mobile.xml new file mode 100644 index 0000000000..2616c8f020 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/ic_mobile.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/ic_settings_24dp.xml b/com.discord/res/drawable-anydpi-v24/ic_settings_24dp.xml new file mode 100644 index 0000000000..9546f33662 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/ic_settings_24dp.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-hdpi/ic_channel_text.png b/com.discord/res/drawable-hdpi/ic_channel_text.png new file mode 100644 index 0000000000..2216a27d53 Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_channel_text.png differ diff --git a/com.discord/res/drawable-hdpi/ic_channel_text_nsfw.png b/com.discord/res/drawable-hdpi/ic_channel_text_nsfw.png new file mode 100644 index 0000000000..87cba430ee Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_channel_text_nsfw.png differ diff --git a/com.discord/res/drawable-hdpi/ic_channel_voice.png b/com.discord/res/drawable-hdpi/ic_channel_voice.png new file mode 100644 index 0000000000..aa7de6bc52 Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_channel_voice.png differ diff --git a/com.discord/res/drawable-hdpi/ic_channel_voice_locked.png b/com.discord/res/drawable-hdpi/ic_channel_voice_locked.png new file mode 100644 index 0000000000..c2e8ce9472 Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_channel_voice_locked.png differ diff --git a/com.discord/res/drawable-hdpi/ic_mobile.png b/com.discord/res/drawable-hdpi/ic_mobile.png new file mode 100644 index 0000000000..5c6f2efce5 Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_mobile.png differ diff --git a/com.discord/res/drawable-hdpi/ic_settings_24dp.png b/com.discord/res/drawable-hdpi/ic_settings_24dp.png new file mode 100644 index 0000000000..52b649249e Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_settings_24dp.png differ diff --git a/com.discord/res/drawable-ldpi/ic_channel_text.png b/com.discord/res/drawable-ldpi/ic_channel_text.png new file mode 100644 index 0000000000..3be5df93d1 Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_channel_text.png differ diff --git a/com.discord/res/drawable-ldpi/ic_channel_text_nsfw.png b/com.discord/res/drawable-ldpi/ic_channel_text_nsfw.png new file mode 100644 index 0000000000..9928496881 Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_channel_text_nsfw.png differ diff --git a/com.discord/res/drawable-ldpi/ic_channel_voice.png b/com.discord/res/drawable-ldpi/ic_channel_voice.png new file mode 100644 index 0000000000..1ecab0a7f4 Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_channel_voice.png differ diff --git a/com.discord/res/drawable-ldpi/ic_channel_voice_locked.png b/com.discord/res/drawable-ldpi/ic_channel_voice_locked.png new file mode 100644 index 0000000000..7e3d013d75 Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_channel_voice_locked.png differ diff --git a/com.discord/res/drawable-ldpi/ic_mobile.png b/com.discord/res/drawable-ldpi/ic_mobile.png new file mode 100644 index 0000000000..5f55dbb2a2 Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_mobile.png differ diff --git a/com.discord/res/drawable-ldpi/ic_settings_24dp.png b/com.discord/res/drawable-ldpi/ic_settings_24dp.png new file mode 100644 index 0000000000..e63de75fb8 Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_settings_24dp.png differ diff --git a/com.discord/res/drawable-mdpi/ic_channel_text.png b/com.discord/res/drawable-mdpi/ic_channel_text.png new file mode 100644 index 0000000000..c2c73c4bfe Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_channel_text.png differ diff --git a/com.discord/res/drawable-mdpi/ic_channel_text_nsfw.png b/com.discord/res/drawable-mdpi/ic_channel_text_nsfw.png new file mode 100644 index 0000000000..bbf521e368 Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_channel_text_nsfw.png differ diff --git a/com.discord/res/drawable-mdpi/ic_channel_voice.png b/com.discord/res/drawable-mdpi/ic_channel_voice.png new file mode 100644 index 0000000000..25c85c0b4c Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_channel_voice.png differ diff --git a/com.discord/res/drawable-mdpi/ic_channel_voice_locked.png b/com.discord/res/drawable-mdpi/ic_channel_voice_locked.png new file mode 100644 index 0000000000..305b1b2143 Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_channel_voice_locked.png differ diff --git a/com.discord/res/drawable-mdpi/ic_mobile.png b/com.discord/res/drawable-mdpi/ic_mobile.png new file mode 100644 index 0000000000..1e7695f3b7 Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_mobile.png differ diff --git a/com.discord/res/drawable-mdpi/ic_settings_24dp.png b/com.discord/res/drawable-mdpi/ic_settings_24dp.png new file mode 100644 index 0000000000..c3d6d0a7dc Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_settings_24dp.png differ diff --git a/com.discord/res/drawable-xhdpi/ic_channel_text.png b/com.discord/res/drawable-xhdpi/ic_channel_text.png new file mode 100644 index 0000000000..63846b1b83 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_channel_text.png differ diff --git a/com.discord/res/drawable-xhdpi/ic_channel_text_nsfw.png b/com.discord/res/drawable-xhdpi/ic_channel_text_nsfw.png new file mode 100644 index 0000000000..f7ee23e262 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_channel_text_nsfw.png differ diff --git a/com.discord/res/drawable-xhdpi/ic_channel_voice.png b/com.discord/res/drawable-xhdpi/ic_channel_voice.png new file mode 100644 index 0000000000..cc211e2e68 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_channel_voice.png differ diff --git a/com.discord/res/drawable-xhdpi/ic_channel_voice_locked.png b/com.discord/res/drawable-xhdpi/ic_channel_voice_locked.png new file mode 100644 index 0000000000..f65603eda8 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_channel_voice_locked.png differ diff --git a/com.discord/res/drawable-xhdpi/ic_mobile.png b/com.discord/res/drawable-xhdpi/ic_mobile.png new file mode 100644 index 0000000000..c280fec2f3 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_mobile.png differ diff --git a/com.discord/res/drawable-xhdpi/ic_settings_24dp.png b/com.discord/res/drawable-xhdpi/ic_settings_24dp.png new file mode 100644 index 0000000000..3b790b4e8d Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_settings_24dp.png differ diff --git a/com.discord/res/drawable-xxhdpi/ic_add_server_46dp.png b/com.discord/res/drawable-xxhdpi/ic_add_server_46dp.png deleted file mode 100644 index d08120b46e..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/ic_add_server_46dp.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/ic_channel_text.png b/com.discord/res/drawable-xxhdpi/ic_channel_text.png new file mode 100644 index 0000000000..e452ba8557 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_channel_text.png differ diff --git a/com.discord/res/drawable-xxhdpi/ic_channel_text_nsfw.png b/com.discord/res/drawable-xxhdpi/ic_channel_text_nsfw.png new file mode 100644 index 0000000000..4bb989270c Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_channel_text_nsfw.png differ diff --git a/com.discord/res/drawable-xxhdpi/ic_channel_voice.png b/com.discord/res/drawable-xxhdpi/ic_channel_voice.png new file mode 100644 index 0000000000..3da704d69c Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_channel_voice.png differ diff --git a/com.discord/res/drawable-xxhdpi/ic_channel_voice_locked.png b/com.discord/res/drawable-xxhdpi/ic_channel_voice_locked.png new file mode 100644 index 0000000000..2f34fa7163 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_channel_voice_locked.png differ diff --git a/com.discord/res/drawable-xxhdpi/ic_mobile.png b/com.discord/res/drawable-xxhdpi/ic_mobile.png new file mode 100644 index 0000000000..188668c136 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_mobile.png differ diff --git a/com.discord/res/drawable-xxhdpi/ic_settings_24dp.png b/com.discord/res/drawable-xxhdpi/ic_settings_24dp.png new file mode 100644 index 0000000000..f10200fd57 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_settings_24dp.png differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_add_server_46dp.png b/com.discord/res/drawable-xxxhdpi/ic_add_server_46dp.png deleted file mode 100644 index dd480c08de..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/ic_add_server_46dp.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_channel_text.png b/com.discord/res/drawable-xxxhdpi/ic_channel_text.png new file mode 100644 index 0000000000..f1df959090 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_channel_text.png differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_channel_text_nsfw.png b/com.discord/res/drawable-xxxhdpi/ic_channel_text_nsfw.png new file mode 100644 index 0000000000..aaab4c7d39 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_channel_text_nsfw.png differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_channel_voice.png b/com.discord/res/drawable-xxxhdpi/ic_channel_voice.png new file mode 100644 index 0000000000..ec3693f4b6 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_channel_voice.png differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_channel_voice_locked.png b/com.discord/res/drawable-xxxhdpi/ic_channel_voice_locked.png new file mode 100644 index 0000000000..50adc0cccc Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_channel_voice_locked.png differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_mobile.png b/com.discord/res/drawable-xxxhdpi/ic_mobile.png new file mode 100644 index 0000000000..adebc87b48 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_mobile.png differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_settings_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_settings_24dp.png new file mode 100644 index 0000000000..a87bfcc741 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_settings_24dp.png differ diff --git a/com.discord/res/drawable-xxxhdpi/icon_friends_list.png b/com.discord/res/drawable-xxxhdpi/icon_friends_list.png deleted file mode 100644 index a456cf69b1..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/icon_friends_list.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/icon_more.png b/com.discord/res/drawable-xxxhdpi/icon_more.png deleted file mode 100644 index 2f2cb3d004..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/icon_more.png and /dev/null differ diff --git a/com.discord/res/drawable/drawable_bottom_up_primary_630_gradient.xml b/com.discord/res/drawable/drawable_bottom_up_primary_630_gradient.xml deleted file mode 100644 index d0365f37f4..0000000000 --- a/com.discord/res/drawable/drawable_bottom_up_primary_630_gradient.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_button_theme_grey_channels.xml b/com.discord/res/drawable/drawable_button_theme_grey_channels.xml deleted file mode 100644 index cde07b0fde..0000000000 --- a/com.discord/res/drawable/drawable_button_theme_grey_channels.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_circle_grey_channels.xml b/com.discord/res/drawable/drawable_circle_black.xml similarity index 68% rename from com.discord/res/drawable/drawable_circle_grey_channels.xml rename to com.discord/res/drawable/drawable_circle_black.xml index 9238303515..0f02c36632 100644 --- a/com.discord/res/drawable/drawable_circle_grey_channels.xml +++ b/com.discord/res/drawable/drawable_circle_black.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_circle_guild_badge_active.xml b/com.discord/res/drawable/drawable_circle_guild_badge_active_dark.xml similarity index 79% rename from com.discord/res/drawable/drawable_circle_guild_badge_active.xml rename to com.discord/res/drawable/drawable_circle_guild_badge_active_dark.xml index b88bc1b525..23e975d785 100644 --- a/com.discord/res/drawable/drawable_circle_guild_badge_active.xml +++ b/com.discord/res/drawable/drawable_circle_guild_badge_active_dark.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_circle_guild_badge_active_light.xml b/com.discord/res/drawable/drawable_circle_guild_badge_active_light.xml new file mode 100644 index 0000000000..cbc0585805 --- /dev/null +++ b/com.discord/res/drawable/drawable_circle_guild_badge_active_light.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_circle_guild_badge_inactive.xml b/com.discord/res/drawable/drawable_circle_guild_badge_inactive_dark.xml similarity index 79% rename from com.discord/res/drawable/drawable_circle_guild_badge_inactive.xml rename to com.discord/res/drawable/drawable_circle_guild_badge_inactive_dark.xml index 3c3a0e66b9..fea1ec1ac8 100644 --- a/com.discord/res/drawable/drawable_circle_guild_badge_inactive.xml +++ b/com.discord/res/drawable/drawable_circle_guild_badge_inactive_dark.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_circle_guild_badge_inactive_light.xml b/com.discord/res/drawable/drawable_circle_guild_badge_inactive_light.xml new file mode 100644 index 0000000000..9382a72d47 --- /dev/null +++ b/com.discord/res/drawable/drawable_circle_guild_badge_inactive_light.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_circle_speaking.xml b/com.discord/res/drawable/drawable_circle_speaking_dark.xml similarity index 78% rename from com.discord/res/drawable/drawable_circle_speaking.xml rename to com.discord/res/drawable/drawable_circle_speaking_dark.xml index fecee9b0b5..c4812d184c 100644 --- a/com.discord/res/drawable/drawable_circle_speaking.xml +++ b/com.discord/res/drawable/drawable_circle_speaking_dark.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_open_folder.xml b/com.discord/res/drawable/drawable_open_folder_dark.xml similarity index 100% rename from com.discord/res/drawable/drawable_open_folder.xml rename to com.discord/res/drawable/drawable_open_folder_dark.xml diff --git a/com.discord/res/drawable/drawable_open_folder_light.xml b/com.discord/res/drawable/drawable_open_folder_light.xml new file mode 100644 index 0000000000..afe3fafeba --- /dev/null +++ b/com.discord/res/drawable/drawable_open_folder_light.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_overlay_channels.xml b/com.discord/res/drawable/drawable_overlay_category_dark.xml similarity index 73% rename from com.discord/res/drawable/drawable_overlay_channels.xml rename to com.discord/res/drawable/drawable_overlay_category_dark.xml index bc90e038b9..93fb300cf4 100644 --- a/com.discord/res/drawable/drawable_overlay_channels.xml +++ b/com.discord/res/drawable/drawable_overlay_category_dark.xml @@ -1,7 +1,7 @@ - - + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_overlay_category_light.xml b/com.discord/res/drawable/drawable_overlay_category_light.xml new file mode 100644 index 0000000000..d9f77e475a --- /dev/null +++ b/com.discord/res/drawable/drawable_overlay_category_light.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_overlay_category_pressed.xml b/com.discord/res/drawable/drawable_overlay_category_pressed_dark.xml similarity index 80% rename from com.discord/res/drawable/drawable_overlay_category_pressed.xml rename to com.discord/res/drawable/drawable_overlay_category_pressed_dark.xml index c7e5209509..4efcba9394 100644 --- a/com.discord/res/drawable/drawable_overlay_category_pressed.xml +++ b/com.discord/res/drawable/drawable_overlay_category_pressed_dark.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + diff --git a/com.discord/res/drawable/drawable_overlay_category_pressed_light.xml b/com.discord/res/drawable/drawable_overlay_category_pressed_light.xml new file mode 100644 index 0000000000..0ce7b2c26e --- /dev/null +++ b/com.discord/res/drawable/drawable_overlay_category_pressed_light.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_overlay_channels_active.xml b/com.discord/res/drawable/drawable_overlay_channel_pressed_dark.xml similarity index 79% rename from com.discord/res/drawable/drawable_overlay_channels_active.xml rename to com.discord/res/drawable/drawable_overlay_channel_pressed_dark.xml index 8c475a380c..ec23580cb2 100644 --- a/com.discord/res/drawable/drawable_overlay_channels_active.xml +++ b/com.discord/res/drawable/drawable_overlay_channel_pressed_dark.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + diff --git a/com.discord/res/drawable/drawable_overlay_channel_pressed_light.xml b/com.discord/res/drawable/drawable_overlay_channel_pressed_light.xml new file mode 100644 index 0000000000..b881a6cd42 --- /dev/null +++ b/com.discord/res/drawable/drawable_overlay_channel_pressed_light.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_overlay_channel_pressed.xml b/com.discord/res/drawable/drawable_overlay_channels_active_dark.xml similarity index 80% rename from com.discord/res/drawable/drawable_overlay_channel_pressed.xml rename to com.discord/res/drawable/drawable_overlay_channels_active_dark.xml index d256031d32..eddc8945f6 100644 --- a/com.discord/res/drawable/drawable_overlay_channel_pressed.xml +++ b/com.discord/res/drawable/drawable_overlay_channels_active_dark.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + diff --git a/com.discord/res/drawable/drawable_overlay_channels_active_light.xml b/com.discord/res/drawable/drawable_overlay_channels_active_light.xml new file mode 100644 index 0000000000..ce8703edbc --- /dev/null +++ b/com.discord/res/drawable/drawable_overlay_channels_active_light.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_overlay_category.xml b/com.discord/res/drawable/drawable_overlay_channels_dark.xml similarity index 74% rename from com.discord/res/drawable/drawable_overlay_category.xml rename to com.discord/res/drawable/drawable_overlay_channels_dark.xml index 0affafc79d..84049ddedd 100644 --- a/com.discord/res/drawable/drawable_overlay_category.xml +++ b/com.discord/res/drawable/drawable_overlay_channels_dark.xml @@ -1,7 +1,7 @@ - - + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_overlay_channels_light.xml b/com.discord/res/drawable/drawable_overlay_channels_light.xml new file mode 100644 index 0000000000..8ee20ae07d --- /dev/null +++ b/com.discord/res/drawable/drawable_overlay_channels_light.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_overlay_channels_selected.xml b/com.discord/res/drawable/drawable_overlay_channels_selected_dark.xml similarity index 72% rename from com.discord/res/drawable/drawable_overlay_channels_selected.xml rename to com.discord/res/drawable/drawable_overlay_channels_selected_dark.xml index 23a1068387..a1ac0230e3 100644 --- a/com.discord/res/drawable/drawable_overlay_channels_selected.xml +++ b/com.discord/res/drawable/drawable_overlay_channels_selected_dark.xml @@ -1,7 +1,7 @@ - - - + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_overlay_channels_selected_light.xml b/com.discord/res/drawable/drawable_overlay_channels_selected_light.xml new file mode 100644 index 0000000000..eb131781a8 --- /dev/null +++ b/com.discord/res/drawable/drawable_overlay_channels_selected_light.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_overlay_guild_mentions.xml b/com.discord/res/drawable/drawable_overlay_guild_mentions_dark.xml similarity index 81% rename from com.discord/res/drawable/drawable_overlay_guild_mentions.xml rename to com.discord/res/drawable/drawable_overlay_guild_mentions_dark.xml index 3baf698809..87caa40e12 100644 --- a/com.discord/res/drawable/drawable_overlay_guild_mentions.xml +++ b/com.discord/res/drawable/drawable_overlay_guild_mentions_dark.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_overlay_guild_mentions_light.xml b/com.discord/res/drawable/drawable_overlay_guild_mentions_light.xml new file mode 100644 index 0000000000..1267cf1e3a --- /dev/null +++ b/com.discord/res/drawable/drawable_overlay_guild_mentions_light.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_overlay_mentions_primary_light_130.xml b/com.discord/res/drawable/drawable_overlay_mentions_primary_light_130.xml new file mode 100644 index 0000000000..170eef962c --- /dev/null +++ b/com.discord/res/drawable/drawable_overlay_mentions_primary_light_130.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_overlay_status_bar.xml b/com.discord/res/drawable/drawable_overlay_status_bar.xml deleted file mode 100644 index e36c472c42..0000000000 --- a/com.discord/res/drawable/drawable_overlay_status_bar.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_reaction_text_color_light.xml b/com.discord/res/drawable/drawable_reaction_text_color_light.xml index 1c3814b31b..45bcd3a5e9 100644 --- a/com.discord/res/drawable/drawable_reaction_text_color_light.xml +++ b/com.discord/res/drawable/drawable_reaction_text_color_light.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_rect_rounded_dark.xml b/com.discord/res/drawable/drawable_rect_rounded_dark.xml index f6cd63901a..7684fc15f7 100644 --- a/com.discord/res/drawable/drawable_rect_rounded_dark.xml +++ b/com.discord/res/drawable/drawable_rect_rounded_dark.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_squircle_primary_light_700_alpha_20.xml b/com.discord/res/drawable/drawable_squircle_primary_light_700_alpha_20.xml new file mode 100644 index 0000000000..1d65309beb --- /dev/null +++ b/com.discord/res/drawable/drawable_squircle_primary_light_700_alpha_20.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_overlay_search.xml b/com.discord/res/drawable/drawable_squircle_white.xml similarity index 57% rename from com.discord/res/drawable/drawable_overlay_search.xml rename to com.discord/res/drawable/drawable_squircle_white.xml index 32f5dc4a6b..d038b323f8 100644 --- a/com.discord/res/drawable/drawable_overlay_search.xml +++ b/com.discord/res/drawable/drawable_squircle_white.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_top_down_primary_630_gradient.xml b/com.discord/res/drawable/drawable_top_down_primary_630_gradient.xml new file mode 100644 index 0000000000..d8959070f5 --- /dev/null +++ b/com.discord/res/drawable/drawable_top_down_primary_630_gradient.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_top_down_primary_light_130_gradient.xml b/com.discord/res/drawable/drawable_top_down_primary_light_130_gradient.xml new file mode 100644 index 0000000000..d0e51b0e52 --- /dev/null +++ b/com.discord/res/drawable/drawable_top_down_primary_light_130_gradient.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_add_grey_24dp.xml b/com.discord/res/drawable/ic_add_grey_24dp.xml deleted file mode 100644 index dd295b6d7d..0000000000 --- a/com.discord/res/drawable/ic_add_grey_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_channel_text.xml b/com.discord/res/drawable/ic_channel_text.xml deleted file mode 100644 index a8fb235d88..0000000000 --- a/com.discord/res/drawable/ic_channel_text.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_channel_text_locked.xml b/com.discord/res/drawable/ic_channel_text_locked.xml index 7b02b07b72..f59717968a 100644 --- a/com.discord/res/drawable/ic_channel_text_locked.xml +++ b/com.discord/res/drawable/ic_channel_text_locked.xml @@ -1,6 +1,6 @@ - - - + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_channel_text_muted.xml b/com.discord/res/drawable/ic_channel_text_muted.xml deleted file mode 100644 index 8ce6dfa964..0000000000 --- a/com.discord/res/drawable/ic_channel_text_muted.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_channel_text_nsfw.xml b/com.discord/res/drawable/ic_channel_text_nsfw.xml deleted file mode 100644 index bda37b84e0..0000000000 --- a/com.discord/res/drawable/ic_channel_text_nsfw.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_channel_voice.xml b/com.discord/res/drawable/ic_channel_voice.xml deleted file mode 100644 index 499af9659b..0000000000 --- a/com.discord/res/drawable/ic_channel_voice.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_channel_voice_locked.xml b/com.discord/res/drawable/ic_channel_voice_locked.xml deleted file mode 100644 index 1193529c03..0000000000 --- a/com.discord/res/drawable/ic_channel_voice_locked.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_chevron_right_dark_grey_12dp.xml b/com.discord/res/drawable/ic_chevron_right_dark_grey_12dp.xml deleted file mode 100644 index 24d7f71d20..0000000000 --- a/com.discord/res/drawable/ic_chevron_right_dark_grey_12dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_guild_list_dms_24dp.xml b/com.discord/res/drawable/ic_guild_list_dms_24dp.xml new file mode 100644 index 0000000000..3883c55615 --- /dev/null +++ b/com.discord/res/drawable/ic_guild_list_dms_24dp.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_help_outline_white_24dp.xml b/com.discord/res/drawable/ic_help_outline_24dp.xml similarity index 86% rename from com.discord/res/drawable/ic_help_outline_white_24dp.xml rename to com.discord/res/drawable/ic_help_outline_24dp.xml index 5449e561f4..e6e16596d0 100644 --- a/com.discord/res/drawable/ic_help_outline_white_24dp.xml +++ b/com.discord/res/drawable/ic_help_outline_24dp.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_mentions_24dp.xml b/com.discord/res/drawable/ic_mentions_24dp.xml new file mode 100644 index 0000000000..d6cd783833 --- /dev/null +++ b/com.discord/res/drawable/ic_mentions_24dp.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_mentions_white_a60_24dp.xml b/com.discord/res/drawable/ic_mentions_white_a60_24dp.xml deleted file mode 100644 index 752864f9ad..0000000000 --- a/com.discord/res/drawable/ic_mentions_white_a60_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_quickswitcher_24dp.xml b/com.discord/res/drawable/ic_quickswitcher_24dp.xml new file mode 100644 index 0000000000..15691d988e --- /dev/null +++ b/com.discord/res/drawable/ic_quickswitcher_24dp.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_search_items_white_a60_24dp.xml b/com.discord/res/drawable/ic_search_items_white_a60_24dp.xml deleted file mode 100644 index 3538582959..0000000000 --- a/com.discord/res/drawable/ic_search_items_white_a60_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/layout-v22/widget_channels_list.xml b/com.discord/res/layout-v22/widget_channels_list.xml new file mode 100644 index 0000000000..64808e1f24 --- /dev/null +++ b/com.discord/res/layout-v22/widget_channels_list.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/settings_channel_list_item.xml b/com.discord/res/layout/settings_channel_list_item.xml index 5c641d450a..dfd9b6a9e5 100644 --- a/com.discord/res/layout/settings_channel_list_item.xml +++ b/com.discord/res/layout/settings_channel_list_item.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/user_profile_header_view.xml b/com.discord/res/layout/user_profile_header_view.xml index 7dfc9159b0..a29c36ec2f 100644 --- a/com.discord/res/layout/user_profile_header_view.xml +++ b/com.discord/res/layout/user_profile_header_view.xml @@ -1,8 +1,8 @@ - - + diff --git a/com.discord/res/layout/view_guild.xml b/com.discord/res/layout/view_guild.xml index 12964a98dd..aced72b0e0 100644 --- a/com.discord/res/layout/view_guild.xml +++ b/com.discord/res/layout/view_guild.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/com.discord/res/layout/view_server_folder.xml b/com.discord/res/layout/view_server_folder.xml index a515e3e2dc..05bcae86b1 100644 --- a/com.discord/res/layout/view_server_folder.xml +++ b/com.discord/res/layout/view_server_folder.xml @@ -3,9 +3,9 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> - - - - + + + + \ No newline at end of file diff --git a/com.discord/res/layout/view_toolbar_title.xml b/com.discord/res/layout/view_toolbar_title.xml index f9e24702d0..e16c29456f 100644 --- a/com.discord/res/layout/view_toolbar_title.xml +++ b/com.discord/res/layout/view_toolbar_title.xml @@ -3,5 +3,5 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> - + \ No newline at end of file diff --git a/com.discord/res/layout/view_user_avatar_presence.xml b/com.discord/res/layout/view_user_avatar_presence.xml index a6ca8cbe03..4142dd369f 100644 --- a/com.discord/res/layout/view_user_avatar_presence.xml +++ b/com.discord/res/layout/view_user_avatar_presence.xml @@ -2,7 +2,5 @@ - - - + \ No newline at end of file diff --git a/com.discord/res/layout/view_user_list_item.xml b/com.discord/res/layout/view_user_list_item.xml index cd9e3af7c5..2b075b5458 100644 --- a/com.discord/res/layout/view_user_list_item.xml +++ b/com.discord/res/layout/view_user_list_item.xml @@ -2,10 +2,7 @@ - - - - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_add_friend_user_list_item.xml b/com.discord/res/layout/widget_add_friend_user_list_item.xml index 072f9ae74d..c0e41feede 100644 --- a/com.discord/res/layout/widget_add_friend_user_list_item.xml +++ b/com.discord/res/layout/widget_add_friend_user_list_item.xml @@ -2,10 +2,7 @@ - - - - + diff --git a/com.discord/res/layout/widget_channel_members_list_item_user.xml b/com.discord/res/layout/widget_channel_members_list_item_user.xml index 3a775fe52b..58a383c847 100644 --- a/com.discord/res/layout/widget_channel_members_list_item_user.xml +++ b/com.discord/res/layout/widget_channel_members_list_item_user.xml @@ -2,10 +2,7 @@ - - - - + diff --git a/com.discord/res/layout/widget_channels_list.xml b/com.discord/res/layout/widget_channels_list.xml index 9667f0c61d..af2572a5da 100644 --- a/com.discord/res/layout/widget_channels_list.xml +++ b/com.discord/res/layout/widget_channels_list.xml @@ -1,26 +1,27 @@ - - - - + + + + - + - + - + - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_channels_list_item_category.xml b/com.discord/res/layout/widget_channels_list_item_category.xml index 89902205c8..cda5dd18cb 100644 --- a/com.discord/res/layout/widget_channels_list_item_category.xml +++ b/com.discord/res/layout/widget_channels_list_item_category.xml @@ -1,7 +1,6 @@ - - - - + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_channels_list_item_channel.xml b/com.discord/res/layout/widget_channels_list_item_channel.xml index 19a02464aa..15f1465cdc 100644 --- a/com.discord/res/layout/widget_channels_list_item_channel.xml +++ b/com.discord/res/layout/widget_channels_list_item_channel.xml @@ -1,8 +1,8 @@ - - - - + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_channels_list_item_channel_private.xml b/com.discord/res/layout/widget_channels_list_item_channel_private.xml index 1b77113eb0..829cd3bd72 100644 --- a/com.discord/res/layout/widget_channels_list_item_channel_private.xml +++ b/com.discord/res/layout/widget_channels_list_item_channel_private.xml @@ -2,16 +2,13 @@ - - - + - + - - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_channels_list_item_channel_voice.xml b/com.discord/res/layout/widget_channels_list_item_channel_voice.xml index ea1c606b2c..763dff1197 100644 --- a/com.discord/res/layout/widget_channels_list_item_channel_voice.xml +++ b/com.discord/res/layout/widget_channels_list_item_channel_voice.xml @@ -1,7 +1,7 @@ - - - + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_channels_list_item_friends.xml b/com.discord/res/layout/widget_channels_list_item_friends.xml index 50b805ebb2..115c7ad5b5 100644 --- a/com.discord/res/layout/widget_channels_list_item_friends.xml +++ b/com.discord/res/layout/widget_channels_list_item_friends.xml @@ -1,7 +1,7 @@ - - - + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_channels_list_item_header.xml b/com.discord/res/layout/widget_channels_list_item_header.xml index 33117bebb3..35fb365896 100644 --- a/com.discord/res/layout/widget_channels_list_item_header.xml +++ b/com.discord/res/layout/widget_channels_list_item_header.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_channels_list_item_invite.xml b/com.discord/res/layout/widget_channels_list_item_invite.xml index bc1d54be85..3726658954 100644 --- a/com.discord/res/layout/widget_channels_list_item_invite.xml +++ b/com.discord/res/layout/widget_channels_list_item_invite.xml @@ -1,7 +1,3 @@ - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/com.discord/res/layout/widget_channels_list_item_mfa.xml b/com.discord/res/layout/widget_channels_list_item_mfa.xml index 9b8b9de240..153d2bab6d 100644 --- a/com.discord/res/layout/widget_channels_list_item_mfa.xml +++ b/com.discord/res/layout/widget_channels_list_item_mfa.xml @@ -1,6 +1,6 @@ - - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_channels_list_item_voice_user.xml b/com.discord/res/layout/widget_channels_list_item_voice_user.xml index 9ace0f1a94..c0df562f41 100644 --- a/com.discord/res/layout/widget_channels_list_item_voice_user.xml +++ b/com.discord/res/layout/widget_channels_list_item_voice_user.xml @@ -2,8 +2,8 @@ - - - + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_chat_input_item.xml b/com.discord/res/layout/widget_chat_input_item.xml index c29ed50fbd..160f1dc308 100644 --- a/com.discord/res/layout/widget_chat_input_item.xml +++ b/com.discord/res/layout/widget_chat_input_item.xml @@ -3,10 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> - - - - + diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_mention_footer.xml b/com.discord/res/layout/widget_chat_list_adapter_item_mention_footer.xml index 4eeb18e63d..fc44b4f1d9 100644 --- a/com.discord/res/layout/widget_chat_list_adapter_item_mention_footer.xml +++ b/com.discord/res/layout/widget_chat_list_adapter_item_mention_footer.xml @@ -1,16 +1,17 @@ - - - - + xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> + + + - - - - + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_result_count.xml b/com.discord/res/layout/widget_chat_list_adapter_item_result_count.xml index 2156ff6873..dab5ab0676 100644 --- a/com.discord/res/layout/widget_chat_list_adapter_item_result_count.xml +++ b/com.discord/res/layout/widget_chat_list_adapter_item_result_count.xml @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/com.discord/res/layout/widget_chat_voice_list_item_user.xml b/com.discord/res/layout/widget_chat_voice_list_item_user.xml index e3a71935ae..2f418b5093 100644 --- a/com.discord/res/layout/widget_chat_voice_list_item_user.xml +++ b/com.discord/res/layout/widget_chat_voice_list_item_user.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_friends_list_adapter_item.xml b/com.discord/res/layout/widget_friends_list_adapter_item.xml index 40dac1e115..f276c6b4e2 100644 --- a/com.discord/res/layout/widget_friends_list_adapter_item.xml +++ b/com.discord/res/layout/widget_friends_list_adapter_item.xml @@ -2,10 +2,7 @@ - - - - + diff --git a/com.discord/res/layout/widget_global_search_item_guild.xml b/com.discord/res/layout/widget_global_search_item_guild.xml index 4656351b71..691f860908 100644 --- a/com.discord/res/layout/widget_global_search_item_guild.xml +++ b/com.discord/res/layout/widget_global_search_item_guild.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_group_invite_friends_item.xml b/com.discord/res/layout/widget_group_invite_friends_item.xml index ec0d549386..7dd93410a6 100644 --- a/com.discord/res/layout/widget_group_invite_friends_item.xml +++ b/com.discord/res/layout/widget_group_invite_friends_item.xml @@ -2,12 +2,9 @@ - + - - - - + diff --git a/com.discord/res/layout/widget_guilds_list.xml b/com.discord/res/layout/widget_guilds_list.xml index aea5f7ca6a..f8875aba05 100644 --- a/com.discord/res/layout/widget_guilds_list.xml +++ b/com.discord/res/layout/widget_guilds_list.xml @@ -1,5 +1,5 @@ - diff --git a/com.discord/res/layout/widget_guilds_list_item_guild_new.xml b/com.discord/res/layout/widget_guilds_list_item_guild_new.xml index d8731117e9..c2e71ebd8d 100644 --- a/com.discord/res/layout/widget_guilds_list_item_guild_new.xml +++ b/com.discord/res/layout/widget_guilds_list_item_guild_new.xml @@ -1,3 +1,6 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_guilds_list_item_guild_vertical.xml b/com.discord/res/layout/widget_guilds_list_item_guild_vertical.xml index b1737ea24d..745b31b064 100644 --- a/com.discord/res/layout/widget_guilds_list_item_guild_vertical.xml +++ b/com.discord/res/layout/widget_guilds_list_item_guild_vertical.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/widget_guilds_list_item_profile.xml b/com.discord/res/layout/widget_guilds_list_item_profile.xml index ae062f6873..2c25d16259 100644 --- a/com.discord/res/layout/widget_guilds_list_item_profile.xml +++ b/com.discord/res/layout/widget_guilds_list_item_profile.xml @@ -1,6 +1,9 @@ - - - + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_main_panel_left.xml b/com.discord/res/layout/widget_main_panel_left.xml index 098afc2975..c5c7648ab1 100644 --- a/com.discord/res/layout/widget_main_panel_left.xml +++ b/com.discord/res/layout/widget_main_panel_left.xml @@ -1,5 +1,5 @@ - diff --git a/com.discord/res/layout/widget_user_profile_adapter_item_friend.xml b/com.discord/res/layout/widget_user_profile_adapter_item_friend.xml index 08356828d5..de14e8b45c 100644 --- a/com.discord/res/layout/widget_user_profile_adapter_item_friend.xml +++ b/com.discord/res/layout/widget_user_profile_adapter_item_friend.xml @@ -2,9 +2,7 @@ - - - + diff --git a/com.discord/res/layout/widget_user_profile_strip.xml b/com.discord/res/layout/widget_user_profile_strip.xml index 322ad17fdf..0bb25b95d0 100644 --- a/com.discord/res/layout/widget_user_profile_strip.xml +++ b/com.discord/res/layout/widget_user_profile_strip.xml @@ -1,17 +1,14 @@ - - - - - - - + + + - - - + + + \ No newline at end of file diff --git a/com.discord/res/mipmap-anydpi-v26/ic_logo_round_debug.xml b/com.discord/res/mipmap-anydpi-v26/ic_logo_round_debug.xml index 8a4aa5554e..5f869cc65a 100644 --- a/com.discord/res/mipmap-anydpi-v26/ic_logo_round_debug.xml +++ b/com.discord/res/mipmap-anydpi-v26/ic_logo_round_debug.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/com.discord/res/mipmap-anydpi-v26/ic_logo_square_debug.xml b/com.discord/res/mipmap-anydpi-v26/ic_logo_square_debug.xml index 8a4aa5554e..5f869cc65a 100644 --- a/com.discord/res/mipmap-anydpi-v26/ic_logo_square_debug.xml +++ b/com.discord/res/mipmap-anydpi-v26/ic_logo_square_debug.xml @@ -1,6 +1,6 @@ - + \ 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 0fd9559d55..fbb90447b9 100644 --- a/com.discord/res/values-bg/strings.xml +++ b/com.discord/res/values-bg/strings.xml @@ -2190,7 +2190,6 @@ NSFW каналите нямат филтър за нецензурно съдъ КУПОН!!! Вътре си! %1$s е на картата! Разшири общността си с Откриване на сървър - Само собственици могат да активират и деактивират Откриване. Все още чакаме твоите здравни показатели! Персонализира своя списък с обложка и описание Сървърите в Откриване имат шанс да бъдат препоръчани @@ -4370,7 +4369,6 @@ NSFW каналите нямат филтър за нецензурно съдъ Твоята реакция не беше добавена, защото има твърде много реакции в това съобщение. Ъхъ! Това е задължително за откриваеми сървъри. Първо деактивирай Откриване, за да направиш това. - Само собственикът на сървъра може да промени това. Първо потвърди своя имейл Тази опция не е налична за публични сървъри. Общо членове diff --git a/com.discord/res/values-cs/strings.xml b/com.discord/res/values-cs/strings.xml index 469388f455..3ae1c511ca 100644 --- a/com.discord/res/values-cs/strings.xml +++ b/com.discord/res/values-cs/strings.xml @@ -2164,7 +2164,6 @@ Požadavky kontrolujeme každých 24 hodin." Lidé tě teď mohou najít ve Vyhledávání serverů. Jsi tam! %1$s je teď vidět na mapě! Rozšiřuj svou komunitu pomocí Vyhledávání serverů - Povolit nebo zrušit Vyhledávání mohou pouze majitelé. Ještě čekáme na výsledky zdraví! Přizpůsob zobrazení výsledku motivem a popisem Servery ve Vyhledávání mají šanci na doporučení @@ -4328,7 +4327,6 @@ Prozkoumej textové kanály a zapoj se do konverzace. Nebo si pokláboste s př Tvoji reakci jsme nepřidali, protože už jich je na zprávě příliš mnoho. Ale no tak! Tohle je pro vyhledatelné servery nezbytné. Abys mohl pokračovat, vypni nejdřív Vyhledávání. - Toto nastavení může změnit pouze majitel serveru. Nejdřív prosím ověř svůj e-mail Tato možnost není pro veřejné servery k dispozici. Celkem členů diff --git a/com.discord/res/values-da/strings.xml b/com.discord/res/values-da/strings.xml index 8511a20d88..ad163fad98 100644 --- a/com.discord/res/values-da/strings.xml +++ b/com.discord/res/values-da/strings.xml @@ -2154,7 +2154,6 @@ Vi kontrollerer kravene en gang i døgnet." SÅ ER DER FEST! Du er inde! %1$s er nu på kortet! Øg dit fællesskab med Serveropdagelse - Kun ejere kan aktivere og deaktivere Discovery. Vi venter stadig på din sundhedstilstand! Tilpas din fortegnelse med et omslag og en beskrivelse Servere i Discovery har en chance for at blive vist @@ -4302,7 +4301,6 @@ Udforsk tekstkanaler og deltag i en samtale. Eller, saml nogle venner og kom på Din reaktion blev ikke tilføjet, fordi der er for mange reaktioner på denne besked. Bvadr! Dette er påkrævet for detekterbare servere. Slå først Discovery fra for at gøre dette. - Kun serverejer kan ændre dette. Bekræft din e-mail først Denne indstilling er ikke tilgængelig for offentlige servere. Antal totale medlemmer diff --git a/com.discord/res/values-de/strings.xml b/com.discord/res/values-de/strings.xml index 10e613cd04..6192597fa7 100644 --- a/com.discord/res/values-de/strings.xml +++ b/com.discord/res/values-de/strings.xml @@ -2171,7 +2171,6 @@ Wir überprüfen die Voraussetzungen alle 24 Stunden." Zeit zum Feiern!! Du bist drin! %1$s ist jetzt auf der Liste! Vergrößere deine Community mit „Server entdecken“. - Nur Eigentümer können Entdeckung aktivieren und deaktivieren. Wir warten noch auf deine Gesundheitsstatistiken! Passe deine Auflistung mit einem Cover und einer Beschreibung an. Server in Entdeckung haben eine Chance, empfohlen zu werden. @@ -4322,7 +4321,6 @@ Klink dich in Textkanäle ein oder schnapp dir ein paar Freunde und sprich mit i Deine Reaktion wurde nicht hinzugefügt, da es zu viele Reaktionen auf diese Nachricht gibt. Nein! Diese Option ist für entdeckbare Server nötig. Deaktiviere zuerst Entdeckung, um fortzufahren. - Nur der Servereigentümer kann diese Einstellung ändern. Verifiziere bitte zuerst deine E-Mail-Adresse. Diese Option ist für öffentliche Server nicht verfügbar. Mitglieder insgesamt diff --git a/com.discord/res/values-el/strings.xml b/com.discord/res/values-el/strings.xml index 324ece4f7f..3f6cf0e229 100644 --- a/com.discord/res/values-el/strings.xml +++ b/com.discord/res/values-el/strings.xml @@ -2186,7 +2186,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ ΩΡΑ ΓΙΑ ΠΑΡΤΙ!!! Είσαι μέσα! Ο %1$s μπήκε στη λίστα! Διεύρυνε την κοινότητά σου με την Ανακάλυψη Διακομιστή - Μόνο οι ιδιοκτήτες μπορούν να ενεργοποιήσουν και να απενεργοποιήσουν την Ανακάλυψη. Αναμένουμε ακόμα τις μετρήσεις υγείας σου! Προσάρμοσε τον τρόπο που εμφανίζεσαι στη λίστα με ένα εξώφυλλο και μια περιγραφή Οι διακομιστές στην Ανακάλυψη έχουν την πιθανότητα να γίνουν προτεινόμενοι @@ -4363,7 +4362,6 @@ ping ήταν **%3$s ms**. Ο ρυθμός απώλειας εξερχόμενω Η αντίδρασή σου δεν προστέθηκε, επειδή υπάρχουν πάρα πολλές αντιδράσεις σε αυτό το μήνυμα. Ωχ! Αυτό απαιτείται για διακομιστές που μπορούν να ανακαλυφθούν. Απενεργοποίησε πρώτα την Ανακάλυψη για να το κάνεις. - Μόνο ο ιδιοκτήτης διακομιστή μπορεί να αλλάξει αυτήν τη ρύθμιση. Επαλήθευσε πρώτα το email σου Αυτή η επιλογή δεν είναι διαθέσιμη για Δημόσιους διακομιστές. Σύνολο Μελών diff --git a/com.discord/res/values-es-rES/strings.xml b/com.discord/res/values-es-rES/strings.xml index 8b28636186..2fec508ae8 100644 --- a/com.discord/res/values-es-rES/strings.xml +++ b/com.discord/res/values-es-rES/strings.xml @@ -2152,7 +2152,6 @@ Comprobamos los requisitos cada 24 horas." ¡¡¡FIESTA!!! ¡Lo has conseguido! ¡%1$s ya está en el mapa! Haz crecer tu comunidad con Descubrimiento de servidor - Solo los propietarios pueden habilitar y deshabilitar Descubrimiento. ¡Seguimos pendientes de las estadísticas del estado de tu servidor! Personaliza tu lista con una portada y una descripción Los servidores de Descubrimiento tienen la oportunidad de ser destacados @@ -4319,7 +4318,6 @@ Explora los canales de texto y únete a la conversación. ¡O coge a algunos ami No se ha añadido tu reacción porque hay demasiadas reacciones en este mensaje. ¡Doh! Esto es obligatorio para los servidores de Descubrimiento. Para hacerlo, primero deshabilita Descubrimiento. - Solo puede cambiarlo el propietario del servidor. Primero verifica tu correo electrónico Esta opción no está disponible para los servidores públicos. Total de miembros diff --git a/com.discord/res/values-fi/strings.xml b/com.discord/res/values-fi/strings.xml index 9655b7ebc0..35f6b690c2 100644 --- a/com.discord/res/values-fi/strings.xml +++ b/com.discord/res/values-fi/strings.xml @@ -2193,7 +2193,6 @@ Tarkistamme vaatimustenmukaisuuden 24 tunnin välein." JUHLAN AIKA!!! Olet mukana! %1$s on nyt kartalla! Kasvata yhteisöäsi palvelinhaun avulla - Vain omistajat voivat ottaa palvelinhaun käyttöön tai poistaa sen käytöstä. Odotamme yhä palvelimesi toimintakuntotietoja! Mukauta listaustasi saatekuvalla ja kuvauksella Palvelinhakuun lisätyt palvelimet voidaan ottaa esiteltäviksi @@ -4373,7 +4372,6 @@ Tutustu kanaviin ja liity mukaan keskusteluun. Tai nappaa kavereitasi mukaan ja Reaktiotasi ei lisätty, koska tässä viestissä on liikaa reaktioita. Kääk! Tämä on pakollinen haettavissa olevilla palvelimilla. Poista palvelinhaku ensin käytöstä, jotta voit tehdä tämän. - Vain palvelimen omistaja voi muuttaa tätä. Vahvista ensin sähköpostisi Tämä asetus ei ole käytettävissä julkisilla palvelimilla. Jäseniä yhteensä diff --git a/com.discord/res/values-fr/strings.xml b/com.discord/res/values-fr/strings.xml index 4713ed71f9..98b8a91ab4 100644 --- a/com.discord/res/values-fr/strings.xml +++ b/com.discord/res/values-fr/strings.xml @@ -2198,7 +2198,6 @@ Nous réévaluons les serveurs toutes les 24 h." YOUHOU !!! Ça y est ! %1$s est dans la cour des grands ! Fais grandir ta communauté avec la Découverte de serveurs - Seul(e) un(e) propriétaire peut activer ou désactiver la Découverte de serveurs. Nous analysons encore la vitalité de ton serveur ! Customise la façon dont ton serveur apparaît avec une image de couverture et une description "Tous les serveurs en Découverte ont une chance d'être mis en vedette" @@ -4352,7 +4351,6 @@ Explore les salons textuels et rejoint la conversation. Ou sinon, tu peux aussi "Ta réaction n'a pas été ajoutée car il y a trop de réactions sur ce message." Doh ! Ceci est obligatoire pour les serveurs en mode Découverte. Désactive Découverte si tu veux faire cela. - Seul le propriétaire du serveur peut changer ceci. "Tu dois d'abord vérifier ton e-mail" "Cette option n'est pas disponible pour les serveurs publics." Total des membres diff --git a/com.discord/res/values-hr/strings.xml b/com.discord/res/values-hr/strings.xml index 434377e90a..ef6a21eab8 100644 --- a/com.discord/res/values-hr/strings.xml +++ b/com.discord/res/values-hr/strings.xml @@ -2124,7 +2124,6 @@ Preglede ponavljamo svaka 24 sata." TULUM!!! Upao si! %1$s od sada je dio vidljivog svijeta! Uz Otkrivanje servera neka tvoja zajednica raste - Otkrivanje mogu omogućiti ili onemogućiti isključivo vlasnici. Još uvijek čekamo metrike o zdravlju tvojeg servera! Dodaj naslovnicu i opis kako bi se na popisu pojavio baš kako ti želiš Serveri koji su uključeni u Otkrivanje imaju šanse da ih posebno istaknemo @@ -4275,7 +4274,6 @@ Istraži tekstualne kanale i pridruži se razgovoru. A možeš i uzeti nekog pri Ponestalo ti je mjesta za emojie. Tvoja reakcija nije dodana jer ova poruka ima previše reakcija. Za servere koje je moguće otkriti ovo je obavezno. Da bi to bilo obavljeno, prvo moraš onemogućiti otkrivanje. - To može promijeniti samo vlasnik servera. Prvo ovjeri svoju adresu e-pošte Ta opcija za javne servere nije dostupna. Ukupno članova diff --git a/com.discord/res/values-hu/strings.xml b/com.discord/res/values-hu/strings.xml index a9fea0fc3e..16ef2fa12e 100644 --- a/com.discord/res/values-hu/strings.xml +++ b/com.discord/res/values-hu/strings.xml @@ -2180,7 +2180,6 @@ A követelményeket 24 óránként újra ellenőrizzük." INDULHAT A PARTI!!! Sikerült! %1$s szervered felkerült a térképre! Növeld meg közösséged szerverfelfedezéssel - A felfedezést csak a tulajdonosok engedélyezhetik vagy tilthatják le. Továbbra is várjuk az állapotértékelést! Szabd testre a listát borítóképpel és leírással A felfedezésben szereplő szerverek kiemelt helyre kerülhetnek @@ -4357,7 +4356,6 @@ Fedezd fel a szöveges csatornákat és csatlakozz egy beszélgetéshez. Vagy ke Nem sikerült hozzáadni a reakciódat, mert már túl sok van ezen az üzeneten. Hőőőte! Ez a felfedezhető szervereknél szükséges. Ehhez elsőként tiltsd le a felfedezést. - Ezt csak a szerver tulajdonosa tudja módosítani. Kérjük, hogy először erősítsd meg az e-mailedet Ez az opció nyilvános szervereknél nem áll rendelkezésre. Tagok száma összesen diff --git a/com.discord/res/values-it/strings.xml b/com.discord/res/values-it/strings.xml index 7517515282..ef1d9ec4a3 100644 --- a/com.discord/res/values-it/strings.xml +++ b/com.discord/res/values-it/strings.xml @@ -2180,7 +2180,6 @@ Ricontrolliamo i requisiti ogni 24 ore." BRINDISI!!! "Ce l'hai fatta! %1$s è ora in vetrina!" Fai crescere la tua community con Esplora server - Solo i proprietari possono attivare o disattivare Esplora. Stiamo ancora aspettando i tuoi parametri di salute! Modifica a piacimento la tua inserzione con una copertina e una descrizione I server in Esplora hanno la possibilità di essere messi in evidenza @@ -4344,7 +4343,6 @@ Esplora i canali testuali e unisciti in una conversazione. Oppure raduna qualche Non è stato possibile aggiungere la reazione poiché questo messaggio ne ha già fin troppe. "D'oh!" È un requisito per i server che possono essere trovati. Devi prima disattivare Esplora. - Solo il proprietario del server può modificare questa opzione. Ti preghiamo di verificare prima la tua e-mail "Quest'opzione non è disponibile per i server pubblici." Membri totali diff --git a/com.discord/res/values-ja/strings.xml b/com.discord/res/values-ja/strings.xml index c1c42f27b1..9e40166e18 100644 --- a/com.discord/res/values-ja/strings.xml +++ b/com.discord/res/values-ja/strings.xml @@ -2216,7 +2216,6 @@ パーティータイム!!! ようこそ！%1$sが地図に載りました！ サーバー発見でコミュニティを広げましょう - 発見は、所有者のみが有効化・無効化できます。 まだ正常性メトリックがありません。 あなたのリストにカバーと説明を追加してカスタマイズ 発見に参加しているサーバーは、特集されるチャンスがあります @@ -4398,7 +4397,6 @@ Discordについて詳しい情報が必要ですか？" このメッセージにはたくさんのリアクションがあるため、リアクションを追加できませんでした。 あちゃー！ これは発見の対象になっているサーバーに対して必須です。これを行うためには、まず発見を無効にしてください。 - これを変更できるのはサーバー管理人のみです。 最初にメールアドレスの認証をしてください このオプションは公開サーバーではご利用いただけません。 メンバー合計 diff --git a/com.discord/res/values-ko/strings.xml b/com.discord/res/values-ko/strings.xml index 5ccc87548b..c7337137a4 100644 --- a/com.discord/res/values-ko/strings.xml +++ b/com.discord/res/values-ko/strings.xml @@ -2213,7 +2213,6 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주 파티 시간입니다!!! 됐습니다! %1$s 서버를 알릴 수 있어요! 서버 찾기로 커뮤니티를 키우세요 - 서버 주인만 서버 찾기 기능을 켜거나 끌 수 있어요. 건강도가 더 높아야 해요! 커버와 설명으로 목록을 꾸며보세요 서버 찾기에 등록되면 추천 서버도 될 수 있어요 @@ -4394,7 +4393,6 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)" 이 메시지에는 반응이 너무 많아서 반응이 추가되지 않았어요. 이런! 서버 찾기에 필요해요. 먼저 서버 찾기를 끄세요. - 서버 주인만 변경할 수 있어요. 먼저 이메일을 인증해 주세요 공개 서버에서는 사용할 수 없어요. 총 멤버 수 diff --git a/com.discord/res/values-lt/strings.xml b/com.discord/res/values-lt/strings.xml index af99e193ea..e99107da33 100644 --- a/com.discord/res/values-lt/strings.xml +++ b/com.discord/res/values-lt/strings.xml @@ -2181,7 +2181,6 @@ Reikalavimus pakartotinai tikriname kas 24 valandas." VAKARĖLIS!!! Patekai! Nuo šiol %1$s matomas žemėlapyje! Plėsk savo bendruomenę su serverių atradimo funkcija - Atradimo funkciją įjungti ir išjungti gali tik savininkai. Vis dar laukiame tavo tvarkingumo metrikos! Sukurk tinkintą savo įrašo viršelį ir aprašą Atradimo sąraše esantys serveriai gali būti skelbiami kaip atrinkti @@ -4360,7 +4359,6 @@ Naršyk tekstinių pokalbių kanalus ir prisijunk prie pokalbio. Arba čiupk kel Tavo reakcija nebuvo pridėta, nes jau ir taip per daug reakcijų ant šio pranešimo. Ak! Tai yra privaloma atrandamiesiems serveriams. Norėdamas tai padaryti, pirmiausia išjunk atradimo funkciją. - Tai gali pakeisti tik serverio savininkas. Pirmiausia patvirtink savo el. pašto adresą Ši parinktis neprieinama viešiems serveriams. Bendras narių skaičius diff --git a/com.discord/res/values-nl/strings.xml b/com.discord/res/values-nl/strings.xml index 01e0b27428..386307fc05 100644 --- a/com.discord/res/values-nl/strings.xml +++ b/com.discord/res/values-nl/strings.xml @@ -2159,7 +2159,6 @@ We controleren de vereisten elke 24 uur opnieuw." FEESTJE!!! Je zit erin! %1$s staat nu op de kaart! Vergroot je community met serverontdekking - Alleen eigenaren kunnen Ontdekking in- en uitschakelen. We wachten nog steeds op je gezondheidsstatistieken! Pas je lijst aan met een omslag en een beschrijving "Servers in Ontdekking maken kans om 'in de kijker' te staan" @@ -4300,7 +4299,6 @@ Verken tekstkanalen en doe mee aan een gesprek. Of haal wat vrienden erbij en ge Je reactie is niet toegevoegd omdat er teveel reacties op dit bericht zijn. Ojee! Dit is vereist voor vindbare servers. Schakel Ontdekking hiervoor eerst uit. - Alleen de servereigenaar kan dit veranderen. Controleer eerst je e-mail, alsjeblieft Deze optie is niet beschikbaar voor openbare servers. Totaal aantal leden diff --git a/com.discord/res/values-no/strings.xml b/com.discord/res/values-no/strings.xml index 9b85b87684..37caee1184 100644 --- a/com.discord/res/values-no/strings.xml +++ b/com.discord/res/values-no/strings.xml @@ -2102,7 +2102,6 @@ Vi sjekker kravene en gang i døgnet." Det er nå mulig å finne serveren din i Serveroppdagelse. Du er med! %1$s er nå på kartet! Utvid fellesskapet ditt med serveroppdagelse - Det er kun eiere som kan aktivere og deaktivere oppdagelse. Vi venter fortsatt på helseinformasjonen din! Tilpass oppføringen din med en forside og en beskrivelse Servere i oppdagelse kan bli fremhevet @@ -4258,7 +4257,6 @@ Utforsk tekstkanaler og bli med i en samtale. Eller hent noen venner og kom på Du har ikke flere plasser til emojier. Reaksjonen din ble ikke lagt til fordi det er for mange reaksjoner i denne meldingen. Dette er påkrevd for servere som kan oppdages. Deaktiver oppdagelse først for å kunne gjøre dette. - Det er kun servereieren som kan endre dette. Bekreft e-postadressen din først Dette alternativet er ikke tilgjengelig for offentlige servere. Totalt antall medlemmer diff --git a/com.discord/res/values-pl/strings.xml b/com.discord/res/values-pl/strings.xml index 3795cd7ee2..6ac9b72066 100644 --- a/com.discord/res/values-pl/strings.xml +++ b/com.discord/res/values-pl/strings.xml @@ -2205,7 +2205,6 @@ Sprawdzamy wymagania co 24 godziny." IMPREZA!!! Udało się! %1$s jest już na mapie! Niech Twoja społeczność rośnie dzięki Wyszukiwaniu serwerów - Tylko właściciele mogą włączać i wyłączać Wyszukiwanie. Wciąż czekamy na statystyki zdrowia Twojego serwera! Dostosuj sposób wyświetlania Twojego serwera na liście za pomocą obrazu tła i opisu Serwery obecne w Wyszukiwaniu mają szansę, by znaleźć się w polecanych @@ -4383,7 +4382,6 @@ Odkrywaj kanały tekstowe i włącz się do rozmowy. Albo zgromadź znajomych i Twoja reakcja nie została dodana, ponieważ jest już zbyt wiele reakcji na tę wiadomość. Oj! Ta opcja jest wymagana w przypadku wyszukiwalnych serwerów. By to zrobić, wyłącz najpierw Wyszukiwanie. - Tylko właściciele serwerów mogą to zmienić. Najpierw zweryfikuj swój adres e-mail Ta opcja nie jest dostępna dla serwerów publicznych. Wszyscy członkowie diff --git a/com.discord/res/values-pt-rBR/strings.xml b/com.discord/res/values-pt-rBR/strings.xml index 26d4590e26..ded1a9c148 100644 --- a/com.discord/res/values-pt-rBR/strings.xml +++ b/com.discord/res/values-pt-rBR/strings.xml @@ -2191,7 +2191,6 @@ Fazemos novas avaliações a cada 24 horas." E VAI ROLAR A FESTA!! Estamos transmitindo! %1$s está aparecendo no mapa! Expanda sua comunidade com o Descobrir Servidores - Só donos podem ativar ou desativar o Descobrir. Ainda estamos esperando o resultado dos exames! Personalize sua lista com uma descrição e uma capa Servidores no Descobrir podem aparecer em destaque @@ -4365,7 +4364,6 @@ Explore os canais de texto e participe de uma conversa. Ou, junte alguns amigos Sua reação não foi adicionada porque já existem reações demais nesta mensagem. Eita! Isto é obrigatório para servidores do Descobrir. Desative o Descobrir antes de fazer isto. - Apenas o(a) dono(a) do servidor pode mudar isto. Verifique seu e-mail primeiro Esta opção não está disponível para servidores públicos. Total de membros diff --git a/com.discord/res/values-ro/strings.xml b/com.discord/res/values-ro/strings.xml index 07b8ab229f..c346ba665e 100644 --- a/com.discord/res/values-ro/strings.xml +++ b/com.discord/res/values-ro/strings.xml @@ -2152,7 +2152,6 @@ Reverificăm cerințele o dată la 24 de ore." PETRECERE!!! Ai reușit! %1$s este acum pe hartă! Crește-ți comunitatea cu Descoperire server - Doar proprietarii pot activa și dezactiva funcția de Descoperire. Încă îți așteptăm parametrii de sănătate! Personalizează-ți listarea cu o copertă și o descriere Serverele din Descoperire au șansa de a fi promovate @@ -4325,7 +4324,6 @@ Explorează canalele de text și alătură-te unei conversaţii. Sau cheamă câ Nu mai sunt locuri pentru emoji-uri noi. Reacția ta nu a fost adăugată deoarece există prea multe reacții în acest mesaj. Funcția e necesară pentru ca serverele să poată fi descoperite. Pentru a continua, dezactivează mai întâi Descoperire. - Doar proprietarul server-ului poate modifica setarea asta. Te rugăm să-ți verifici mai întâi e-mailul Această opțiune nu e disponibilă pentru serverele publice. Total membri diff --git a/com.discord/res/values-ru/strings.xml b/com.discord/res/values-ru/strings.xml index 9ce3ba794a..1f92ad6462 100644 --- a/com.discord/res/values-ru/strings.xml +++ b/com.discord/res/values-ru/strings.xml @@ -2228,7 +2228,6 @@ ОТПАД! Получилось! %1$s добавлен на карту! Увеличивайте своё сообщество с помощью «Путешествия по серверам» - «Путешествие» может включить или отключить только владелец сервера. Мы всё ещё ждём результата проверки! Персонализируйте свою страницу с помощью обложки и описания Серверы из «Путешествия» могут быть добавлены в «Похожие» @@ -4411,7 +4410,6 @@ Реакция не была добавлена, так как сообщение уже содержит слишком много реакций. Ох! Обязательно для участвующих в «Путешествии» серверов. Отключите «Путешествие», чтобы воспользоваться этой функцией. - Данный параметр может быть изменён только владельцем сервера. Сначала подтвердите адрес эл. почты Данная функция недоступна для публичных серверов. Всего участников diff --git a/com.discord/res/values-sv-rSE/strings.xml b/com.discord/res/values-sv-rSE/strings.xml index a33e22c1ec..6b59aa6f00 100644 --- a/com.discord/res/values-sv-rSE/strings.xml +++ b/com.discord/res/values-sv-rSE/strings.xml @@ -2106,7 +2106,6 @@ Vi kollar kraven var 24:e timme." Nu kan man hitta din server i Serveridentifiering. Du är med! %1$s finns nu på kartan! Få ditt community att växa med Serveridentifiering - Endast ägare kan aktivera och avaktivera Identifiering. Vi väntar fortfarande på dina hälsovärden! Anpassa listning med ett omslag och en beskrivning Servrar i Identifiering har chans att visas som aktuella @@ -4263,7 +4262,6 @@ Utforska textkanalerna och gå med i en konversation eller testa en röstkanal m Din reaktion lades inte till då det finns för många reaktioner i detta meddelande. Oj! Detta krävs för identifieringsbara servrar. Avaktivera Identifiering först för att göra det här. - Endast serverägaren kan ändra detta. Verifiera din e-post först Det här alternativet är inte tillgängligt för offentliga servrar. Medlemmar sammanlagt diff --git a/com.discord/res/values-th/strings.xml b/com.discord/res/values-th/strings.xml index bbae240b46..2c0f48398a 100644 --- a/com.discord/res/values-th/strings.xml +++ b/com.discord/res/values-th/strings.xml @@ -2188,7 +2188,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ ได้เวลาปาร์ตี้! เรียบร้อยแล้ว %1$s ตอนนี้อยู่บนแผนที่แล้ว ขยายชุมชนของคุณด้วยการค้นพบเซิร์ฟเวอร์ - เฉพาะเจ้าของเท่านั้นที่เปิดหรือปิดใช้งานการค้นพบได้ เรารอดูเมตริกส์สุขภาพของคุณอยู่นะ! ปรับแต่งรายการของคุณด้วยภาพปกและคำบรรยาย เซิร์ฟเวอร์ในการค้นหามีโอกาสเป็นที่รู้จัก @@ -4364,7 +4363,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ ไม่สามารถเพิ่มรีแอคชั่นได้อีกเนื่องจากข้อความนี้มีรีแอคชั่นมากเกินไป อ๋อย! ต้องใช้ข้อนี้ในเซิร์ฟเวอร์ที่ค้นหาได้ ปิดใช้งานการค้นพบก่อนดำเนินการนี้ - เฉพาะเจ้าของเซิร์ฟเวอร์เท่านั้นที่สามารถเปลี่ยนข้อนี้ได้ ยืนยันอีเมล์ของคุณก่อน ไม่มีตัวเลือกนี้ในเซิร์ฟเวอร์สาธารณะ สมาชิกทั้งหมด diff --git a/com.discord/res/values-tr/strings.xml b/com.discord/res/values-tr/strings.xml index 5dd088f10b..c7ba17f826 100644 --- a/com.discord/res/values-tr/strings.xml +++ b/com.discord/res/values-tr/strings.xml @@ -2174,7 +2174,6 @@ Discord'a, [mikrofonuna erişim izni](onEnableClick) vermelisin." PARTİ!!! Katıldın! %1$s artık haritada! Sunucu Keşfi ile topluluğunu büyüt - Sadece sunucu sahipleri Keşfi etkinleştirebilir ve devre dışı bırakabilirler. Hala sağlık ölçütlerini bekliyoruz! Listedeki yerini bir kapak resmi ve açıklama ile özelleştir Keşif içindeki sunucuların ön plana çıkarılma şansı vardır @@ -4351,7 +4350,6 @@ Metin kanallarını keşfet ve bir konuşmaya katıl. Ya da birkaç arkadaşın Tepkin eklenmedi çünkü bu mesajda çok fazla tepki var. Hay! "Bu, keşfedilebilir sunucular için gereklidir. Bunu yapmak için önce Keşif'i devre dışı bırak." - Bunu sadece sunucu sahibi değiştirebilir. Lütfen önce e-postanı doğrula Bu seçenek Herkese Açık sunucularda bulunmaz. Toplam Üye Sayısı diff --git a/com.discord/res/values-uk/strings.xml b/com.discord/res/values-uk/strings.xml index ec4edae368..99c0b1e987 100644 --- a/com.discord/res/values-uk/strings.xml +++ b/com.discord/res/values-uk/strings.xml @@ -2202,7 +2202,6 @@ AFK. Це не впливає на браузери." СВЯТКУЙМО!!! Ти в грі! Сервер %1$s уже на мапі! Збільшуйте свою спільноту завдяки знайомству з серверами - Тільки власники сервера можуть увімкнути чи вимкнути участь у категорії «Знайомство з серверами». "Ми ще чекаємо на індикатор здоров'я твого сервера!" Персоналізуй свій сервер за допомогою зображення профілю та опису Сервери в категорії «знайомство» можуть стати обраними @@ -4385,7 +4384,6 @@ AFK. Це не впливає на браузери." Твою реакцію не додано, тому що на це повідомлення занадто багато реакцій. Охх! Це необхідно для серверів із категорії «Знайомство з серверами». Щоб зробити це, спочатку вимкни участь у знайомстві. - Цей параметр може змінювати тільки власник сервера. Спочатку треба підтвердити свою адресу ел. пошти Цей параметр недоступний для публічних серверів. Усього гравців diff --git a/com.discord/res/values-v23/styles.xml b/com.discord/res/values-v23/styles.xml index 3abb890d79..dd0bd8a88f 100644 --- a/com.discord/res/values-v23/styles.xml +++ b/com.discord/res/values-v23/styles.xml @@ -22,6 +22,7 @@ @color/primary_light_200 @color/brand_500 @color/uikit_btn_bg_color_selector_secondary_light + @color/primary_light_530 @color/uikit_btn_compound_color_selector_light @color/brand_500 @color/primary_light_900 diff --git a/com.discord/res/values-vi/strings.xml b/com.discord/res/values-vi/strings.xml index cdd80bb6fb..844f13a763 100644 --- a/com.discord/res/values-vi/strings.xml +++ b/com.discord/res/values-vi/strings.xml @@ -2175,7 +2175,6 @@ Chúng tôi thực hiện kiểm tra lại các yêu cầu mỗi 24 giờ."QUẨY THÔI!!! Xong rồi đó! %1$s đã xuất hiện trên bản đồ! Phát triển cộng đồng của bạn với Khám Phá Máy Chủ - Chỉ có người sỡ hữu mới có thể kích hoạt và vô hiệu hóa Khám Phá. Chúng tôi vẫn đang đợi thông tin tình trạng máy chủ của bạn đấy! Tùy chỉnh danh sách với một hình bìa và vài dòng ô tả Các máy chủ trong Khám Phá có cơ hội được làm nổi bật @@ -4340,7 +4339,6 @@ Hãy khám phá các kênh văn bản và tham gia trò chuyện. Hoặc là r Biểu cảm không được thêm vì đã có quá nhiều biểu cảm trong tin nhắn. Chà! Các máy chủ có thể được tìm thấy bắt buộc phải có chức năng này. Vô hiệu hóa Khám Phá trước để làm việc này. - Chỉ có người sở hữu máy chủ mới có thể thay đổi cài đặt này. Vui lòng xác minh email của bạn trước Tùy chọn này không có trên máy chủ Công Khai. Tổng số Thành viên diff --git a/com.discord/res/values-zh-rCN/strings.xml b/com.discord/res/values-zh-rCN/strings.xml index 48abad36d2..029e579f72 100644 --- a/com.discord/res/values-zh-rCN/strings.xml +++ b/com.discord/res/values-zh-rCN/strings.xml @@ -2198,7 +2198,6 @@ 嗨起来！！！ 您已成功加入！%1$s已经在地图上啦！ 通过“发现服务器”来发展您的社区吧 - 只有所有者可以开启和关闭“发现服务器”。 我们仍在等待获得您的健康指标！ 通过设置封面与简介来自定义您的列表 “发现服务器”内的服务器有机会被设为精选 @@ -4377,7 +4376,6 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**. 您的反应因此讯息反应过多而没有被添加。 警告 这对于可发现服务器是必需的。如要继续，请先关闭“发现服务器”。 - 只有服务器所有者能对此进行变更。 请首先验证您的电子邮件 该选项不适用于公开服务器。 成员总数 diff --git a/com.discord/res/values-zh-rTW/strings.xml b/com.discord/res/values-zh-rTW/strings.xml index 6147d4727d..5860d84783 100644 --- a/com.discord/res/values-zh-rTW/strings.xml +++ b/com.discord/res/values-zh-rTW/strings.xml @@ -2200,7 +2200,6 @@ 開始狂歡！！ 你成功加入了！%1$s 已經登場！ 透過探索伺服器，讓你的社群蓬勃發展 - 只有擁有者才能啟用和停用探索功能。 我們還在等待您健康指標！ 可運用封面圖片和簡介來自訂自己的相關資訊 「探索」中的伺服器有機會成為主打伺服器 @@ -4377,7 +4376,6 @@ Server Insights 是實驗性功能，未來有可能變更或移除。" 沒有加入您的反應，是因為這則訊息有太多的反應。 靠！ 可供探索的伺服器有這項要求。如要執行此動作，請先停用探索功能。 - 只有伺服器擁有者才能變更此項目。 請先認證你的電子郵件 公開伺服器無法使用此選項。 成員總數 diff --git a/com.discord/res/values/attrs.xml b/com.discord/res/values/attrs.xml index b1e4ff4059..fec078de77 100644 --- a/com.discord/res/values/attrs.xml +++ b/com.discord/res/values/attrs.xml @@ -180,6 +180,9 @@ + + + @@ -343,6 +346,7 @@ + @@ -378,6 +382,7 @@ + @@ -522,6 +527,14 @@ + + + + + + + + @@ -1488,6 +1501,10 @@ + + + + diff --git a/com.discord/res/values/colors.xml b/com.discord/res/values/colors.xml index a918dd1acc..17bd56c214 100644 --- a/com.discord/res/values/colors.xml +++ b/com.discord/res/values/colors.xml @@ -107,9 +107,9 @@ #ffff7043 #ffff5722 #ff355089 - @color/grey_6 + @color/primary_500 @color/purple_brand - @color/grey_6_alpha_30 + @color/primary_500_alpha_30 @android:color/white @android:color/black #ffcb2120 @@ -119,12 +119,8 @@ #ff737f8d #4d737f8d #ff949494 - #ff4f545c #0d4f545c - #4d4f545c #ff282b30 - #ff2e3136 - #ff1e2124 #ff8a8e94 #6680cbc4 #66009688 @@ -176,12 +172,14 @@ #ffb9bbbe #4db9bbbe #99b9bbbe + #ff8e9297 #ff72767d #4d72767d #9972767d #ff4f545c #334f545c #4d4f545c + #514f545c #994f545c #ff40444b #ff36393f @@ -212,8 +210,11 @@ #ff9099a4 #ff747f8d #33747f8d + #3d747f8d + #ff6a7480 #ff4f5660 #ff2e3338 + #ff2e3338 #ff23262a #ff060607 #ff060607 diff --git a/com.discord/res/values/dimens.xml b/com.discord/res/values/dimens.xml index 43f5cdc84b..6f0cb1d34e 100644 --- a/com.discord/res/values/dimens.xml +++ b/com.discord/res/values/dimens.xml @@ -98,13 +98,6 @@ 32.0dip 0.0dip 80.0dip - 16.0dip - 2.0dip - 3.0dip - 24.0dip - 14.0dip - 2.0dip - -2.0dip 500.0dip 20.0dip 64.0dip @@ -461,7 +454,6 @@ 48.0dip 72.0dip 3.0dip - 1.5dip @dimen/uikit_textsize_medium @dimen/uikit_textsize_large 4.0dip diff --git a/com.discord/res/values/ids.xml b/com.discord/res/values/ids.xml index 66f19e81ea..3dec249f78 100644 --- a/com.discord/res/values/ids.xml +++ b/com.discord/res/values/ids.xml @@ -84,10 +84,9 @@ - - + @@ -275,7 +274,7 @@ - + @@ -357,7 +356,6 @@ - @@ -382,18 +380,16 @@ + - - - @@ -434,8 +430,7 @@ - - + @@ -753,7 +748,7 @@ - + @@ -881,10 +876,10 @@ - + @@ -1975,8 +1970,7 @@ - - + @@ -1985,8 +1979,7 @@ - - + @@ -2006,7 +1999,7 @@ - + diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml index 63f4bd8497..1275728e69 100644 --- a/com.discord/res/values/public.xml +++ b/com.discord/res/values/public.xml @@ -207,1149 +207,1166 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1429,366 +1446,365 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1888,387 +1904,379 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2408,31 +2416,31 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + @@ -2460,606 +2468,611 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3071,189 +3084,195 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3307,18 +3326,18 @@ - - - - - - - - + + + + + + + + - - + + @@ -3329,70 +3348,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3402,57 +3421,56 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3465,23 +3483,21 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -3601,2243 +3617,2236 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10746,4243 +10755,4251 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -15022,1002 +15039,1000 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 459dcbddf0..ac1c77b1b2 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -1023,8 +1023,9 @@ ONE MORE THING {fixed} An issue is preventing Discord from syncing cloud saves for **%1$s.** Do you want to play anyway? Unable to sync cloud saves OR + Collapse Collapse Category - 1850c70b-5f40-4142-8749-d514535f6355 + 3901acd1-c80f-461c-93c8-a2caa305af42 Coming Soon Search Animated GIFs on the Web Displays text with emphasis. @@ -2080,6 +2081,9 @@ ONE MORE THING {fixed} Group DM Add Friends to DM Select Friends + Confirm New Group + Create Group + You already have a group with these people! Are you sure you want to create a new one? No friends found that are not already in this DM. The party is full! Groups have a 10 member limit. @@ -2090,6 +2094,7 @@ ONE MORE THING {fixed} "You don't have any friends to add!" You need to be friends with **%1$s** to start a group DM. %1$s + Existing Groups To: %1$s The selected users will fill the group. @@ -2316,6 +2321,7 @@ ONE MORE THING {fixed} This will determine whether members who have not explicitly set their notification settings receive a notification for every message sent in this server or not. We highly recommend setting this to only @mentions for a public Discord to avoid [this insanity](%1$s). Disable Discovery + Only server administrators can enable and disable Discovery. By qualifying and enabling Discovery, your server will show up in [Server Discovery.](onClick) Make sure you’re ready to make a good impression! 2FA Requirement For Moderation Enabled Members with moderation powers (e.g. admins or mods) are required to have 2FA enabled to perform moderation actions. @@ -2372,7 +2378,6 @@ We recheck requirements every 24 hours." PARTY!!! You’re in! %1$s is now on the map! Grow your community with Server Discovery - Only owners can enable and disable Discovery. "We're still waiting on your health metrics!" Customize your listing with a cover and a description Servers in Discovery have a chance to be featured @@ -2829,6 +2834,7 @@ Want to know more about Discord?" Invite to Stream Invite to Server Invite URL + Join Voice There’s always room for more. Share this link and get them in here: Invite friends to %1$s Your Friends @@ -4038,7 +4044,7 @@ The changes to your subscription are reflected below:" You launched %1$s as administrator. Please relaunch Discord as an administrator in order to enable Push-to-talk detection while the game has focus. Push-to-talk Needs Permission I agree and understand - "By setting your server to Public, you agree that your server complies with our [Public Server Guidelines](%1$s), and that Discord may check the contents of your server to make sure it's safe for users." + By setting your server to Public, you agree that your server complies with our [Public Server Guidelines](%1$s), and that Discord may check the contents of your server for analytical and user safety purposes. Follow the rules "We're doing some research to better understand and support different types of Discord servers." Hey Server Admin! Would you answer a few questions about Discord? Puhhhlease! @@ -4715,9 +4721,11 @@ Server Insights is an experimental feature and is subject to change or removal i %1$s was live for %2$s. Join the call %1$s pinned a message to this channel. [See all the pins.](pinsActionOnClick) - %1$s pinned a message to this channel. + %1$s pinned a message to this channel. [See all the pins.](pinsOnClick) %1$s pinned a message to this channel. %1$s pinned a message to this channel. + %1$s pinned [a message](messageOnClick) to this channel. + %1$s pinned [a message](messageOnClick) to this channel. [See all the pins.](pinsActionOnClick) %1$s added %2$s to the group. %1$s removed %2$s from the group. %1$s left the group. @@ -4797,7 +4805,7 @@ Server Insights is an experimental feature and is subject to change or removal i Your reaction was not added because there are too many reactions on this message. Doh! This is required for discoverable servers. Disable Discovery first to do this. - Only the server owner can change this. + Only server administrators can change this. Please verify your email first This option is not available for Public servers. Total Members diff --git a/com.discord/res/values/styles.xml b/com.discord/res/values/styles.xml index 6046819f53..0d0ad858db 100644 --- a/com.discord/res/values/styles.xml +++ b/com.discord/res/values/styles.xml @@ -52,7 +52,7 @@ @@ -898,9 +924,6 @@ false true - -