diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index a2b9201fc0..c91d0fe6de 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1062.apk +apkFileName: com.discord-1063.apk compressionType: false doNotCompress: - arsc @@ -190,5 +190,5 @@ usesFramework: tag: null version: 2.4.1-197d46-SNAPSHOT versionInfo: - versionCode: '1062' - versionName: 14-alpha2 + versionCode: '1063' + versionName: '12.6' diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index f37e82e089..4f082af617 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! # -#Thu Mar 12 03:03:03 UTC 2020 -version_name=14-alpha2 +#Sat Mar 14 00:12:52 UTC 2020 +version_name=12.6 package_name=com.discord -build_id=ac26d5b8-d006-4720-b438-f5f4f47f3892 -version_code=1062 +build_id=baa076cb-843d-48bf-b0d8-c8a7444d36c1 +version_code=1063 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index 03b0bda7c5..e16db3bc65 100644 Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ diff --git a/com.discord/res/drawable-anydpi-v24/ic_settings_24dp.xml b/com.discord/res/drawable-anydpi-v24/ic_settings_24dp.xml index 5bd93f4fea..9546f33662 100644 --- a/com.discord/res/drawable-anydpi-v24/ic_settings_24dp.xml +++ b/com.discord/res/drawable-anydpi-v24/ic_settings_24dp.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/ic_sidebar_notifications_on_dark_24dp.xml b/com.discord/res/drawable-anydpi-v24/ic_sidebar_notifications_on_dark_24dp.xml deleted file mode 100644 index 50e96916c9..0000000000 --- a/com.discord/res/drawable-anydpi-v24/ic_sidebar_notifications_on_dark_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/ic_sidebar_notifications_on_light_24dp.xml b/com.discord/res/drawable-anydpi-v24/ic_sidebar_notifications_on_light_24dp.xml deleted file mode 100644 index d2e7d92496..0000000000 --- a/com.discord/res/drawable-anydpi-v24/ic_sidebar_notifications_on_light_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/ic_sidebar_pins_on_dark_24dp.xml b/com.discord/res/drawable-anydpi-v24/ic_sidebar_pins_on_dark_24dp.xml deleted file mode 100644 index 8890f9bae2..0000000000 --- a/com.discord/res/drawable-anydpi-v24/ic_sidebar_pins_on_dark_24dp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/ic_sidebar_pins_on_light_24dp.xml b/com.discord/res/drawable-anydpi-v24/ic_sidebar_pins_on_light_24dp.xml deleted file mode 100644 index b7da1cbebb..0000000000 --- a/com.discord/res/drawable-anydpi-v24/ic_sidebar_pins_on_light_24dp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/ic_template_32dp.xml b/com.discord/res/drawable-anydpi-v24/ic_template_32dp.xml new file mode 100644 index 0000000000..2fd78c6985 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/ic_template_32dp.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-hdpi/ic_settings_24dp.png b/com.discord/res/drawable-hdpi/ic_settings_24dp.png index 90de14c59e..52b649249e 100644 Binary files a/com.discord/res/drawable-hdpi/ic_settings_24dp.png and b/com.discord/res/drawable-hdpi/ic_settings_24dp.png differ diff --git a/com.discord/res/drawable-hdpi/ic_sidebar_notifications_on_dark_24dp.png b/com.discord/res/drawable-hdpi/ic_sidebar_notifications_on_dark_24dp.png deleted file mode 100644 index e37d44e725..0000000000 Binary files a/com.discord/res/drawable-hdpi/ic_sidebar_notifications_on_dark_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-hdpi/ic_sidebar_notifications_on_light_24dp.png b/com.discord/res/drawable-hdpi/ic_sidebar_notifications_on_light_24dp.png deleted file mode 100644 index 3f6308c77c..0000000000 Binary files a/com.discord/res/drawable-hdpi/ic_sidebar_notifications_on_light_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-hdpi/ic_sidebar_pins_on_dark_24dp.png b/com.discord/res/drawable-hdpi/ic_sidebar_pins_on_dark_24dp.png deleted file mode 100644 index 57fb30a4ec..0000000000 Binary files a/com.discord/res/drawable-hdpi/ic_sidebar_pins_on_dark_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-hdpi/ic_sidebar_pins_on_light_24dp.png b/com.discord/res/drawable-hdpi/ic_sidebar_pins_on_light_24dp.png deleted file mode 100644 index 26ed8a2a98..0000000000 Binary files a/com.discord/res/drawable-hdpi/ic_sidebar_pins_on_light_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-hdpi/ic_template_32dp.png b/com.discord/res/drawable-hdpi/ic_template_32dp.png new file mode 100644 index 0000000000..cdbd50fe48 Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_template_32dp.png differ diff --git a/com.discord/res/drawable-ldpi/ic_settings_24dp.png b/com.discord/res/drawable-ldpi/ic_settings_24dp.png index 502721f557..e63de75fb8 100644 Binary files a/com.discord/res/drawable-ldpi/ic_settings_24dp.png and b/com.discord/res/drawable-ldpi/ic_settings_24dp.png differ diff --git a/com.discord/res/drawable-ldpi/ic_sidebar_notifications_on_dark_24dp.png b/com.discord/res/drawable-ldpi/ic_sidebar_notifications_on_dark_24dp.png deleted file mode 100644 index 53f2517e85..0000000000 Binary files a/com.discord/res/drawable-ldpi/ic_sidebar_notifications_on_dark_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-ldpi/ic_sidebar_notifications_on_light_24dp.png b/com.discord/res/drawable-ldpi/ic_sidebar_notifications_on_light_24dp.png deleted file mode 100644 index c5c0a5cd24..0000000000 Binary files a/com.discord/res/drawable-ldpi/ic_sidebar_notifications_on_light_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-ldpi/ic_sidebar_pins_on_dark_24dp.png b/com.discord/res/drawable-ldpi/ic_sidebar_pins_on_dark_24dp.png deleted file mode 100644 index 2d25174a3e..0000000000 Binary files a/com.discord/res/drawable-ldpi/ic_sidebar_pins_on_dark_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-ldpi/ic_sidebar_pins_on_light_24dp.png b/com.discord/res/drawable-ldpi/ic_sidebar_pins_on_light_24dp.png deleted file mode 100644 index 9efe273b08..0000000000 Binary files a/com.discord/res/drawable-ldpi/ic_sidebar_pins_on_light_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-ldpi/ic_template_32dp.png b/com.discord/res/drawable-ldpi/ic_template_32dp.png new file mode 100644 index 0000000000..b71aba2343 Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_template_32dp.png differ diff --git a/com.discord/res/drawable-mdpi/ic_settings_24dp.png b/com.discord/res/drawable-mdpi/ic_settings_24dp.png index fdacabda75..c3d6d0a7dc 100644 Binary files a/com.discord/res/drawable-mdpi/ic_settings_24dp.png and b/com.discord/res/drawable-mdpi/ic_settings_24dp.png differ diff --git a/com.discord/res/drawable-mdpi/ic_sidebar_notifications_on_dark_24dp.png b/com.discord/res/drawable-mdpi/ic_sidebar_notifications_on_dark_24dp.png deleted file mode 100644 index 73072ecaf6..0000000000 Binary files a/com.discord/res/drawable-mdpi/ic_sidebar_notifications_on_dark_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-mdpi/ic_sidebar_notifications_on_light_24dp.png b/com.discord/res/drawable-mdpi/ic_sidebar_notifications_on_light_24dp.png deleted file mode 100644 index 7ce8171fbc..0000000000 Binary files a/com.discord/res/drawable-mdpi/ic_sidebar_notifications_on_light_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-mdpi/ic_sidebar_pins_on_dark_24dp.png b/com.discord/res/drawable-mdpi/ic_sidebar_pins_on_dark_24dp.png deleted file mode 100644 index b070d157ae..0000000000 Binary files a/com.discord/res/drawable-mdpi/ic_sidebar_pins_on_dark_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-mdpi/ic_sidebar_pins_on_light_24dp.png b/com.discord/res/drawable-mdpi/ic_sidebar_pins_on_light_24dp.png deleted file mode 100644 index cee0b7ef4e..0000000000 Binary files a/com.discord/res/drawable-mdpi/ic_sidebar_pins_on_light_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-mdpi/ic_template_32dp.png b/com.discord/res/drawable-mdpi/ic_template_32dp.png new file mode 100644 index 0000000000..bdd254b27b Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_template_32dp.png differ diff --git a/com.discord/res/drawable-xhdpi/ic_settings_24dp.png b/com.discord/res/drawable-xhdpi/ic_settings_24dp.png index 2f78269c7c..3b790b4e8d 100644 Binary files a/com.discord/res/drawable-xhdpi/ic_settings_24dp.png and b/com.discord/res/drawable-xhdpi/ic_settings_24dp.png differ diff --git a/com.discord/res/drawable-xhdpi/ic_sidebar_notifications_on_dark_24dp.png b/com.discord/res/drawable-xhdpi/ic_sidebar_notifications_on_dark_24dp.png deleted file mode 100644 index 8e9fc40d74..0000000000 Binary files a/com.discord/res/drawable-xhdpi/ic_sidebar_notifications_on_dark_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/ic_sidebar_notifications_on_light_24dp.png b/com.discord/res/drawable-xhdpi/ic_sidebar_notifications_on_light_24dp.png deleted file mode 100644 index c10eb10e87..0000000000 Binary files a/com.discord/res/drawable-xhdpi/ic_sidebar_notifications_on_light_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/ic_sidebar_pins_on_dark_24dp.png b/com.discord/res/drawable-xhdpi/ic_sidebar_pins_on_dark_24dp.png deleted file mode 100644 index 915e654fe8..0000000000 Binary files a/com.discord/res/drawable-xhdpi/ic_sidebar_pins_on_dark_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/ic_sidebar_pins_on_light_24dp.png b/com.discord/res/drawable-xhdpi/ic_sidebar_pins_on_light_24dp.png deleted file mode 100644 index ad8895239b..0000000000 Binary files a/com.discord/res/drawable-xhdpi/ic_sidebar_pins_on_light_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/ic_template_32dp.png b/com.discord/res/drawable-xhdpi/ic_template_32dp.png new file mode 100644 index 0000000000..b17d8c03ba Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_template_32dp.png differ diff --git a/com.discord/res/drawable-xxhdpi/ic_settings_24dp.png b/com.discord/res/drawable-xxhdpi/ic_settings_24dp.png index 5adbcb4d42..f10200fd57 100644 Binary files a/com.discord/res/drawable-xxhdpi/ic_settings_24dp.png and b/com.discord/res/drawable-xxhdpi/ic_settings_24dp.png differ diff --git a/com.discord/res/drawable-xxhdpi/ic_sidebar_notifications_on_dark_24dp.png b/com.discord/res/drawable-xxhdpi/ic_sidebar_notifications_on_dark_24dp.png deleted file mode 100644 index 4c9cf71a65..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/ic_sidebar_notifications_on_dark_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/ic_sidebar_notifications_on_light_24dp.png b/com.discord/res/drawable-xxhdpi/ic_sidebar_notifications_on_light_24dp.png deleted file mode 100644 index b6d9f6f280..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/ic_sidebar_notifications_on_light_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/ic_sidebar_pins_on_dark_24dp.png b/com.discord/res/drawable-xxhdpi/ic_sidebar_pins_on_dark_24dp.png deleted file mode 100644 index 0678340c5f..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/ic_sidebar_pins_on_dark_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/ic_sidebar_pins_on_light_24dp.png b/com.discord/res/drawable-xxhdpi/ic_sidebar_pins_on_light_24dp.png deleted file mode 100644 index 1597144190..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/ic_sidebar_pins_on_light_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/ic_template_32dp.png b/com.discord/res/drawable-xxhdpi/ic_template_32dp.png new file mode 100644 index 0000000000..6b73a3fc5d Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_template_32dp.png differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_settings_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_settings_24dp.png index a6b259c7d1..a87bfcc741 100644 Binary files a/com.discord/res/drawable-xxxhdpi/ic_settings_24dp.png and b/com.discord/res/drawable-xxxhdpi/ic_settings_24dp.png differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_sidebar_notifications_on_dark_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_sidebar_notifications_on_dark_24dp.png deleted file mode 100644 index 70dd3d9cbb..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/ic_sidebar_notifications_on_dark_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_sidebar_notifications_on_light_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_sidebar_notifications_on_light_24dp.png deleted file mode 100644 index 895766a4bc..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/ic_sidebar_notifications_on_light_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_sidebar_pins_on_dark_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_sidebar_pins_on_dark_24dp.png deleted file mode 100644 index 2198873904..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/ic_sidebar_pins_on_dark_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_sidebar_pins_on_light_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_sidebar_pins_on_light_24dp.png deleted file mode 100644 index 4ade7c3d8c..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/ic_sidebar_pins_on_light_24dp.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_template_32dp.png b/com.discord/res/drawable-xxxhdpi/ic_template_32dp.png new file mode 100644 index 0000000000..cd86eae2ad Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_template_32dp.png differ diff --git a/com.discord/res/drawable/drawable_notifications_badge_border_color_tabs_background.xml b/com.discord/res/drawable/drawable_notifications_badge_border_color_tabs_background.xml deleted file mode 100644 index 6aee5d9228..0000000000 --- a/com.discord/res/drawable/drawable_notifications_badge_border_color_tabs_background.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_sidebar_notifications_off_dark_24dp.xml b/com.discord/res/drawable/ic_sidebar_notifications_off_dark_24dp.xml deleted file mode 100644 index 944a797eef..0000000000 --- a/com.discord/res/drawable/ic_sidebar_notifications_off_dark_24dp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_sidebar_notifications_off_light_24dp.xml b/com.discord/res/drawable/ic_sidebar_notifications_off_light_24dp.xml deleted file mode 100644 index 39965d0eed..0000000000 --- a/com.discord/res/drawable/ic_sidebar_notifications_off_light_24dp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_sidebar_pins_off_dark_24dp.xml b/com.discord/res/drawable/ic_sidebar_pins_off_dark_24dp.xml deleted file mode 100644 index b01e68b805..0000000000 --- a/com.discord/res/drawable/ic_sidebar_pins_off_dark_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_sidebar_pins_off_light_24dp.xml b/com.discord/res/drawable/ic_sidebar_pins_off_light_24dp.xml deleted file mode 100644 index be4f4e64fb..0000000000 --- a/com.discord/res/drawable/ic_sidebar_pins_off_light_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_sidebar_search_24dp.xml b/com.discord/res/drawable/ic_sidebar_search_24dp.xml deleted file mode 100644 index 69ea8923ed..0000000000 --- a/com.discord/res/drawable/ic_sidebar_search_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/layout-v22/widget_guild_clone.xml b/com.discord/res/layout-v22/widget_guild_clone.xml index 1734b0786a..5089640de4 100644 --- a/com.discord/res/layout-v22/widget_guild_clone.xml +++ b/com.discord/res/layout-v22/widget_guild_clone.xml @@ -2,7 +2,7 @@ - + @@ -15,8 +15,8 @@ - - + + @@ -26,7 +26,7 @@ - + diff --git a/com.discord/res/layout/guild_channel_side_bar_actions_view.xml b/com.discord/res/layout/guild_channel_side_bar_actions_view.xml deleted file mode 100644 index 99e05530d4..0000000000 --- a/com.discord/res/layout/guild_channel_side_bar_actions_view.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/com.discord/res/layout/tabs_host_bottom_navigation_view.xml b/com.discord/res/layout/tabs_host_bottom_navigation_view.xml index 0966115d88..f85f0f4da5 100644 --- a/com.discord/res/layout/tabs_host_bottom_navigation_view.xml +++ b/com.discord/res/layout/tabs_host_bottom_navigation_view.xml @@ -1,24 +1,21 @@ - - - - - - - - - - - + + + + + + + - + - + - + - \ No newline at end of file + \ No newline at end of file diff --git a/com.discord/res/layout/view_nitro_boost_perks.xml b/com.discord/res/layout/view_nitro_boost_perks.xml index b386ab1b70..1c865d85f3 100644 --- a/com.discord/res/layout/view_nitro_boost_perks.xml +++ b/com.discord/res/layout/view_nitro_boost_perks.xml @@ -3,13 +3,11 @@ 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_auth_invite_info.xml b/com.discord/res/layout/widget_auth_invite_info.xml index 4e732a7289..60bf476326 100644 --- a/com.discord/res/layout/widget_auth_invite_info.xml +++ b/com.discord/res/layout/widget_auth_invite_info.xml @@ -1,9 +1,10 @@ - + - + + diff --git a/com.discord/res/layout/widget_channel_sidebar_actions.xml b/com.discord/res/layout/widget_channel_sidebar_actions.xml deleted file mode 100644 index c467812bc5..0000000000 --- a/com.discord/res/layout/widget_channel_sidebar_actions.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/layout/widget_channel_topic.xml b/com.discord/res/layout/widget_channel_topic.xml index 9327def058..28df1fa559 100644 --- a/com.discord/res/layout/widget_channel_topic.xml +++ b/com.discord/res/layout/widget_channel_topic.xml @@ -1,8 +1,8 @@ - - - + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_friends_list_adapter_item_loading.xml b/com.discord/res/layout/widget_friends_list_adapter_item_loading.xml deleted file mode 100644 index f5de4d2da8..0000000000 --- a/com.discord/res/layout/widget_friends_list_adapter_item_loading.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/layout/widget_friends_list_v2.xml b/com.discord/res/layout/widget_friends_list_v2.xml index a9f247d690..0855537f9a 100644 --- a/com.discord/res/layout/widget_friends_list_v2.xml +++ b/com.discord/res/layout/widget_friends_list_v2.xml @@ -3,5 +3,4 @@ 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_guild_clone.xml b/com.discord/res/layout/widget_guild_clone.xml index 208d2dc29c..d80a14db2b 100644 --- a/com.discord/res/layout/widget_guild_clone.xml +++ b/com.discord/res/layout/widget_guild_clone.xml @@ -2,7 +2,7 @@ - + @@ -15,8 +15,8 @@ - - + + @@ -26,7 +26,7 @@ - + diff --git a/com.discord/res/layout/widget_guild_profile_sheet_v2.xml b/com.discord/res/layout/widget_guild_profile_sheet_v2.xml index a1dca37859..f333d159a4 100644 --- a/com.discord/res/layout/widget_guild_profile_sheet_v2.xml +++ b/com.discord/res/layout/widget_guild_profile_sheet_v2.xml @@ -8,7 +8,7 @@ - + @@ -31,31 +31,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/layout/widget_main_panel_center.xml b/com.discord/res/layout/widget_main_panel_center.xml index 53d66440d7..610ebc2f3d 100644 --- a/com.discord/res/layout/widget_main_panel_center.xml +++ b/com.discord/res/layout/widget_main_panel_center.xml @@ -1,5 +1,5 @@ - \ No newline at end of file diff --git a/com.discord/res/layout/widget_main_panel_right.xml b/com.discord/res/layout/widget_main_panel_right.xml index 1d5cd70ded..360509b66b 100644 --- a/com.discord/res/layout/widget_main_panel_right.xml +++ b/com.discord/res/layout/widget_main_panel_right.xml @@ -2,6 +2,5 @@ - - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_settings.xml b/com.discord/res/layout/widget_settings.xml index f52b9ebace..45858a526e 100644 --- a/com.discord/res/layout/widget_settings.xml +++ b/com.discord/res/layout/widget_settings.xml @@ -4,16 +4,16 @@ - + - - + + - + diff --git a/com.discord/res/layout/widget_settings_behavior.xml b/com.discord/res/layout/widget_settings_behavior.xml index 9658ac195f..5f625ae51a 100644 --- a/com.discord/res/layout/widget_settings_behavior.xml +++ b/com.discord/res/layout/widget_settings_behavior.xml @@ -6,9 +6,9 @@ - - - + + + diff --git a/com.discord/res/layout/widget_tabs_host.xml b/com.discord/res/layout/widget_tabs_host.xml index 19294b0939..7d9e27068c 100644 --- a/com.discord/res/layout/widget_tabs_host.xml +++ b/com.discord/res/layout/widget_tabs_host.xml @@ -1,13 +1,12 @@ - - - - - - + + + + - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_url_actions.xml b/com.discord/res/layout/widget_url_actions.xml index bc88b785e4..f7e9591d3a 100644 --- a/com.discord/res/layout/widget_url_actions.xml +++ b/com.discord/res/layout/widget_url_actions.xml @@ -1,9 +1,9 @@ - + - + \ No newline at end of file diff --git a/com.discord/res/menu/menu_friends.xml b/com.discord/res/menu/menu_friends.xml deleted file mode 100644 index 158b6f5a7e..0000000000 --- a/com.discord/res/menu/menu_friends.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/values-da/strings.xml b/com.discord/res/values-da/strings.xml index b4f4f9f6ba..cc79d79933 100644 --- a/com.discord/res/values-da/strings.xml +++ b/com.discord/res/values-da/strings.xml @@ -4400,8 +4400,6 @@ Er du sikker på, at du vil gøre dette?" Fanebjælke Gyldenbrun Tryk for at tilføje et kælenavn - Forstået - I lyset af COVID-19 og det øgede brug, så er Go Lives begrænsning midlertidigt øget fra 10 til 50 mennesker de næste par måneder. "Midlertidige medlemmer bliver automatisk smidt ud, når de frakobler sig, medmindre en rolle er blevet tildelt" [Servicevilkår](%1$s) diff --git a/com.discord/res/values-de/strings.xml b/com.discord/res/values-de/strings.xml index d0a3e71e19..a47b0f5645 100644 --- a/com.discord/res/values-de/strings.xml +++ b/com.discord/res/values-de/strings.xml @@ -4424,8 +4424,6 @@ Bist du sicher, dass du das tun möchtest?" Hellbraun Tippe, um einen Nickname hinzuzufügen Türkis - Alles klar - Angesichts der aktuellen Lage mit COVID-19 und der damit verbundenen erhöhten Inanspruchnahme unseres Go Live-Features, wird das Limit der Teilnehmer für die nächsten Monate von 10 auf 50 Leute erhöht. "Wenn keine Rolle zugewiesen ist, werden vorübergehende Mitglieder bei Trennung der Verbindung automatisch gekickt." [Nutzungsbedingungen](%1$s) diff --git a/com.discord/res/values-es-rES/strings.xml b/com.discord/res/values-es-rES/strings.xml index 8ac14cfe2d..b4f4837280 100644 --- a/com.discord/res/values-es-rES/strings.xml +++ b/com.discord/res/values-es-rES/strings.xml @@ -4418,8 +4418,6 @@ Información del servidor es una característica experimental que está sujeta a Bronceado Toca para añadir un apodo Verde azulado - Entendido - A la luz de COVID-19 y el aumento de uso, el límite de En Directo se sube temporalmente de 10 a 50 personas para los próximos meses. "Cuando los miembros temporales se desconectan, se les expulsa automáticamente a menos que tengan un rol asignado" [Condiciones del Servicio](%1$s) diff --git a/com.discord/res/values-fr/strings.xml b/com.discord/res/values-fr/strings.xml index de748a375d..b98ae026f1 100644 --- a/com.discord/res/values-fr/strings.xml +++ b/com.discord/res/values-fr/strings.xml @@ -4450,8 +4450,6 @@ Tu es sûr(e) de vouloir faire ça ?" Brun clair Appuie pour ajouter un pseudo Turquoise - Compris - À la lumière du virus COVID-19 et de son utilisation croissante, la limite de Go Live sera temporairement augmentée de 10 à 50 utilisateurs pour les prochains mois. "Les membres provisoires sont automatiquement expulsés quand ils se déconnectent, à moins qu'un rôle ne leur ait été assigné" "[Conditions d'Utilisation](%1$s)" diff --git a/com.discord/res/values-it/strings.xml b/com.discord/res/values-it/strings.xml index 2504ee03dc..81af3df61e 100644 --- a/com.discord/res/values-it/strings.xml +++ b/com.discord/res/values-it/strings.xml @@ -4446,8 +4446,6 @@ Procedere?" Beige Tocca per aggiungere un nickname Foglia di tè - Capito - "Alla luce del COVID-19 e l'aumento dell'utilizzo, il limite di Go Live è temporaneamente passato da 10 a 50 utenti per i prossimi mesi." "I membri temporanei saranno espulsi automaticamente quando si disconnetteranno a meno che non sia stato assegnato loro un ruolo" [Termini di Servizio](%1$s) diff --git a/com.discord/res/values-ja/strings.xml b/com.discord/res/values-ja/strings.xml index 81594c0131..b7c21168b0 100644 --- a/com.discord/res/values-ja/strings.xml +++ b/com.discord/res/values-ja/strings.xml @@ -4500,8 +4500,6 @@ Discordについて詳しい情報が必要ですか？" タン タップしてニックネームを追加 ティール - 了解 - COVID-19(コロナウィルス)の影響とそれに伴う利用の増加を考慮し、今後数か月間は一時的にGo Liveの上限を10人から50人に引き上げます。 "一時的なメンバーはロールが割り当てられない限り、 切断時に自動的にキックされます" [利用規約](%1$s) diff --git a/com.discord/res/values-ko/strings.xml b/com.discord/res/values-ko/strings.xml index 0255dc9ef2..c73bcf645e 100644 --- a/com.discord/res/values-ko/strings.xml +++ b/com.discord/res/values-ko/strings.xml @@ -4491,8 +4491,6 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)" 탠 탭하여 별명 추가하기 청록색 - 알겠어요 - COVID-19 및 사용 증가를 고려해, Go Live의 동시 시청자 수를 향후 몇 달 동안 일시적으로 최대 10명에서 50명으로 확대했습니다. "임시 멤버는 역할을 부여받지 못하면 접속 종료 시 추방돼요." [서비스 이용 약관](%1$s) diff --git a/com.discord/res/values-nl/strings.xml b/com.discord/res/values-nl/strings.xml index 346821d966..c2b67ec6fe 100644 --- a/com.discord/res/values-nl/strings.xml +++ b/com.discord/res/values-nl/strings.xml @@ -4412,8 +4412,6 @@ Weet je zeker dat je dit wilt doen?" Geelbruin Tik om een bijnaam toe te voegen Groenblauw - Begrepen - Vanwege COVID-19 en een toename in gebruik, wordt de GoLive-limiet tijdelijk verhoogd van 10 naar 50 mensen. Dit is voor de komende paar maanden. "Tijdelijke leden worden automatisch gekickt wanneer ze worden losgekoppeld tenzij een rol is toegewezen" [Servicevoorwaarden](%1$s) diff --git a/com.discord/res/values-pl/strings.xml b/com.discord/res/values-pl/strings.xml index 6b574265e0..6f11399d2f 100644 --- a/com.discord/res/values-pl/strings.xml +++ b/com.discord/res/values-pl/strings.xml @@ -4482,8 +4482,6 @@ Czy na pewno chcesz to zrobić?" Jasnobrązowy Dotknij, aby dodać pseudonim Morski - Zrozumiano - W świetle sytuacji z COVID-19 i zwiększonego użycia, limit użytkowników naszej funkcji Nadawaj na żywo! został tymczasowo podniesiony z 10 do 50 osób na następne kilka miesięcy. "Tymczasowi członkowie są automatycznie wyrzucani, gdy się rozłączą, chyba że przyznano im rolę" [Warunki korzystania z usługi](%1$s) diff --git a/com.discord/res/values-pt-rBR/strings.xml b/com.discord/res/values-pt-rBR/strings.xml index f3e50368b5..3942d22171 100644 --- a/com.discord/res/values-pt-rBR/strings.xml +++ b/com.discord/res/values-pt-rBR/strings.xml @@ -4466,8 +4466,6 @@ Deseja mesmo fazer isso?" Bege Toque para adicionar um apelido Ciano - Entendi - Devido ao COVID-19 e ao seu uso mais frequente, o limite do Go Live foi temporariamente elevado de 10 para 50 usuários pelos próximos meses. "Os membros temporários são expulsos automaticamente quando se desconectam, a menos que um cargo seja atribuído a eles" [Termos de serviço](%1$s) diff --git a/com.discord/res/values-ru/strings.xml b/com.discord/res/values-ru/strings.xml index 5d3fc178fe..12750db4ef 100644 --- a/com.discord/res/values-ru/strings.xml +++ b/com.discord/res/values-ru/strings.xml @@ -4516,8 +4516,6 @@ Песочно-коричневый Нажмите, чтобы добавить никнейм Бирюзовый - Ясно - В свете последних событий, связанных с вирусом COVID-19, на протяжении ближайших месяцев аудитория для использования функции Go Live увеличивается с 10 до 50 участников. "Если временным участникам не была назначена роль, то они автоматически выгоняются при отключении." [Условия использования](%1$s) diff --git a/com.discord/res/values-sv-rSE/strings.xml b/com.discord/res/values-sv-rSE/strings.xml index 13d73185ab..e540c0d9a7 100644 --- a/com.discord/res/values-sv-rSE/strings.xml +++ b/com.discord/res/values-sv-rSE/strings.xml @@ -4390,8 +4390,6 @@ Server Insights är en experimentell funktion som kan komma att ändras eller ta Mellanbrun Tryck för att lägga till ett smeknamn Blågrön - Jag förstår - Mot bakgrund av COVID-19 och sin ökad användning, höjs Go Lives gräns för närvarande från 10 till 50 personer under de kommande månaderna. "Tillfälliga medlemmar utan tilldelade roller sparkas automatiskt när de lämnar servern" [Användarvillkor](%1$s) diff --git a/com.discord/res/values-tr/strings.xml b/com.discord/res/values-tr/strings.xml index abc87459a8..4d9c5fd192 100644 --- a/com.discord/res/values-tr/strings.xml +++ b/com.discord/res/values-tr/strings.xml @@ -4444,8 +4444,6 @@ Bunu yapmak istediğine emin misin?" Bronz Bir kullanıcı adı eklemek için dokunun Deniz mavisi - Anladım - "COVID-19 ve artan kullanım sebebiyle, Go Live'ın kullanıcı limiti sonraki bir kaç ay için geçici olarak 10'dan 50'ye yükseltilmiştir." "Geçici üyelere bir rol atanmadığı takdirde, bağlantıları kesildiğinde otomatik olarak atılırlar" [Hizmet Koşulları](%1$s) diff --git a/com.discord/res/values-v23/styles.xml b/com.discord/res/values-v23/styles.xml index 7717063305..c2119f2612 100644 --- a/com.discord/res/values-v23/styles.xml +++ b/com.discord/res/values-v23/styles.xml @@ -28,9 +28,6 @@ @color/primary_200_alpha_60 @color/primary_200_alpha_30 @color/white - @color/primary_light_130 - @color/primary_light_300 - @color/primary_light_900 @style/AppTheme.Light.Notice @color/primary_100 @style/AppTheme.Light.Notice.PositiveRed diff --git a/com.discord/res/values-zh-rTW/strings.xml b/com.discord/res/values-zh-rTW/strings.xml index 3383d4d61a..b196f8d5b3 100644 --- a/com.discord/res/values-zh-rTW/strings.xml +++ b/com.discord/res/values-zh-rTW/strings.xml @@ -4473,8 +4473,6 @@ Server Insights 是實驗性功能，未來有可能變更或移除。" 古銅色 點選可加入暱稱 青綠色 - 知道了 - 由於COVID-19的影響間接造成Discord使用人數增加，在接下來的幾個月中Go Live的限額將暫時從10人提升到50人。 "除非已被分配身分組，當臨時成員們斷線時 將被自動踢出" [服務條款](%1$s) diff --git a/com.discord/res/values/attrs.xml b/com.discord/res/values/attrs.xml index a42fe1ccc3..de5f91b08b 100644 --- a/com.discord/res/values/attrs.xml +++ b/com.discord/res/values/attrs.xml @@ -401,9 +401,6 @@ - - - @@ -462,7 +459,6 @@ - @@ -844,10 +840,6 @@ - - - - diff --git a/com.discord/res/values/dimens.xml b/com.discord/res/values/dimens.xml index 7cbe2f3b91..9d577cfd70 100644 --- a/com.discord/res/values/dimens.xml +++ b/com.discord/res/values/dimens.xml @@ -397,7 +397,7 @@ 15.0dip 36.0dip 208.0dip - 328.0dip + 275.0dip 40.0dip 28.0dip -1.0dip diff --git a/com.discord/res/values/ids.xml b/com.discord/res/values/ids.xml index ec1df334ee..c52a539f9a 100644 --- a/com.discord/res/values/ids.xml +++ b/com.discord/res/values/ids.xml @@ -152,6 +152,7 @@ + @@ -368,14 +369,9 @@ - - - - - @@ -789,7 +785,6 @@ - @@ -885,42 +880,27 @@ - - - - - - - - - - - - - - - @@ -1181,8 +1161,6 @@ - - @@ -1397,7 +1375,6 @@ - @@ -1868,8 +1845,6 @@ - - @@ -2053,10 +2028,8 @@ - - @@ -2315,13 +2288,10 @@ - - - @@ -2347,12 +2317,11 @@ - - + diff --git a/com.discord/res/values/plurals.xml b/com.discord/res/values/plurals.xml index ff07dab62e..c4089ece04 100644 --- a/com.discord/res/values/plurals.xml +++ b/com.discord/res/values/plurals.xml @@ -540,11 +540,6 @@ %s unused Boosts %s unused Boost - - %s people used this template - No one has used this template - 1 person used this template - %s days a day @@ -953,5 +948,5 @@ %s People %s Person - false + false diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml index f859566427..6f484735cd 100644 --- a/com.discord/res/values/public.xml +++ b/com.discord/res/values/public.xml @@ -375,1031 +375,1023 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2734,648 +2726,642 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3395,212 +3381,209 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3654,18 +3637,18 @@ - - - - - - - - + + + + + + + + - - + + @@ -3676,70 +3659,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3749,56 +3732,56 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3811,21 +3794,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -4024,2342 +4007,2311 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6464,556 +6416,553 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7028,24 +6977,23 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -7189,109 +7137,108 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10492,5297 +10439,5252 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16047,807 +15949,801 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index f8ace12f70..11ea68958c 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -163,21 +163,13 @@ Members with this permission can add new reactions to a message. Members can still react using reactions already added to messages without this permission. Add: Role + "Add '%1$s' as a friend" Add to Dictionary Administrative Administrator Members with this permission have every permission and also bypass channel specific permissions. This is a dangerous permission to grant. Advanced Settings AFK Settings - Example: %1$s - Date of birth - Enter your birthday! - Please enter a valid date of birth - Back to Login - You need to be 13 or older in order to use Discord. [View our terms of service](%1$s) to learn more. - Unable to register - View Help Article - Your birthday AKA All Servers Allow Direct Messages @@ -1016,7 +1008,7 @@ Fixes and Updates {fixed} OR Collapse Collapse Category - ac26d5b8-d006-4720-b438-f5f4f47f3892 + baa076cb-843d-48bf-b0d8-c8a7444d36c1 Coming Soon Search Animated GIFs on the Web Displays text with emphasis. @@ -1172,6 +1164,7 @@ Fixes and Updates {fixed} Create Channel Create DM Create Group DM + Create your own server "**Create** a new server and invite your friends. It's free!" Create Invite Create Link @@ -1436,7 +1429,6 @@ Fixes and Updates {fixed} English, US Enable Enable in-game overlay. - Enable notifications You can enable access in privacy settings. To ensure user safety, Public servers are required to have these moderation settings enabled. Almost there. @@ -1537,7 +1529,7 @@ Fixes and Updates {fixed} Force Sync Forgot your password? "Don't worry! Please enter the email associated with your account so we can verify it's you." - Diagnostic Audio Recording + Audio Debug Recording Debug Logging Enable Quality of Service High Packet Priority If you are experiencing microphone or headphone issues, you may try using this audio mode. Otherwise, leave it on the default. @@ -1548,9 +1540,9 @@ Fixes and Updates {fixed} Discord avoids sending push notifications to your mobile device when you are at your computer. Use this setting to control how long you need to be AFK for before you receive push notifications. Turn this on to have a high tech robot speak your notifications to you. "Oops! You've caught an ultra rare error. This is probably our fault, so please try again or check [our status page](%1$s)." - Diagnostic audio recording is used for analyzing audio problems. Currently, one file is saved to voice module folder. Automatically move members to this channel and mute them when they have been idle for longer than the AFK timeout. This does not affect browsers. Lower the volume of other applications by this percent when someone is speaking. Set to 0%% to completely disable attenuation. + Record your voice while participating in a server voice channel or DM call. Recordings are saved to voice module folder. If the indicator is solid green then Discord is transmitting your beautiful voice. ALL THE BITS! Going above %1$skbps may adversely affect people on poor connections. While using a Discord Certified microphone certain voice processing features are no longer handled by Discord itself, but rather the microphone. @@ -2149,8 +2141,8 @@ Fixes and Updates {fixed} View Server Server Boost Status People can only join this server if they are invited by a member. + This will allow users to find and join your server without an invite, like through your Announcement Channel server popout. Anyone is welcome! Get features that allow users to find and join this server without an invite. - Anyone is welcome! Get [features](onClick) that allow users to find and join this server without an invite. "When enabled, this requires members with moderation powers to have two-factor authentication enabled on their account in order to take moderation actions (e.g. kick, ban, and delete message). This can help prevent malicious people who compromise a mod or admin's account from taking destructive actions. **This setting can only be changed by the server owner if they have 2FA enabled on their account**." [Enable on your account.](onClick) Disable 2FA Requirement @@ -2512,12 +2504,12 @@ Boosts are **%3$s** $[(%4$s)](originalPriceHook)." Nice! "Boost success! -You just Boosted %1$s **%2$s**." +You've successfully Boosted %1$s **%2$s**." "Boost success! -You just Boosted the server **%1$s**." +You've succesfully Boosted the server **%1$s**." Boost success! - You just Boosted %1$s **%2$s**. + "You've successfully Boosted %1$s **%2$s**." "Sorry, we don't currently support buying Boosts with a [subscription through Apple](%1$s)." Server Boost(s) You get a discount as part of your **%1$s** subscription! @@ -2530,12 +2522,12 @@ You just Boosted the server **%1$s**." Subtotal "Boost transfer success! -You just Boosted %1$s." +You've Boosted %1$s." "Boost transfer success! -You just Boosted the server." +You've Boosted the server." Boost transfer success! - You just Boosted %1$s **%2$s**. + "You've Boosted %1$s **%2$s**." "Looks like you have %1$s. We'll add 'em to this server for you." Working… Create Server @@ -2545,14 +2537,12 @@ You just Boosted the server." "This template link is invalid or has expired. Want to know more about Discord?" Use channels to organize your chatroom by specific topics. - Template Channels You can always edit the channels after creating the server. Whoops… Use roles to organize your members and to grant permissions like access to private channels. Roles and Permissions - Template Roles and Permissions Create a server based on: - Create a Server from a Template + You received a server template based on: announcements Text Channels Voice Channels @@ -2573,7 +2563,7 @@ Want to know more about Discord?" strategy-discussion welcome welcome-and-rules - View Template + Open Template Channels are places in your server where people can talk about different things. You can always edit the channels after creating the server. Server Channels @@ -2590,29 +2580,15 @@ Want to know more about Discord?" "Don't see what you're looking for? [Let us know if you have any suggestions.](%1$s)" Create Your Server Kick-start a friend’s new server by sharing a template based on your own server setup. - %1$s Server templates Generate Link %1$s Template - Are you sure you want to delete the template link and prevent anyone from using it? + Delete the template link and prevent anyone from using it again. Delete Template - Delete Template Link - Channels and channel topics - Members or bots - Messages or any content - Your server icon, Boosts, or other perks - Roles and permissions - Default server settings - Templates will copy: - Templates will not copy: - Your server icon Template Link - Template Title - Lasy sync: %1$s - Preview Template - Update the channels, roles, and permissions in your template by syncing. + Name + Update the channels, roles, and permissions in your template by re-syncing with your server. Sync Template - Template Sync But no worries! Check back later to see if things smooth out. Unavailable Looks like we’re having trouble connecting… @@ -2786,7 +2762,6 @@ Want to know more about Discord?" Incoming Call Incoming Call… Incoming Friend Request - %1$s incoming friend requests Incoming Video Call Incoming Video Call… Or, visit this page from a [supported browser](%1$s). @@ -2927,12 +2902,6 @@ Want to know more about Discord?" An adventure begins. "Let's add some party members!" Invite People - **Get latest announcements** for Pokemon GO raids in Los Angeles! - **Get latest announcements** - **Make new friends** who are also passionate about Pokemon GO in your area! - **Make new friends** - **Share tips and strategy** so you can train the strongest Pokemon! - **Share tips and strategy** Heads up! Friends you invite can see your previous message history. Search for friends Invite Sent @@ -2948,16 +2917,12 @@ Want to know more about Discord?" Invite URL Join Voice There’s always room for more. Share this link and get them in here: - Welcome to your new server! - "Let's start by inviting your friends" Invite friends to %1$s Your Friends Invites "All-in-one voice and text chat for gamers that's free, secure, and works on all your devices." Automatic (follows iOS settings) Automatic - Call Disconnected - Your call has ended! Camera Something went wrong while processing your payment, please try again! Apple Error @@ -2994,9 +2959,13 @@ Want to know more about Discord?" "It seems you've joined the AFK channel. You cannot speak in this channel." Join Call Join + Changed your mind? [Create a server instead](onCreate) [Connect Twitch or YouTube accounts](onClick) Looking for more servers to join? **Join** a server with an invite code or link. + Have an invite? [Join a server instead](onJoin) + Have an invite? + Enter an invite link "Enter an invite and join your friend's server." Join a server Join a Server with an Invite Link @@ -3144,6 +3113,7 @@ Want to know more about Discord?" Log in with QR Code Scan this with the **Discord mobile app** to log in instantly. Log Out + Looking for something else? Low quality image mode. When this is on, images sent will be lower quality on cellular networks. Lithuanian @@ -3282,6 +3252,7 @@ Want to know more about Discord?" Are you sure? Monthly More + Looking for something different? [Connect Twitch or YouTube accounts](onConnectClick) or browse our [public servers](onPublicServerClick). Move from %1$s to Move Members Members with this permission can drag other members out of this channel. They can only move members between channels both they and the member they are moving have access. @@ -3356,7 +3327,6 @@ Want to know more about Discord?" You are unauthorized to perform this request. An unknown network error has occurred. Network connectivity limited or unavailable. - Never ask again Never Mind New Direct Message New Group DM @@ -3483,8 +3453,6 @@ Want to know more about Discord?" Help! "Well, it looks like Discord is not detecting any input from your mic. Let's fix that!" Visit Settings - "Don't miss a thing! Know when your friends send a message" - Keep up with your conversations with desktop notifications Your access to Nitro has expired. Upgrade from Nitro Classic to Nitro for superpowered chat perks and Server Boosts. You only have %1$s left of Nitro! Your subscription downgrades to Nitro Classic on **%2$s**. Hey Nitro sub! We added an extra month to your grandfathered perks @@ -4213,8 +4181,6 @@ The changes to your subscription are reflected below:" This is the channel where Discord will send announcements specific to Public server admins or mods. This is also where system messages about your server will show up, like changes to your Discovery eligibility. Mod-only Channel Select a Mod-only Channel - This is intended for servers that are open or public in nature - Get features that can help grow your community! **$[Create Announcement channels](focusHook)** so users can follow and get your announcements in their own servers. If so, set your server to Public and get tailored features and tools that can help grow your community! Set my server to Public @@ -4304,7 +4270,6 @@ The changes to your subscription are reflected below:" Enter login information Create an account Add Members (%1$s/%2$s) - Remind me later Remove Remove All Reactions Are you sure you want to remove all reactions from this message? @@ -4919,19 +4884,10 @@ Server Insights is an experimental feature and is subject to change or removal i "To access **your camera, you'll need to grant us permission**." "To access **your impressive files, you'll need to grant us permission**." Tab bar - Friends tab - Home tab - Mentions tab - Search tab - Settings tab Tan Tap to add a nickname TAR Teal - Got it - "Go Live's limit is temporarily upped from 10 to 50 people for creative uses like virtual classrooms & working remote." - Stay safe! - In light of COVID-19: Temporary members are automatically kicked when they disconnect unless a role has been assigned [Terms of Service](%1$s) https://discordapp.com/terms @@ -5462,7 +5418,6 @@ You cannot take any moderation actions until you enable it." Add a server icon Give your server some personality with a server icon. Welcome to your server, %1$s! - **Customize your server** with an [awesome name and icon](onSetupClick) to make it unique. **Reach us** via [our help desk](%1$s) or on Twitter [@discordapp](%2$s) if you have any questions or need help. Welcome to the server, %1$s! **Learn about Discord** at your own pace by exploring the floating quest indicators. @@ -5517,5 +5472,5 @@ You cannot take any moderation actions until you enable it." "You're viewing older messages" Chinese, China Chinese, Taiwan - false + false diff --git a/com.discord/res/values/styles.xml b/com.discord/res/values/styles.xml index f214e20ead..e0fcb5c09d 100644 --- a/com.discord/res/values/styles.xml +++ b/com.discord/res/values/styles.xml @@ -322,10 +322,6 @@ @drawable/ic_gift_dark_a60_24dp @drawable/ic_share_white_a60_24dp @drawable/ic_share_white_24dp - @drawable/ic_sidebar_notifications_off_dark_24dp - @drawable/ic_sidebar_notifications_on_dark_24dp - @drawable/ic_sidebar_pins_off_dark_24dp - @drawable/ic_sidebar_pins_on_dark_24dp @drawable/ic_timer_dark @drawable/ic_sort_white_24dp @drawable/ic_speaker_white @@ -610,10 +606,6 @@ @drawable/ic_gift_light_a60_24dp @drawable/ic_share_grey_a60_24dp @drawable/ic_share_grey_24dp - @drawable/ic_sidebar_notifications_off_light_24dp - @drawable/ic_sidebar_notifications_on_light_24dp - @drawable/ic_sidebar_pins_off_light_24dp - @drawable/ic_sidebar_pins_on_light_24dp @drawable/ic_timer_light @drawable/ic_sort_grey_24dp @drawable/ic_speaker_grey @@ -778,9 +770,6 @@ @color/primary_500_alpha_60 @color/black_alpha_05 @color/primary_dark_800 - @color/primary_dark_800 - @color/transparent - @color/white @style/AppTheme.Dark.Notice @color/primary_700 @style/AppTheme.Dark.Notice.PositiveRed @@ -908,9 +897,6 @@ @color/primary_200_alpha_60 @color/primary_200_alpha_30 @color/white - @color/primary_light_130 - @color/primary_light_300 - @color/primary_light_900 @style/AppTheme.Light.Notice @color/primary_100 @style/AppTheme.Light.Notice.PositiveRed @@ -2537,18 +2523,6 @@ - - - - - -