diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index c91d0fe6de..d5d196fe04 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1063.apk +apkFileName: com.discord-1065.apk compressionType: false doNotCompress: - arsc @@ -190,5 +190,5 @@ usesFramework: tag: null version: 2.4.1-197d46-SNAPSHOT versionInfo: - versionCode: '1063' - versionName: '12.6' + versionCode: '1065' + versionName: 14-alpha3 diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index 4f082af617..bfa5b93221 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! # -#Sat Mar 14 00:12:52 UTC 2020 -version_name=12.6 +#Sat Mar 14 00:20:30 UTC 2020 +version_name=14-alpha3 package_name=com.discord -build_id=baa076cb-843d-48bf-b0d8-c8a7444d36c1 -version_code=1063 +build_id=584e5601-de95-4580-a912-35d66543b707 +version_code=1065 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index e16db3bc65..b1c3d8d08a 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 9546f33662..5bd93f4fea 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 new file mode 100644 index 0000000000..50e96916c9 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/ic_sidebar_notifications_on_dark_24dp.xml @@ -0,0 +1,5 @@ + + + + \ 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 new file mode 100644 index 0000000000..d2e7d92496 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/ic_sidebar_notifications_on_light_24dp.xml @@ -0,0 +1,5 @@ + + + + \ 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 new file mode 100644 index 0000000000..8890f9bae2 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/ic_sidebar_pins_on_dark_24dp.xml @@ -0,0 +1,6 @@ + + + + + \ 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 new file mode 100644 index 0000000000..b7da1cbebb --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/ic_sidebar_pins_on_light_24dp.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 52b649249e..90de14c59e 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 new file mode 100644 index 0000000000..e37d44e725 Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_sidebar_notifications_on_dark_24dp.png 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 new file mode 100644 index 0000000000..3f6308c77c Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_sidebar_notifications_on_light_24dp.png 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 new file mode 100644 index 0000000000..57fb30a4ec Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_sidebar_pins_on_dark_24dp.png 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 new file mode 100644 index 0000000000..26ed8a2a98 Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_sidebar_pins_on_light_24dp.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 e63de75fb8..502721f557 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 new file mode 100644 index 0000000000..53f2517e85 Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_sidebar_notifications_on_dark_24dp.png 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 new file mode 100644 index 0000000000..c5c0a5cd24 Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_sidebar_notifications_on_light_24dp.png 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 new file mode 100644 index 0000000000..2d25174a3e Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_sidebar_pins_on_dark_24dp.png 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 new file mode 100644 index 0000000000..9efe273b08 Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_sidebar_pins_on_light_24dp.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 c3d6d0a7dc..fdacabda75 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 new file mode 100644 index 0000000000..73072ecaf6 Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_sidebar_notifications_on_dark_24dp.png 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 new file mode 100644 index 0000000000..7ce8171fbc Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_sidebar_notifications_on_light_24dp.png 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 new file mode 100644 index 0000000000..b070d157ae Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_sidebar_pins_on_dark_24dp.png 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 new file mode 100644 index 0000000000..cee0b7ef4e Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_sidebar_pins_on_light_24dp.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 3b790b4e8d..2f78269c7c 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 new file mode 100644 index 0000000000..8e9fc40d74 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_sidebar_notifications_on_dark_24dp.png 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 new file mode 100644 index 0000000000..c10eb10e87 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_sidebar_notifications_on_light_24dp.png 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 new file mode 100644 index 0000000000..915e654fe8 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_sidebar_pins_on_dark_24dp.png 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 new file mode 100644 index 0000000000..ad8895239b Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_sidebar_pins_on_light_24dp.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 f10200fd57..5adbcb4d42 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 new file mode 100644 index 0000000000..4c9cf71a65 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_sidebar_notifications_on_dark_24dp.png 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 new file mode 100644 index 0000000000..b6d9f6f280 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_sidebar_notifications_on_light_24dp.png 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 new file mode 100644 index 0000000000..0678340c5f Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_sidebar_pins_on_dark_24dp.png 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 new file mode 100644 index 0000000000..1597144190 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_sidebar_pins_on_light_24dp.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 a87bfcc741..a6b259c7d1 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 new file mode 100644 index 0000000000..70dd3d9cbb Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_sidebar_notifications_on_dark_24dp.png 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 new file mode 100644 index 0000000000..895766a4bc Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_sidebar_notifications_on_light_24dp.png 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 new file mode 100644 index 0000000000..2198873904 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_sidebar_pins_on_dark_24dp.png 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 new file mode 100644 index 0000000000..4ade7c3d8c Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_sidebar_pins_on_light_24dp.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 new file mode 100644 index 0000000000..6aee5d9228 --- /dev/null +++ b/com.discord/res/drawable/drawable_notifications_badge_border_color_tabs_background.xml @@ -0,0 +1,7 @@ + + + + + + \ 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 new file mode 100644 index 0000000000..944a797eef --- /dev/null +++ b/com.discord/res/drawable/ic_sidebar_notifications_off_dark_24dp.xml @@ -0,0 +1,8 @@ + + + + + + + \ 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 new file mode 100644 index 0000000000..39965d0eed --- /dev/null +++ b/com.discord/res/drawable/ic_sidebar_notifications_off_light_24dp.xml @@ -0,0 +1,8 @@ + + + + + + + \ 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 new file mode 100644 index 0000000000..b01e68b805 --- /dev/null +++ b/com.discord/res/drawable/ic_sidebar_pins_off_dark_24dp.xml @@ -0,0 +1,5 @@ + + + + \ 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 new file mode 100644 index 0000000000..be4f4e64fb --- /dev/null +++ b/com.discord/res/drawable/ic_sidebar_pins_off_light_24dp.xml @@ -0,0 +1,5 @@ + + + + \ 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 new file mode 100644 index 0000000000..69ea8923ed --- /dev/null +++ b/com.discord/res/drawable/ic_sidebar_search_24dp.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file 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 new file mode 100644 index 0000000000..99e05530d4 --- /dev/null +++ b/com.discord/res/layout/guild_channel_side_bar_actions_view.xml @@ -0,0 +1,8 @@ + + + + + + + \ 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 f85f0f4da5..0966115d88 100644 --- a/com.discord/res/layout/tabs_host_bottom_navigation_view.xml +++ b/com.discord/res/layout/tabs_host_bottom_navigation_view.xml @@ -1,21 +1,24 @@ - - - - - - - - + + + + + + + + + + - + - + - + - \ 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 1c865d85f3..b386ab1b70 100644 --- a/com.discord/res/layout/view_nitro_boost_perks.xml +++ b/com.discord/res/layout/view_nitro_boost_perks.xml @@ -3,11 +3,13 @@ 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_channel_sidebar_actions.xml b/com.discord/res/layout/widget_channel_sidebar_actions.xml new file mode 100644 index 0000000000..c467812bc5 --- /dev/null +++ b/com.discord/res/layout/widget_channel_sidebar_actions.xml @@ -0,0 +1,6 @@ + + + + + \ 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 28df1fa559..83f5157777 100644 --- a/com.discord/res/layout/widget_channel_topic.xml +++ b/com.discord/res/layout/widget_channel_topic.xml @@ -1,8 +1,16 @@ - - - + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_guild_template.xml b/com.discord/res/layout/widget_chat_list_adapter_item_guild_template.xml index 73661bcf8d..f9bf315bd5 100644 --- a/com.discord/res/layout/widget_chat_list_adapter_item_guild_template.xml +++ b/com.discord/res/layout/widget_chat_list_adapter_item_guild_template.xml @@ -6,5 +6,5 @@ - + \ 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 new file mode 100644 index 0000000000..f5de4d2da8 --- /dev/null +++ b/com.discord/res/layout/widget_friends_list_adapter_item_loading.xml @@ -0,0 +1,6 @@ + + + + + \ 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 0855537f9a..a9f247d690 100644 --- a/com.discord/res/layout/widget_friends_list_v2.xml +++ b/com.discord/res/layout/widget_friends_list_v2.xml @@ -3,4 +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/widget_guild_profile_sheet_v2.xml b/com.discord/res/layout/widget_guild_profile_sheet_v2.xml index f333d159a4..a3d6c4c341 100644 --- a/com.discord/res/layout/widget_guild_profile_sheet_v2.xml +++ b/com.discord/res/layout/widget_guild_profile_sheet_v2.xml @@ -1,35 +1,79 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 610ebc2f3d..53d66440d7 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 360509b66b..1d5cd70ded 100644 --- a/com.discord/res/layout/widget_main_panel_right.xml +++ b/com.discord/res/layout/widget_main_panel_right.xml @@ -2,5 +2,6 @@ - + + \ 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 45858a526e..f52b9ebace 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 5f625ae51a..9658ac195f 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 7d9e27068c..19294b0939 100644 --- a/com.discord/res/layout/widget_tabs_host.xml +++ b/com.discord/res/layout/widget_tabs_host.xml @@ -1,12 +1,13 @@ - - - - - + + + + + - + \ 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 f7e9591d3a..bc88b785e4 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 new file mode 100644 index 0000000000..158b6f5a7e --- /dev/null +++ b/com.discord/res/menu/menu_friends.xml @@ -0,0 +1,6 @@ + + + + + \ 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 cc79d79933..cfb495973d 100644 --- a/com.discord/res/values-da/strings.xml +++ b/com.discord/res/values-da/strings.xml @@ -4400,6 +4400,10 @@ Er du sikker på, at du vil gøre dette?" Fanebjælke Gyldenbrun Tryk for at tilføje et kælenavn + Forstået + Go Lives begrænsning er imidlertidigt øget fra 10 til 50 mennesker for kreativ brug, som for eksempel virtuelle klasseværelser eller fjernarbejde. + Pas på jer selv! + I lyset af COVID-19: "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 a47b0f5645..e4f3c4d0f8 100644 --- a/com.discord/res/values-de/strings.xml +++ b/com.discord/res/values-de/strings.xml @@ -4424,6 +4424,10 @@ Bist du sicher, dass du das tun möchtest?" Hellbraun Tippe, um einen Nickname hinzuzufügen Türkis + Alles klar + Das Limit an Zuschauern für Go Live wird in den nächsten Monaten von 10 auf 50 erhöht. + Passt auf euch auf! + Aufgrund der aktuellen Lage rund um COVID-19: "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 b4f4837280..b355152cf9 100644 --- a/com.discord/res/values-es-rES/strings.xml +++ b/com.discord/res/values-es-rES/strings.xml @@ -4418,6 +4418,10 @@ Información del servidor es una característica experimental que está sujeta a Bronceado Toca para añadir un apodo Verde azulado + Entendido + El limite de En Directo se sube temporalmente de 10 a 50 personas para los usos creativos como clases virtuales y trabajo remoto. + ¡Cuidense! + A la luz de COVID-19: "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 b98ae026f1..eb71b8f74c 100644 --- a/com.discord/res/values-fr/strings.xml +++ b/com.discord/res/values-fr/strings.xml @@ -4450,6 +4450,10 @@ Tu es sûr(e) de vouloir faire ça ?" Brun clair Appuie pour ajouter un pseudo Turquoise + Compris + La limite de Go Live a désormais été augmentée temporairement de 10 à 50 personnes pour faciliter son utilisation de façon créative telle que les classes virtuelles et le travail à distance. + Prenez soin de vous ! + Compte tenu du COVID-19: "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 81af3df61e..503f77fb22 100644 --- a/com.discord/res/values-it/strings.xml +++ b/com.discord/res/values-it/strings.xml @@ -4446,6 +4446,10 @@ Procedere?" Beige Tocca per aggiungere un nickname Foglia di tè + Capito + il limite di Go Live è temporaneamente passato da 10 a 50 utenti per i prossimi mesi. + Abbiate cura di voi! + "Alla luce del COVID-19 e l'aumento dell'utilizzo:" "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 b7c21168b0..8235197ded 100644 --- a/com.discord/res/values-ja/strings.xml +++ b/com.discord/res/values-ja/strings.xml @@ -4500,6 +4500,10 @@ Discordについて詳しい情報が必要ですか？" タン タップしてニックネームを追加 ティール + 了解 + リモートで授業や業務を行っている方のために、Go Liveの上限を一時的に10人から５０人へ引き上げました。 + どうかご無事で！ + COVID-19（コロナウィルスについて）： "一時的なメンバーはロールが割り当てられない限り、 切断時に自動的にキックされます" [利用規約](%1$s) diff --git a/com.discord/res/values-ko/strings.xml b/com.discord/res/values-ko/strings.xml index c73bcf645e..6102b4afbb 100644 --- a/com.discord/res/values-ko/strings.xml +++ b/com.discord/res/values-ko/strings.xml @@ -4491,6 +4491,10 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)" 탠 탭하여 별명 추가하기 청록색 + 알겠어요 + 가상 강의 & 원격 작업 등과 같은 용도를 위해 Go Live의 최대 시청자 수를 일시적으로 10명에서 50명으로 확대했습니다. + 건강에 유의하시기 바랍니다! + COVID-19의 영향으로,: "임시 멤버는 역할을 부여받지 못하면 접속 종료 시 추방돼요." [서비스 이용 약관](%1$s) diff --git a/com.discord/res/values-nl/strings.xml b/com.discord/res/values-nl/strings.xml index c2b67ec6fe..503c83089a 100644 --- a/com.discord/res/values-nl/strings.xml +++ b/com.discord/res/values-nl/strings.xml @@ -4412,6 +4412,10 @@ Weet je zeker dat je dit wilt doen?" Geelbruin Tik om een bijnaam toe te voegen Groenblauw + Begrepen + De GoLive-limiet is tijdelijk verhoogd van 10 naar 50 mensen. Op die manier kan schermdelen gebruikt worden voor virtuele lessen en thuiswerken. + Pas goed op jezelf! + In verband met COVID-19: "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 6f11399d2f..f655932837 100644 --- a/com.discord/res/values-pl/strings.xml +++ b/com.discord/res/values-pl/strings.xml @@ -4482,6 +4482,10 @@ Czy na pewno chcesz to zrobić?" Jasnobrązowy Dotknij, aby dodać pseudonim Morski + Zrozumiano + Limit użytkowników naszej funkcji Nadawaj na żywo! został tymczasowo podniesiony z 10 do 50 osób dla kreatywnych zastosowań takich jak prowadzenie zajęć online lub pracy zdalnej. + Uważaj na siebie! + W świetle sytuacji z COVID-19: "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 3942d22171..8275e10e2d 100644 --- a/com.discord/res/values-pt-rBR/strings.xml +++ b/com.discord/res/values-pt-rBR/strings.xml @@ -4466,6 +4466,10 @@ Deseja mesmo fazer isso?" Bege Toque para adicionar um apelido Ciano + Entendi + O limite do Go Live foi temporariamente aumentado de 10 para 50 pessoas, para usos criativos como salas de aula virtuais e trabalho remoto. + Se cuide! + Devido ao COVID-19: "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 12750db4ef..e73e70fb86 100644 --- a/com.discord/res/values-ru/strings.xml +++ b/com.discord/res/values-ru/strings.xml @@ -4516,6 +4516,10 @@ Песочно-коричневый Нажмите, чтобы добавить никнейм Бирюзовый + Ясно + Мы временно увеличиваем лимит пользователей в Go Live c 10 до 50 человек, для тех, кто пользуется виртуальными классами и работает удаленно. + Будьте здоровы! + Из-за вируса COVID-19: "Если временным участникам не была назначена роль, то они автоматически выгоняются при отключении." [Условия использования](%1$s) diff --git a/com.discord/res/values-sv-rSE/strings.xml b/com.discord/res/values-sv-rSE/strings.xml index e540c0d9a7..cd78d8e6e3 100644 --- a/com.discord/res/values-sv-rSE/strings.xml +++ b/com.discord/res/values-sv-rSE/strings.xml @@ -4390,6 +4390,10 @@ 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 + Go Live-gränsen höjs tillfälligt från 10 till 50 personer för kreativa användningsområden såsom virtuella klassrum och distansarbete. + Håll dig säker! + Mot bakgrund av COVID-19: "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 4d9c5fd192..8496a87eb3 100644 --- a/com.discord/res/values-tr/strings.xml +++ b/com.discord/res/values-tr/strings.xml @@ -4444,6 +4444,10 @@ Bunu yapmak istediğine emin misin?" Bronz Bir kullanıcı adı eklemek için dokunun Deniz mavisi + Anladım + "Go Live sınırı sanal sınıflar ve uzaktan çalışma gibi yaratıcı kullanımlar için 10'dan 50 kişiye çıkarılmıştır." + Güvende Kalın! + "COVID-19'un sebebiyle:" "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 c2119f2612..7717063305 100644 --- a/com.discord/res/values-v23/styles.xml +++ b/com.discord/res/values-v23/styles.xml @@ -28,6 +28,9 @@ @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-rCN/strings.xml b/com.discord/res/values-zh-rCN/strings.xml index 39d27a77ba..b0d6c12b43 100644 --- a/com.discord/res/values-zh-rCN/strings.xml +++ b/com.discord/res/values-zh-rCN/strings.xml @@ -4475,6 +4475,10 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**. 棕褐色 点击添加昵称 凫蓝色 + 知道了 + 我们暂时将GO LIVE的限制从10人提升到50人。这是为了方便虚拟教室和远程办公。 + 注意安全！ + 由于COVID-19的影响, "没有 分配身份组的临时用户断开链接时，系统自动将其踢除" [服务条款](%1$s) diff --git a/com.discord/res/values-zh-rTW/strings.xml b/com.discord/res/values-zh-rTW/strings.xml index b196f8d5b3..ce52e49e5c 100644 --- a/com.discord/res/values-zh-rTW/strings.xml +++ b/com.discord/res/values-zh-rTW/strings.xml @@ -4473,6 +4473,10 @@ Server Insights 是實驗性功能，未來有可能變更或移除。" 古銅色 點選可加入暱稱 青綠色 + 知道了 + 我們暫時將 GO LIVE的限額从10人提升到50人。這是爲了方便虛擬教室和遠程辦公。 + 注意安全！ + 由於COVID-19的影響， "除非已被分配身分組，當臨時成員們斷線時 將被自動踢出" [服務條款](%1$s) diff --git a/com.discord/res/values/attrs.xml b/com.discord/res/values/attrs.xml index de5f91b08b..a42fe1ccc3 100644 --- a/com.discord/res/values/attrs.xml +++ b/com.discord/res/values/attrs.xml @@ -401,6 +401,9 @@ + + + @@ -459,6 +462,7 @@ + @@ -840,6 +844,10 @@ + + + + diff --git a/com.discord/res/values/dimens.xml b/com.discord/res/values/dimens.xml index 9d577cfd70..7cbe2f3b91 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 - 275.0dip + 328.0dip 40.0dip 28.0dip -1.0dip diff --git a/com.discord/res/values/ids.xml b/com.discord/res/values/ids.xml index c52a539f9a..26950d4258 100644 --- a/com.discord/res/values/ids.xml +++ b/com.discord/res/values/ids.xml @@ -369,9 +369,18 @@ + + + + + + + + + @@ -785,6 +794,7 @@ + @@ -880,31 +890,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1161,6 +1195,8 @@ + + @@ -1375,6 +1411,7 @@ + @@ -1845,6 +1882,8 @@ + + @@ -2028,8 +2067,10 @@ + + @@ -2288,10 +2329,13 @@ + + + @@ -2317,11 +2361,12 @@ + - + diff --git a/com.discord/res/values/plurals.xml b/com.discord/res/values/plurals.xml index c4089ece04..98bb944748 100644 --- a/com.discord/res/values/plurals.xml +++ b/com.discord/res/values/plurals.xml @@ -211,6 +211,11 @@ no slots %s slot + + %s emojis + no emoji + %s emoji + %s days 1 day @@ -540,6 +545,11 @@ %s unused Boosts %s unused Boost + + %s people used this template + Be the first to use this! + 1 person used this template + %s days a day @@ -948,5 +958,5 @@ %s People %s Person - false + false diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml index 6f484735cd..6c146eac8d 100644 --- a/com.discord/res/values/public.xml +++ b/com.discord/res/values/public.xml @@ -375,1023 +375,1031 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2726,642 +2734,648 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3381,209 +3395,213 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3637,18 +3655,18 @@ - - - - - - - - + + + + + + + + - - + + @@ -3659,70 +3677,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3732,56 +3750,56 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3794,21 +3812,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -4239,2079 +4257,2124 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6416,553 +6479,556 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6977,23 +7043,24 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -7055,190 +7122,192 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10439,5252 +10508,5325 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -15949,801 +16091,807 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 11ea68958c..fb4ff66389 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -163,13 +163,24 @@ 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" + Give special permissions to your members. + Set a role Add to Dictionary + Add Topic 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 @@ -582,6 +593,8 @@ Unable to convert avatar to data URL. %1$s Large Small + Upload a snazzy picture that represents your server! + Set an icon for your server Back Back button drawer behavior Back button opens channel drawer. @@ -604,7 +617,9 @@ Search Bans Beep boop. Boop beep? Welcome to the beginning of the **#%1$s** channel. + This is the start of the %1$s channel. %2$s You do not have permission to view the message history of **#%1$s**. + Welcome to **%1$s**! Welcome to the beginning of the chat. This is the very beginning of your legendary conversation with %1$s. Added from your contacts: $[](nicknameHook) @@ -949,6 +964,8 @@ Fixes and Updates {fixed} Slowmode is enabled, but you are immune. Amazing! Slowmode is enabled. Members can send one message every %1$s %2$s Slowmode is enabled. + Enter some topics to chat about so we can create a chatroom for them! + What topics do you want to talk about here? No topic set. Channel Type Un-muting a channel will show unread indicators and trigger notifications for all messages. @@ -1008,7 +1025,7 @@ Fixes and Updates {fixed} OR Collapse Collapse Category - baa076cb-843d-48bf-b0d8-c8a7444d36c1 + 584e5601-de95-4580-a912-35d66543b707 Coming Soon Search Animated GIFs on the Web Displays text with emphasis. @@ -1162,9 +1179,9 @@ Fixes and Updates {fixed} Create Create Category Create Channel + Something went wrong trying to create a channel. Please try again later. Create DM Create Group DM - Create your own server "**Create** a new server and invite your friends. It's free!" Create Invite Create Link @@ -1425,10 +1442,12 @@ Fixes and Updates {fixed} %1$s - %2$s %1$s available That emoji was too big! Emojis must be under %1$skb. + %1$s English, UK 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. @@ -1449,6 +1468,7 @@ Fixes and Updates {fixed} "Allow sync'd subscribers to use your Twitch Custom Emoticons in Discord." Engagement Ratio In order to verify your email address, you must first enter an email address. + Enter a new topic Please enter your phone number. You will receive a text message with your verification code. Enter a Phone Number Error @@ -1481,6 +1501,7 @@ Fixes and Updates {fixed} Scan media content from members without a role. Recommended option for servers that use roles for trusted membership. Show dropdown menu + +%1$s com.google.android.material.transformation.FabTransformationScrimBehavior com.google.android.material.transformation.FabTransformationSheetBehavior Facebook @@ -1529,7 +1550,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." - Audio Debug Recording + Diagnostic Audio 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. @@ -1540,9 +1561,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. @@ -2141,8 +2162,9 @@ 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. + Join Server "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 @@ -2504,12 +2526,12 @@ Boosts are **%3$s** $[(%4$s)](originalPriceHook)." Nice! "Boost success! -You've successfully Boosted %1$s **%2$s**." +You just Boosted %1$s **%2$s**." "Boost success! -You've succesfully Boosted the server **%1$s**." +You just Boosted the server **%1$s**." Boost success! - "You've successfully Boosted %1$s **%2$s**." + You just Boosted %1$s **%2$s**. "Sorry, we don't currently support buying Boosts with a [subscription through Apple](%1$s)." Server Boost(s) You get a discount as part of your **%1$s** subscription! @@ -2522,27 +2544,27 @@ You've succesfully Boosted the server **%1$s**." Subtotal "Boost transfer success! -You've Boosted %1$s." +You just Boosted %1$s." "Boost transfer success! -You've Boosted the server." +You just Boosted the server." Boost transfer success! - "You've Boosted %1$s **%2$s**." + You just Boosted %1$s **%2$s**. "Looks like you have %1$s. We'll add 'em to this server for you." Working… - Create Server You can ask the owner to make a new one though Invalid server template Tap to learn more "This template link is invalid or has expired. Want to know more about Discord?" Use channels to organize your chatroom by specific topics. - You can always edit the channels after creating the server. + Template Channels + You can always edit the channels, roles, and permissions after creation. 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: - You received a server template based on: announcements Text Channels Voice Channels @@ -2563,11 +2585,11 @@ Want to know more about Discord?" strategy-discussion welcome welcome-and-rules - Open Template + View 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 - Server template from + Server template Loading server template A server is a superpowered group chat where people come together around a topic or to hang out. Create my own @@ -2580,15 +2602,29 @@ 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 - Delete the template link and prevent anyone from using it again. + Are you sure you want to delete the template link and prevent anyone from using it? 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 - Name - Update the channels, roles, and permissions in your template by re-syncing with your server. + Template Title + Lasy sync: %1$s + Preview Template + Update the channels, roles, and permissions in your template by syncing. Sync Template + Template Sync But no worries! Check back later to see if things smooth out. Unavailable Looks like we’re having trouble connecting… @@ -2762,6 +2798,7 @@ 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). @@ -2902,6 +2939,12 @@ 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 @@ -2911,18 +2954,25 @@ Want to know more about Discord?" Share Invite Link Share this link with others to grant access to your server! Send a stream invite link to a friend + Share this link with your friends and they’ll automatically join your server! + Invite friends to your server! Or, send a stream invite link to a friend Invite to Stream Invite to Server 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 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 @@ -2959,13 +3009,9 @@ 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 @@ -3113,7 +3159,6 @@ 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 @@ -3216,6 +3261,8 @@ Want to know more about Discord?" "You're sending messages too quickly!" Enter the chill zone WOAH THERE. WAY TOO SPICY + Say hi, post a GIF, go wild. The world (or at least this channel) is your oyster. + Send your first message! "Please make your message shorter. We've set the limit at %1$s characters to be courteous to others." Your message is too long. %1$s said %2$s @@ -3252,7 +3299,6 @@ 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. @@ -3327,6 +3373,7 @@ 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 @@ -3453,6 +3500,8 @@ 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 @@ -4150,6 +4199,10 @@ The changes to your subscription are reflected below:" By making a channel private, only selected roles will have access to read or connect to this channel Private Profile + You are all set! + Wow your server is looking all snazzy! Here are a few more things you can do with your server. Have fun! + Step %1$s of 4 + Completed! adept-ethos-91518 "You've redeemed this, but the code is hidden due to Streamer Mode." Prune @@ -4181,6 +4234,8 @@ 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 @@ -4270,6 +4325,7 @@ 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? @@ -4566,6 +4622,7 @@ Server Insights is an experimental feature and is subject to change or removal i Server name is required. Server Options Server Overview + Server Quest Servers with a ratio of 1:3 are considered $[healthy](healthyHook). Unavailable Server Settings @@ -4581,6 +4638,8 @@ Server Insights is an experimental feature and is subject to change or removal i Changing debug logging will quit and re-launch Discord. Are you sure you want to do this? Set this link to never expire Set Status + Start creating a sense of belonging in your server by completing these set of server quests OMG this COPY IS BAD + Set up your server! Settings Advanced Add it! @@ -4884,10 +4943,19 @@ 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 @@ -5097,6 +5165,8 @@ You cannot take any moderation actions until you enable it." Success! Your debug logs have been uploaded to Discord Support. Upload Successful Upload Emoji + Spice up your chat with a custom emoji. + Upload an emoji Upload Image Is this your card? Err, do you want to upload this image? Unable to open file: %1$s. @@ -5369,6 +5439,8 @@ You cannot take any moderation actions until you enable it." Hide Names Muted Show Names + Hang out with your friends + Get on a voice channel Voice Channels Voice Permissions Voice Settings @@ -5418,6 +5490,7 @@ 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. @@ -5472,5 +5545,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 e0fcb5c09d..b0fe5e955a 100644 --- a/com.discord/res/values/styles.xml +++ b/com.discord/res/values/styles.xml @@ -322,6 +322,10 @@ @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 @@ -606,6 +610,10 @@ @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 @@ -770,6 +778,9 @@ @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 @@ -897,6 +908,9 @@ @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 @@ -2523,6 +2537,18 @@ + + + + + +