diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index cd55a8edbe..71aac158f0 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
!!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-867.apk
+apkFileName: com.discord-868.apk
compressionType: false
doNotCompress:
- arsc
@@ -469,5 +469,5 @@ usesFramework:
tag: null
version: 2.4.1-cc194d-SNAPSHOT
versionInfo:
- versionCode: '867'
- versionName: 8.6.7
+ versionCode: '868'
+ versionName: 8.6.8
diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties
index dcf927ad1a..f326bb5d54 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!
#
-#Wed Mar 27 00:41:00 UTC 2019
-version_name=8.6.7
+#Sat Mar 30 05:16:10 UTC 2019
+version_name=8.6.8
package_name=com.discord
-build_id=7289bfde-43b1-4441-a606-756039a6f7cc
-version_code=867
+build_id=83ee19bb-fa7d-4137-b6f3-e73e22c800ed
+version_code=868
app_name=com.discord
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index 3a44e6d4c9..8434746075 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-v21/ic_add_grey_16dp.xml b/com.discord/res/drawable-anydpi-v21/ic_add_grey_16dp.xml
deleted file mode 100644
index 1432e6867e..0000000000
--- a/com.discord/res/drawable-anydpi-v21/ic_add_grey_16dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_arrow_downward_grey_12dp.xml b/com.discord/res/drawable-anydpi-v21/ic_arrow_downward_grey_12dp.xml
deleted file mode 100644
index 934261b43e..0000000000
--- a/com.discord/res/drawable-anydpi-v21/ic_arrow_downward_grey_12dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_arrow_upward_grey_12dp.xml b/com.discord/res/drawable-anydpi-v21/ic_arrow_upward_grey_12dp.xml
deleted file mode 100644
index 23a2eb1802..0000000000
--- a/com.discord/res/drawable-anydpi-v21/ic_arrow_upward_grey_12dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_patreon.xml b/com.discord/res/drawable-anydpi-v21/ic_patreon.xml
deleted file mode 100644
index 4b7b4145aa..0000000000
--- a/com.discord/res/drawable-anydpi-v21/ic_patreon.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_pins_grey_16dp.xml b/com.discord/res/drawable-anydpi-v21/ic_pins_grey_16dp.xml
deleted file mode 100644
index d7989dbd84..0000000000
--- a/com.discord/res/drawable-anydpi-v21/ic_pins_grey_16dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_pins_grey_24dp.xml b/com.discord/res/drawable-anydpi-v21/ic_pins_grey_24dp.xml
deleted file mode 100644
index 2f1faaeac4..0000000000
--- a/com.discord/res/drawable-anydpi-v21/ic_pins_grey_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_reactions_grey_16dp.xml b/com.discord/res/drawable-anydpi-v21/ic_reactions_grey_16dp.xml
deleted file mode 100644
index c33e1476ba..0000000000
--- a/com.discord/res/drawable-anydpi-v21/ic_reactions_grey_16dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_voice_channel_grey_24dp.xml b/com.discord/res/drawable-anydpi-v21/ic_voice_channel_grey_24dp.xml
deleted file mode 100644
index e87c37325e..0000000000
--- a/com.discord/res/drawable-anydpi-v21/ic_voice_channel_grey_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v24/ic_twitter.xml b/com.discord/res/drawable-anydpi-v24/ic_twitter.xml
deleted file mode 100644
index c113815e21..0000000000
--- a/com.discord/res/drawable-anydpi-v24/ic_twitter.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v24/img_empty_friends_no_connection_dark.xml b/com.discord/res/drawable-anydpi-v24/img_empty_friends_no_connection_dark.xml
deleted file mode 100644
index f8cfed1671..0000000000
--- a/com.discord/res/drawable-anydpi-v24/img_empty_friends_no_connection_dark.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v24/img_empty_friends_no_connection_light.xml b/com.discord/res/drawable-anydpi-v24/img_empty_friends_no_connection_light.xml
deleted file mode 100644
index 0c44544d6b..0000000000
--- a/com.discord/res/drawable-anydpi-v24/img_empty_friends_no_connection_light.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable-hdpi/ic_add_grey_16dp.png b/com.discord/res/drawable-hdpi/ic_add_grey_16dp.png
deleted file mode 100644
index 451f36b197..0000000000
Binary files a/com.discord/res/drawable-hdpi/ic_add_grey_16dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-hdpi/ic_arrow_downward_grey_12dp.png b/com.discord/res/drawable-hdpi/ic_arrow_downward_grey_12dp.png
deleted file mode 100644
index 09e40561c1..0000000000
Binary files a/com.discord/res/drawable-hdpi/ic_arrow_downward_grey_12dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-hdpi/ic_arrow_upward_grey_12dp.png b/com.discord/res/drawable-hdpi/ic_arrow_upward_grey_12dp.png
deleted file mode 100644
index 5ec948c6a6..0000000000
Binary files a/com.discord/res/drawable-hdpi/ic_arrow_upward_grey_12dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-hdpi/ic_patreon.png b/com.discord/res/drawable-hdpi/ic_patreon.png
deleted file mode 100644
index bd0b228f6e..0000000000
Binary files a/com.discord/res/drawable-hdpi/ic_patreon.png and /dev/null differ
diff --git a/com.discord/res/drawable-hdpi/ic_pins_grey_16dp.png b/com.discord/res/drawable-hdpi/ic_pins_grey_16dp.png
deleted file mode 100644
index 393fc2c037..0000000000
Binary files a/com.discord/res/drawable-hdpi/ic_pins_grey_16dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-hdpi/ic_pins_grey_24dp.png b/com.discord/res/drawable-hdpi/ic_pins_grey_24dp.png
deleted file mode 100644
index 9118125ddf..0000000000
Binary files a/com.discord/res/drawable-hdpi/ic_pins_grey_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-hdpi/ic_reactions_grey_16dp.png b/com.discord/res/drawable-hdpi/ic_reactions_grey_16dp.png
deleted file mode 100644
index ae154875d8..0000000000
Binary files a/com.discord/res/drawable-hdpi/ic_reactions_grey_16dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-hdpi/ic_twitter.png b/com.discord/res/drawable-hdpi/ic_twitter.png
deleted file mode 100644
index 02ce0d0f6a..0000000000
Binary files a/com.discord/res/drawable-hdpi/ic_twitter.png and /dev/null differ
diff --git a/com.discord/res/drawable-hdpi/ic_voice_channel_grey_24dp.png b/com.discord/res/drawable-hdpi/ic_voice_channel_grey_24dp.png
deleted file mode 100644
index f7a3290e52..0000000000
Binary files a/com.discord/res/drawable-hdpi/ic_voice_channel_grey_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-hdpi/img_empty_friends_no_connection_dark.png b/com.discord/res/drawable-hdpi/img_empty_friends_no_connection_dark.png
deleted file mode 100644
index 1911c9adcb..0000000000
Binary files a/com.discord/res/drawable-hdpi/img_empty_friends_no_connection_dark.png and /dev/null differ
diff --git a/com.discord/res/drawable-hdpi/img_empty_friends_no_connection_light.png b/com.discord/res/drawable-hdpi/img_empty_friends_no_connection_light.png
deleted file mode 100644
index 230ef7d5c4..0000000000
Binary files a/com.discord/res/drawable-hdpi/img_empty_friends_no_connection_light.png and /dev/null differ
diff --git a/com.discord/res/drawable-ldpi/ic_add_grey_16dp.png b/com.discord/res/drawable-ldpi/ic_add_grey_16dp.png
deleted file mode 100644
index 84ade1ad88..0000000000
Binary files a/com.discord/res/drawable-ldpi/ic_add_grey_16dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-ldpi/ic_arrow_downward_grey_12dp.png b/com.discord/res/drawable-ldpi/ic_arrow_downward_grey_12dp.png
deleted file mode 100644
index 283c644e7d..0000000000
Binary files a/com.discord/res/drawable-ldpi/ic_arrow_downward_grey_12dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-ldpi/ic_arrow_upward_grey_12dp.png b/com.discord/res/drawable-ldpi/ic_arrow_upward_grey_12dp.png
deleted file mode 100644
index 64ef56f66b..0000000000
Binary files a/com.discord/res/drawable-ldpi/ic_arrow_upward_grey_12dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-ldpi/ic_patreon.png b/com.discord/res/drawable-ldpi/ic_patreon.png
deleted file mode 100644
index b4e9f78be7..0000000000
Binary files a/com.discord/res/drawable-ldpi/ic_patreon.png and /dev/null differ
diff --git a/com.discord/res/drawable-ldpi/ic_pins_grey_16dp.png b/com.discord/res/drawable-ldpi/ic_pins_grey_16dp.png
deleted file mode 100644
index a4a20ba4bf..0000000000
Binary files a/com.discord/res/drawable-ldpi/ic_pins_grey_16dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-ldpi/ic_pins_grey_24dp.png b/com.discord/res/drawable-ldpi/ic_pins_grey_24dp.png
deleted file mode 100644
index 16cbdf4318..0000000000
Binary files a/com.discord/res/drawable-ldpi/ic_pins_grey_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-ldpi/ic_reactions_grey_16dp.png b/com.discord/res/drawable-ldpi/ic_reactions_grey_16dp.png
deleted file mode 100644
index 516c0ab23e..0000000000
Binary files a/com.discord/res/drawable-ldpi/ic_reactions_grey_16dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-ldpi/ic_twitter.png b/com.discord/res/drawable-ldpi/ic_twitter.png
deleted file mode 100644
index 3786ca3e28..0000000000
Binary files a/com.discord/res/drawable-ldpi/ic_twitter.png and /dev/null differ
diff --git a/com.discord/res/drawable-ldpi/ic_voice_channel_grey_24dp.png b/com.discord/res/drawable-ldpi/ic_voice_channel_grey_24dp.png
deleted file mode 100644
index 977e7f9bab..0000000000
Binary files a/com.discord/res/drawable-ldpi/ic_voice_channel_grey_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-ldpi/img_empty_friends_no_connection_dark.png b/com.discord/res/drawable-ldpi/img_empty_friends_no_connection_dark.png
deleted file mode 100644
index e173ea0a37..0000000000
Binary files a/com.discord/res/drawable-ldpi/img_empty_friends_no_connection_dark.png and /dev/null differ
diff --git a/com.discord/res/drawable-ldpi/img_empty_friends_no_connection_light.png b/com.discord/res/drawable-ldpi/img_empty_friends_no_connection_light.png
deleted file mode 100644
index e3a408d9bb..0000000000
Binary files a/com.discord/res/drawable-ldpi/img_empty_friends_no_connection_light.png and /dev/null differ
diff --git a/com.discord/res/drawable-mdpi/ic_add_grey_16dp.png b/com.discord/res/drawable-mdpi/ic_add_grey_16dp.png
deleted file mode 100644
index af0c0e4908..0000000000
Binary files a/com.discord/res/drawable-mdpi/ic_add_grey_16dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-mdpi/ic_arrow_downward_grey_12dp.png b/com.discord/res/drawable-mdpi/ic_arrow_downward_grey_12dp.png
deleted file mode 100644
index c5b116fabe..0000000000
Binary files a/com.discord/res/drawable-mdpi/ic_arrow_downward_grey_12dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-mdpi/ic_arrow_upward_grey_12dp.png b/com.discord/res/drawable-mdpi/ic_arrow_upward_grey_12dp.png
deleted file mode 100644
index e8b92f5be4..0000000000
Binary files a/com.discord/res/drawable-mdpi/ic_arrow_upward_grey_12dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-mdpi/ic_patreon.png b/com.discord/res/drawable-mdpi/ic_patreon.png
deleted file mode 100644
index 8c7d23ae93..0000000000
Binary files a/com.discord/res/drawable-mdpi/ic_patreon.png and /dev/null differ
diff --git a/com.discord/res/drawable-mdpi/ic_pins_grey_16dp.png b/com.discord/res/drawable-mdpi/ic_pins_grey_16dp.png
deleted file mode 100644
index 4615e915f3..0000000000
Binary files a/com.discord/res/drawable-mdpi/ic_pins_grey_16dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-mdpi/ic_pins_grey_24dp.png b/com.discord/res/drawable-mdpi/ic_pins_grey_24dp.png
deleted file mode 100644
index 393fc2c037..0000000000
Binary files a/com.discord/res/drawable-mdpi/ic_pins_grey_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-mdpi/ic_reactions_grey_16dp.png b/com.discord/res/drawable-mdpi/ic_reactions_grey_16dp.png
deleted file mode 100644
index 951a9bda84..0000000000
Binary files a/com.discord/res/drawable-mdpi/ic_reactions_grey_16dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-mdpi/ic_twitter.png b/com.discord/res/drawable-mdpi/ic_twitter.png
deleted file mode 100644
index 490cff9ad8..0000000000
Binary files a/com.discord/res/drawable-mdpi/ic_twitter.png and /dev/null differ
diff --git a/com.discord/res/drawable-mdpi/ic_voice_channel_grey_24dp.png b/com.discord/res/drawable-mdpi/ic_voice_channel_grey_24dp.png
deleted file mode 100644
index 532d1ecc89..0000000000
Binary files a/com.discord/res/drawable-mdpi/ic_voice_channel_grey_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-mdpi/img_empty_friends_no_connection_dark.png b/com.discord/res/drawable-mdpi/img_empty_friends_no_connection_dark.png
deleted file mode 100644
index ebbc55b4fe..0000000000
Binary files a/com.discord/res/drawable-mdpi/img_empty_friends_no_connection_dark.png and /dev/null differ
diff --git a/com.discord/res/drawable-mdpi/img_empty_friends_no_connection_light.png b/com.discord/res/drawable-mdpi/img_empty_friends_no_connection_light.png
deleted file mode 100644
index 5f9e50b8a3..0000000000
Binary files a/com.discord/res/drawable-mdpi/img_empty_friends_no_connection_light.png and /dev/null differ
diff --git a/com.discord/res/drawable-v21/button_status_green_500.xml b/com.discord/res/drawable-v21/button_green.xml
similarity index 57%
rename from com.discord/res/drawable-v21/button_status_green_500.xml
rename to com.discord/res/drawable-v21/button_green.xml
index 8575f45411..9aaffbd426 100644
--- a/com.discord/res/drawable-v21/button_status_green_500.xml
+++ b/com.discord/res/drawable-v21/button_green.xml
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-v21/button_red.xml b/com.discord/res/drawable-v21/button_red.xml
new file mode 100644
index 0000000000..c10663a97e
--- /dev/null
+++ b/com.discord/res/drawable-v21/button_red.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-v21/drawable_bg_settings_item_white_clickable.xml b/com.discord/res/drawable-v21/drawable_bg_settings_item_white_clickable.xml
deleted file mode 100644
index 851892a8ad..0000000000
--- a/com.discord/res/drawable-v21/drawable_bg_settings_item_white_clickable.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- -
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable-v21/drawable_uikit_status_green_500_button.xml b/com.discord/res/drawable-v21/drawable_uikit_green_button.xml
similarity index 100%
rename from com.discord/res/drawable-v21/drawable_uikit_status_green_500_button.xml
rename to com.discord/res/drawable-v21/drawable_uikit_green_button.xml
diff --git a/com.discord/res/drawable-v21/drawable_uikit_red_button.xml b/com.discord/res/drawable-v21/drawable_uikit_red_button.xml
new file mode 100644
index 0000000000..4ff1b18ef1
--- /dev/null
+++ b/com.discord/res/drawable-v21/drawable_uikit_red_button.xml
@@ -0,0 +1,21 @@
+
+
+ -
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-xhdpi/asset_default_emoji.png b/com.discord/res/drawable-xhdpi/asset_default_emoji.png
deleted file mode 100644
index 76cb526f17..0000000000
Binary files a/com.discord/res/drawable-xhdpi/asset_default_emoji.png and /dev/null differ
diff --git a/com.discord/res/drawable-xhdpi/ic_add_grey_16dp.png b/com.discord/res/drawable-xhdpi/ic_add_grey_16dp.png
deleted file mode 100644
index 6868977c11..0000000000
Binary files a/com.discord/res/drawable-xhdpi/ic_add_grey_16dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xhdpi/ic_arrow_downward_grey_12dp.png b/com.discord/res/drawable-xhdpi/ic_arrow_downward_grey_12dp.png
deleted file mode 100644
index f80bf03a54..0000000000
Binary files a/com.discord/res/drawable-xhdpi/ic_arrow_downward_grey_12dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xhdpi/ic_arrow_upward_grey_12dp.png b/com.discord/res/drawable-xhdpi/ic_arrow_upward_grey_12dp.png
deleted file mode 100644
index 8f51f3b065..0000000000
Binary files a/com.discord/res/drawable-xhdpi/ic_arrow_upward_grey_12dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xhdpi/ic_file_ps.png b/com.discord/res/drawable-xhdpi/ic_file_ps.png
deleted file mode 100644
index 35315c9700..0000000000
Binary files a/com.discord/res/drawable-xhdpi/ic_file_ps.png and /dev/null differ
diff --git a/com.discord/res/drawable-xhdpi/ic_patreon.png b/com.discord/res/drawable-xhdpi/ic_patreon.png
deleted file mode 100644
index 00ea2092c3..0000000000
Binary files a/com.discord/res/drawable-xhdpi/ic_patreon.png and /dev/null differ
diff --git a/com.discord/res/drawable-xhdpi/ic_pins_grey_16dp.png b/com.discord/res/drawable-xhdpi/ic_pins_grey_16dp.png
deleted file mode 100644
index d1439927f5..0000000000
Binary files a/com.discord/res/drawable-xhdpi/ic_pins_grey_16dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xhdpi/ic_pins_grey_24dp.png b/com.discord/res/drawable-xhdpi/ic_pins_grey_24dp.png
deleted file mode 100644
index dd7370f491..0000000000
Binary files a/com.discord/res/drawable-xhdpi/ic_pins_grey_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xhdpi/ic_reactions_grey_16dp.png b/com.discord/res/drawable-xhdpi/ic_reactions_grey_16dp.png
deleted file mode 100644
index cbaa053c74..0000000000
Binary files a/com.discord/res/drawable-xhdpi/ic_reactions_grey_16dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xhdpi/ic_twitter.png b/com.discord/res/drawable-xhdpi/ic_twitter.png
deleted file mode 100644
index b1997a2066..0000000000
Binary files a/com.discord/res/drawable-xhdpi/ic_twitter.png and /dev/null differ
diff --git a/com.discord/res/drawable-xhdpi/ic_voice_channel_grey_24dp.png b/com.discord/res/drawable-xhdpi/ic_voice_channel_grey_24dp.png
deleted file mode 100644
index 466bb44c7e..0000000000
Binary files a/com.discord/res/drawable-xhdpi/ic_voice_channel_grey_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xhdpi/img_empty_friends_no_connection_dark.png b/com.discord/res/drawable-xhdpi/img_empty_friends_no_connection_dark.png
deleted file mode 100644
index 43610bc5a9..0000000000
Binary files a/com.discord/res/drawable-xhdpi/img_empty_friends_no_connection_dark.png and /dev/null differ
diff --git a/com.discord/res/drawable-xhdpi/img_empty_friends_no_connection_light.png b/com.discord/res/drawable-xhdpi/img_empty_friends_no_connection_light.png
deleted file mode 100644
index fc1544cb31..0000000000
Binary files a/com.discord/res/drawable-xhdpi/img_empty_friends_no_connection_light.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_add_grey_16dp.png b/com.discord/res/drawable-xxhdpi/ic_add_grey_16dp.png
deleted file mode 100644
index 799e65d52c..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/ic_add_grey_16dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_arrow_downward_grey_12dp.png b/com.discord/res/drawable-xxhdpi/ic_arrow_downward_grey_12dp.png
deleted file mode 100644
index 0e8a3e1b33..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/ic_arrow_downward_grey_12dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_arrow_upward_grey_12dp.png b/com.discord/res/drawable-xxhdpi/ic_arrow_upward_grey_12dp.png
deleted file mode 100644
index 4198d9a902..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/ic_arrow_upward_grey_12dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_cog_white_18dp.png b/com.discord/res/drawable-xxhdpi/ic_cog_white_18dp.png
deleted file mode 100644
index 04b5e9fcc4..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/ic_cog_white_18dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_file_ps.png b/com.discord/res/drawable-xxhdpi/ic_file_ps.png
deleted file mode 100644
index 537d1cab42..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/ic_file_ps.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_overflow_grey_24dp.png b/com.discord/res/drawable-xxhdpi/ic_overflow_grey_24dp.png
deleted file mode 100644
index 9baae93d83..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/ic_overflow_grey_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_patreon.png b/com.discord/res/drawable-xxhdpi/ic_patreon.png
deleted file mode 100644
index a7f4a57ea4..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/ic_patreon.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_pins_grey_16dp.png b/com.discord/res/drawable-xxhdpi/ic_pins_grey_16dp.png
deleted file mode 100644
index dd7370f491..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/ic_pins_grey_16dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_pins_grey_24dp.png b/com.discord/res/drawable-xxhdpi/ic_pins_grey_24dp.png
deleted file mode 100644
index 4e29f8afd0..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/ic_pins_grey_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_reactions_grey_16dp.png b/com.discord/res/drawable-xxhdpi/ic_reactions_grey_16dp.png
deleted file mode 100644
index 05b14ca8fe..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/ic_reactions_grey_16dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_twitter.png b/com.discord/res/drawable-xxhdpi/ic_twitter.png
deleted file mode 100644
index 09b02b4d72..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/ic_twitter.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_voice_channel_grey_24dp.png b/com.discord/res/drawable-xxhdpi/ic_voice_channel_grey_24dp.png
deleted file mode 100644
index 9c478e7a95..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/ic_voice_channel_grey_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxhdpi/img_empty_friends_no_connection_dark.png b/com.discord/res/drawable-xxhdpi/img_empty_friends_no_connection_dark.png
deleted file mode 100644
index 7d87d04415..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/img_empty_friends_no_connection_dark.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxhdpi/img_empty_friends_no_connection_light.png b/com.discord/res/drawable-xxhdpi/img_empty_friends_no_connection_light.png
deleted file mode 100644
index 19802d6001..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/img_empty_friends_no_connection_light.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/asset_logo_sad.png b/com.discord/res/drawable-xxxhdpi/asset_logo_sad.png
deleted file mode 100644
index 657df2156d..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/asset_logo_sad.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_account_xbox.png b/com.discord/res/drawable-xxxhdpi/ic_account_xbox.png
index 1e03e18761..208a9eb55e 100644
Binary files a/com.discord/res/drawable-xxxhdpi/ic_account_xbox.png and b/com.discord/res/drawable-xxxhdpi/ic_account_xbox.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_add_grey_16dp.png b/com.discord/res/drawable-xxxhdpi/ic_add_grey_16dp.png
deleted file mode 100644
index dcca6b47d9..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/ic_add_grey_16dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_arrow_downward_grey_12dp.png b/com.discord/res/drawable-xxxhdpi/ic_arrow_downward_grey_12dp.png
deleted file mode 100644
index 2c626e8477..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/ic_arrow_downward_grey_12dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_arrow_upward_grey_12dp.png b/com.discord/res/drawable-xxxhdpi/ic_arrow_upward_grey_12dp.png
deleted file mode 100644
index 0d91af11c4..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/ic_arrow_upward_grey_12dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_cog_white_18dp.png b/com.discord/res/drawable-xxxhdpi/ic_cog_white_18dp.png
deleted file mode 100644
index 1058c35486..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/ic_cog_white_18dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_file_ps.png b/com.discord/res/drawable-xxxhdpi/ic_file_ps.png
deleted file mode 100644
index e6482179a2..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/ic_file_ps.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_patreon.png b/com.discord/res/drawable-xxxhdpi/ic_patreon.png
deleted file mode 100644
index 5f6a5e38d7..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/ic_patreon.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_pins_grey_16dp.png b/com.discord/res/drawable-xxxhdpi/ic_pins_grey_16dp.png
deleted file mode 100644
index c4c5d1d72d..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/ic_pins_grey_16dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_pins_grey_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_pins_grey_24dp.png
deleted file mode 100644
index 39483ee61c..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/ic_pins_grey_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_reactions_grey_16dp.png b/com.discord/res/drawable-xxxhdpi/ic_reactions_grey_16dp.png
deleted file mode 100644
index cee095e6b4..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/ic_reactions_grey_16dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_twitter.png b/com.discord/res/drawable-xxxhdpi/ic_twitter.png
deleted file mode 100644
index 70f74f2672..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/ic_twitter.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_voice_channel_grey_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_voice_channel_grey_24dp.png
deleted file mode 100644
index f222fe0884..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/ic_voice_channel_grey_24dp.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/icon_channel_arrow.png b/com.discord/res/drawable-xxxhdpi/icon_channel_arrow.png
deleted file mode 100644
index e0bd458451..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/icon_channel_arrow.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/icon_locked_small.png b/com.discord/res/drawable-xxxhdpi/icon_locked_small.png
deleted file mode 100644
index 0193e382d5..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/icon_locked_small.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/icon_reload.png b/com.discord/res/drawable-xxxhdpi/icon_reload.png
deleted file mode 100644
index d941ce3ca7..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/icon_reload.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/icon_switch_active.png b/com.discord/res/drawable-xxxhdpi/icon_switch_active.png
deleted file mode 100644
index 2f52d60dc8..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/icon_switch_active.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/icon_switch_neutral.png b/com.discord/res/drawable-xxxhdpi/icon_switch_neutral.png
deleted file mode 100644
index 259d9836de..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/icon_switch_neutral.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/icon_upload.png b/com.discord/res/drawable-xxxhdpi/icon_upload.png
deleted file mode 100644
index 17652e414a..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/icon_upload.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/icon_volume_up.png b/com.discord/res/drawable-xxxhdpi/icon_volume_up.png
deleted file mode 100644
index e80819f2ad..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/icon_volume_up.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/img_empty_friends_no_connection_dark.png b/com.discord/res/drawable-xxxhdpi/img_empty_friends_no_connection_dark.png
deleted file mode 100644
index e8ed6f9512..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/img_empty_friends_no_connection_dark.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/img_empty_friends_no_connection_light.png b/com.discord/res/drawable-xxxhdpi/img_empty_friends_no_connection_light.png
deleted file mode 100644
index a9bb1ed54b..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/img_empty_friends_no_connection_light.png and /dev/null differ
diff --git a/com.discord/res/drawable/button_status_green_500.xml b/com.discord/res/drawable/button_green.xml
similarity index 57%
rename from com.discord/res/drawable/button_status_green_500.xml
rename to com.discord/res/drawable/button_green.xml
index b5698ac355..36b49335df 100644
--- a/com.discord/res/drawable/button_status_green_500.xml
+++ b/com.discord/res/drawable/button_green.xml
@@ -1,7 +1,7 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/button_red.xml b/com.discord/res/drawable/button_red.xml
new file mode 100644
index 0000000000..284d520a62
--- /dev/null
+++ b/com.discord/res/drawable/button_red.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_bg_gradient_circle_black.xml b/com.discord/res/drawable/drawable_bg_gradient_circle_black.xml
deleted file mode 100644
index 78b607e79a..0000000000
--- a/com.discord/res/drawable/drawable_bg_gradient_circle_black.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_bg_news_header.xml b/com.discord/res/drawable/drawable_bg_news_header.xml
deleted file mode 100644
index 2dca0e6dda..0000000000
--- a/com.discord/res/drawable/drawable_bg_news_header.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_bg_payment_item_default.xml b/com.discord/res/drawable/drawable_bg_payment_item_default.xml
deleted file mode 100644
index e82e3e08a5..0000000000
--- a/com.discord/res/drawable/drawable_bg_payment_item_default.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_bg_settings_item_white_clickable.xml b/com.discord/res/drawable/drawable_bg_settings_item_white_clickable.xml
deleted file mode 100644
index 880e9128f3..0000000000
--- a/com.discord/res/drawable/drawable_bg_settings_item_white_clickable.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_button_white_border_neutral.xml b/com.discord/res/drawable/drawable_button_white_border_neutral.xml
deleted file mode 100644
index cd9526240b..0000000000
--- a/com.discord/res/drawable/drawable_button_white_border_neutral.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_button_white_border_pressed.xml b/com.discord/res/drawable/drawable_button_white_border_pressed.xml
deleted file mode 100644
index cadf6bb38e..0000000000
--- a/com.discord/res/drawable/drawable_button_white_border_pressed.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_circle_grey.xml b/com.discord/res/drawable/drawable_circle_grey.xml
deleted file mode 100644
index a0188f4ef4..0000000000
--- a/com.discord/res/drawable/drawable_circle_grey.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_icon_select.xml b/com.discord/res/drawable/drawable_icon_select.xml
deleted file mode 100644
index 30c0e167d7..0000000000
--- a/com.discord/res/drawable/drawable_icon_select.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_icon_select_active.xml b/com.discord/res/drawable/drawable_icon_select_active.xml
deleted file mode 100644
index e610bbbea0..0000000000
--- a/com.discord/res/drawable/drawable_icon_select_active.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_icon_select_neutral.xml b/com.discord/res/drawable/drawable_icon_select_neutral.xml
deleted file mode 100644
index 71595337bb..0000000000
--- a/com.discord/res/drawable/drawable_icon_select_neutral.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_icon_select_pressed.xml b/com.discord/res/drawable/drawable_icon_select_pressed.xml
deleted file mode 100644
index bf8206e4bf..0000000000
--- a/com.discord/res/drawable/drawable_icon_select_pressed.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_icon_switch.xml b/com.discord/res/drawable/drawable_icon_switch.xml
deleted file mode 100644
index f9e5f13d77..0000000000
--- a/com.discord/res/drawable/drawable_icon_switch.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_instant_invite_bg.xml b/com.discord/res/drawable/drawable_instant_invite_bg.xml
deleted file mode 100644
index d256031d32..0000000000
--- a/com.discord/res/drawable/drawable_instant_invite_bg.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- -
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_overlay_image_circle.xml b/com.discord/res/drawable/drawable_overlay_image_circle.xml
deleted file mode 100644
index ede8fa25b8..0000000000
--- a/com.discord/res/drawable/drawable_overlay_image_circle.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_overlay_white.xml b/com.discord/res/drawable/drawable_overlay_white.xml
deleted file mode 100644
index 1adf90c726..0000000000
--- a/com.discord/res/drawable/drawable_overlay_white.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_uikit_status_green_500_button.xml b/com.discord/res/drawable/drawable_uikit_green_button.xml
similarity index 100%
rename from com.discord/res/drawable/drawable_uikit_status_green_500_button.xml
rename to com.discord/res/drawable/drawable_uikit_green_button.xml
diff --git a/com.discord/res/drawable/drawable_uikit_status_green_600.xml b/com.discord/res/drawable/drawable_uikit_green_button_disabled.xml
similarity index 100%
rename from com.discord/res/drawable/drawable_uikit_status_green_600.xml
rename to com.discord/res/drawable/drawable_uikit_green_button_disabled.xml
diff --git a/com.discord/res/drawable/drawable_uikit_status_green_600_button.xml b/com.discord/res/drawable/drawable_uikit_green_button_pressed.xml
similarity index 100%
rename from com.discord/res/drawable/drawable_uikit_status_green_600_button.xml
rename to com.discord/res/drawable/drawable_uikit_green_button_pressed.xml
diff --git a/com.discord/res/drawable/drawable_uikit_red_button.xml b/com.discord/res/drawable/drawable_uikit_red_button.xml
new file mode 100644
index 0000000000..9ab3ca20e8
--- /dev/null
+++ b/com.discord/res/drawable/drawable_uikit_red_button.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_uikit_red_button_disabled.xml b/com.discord/res/drawable/drawable_uikit_red_button_disabled.xml
new file mode 100644
index 0000000000..50b587242d
--- /dev/null
+++ b/com.discord/res/drawable/drawable_uikit_red_button_disabled.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_uikit_red_button_pressed.xml b/com.discord/res/drawable/drawable_uikit_red_button_pressed.xml
new file mode 100644
index 0000000000..50b587242d
--- /dev/null
+++ b/com.discord/res/drawable/drawable_uikit_red_button_pressed.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout-v17/widget_cancel_premium_dialog.xml b/com.discord/res/layout-v17/widget_cancel_premium_dialog.xml
index bf95b78cc1..cdc19d9daa 100644
--- a/com.discord/res/layout-v17/widget_cancel_premium_dialog.xml
+++ b/com.discord/res/layout-v17/widget_cancel_premium_dialog.xml
@@ -17,6 +17,6 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout-v17/widget_channels_list_item_channel_private.xml b/com.discord/res/layout-v17/widget_channels_list_item_channel_private.xml
index 883e8643af..ec00ff80cb 100644
--- a/com.discord/res/layout-v17/widget_channels_list_item_channel_private.xml
+++ b/com.discord/res/layout-v17/widget_channels_list_item_channel_private.xml
@@ -10,5 +10,5 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout-v17/widget_disable_delete_account_dialog.xml b/com.discord/res/layout-v17/widget_disable_delete_account_dialog.xml
new file mode 100644
index 0000000000..b955674b53
--- /dev/null
+++ b/com.discord/res/layout-v17/widget_disable_delete_account_dialog.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout-v17/widget_settings_account_edit.xml b/com.discord/res/layout-v17/widget_settings_account_edit.xml
index 2424b77b08..c23ad24bc5 100644
--- a/com.discord/res/layout-v17/widget_settings_account_edit.xml
+++ b/com.discord/res/layout-v17/widget_settings_account_edit.xml
@@ -8,7 +8,7 @@
-
+
@@ -24,7 +24,7 @@
-
+
diff --git a/com.discord/res/layout-v17/widget_user_profile_strip.xml b/com.discord/res/layout-v17/widget_user_profile_strip.xml
index 77058bde2e..097da6c721 100644
--- a/com.discord/res/layout-v17/widget_user_profile_strip.xml
+++ b/com.discord/res/layout-v17/widget_user_profile_strip.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/com.discord/res/layout-v22/widget_settings_account_edit.xml b/com.discord/res/layout-v22/widget_settings_account_edit.xml
index f6e30e8afb..88c8a99ce0 100644
--- a/com.discord/res/layout-v22/widget_settings_account_edit.xml
+++ b/com.discord/res/layout-v22/widget_settings_account_edit.xml
@@ -8,7 +8,7 @@
-
+
@@ -24,7 +24,7 @@
-
+
diff --git a/com.discord/res/layout/edit_payment_method_dialog.xml b/com.discord/res/layout/edit_payment_method_dialog.xml
deleted file mode 100644
index 6b9d74c31b..0000000000
--- a/com.discord/res/layout/edit_payment_method_dialog.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_cancel_premium_dialog.xml b/com.discord/res/layout/widget_cancel_premium_dialog.xml
index fbd15e3061..99ed8df75a 100644
--- a/com.discord/res/layout/widget_cancel_premium_dialog.xml
+++ b/com.discord/res/layout/widget_cancel_premium_dialog.xml
@@ -17,6 +17,6 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channels_list_item_channel_private.xml b/com.discord/res/layout/widget_channels_list_item_channel_private.xml
index 05b92be9a5..bb80ee4ebd 100644
--- a/com.discord/res/layout/widget_channels_list_item_channel_private.xml
+++ b/com.discord/res/layout/widget_channels_list_item_channel_private.xml
@@ -10,5 +10,5 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_disable_delete_account_dialog.xml b/com.discord/res/layout/widget_disable_delete_account_dialog.xml
new file mode 100644
index 0000000000..57d28c8f5f
--- /dev/null
+++ b/com.discord/res/layout/widget_disable_delete_account_dialog.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_account_edit.xml b/com.discord/res/layout/widget_settings_account_edit.xml
index a5f6fdaf89..f028e2d3c1 100644
--- a/com.discord/res/layout/widget_settings_account_edit.xml
+++ b/com.discord/res/layout/widget_settings_account_edit.xml
@@ -8,7 +8,7 @@
-
+
@@ -24,7 +24,7 @@
-
+
diff --git a/com.discord/res/layout/widget_settings_premium.xml b/com.discord/res/layout/widget_settings_premium.xml
index 51660447ec..6afe784673 100644
--- a/com.discord/res/layout/widget_settings_premium.xml
+++ b/com.discord/res/layout/widget_settings_premium.xml
@@ -6,9 +6,9 @@
-
-
-
+
+
+
@@ -17,7 +17,7 @@
-
+
diff --git a/com.discord/res/layout/widget_user_profile_strip.xml b/com.discord/res/layout/widget_user_profile_strip.xml
index bd1b34e2e4..f5dc7d8c4a 100644
--- a/com.discord/res/layout/widget_user_profile_strip.xml
+++ b/com.discord/res/layout/widget_user_profile_strip.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/com.discord/res/menu/menu_invite.xml b/com.discord/res/menu/menu_invite.xml
deleted file mode 100644
index c5822e5639..0000000000
--- a/com.discord/res/menu/menu_invite.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
\ No newline at end of file
diff --git a/com.discord/res/menu/menu_save.xml b/com.discord/res/menu/menu_save.xml
deleted file mode 100644
index 3c52834a13..0000000000
--- a/com.discord/res/menu/menu_save.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
\ No newline at end of file
diff --git a/com.discord/res/values-bg/strings.xml b/com.discord/res/values-bg/strings.xml
index 102fbb2675..7b16d02cd7 100644
--- a/com.discord/res/values-bg/strings.xml
+++ b/com.discord/res/values-bg/strings.xml
@@ -388,9 +388,6 @@
Плащане за него с
Данъци
Общо
- Всички транзакции
- Върнати суми
- Транзакции в магазина
Хронология на транзакциите
Твоят абонамент
Методи на плащане
diff --git a/com.discord/res/values-cs/strings.xml b/com.discord/res/values-cs/strings.xml
index f1b3c886a3..fd42777c2c 100644
--- a/com.discord/res/values-cs/strings.xml
+++ b/com.discord/res/values-cs/strings.xml
@@ -367,9 +367,6 @@
Zaplatit prostřednictvím
Daně
Celkem
- Všechny transakce
- Vráceny peníze
- Transakce v obchodě
Historie transakcí
Tvoje předplatné
Platební metody
diff --git a/com.discord/res/values-da/strings.xml b/com.discord/res/values-da/strings.xml
index 01fd787bab..52aa61e16f 100644
--- a/com.discord/res/values-da/strings.xml
+++ b/com.discord/res/values-da/strings.xml
@@ -352,9 +352,6 @@
Betal for det med
Skatter
Sum
- Alle transaktioner
- Refunderet
- Store-transaktioner
Transaktionshistorik
Dit abonnement
Betalingsmetoder
diff --git a/com.discord/res/values-de/strings.xml b/com.discord/res/values-de/strings.xml
index df612faeb0..a3f38a6403 100644
--- a/com.discord/res/values-de/strings.xml
+++ b/com.discord/res/values-de/strings.xml
@@ -429,9 +429,6 @@ Das Umgehen von Bans kann deutlich erschwert werden, indem die Handyverifizierun
Bezahlen mit
Steuern
Summe
- Alle Transaktionen
- Zurückerstattet
- Transaktionen im Store
Transaktionsverlauf
Dein Abonnement
Zahlungsarten
diff --git a/com.discord/res/values-el/strings.xml b/com.discord/res/values-el/strings.xml
index 8cf672f804..e2d10b8179 100644
--- a/com.discord/res/values-el/strings.xml
+++ b/com.discord/res/values-el/strings.xml
@@ -448,9 +448,6 @@
Πληρωμή για αυτό Με
Φόροι
Σύνολο
- Όλες οι Συναλλαγές
- Επιστράφηκε
- Συναλλαγές Καταστήματος
Ιστορικό Συναλλαγών
Η Συνδρομή σου
Μέθοδοι Πληρωμής
diff --git a/com.discord/res/values-es-rES/strings.xml b/com.discord/res/values-es-rES/strings.xml
index a25e0347ea..ef62802ec8 100644
--- a/com.discord/res/values-es-rES/strings.xml
+++ b/com.discord/res/values-es-rES/strings.xml
@@ -436,9 +436,6 @@ pero siempre y cuando se deba, ¡no dudes en hacerlo!"
Guarda un método de pago para comprar más rápido
Pagar con
Impuestos
- Todas las transacciones
- Reembolsado
- Transacciones de la tienda
Historial de transacciones
Tu suscripción
Métodos de pago
diff --git a/com.discord/res/values-fi/strings.xml b/com.discord/res/values-fi/strings.xml
index 6a03c9e3c3..55c2482624 100644
--- a/com.discord/res/values-fi/strings.xml
+++ b/com.discord/res/values-fi/strings.xml
@@ -472,9 +472,6 @@ Porttikiellon kiertämisestä voi tehdä hyvin hankalaa ottamalla käyttöön pu
Käytä maksutapaa
Verot
Yhteensä
- Kaikki tapahtumat
- Hyvitetty
- Kaupan tapahtumat
Tapahtumahistoria
Tilauksesi
Maksutavat
diff --git a/com.discord/res/values-fr/strings.xml b/com.discord/res/values-fr/strings.xml
index df4e1eab66..91d580a562 100644
--- a/com.discord/res/values-fr/strings.xml
+++ b/com.discord/res/values-fr/strings.xml
@@ -460,9 +460,6 @@ Le contournement de bannissement peut être rendu ardu en autorisant la vérific
Aucun mode de paiement enregistré
Paie plus rapidement en enregistrant un mode de paiement
Payer avec
- Toutes les transactions
- Remboursé
- Transactions de la boutique
Historique des transactions
Ton abonnement
Modes de paiement
diff --git a/com.discord/res/values-hr/strings.xml b/com.discord/res/values-hr/strings.xml
index 10c9667c96..7518e3f2c1 100644
--- a/com.discord/res/values-hr/strings.xml
+++ b/com.discord/res/values-hr/strings.xml
@@ -448,9 +448,6 @@ Zaobilaženje banova se može jako otežati uključivanjem potvrde broja mobitel
Plati s
Porezi
Ukupno
- Sve transakcije
- Vraćen novac
- Pohrani transakcije
Povijest transakcija
Tvoja pretplata
Načini Plaćanja
diff --git a/com.discord/res/values-hu/strings.xml b/com.discord/res/values-hu/strings.xml
index 60a4ad5683..eefe88abca 100644
--- a/com.discord/res/values-hu/strings.xml
+++ b/com.discord/res/values-hu/strings.xml
@@ -470,9 +470,6 @@ A kitiltások kijátszása bonyolulttá tehető telefonos hitelesítés bekapcso
Fizetés ezzel:
Áfa
Teljes összes
- Az összes vásárlás
- Visszatérítve
- Áruházi vásárlások
Vásárlás részletei
Az előfizetésed
Fizetési módok
diff --git a/com.discord/res/values-it/strings.xml b/com.discord/res/values-it/strings.xml
index c3dc26faeb..d06eaa569e 100644
--- a/com.discord/res/values-it/strings.xml
+++ b/com.discord/res/values-it/strings.xml
@@ -457,9 +457,6 @@ Eludere un ban può essere molto difficile abilitando la verifica tramite telefo
Paga con
Tasse
Totale
- Tutte le transazioni
- Rimborsato
- Transazioni negozio
Cronologia transazioni
Il tuo abbonamento
Metodi di pagamento
diff --git a/com.discord/res/values-ja/strings.xml b/com.discord/res/values-ja/strings.xml
index bea760731d..15d42a3025 100644
--- a/com.discord/res/values-ja/strings.xml
+++ b/com.discord/res/values-ja/strings.xml
@@ -438,9 +438,6 @@
お支払い方法
税
合計
- 全ての取引
- 返金済み
- ストア取引
取引履歴
お客さまのサブスクリプション
お支払い方法
diff --git a/com.discord/res/values-ko/strings.xml b/com.discord/res/values-ko/strings.xml
index 2b44efa087..0f0d52adb7 100644
--- a/com.discord/res/values-ko/strings.xml
+++ b/com.discord/res/values-ko/strings.xml
@@ -420,9 +420,6 @@
결제 방식:
세금
총
- 모든 거래
- 환불됨
- 상점 거래
거래 기록
내 구독
결제 방식
diff --git a/com.discord/res/values-lt/strings.xml b/com.discord/res/values-lt/strings.xml
index f790c4142f..af2f1e2478 100644
--- a/com.discord/res/values-lt/strings.xml
+++ b/com.discord/res/values-lt/strings.xml
@@ -460,9 +460,6 @@ Užblokavimo apejima galima sustabdyti įjungiant telefono patvirtinimą [Modera
Mokėk už tai Naudodamas
Mokesčiai
Iš viso
- Visos Operacijos
- Lėšų grąžinimas
- Išsaugoti Operacijas
Operacijų Istorija
Tavo Prenumerata
Mokėjimo Būdai
diff --git a/com.discord/res/values-nl/strings.xml b/com.discord/res/values-nl/strings.xml
index 63871880d1..c7cd0ddcad 100644
--- a/com.discord/res/values-nl/strings.xml
+++ b/com.discord/res/values-nl/strings.xml
@@ -390,9 +390,6 @@ Het omzeilen van verbanningen kan heel moeilijk gemaakt worden door verificatie
Betaal ervoor met
Btw
Totaal
- Alle transacties
- Terugbetaald
- Winkeltransacties
Transactieoverzicht
Jouw abonnement
Betalingswijzen
diff --git a/com.discord/res/values-no/strings.xml b/com.discord/res/values-no/strings.xml
index bcbf18f696..f28639ae0b 100644
--- a/com.discord/res/values-no/strings.xml
+++ b/com.discord/res/values-no/strings.xml
@@ -328,9 +328,6 @@
Betal med
Skatter
Sum
- Alle transaksjoner
- Tilbakebetalt
- Butikktransaksjoner
Transaksjonshistorikk
Ditt abonnement
Betalingsmåter
diff --git a/com.discord/res/values-pl/strings.xml b/com.discord/res/values-pl/strings.xml
index f2a5160b2b..ea80c6a75c 100644
--- a/com.discord/res/values-pl/strings.xml
+++ b/com.discord/res/values-pl/strings.xml
@@ -468,9 +468,6 @@ Omijanie blokady może być stosunkowo utrudnione stosując weryfikację telefon
Zapłać przy użyciu
Opłaty podatkowe
Łącznie
- Wszystkie transakcje
- Zwrócono
- Transakcje w sklepie
Historia transakcji
Twoja subskrypcja
Metody płatności
diff --git a/com.discord/res/values-pt-rBR/strings.xml b/com.discord/res/values-pt-rBR/strings.xml
index 208a5cebae..543aff588c 100644
--- a/com.discord/res/values-pt-rBR/strings.xml
+++ b/com.discord/res/values-pt-rBR/strings.xml
@@ -468,9 +468,6 @@ Burlar um banimento pode ser dificultado ao ativar a verificação por telefone
Salve um método de pagamento para concluir seus pedidos mais rapidamente
Pagar com
Impostos
- Todas as transações
- Reembolsada
- Transações na loja
Histórico de transações
Sua Assinatura
Métodos de Pagamento
diff --git a/com.discord/res/values-ro/strings.xml b/com.discord/res/values-ro/strings.xml
index 138a0e48d6..d4c85ad563 100644
--- a/com.discord/res/values-ro/strings.xml
+++ b/com.discord/res/values-ro/strings.xml
@@ -453,9 +453,6 @@ dar atunci când va trebui, nu ezita!"
Finalizează mai rapid salvând o metodă de plată
Plătește cu
Impozite
- Toate tranzacțiile
- Restituit
- Stocare tranzacții
Istoric tranzacţii
Abonamentul tău
Metode de plată
diff --git a/com.discord/res/values-ru/strings.xml b/com.discord/res/values-ru/strings.xml
index 58cad9e9fe..81f28282f8 100644
--- a/com.discord/res/values-ru/strings.xml
+++ b/com.discord/res/values-ru/strings.xml
@@ -484,9 +484,6 @@
Оплатить при помощи
Налоги
Итого
- Все операции
- Возврат
- Операции в магазине
История операций
Ваша подписка
Способы Оплаты
diff --git a/com.discord/res/values-sv-rSE/strings.xml b/com.discord/res/values-sv-rSE/strings.xml
index 0aba15b984..4fa1dc7faf 100644
--- a/com.discord/res/values-sv-rSE/strings.xml
+++ b/com.discord/res/values-sv-rSE/strings.xml
@@ -428,9 +428,6 @@ En bannlysning blir mycket svårare att kringgå om man aktiverar telefonautenti
Betala med
Skatt
Totalt
- Alla transaktioner
- Återbetalat
- Butikstransaktioner
Transaktionshistorik
Din prenumeration
Betalningsmetoder
diff --git a/com.discord/res/values-th/strings.xml b/com.discord/res/values-th/strings.xml
index c6d52a5b17..ce8dadb82e 100644
--- a/com.discord/res/values-th/strings.xml
+++ b/com.discord/res/values-th/strings.xml
@@ -540,9 +540,6 @@
จ่ายด้วย
ภาษี
ยอดรวม
- ธุรกรรมทั้งหมด
- คืนเงินแล้ว
- ธุรกรรมร้านค้า
ประวัติธุรกรรม
การเป็นสมาชิกของฉัน
เมื่อซื้อการเป็นสมาชิก %1$s หมายความว่าคุณยอมรับ [ข้อตกลงการใช้งานร้านค้า] ของเรา(%2$s) %1$s เป็นการสมัครเป็นสมาชิกแบบต่อเนื่องโดยอัตโนมัติ คุณมอบอำนาจให้ Discord หักค่าใช้จ่ายทันทีตามวิธีการชำระเงินที่ให้ไว้เป็นจำนวน %3$s อย่างต่อเนื่องเป็นรายเดือนโดยอัตโนมัติจนกว่าจะมีการยกเลิก คุณสามารถยกเลิกได้ตลอดเวลา
diff --git a/com.discord/res/values-tr/strings.xml b/com.discord/res/values-tr/strings.xml
index 2c7154f08d..026dcfb482 100644
--- a/com.discord/res/values-tr/strings.xml
+++ b/com.discord/res/values-tr/strings.xml
@@ -457,9 +457,6 @@ Yasak atlatma [Moderasyon](onModerationClick) seçeneğinden telefon doğrulama
Şununla öde:
Vergiler
Toplam
- Tüm İşlemler
- İade Edildi
- Mağaza İşlemleri
İşlem Geçmişi
Aboneliğin
Ödeme Yöntemleri
diff --git a/com.discord/res/values-uk/strings.xml b/com.discord/res/values-uk/strings.xml
index 96fbbcf0d2..e713fc147c 100644
--- a/com.discord/res/values-uk/strings.xml
+++ b/com.discord/res/values-uk/strings.xml
@@ -446,9 +446,6 @@
Заплатити за допомогою
Податки
Усього
- Усі транзакції
- Компенсовано
- Транзакції в магазині
Історія транзакцій
Твоя підписка
Способи оплати
diff --git a/com.discord/res/values-v21/styles.xml b/com.discord/res/values-v21/styles.xml
index 01be2aa4d9..e1dbd57646 100644
--- a/com.discord/res/values-v21/styles.xml
+++ b/com.discord/res/values-v21/styles.xml
@@ -432,11 +432,6 @@
- @dimen/chat_cell_horizontal_spacing_total
- 4.0dip
-
-
diff --git a/com.discord/res/values-zh-rCN/strings.xml b/com.discord/res/values-zh-rCN/strings.xml
index 7b7f99903b..acb9890abe 100644
--- a/com.discord/res/values-zh-rCN/strings.xml
+++ b/com.discord/res/values-zh-rCN/strings.xml
@@ -447,9 +447,6 @@
支付方式为
税
总计
- 所有交易
- 已退款
- 商店交易
交易记录
您的订阅
支付方式
diff --git a/com.discord/res/values-zh-rTW/strings.xml b/com.discord/res/values-zh-rTW/strings.xml
index 36e6c94d1d..4fc91e2155 100644
--- a/com.discord/res/values-zh-rTW/strings.xml
+++ b/com.discord/res/values-zh-rTW/strings.xml
@@ -427,9 +427,6 @@
用以付款:
稅金
總計
- 所有交易
- 已退款
- 商店交易
交易記錄
你的訂閱
付款方式
diff --git a/com.discord/res/values/dimens.xml b/com.discord/res/values/dimens.xml
index adf1a51084..6bdb447565 100644
--- a/com.discord/res/values/dimens.xml
+++ b/com.discord/res/values/dimens.xml
@@ -202,7 +202,6 @@
- 0.38
- 0.7
- 0.54
- 8.0dip
24.0dip
4.0dip
20.0dip
diff --git a/com.discord/res/values/ids.xml b/com.discord/res/values/ids.xml
index 56fb37bca4..e34d983833 100644
--- a/com.discord/res/values/ids.xml
+++ b/com.discord/res/values/ids.xml
@@ -478,6 +478,14 @@
+
+
+
+
+
+
+
+
@@ -519,7 +527,6 @@
-
@@ -900,7 +907,6 @@
-
@@ -911,7 +917,6 @@
-
diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml
index b545e69e73..e0bb49db85 100644
--- a/com.discord/res/values/public.xml
+++ b/com.discord/res/values/public.xml
@@ -1618,163 +1618,162 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1812,256 +1811,245 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2069,470 +2057,459 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2580,199 +2557,187 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3301,1338 +3266,1343 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4706,203 +4676,203 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5106,25 +5076,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7851,3635 +7819,3629 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -11528,776 +11490,772 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index 84cae60442..4f96f68a4e 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -66,16 +66,16 @@
Actions
Active on Mobile
Activity
- "We've already curated news from games you play. You can follow more games or unfollow from settings."
+ News and updates from games you play will show up here. You can also follow more games in settings.
Keep up with games you play
- Follow games
- Let Discord use info like what games you play and who you play with to make sure you only see the good stuff! You can change this anytime in [privacy settings](onClickPrivacy).
+ Follow Games
+ Discord can tailor it to you by looking at what games you play and who you talk to. You can change this anytime in [privacy settings](onClickPrivacy).
No, thanks
Yes, count me in!
- "Seeing games you don't care about?"
+ Your Activity Feed could be better
"Discord can't show you when peeps are gaming until you give us permission to customize your feed."
- "Play games on your computer to get latest news from games you play. We've picked news from popular games for now. Or, you can follow games manually."
- "You haven't played any games recently"
+ News and updates from games you play will show up here. You can also follow more games in settings.
+ Keep up with games you play
Check back here later.
"There isn't any game news right now"
"When someone starts playing a game we'll show it here!"
@@ -727,10 +727,6 @@
Total
Choose a gift
Choose a plan
- All Transactions
- Nitro
- Refunded
- Store Transactions
Transaction History
Your Subscription
By purchasing a %1$s subscription, you agree to our [Terms of Service](%2$s). %1$s is an auto-recurring subscription. You authorize Discord to immediately charge the payment method provided at %3$s and to continue to do so automatically monthly until you cancel. You may cancel anytime.
@@ -966,7 +962,7 @@ HERE ARE MORE THINGS {progress}
Unable to sync cloud saves
OR
Collapse Category
- 7289bfde-43b1-4441-a606-756039a6f7cc
+ 83ee19bb-fa7d-4137-b6f3-e73e22c800ed
Coming Soon
Granular notification control only works on desktop apps at the moment. For now use the iOS notification settings.
COMING SOON!
@@ -1279,7 +1275,6 @@ HERE ARE MORE THINGS {progress}
Get Discord for Mobile
Get the Discord Mobile App
Or on the go
- https://discordapp.com/download
Text me a link
Oops, try again
Text Sent!
@@ -1753,14 +1748,14 @@ HERE ARE MORE THINGS {progress}
Add to Home
by %1$s
Follow
- Go to server
+ Go to Server
None of your friends have played this game recently.
%1$s Online in server
Play
Playing
Game trailer video
- Unfollow
- View server
+ Following
+ View Server
Games
162066849712
General Permissions
@@ -2446,7 +2441,6 @@ Want to know more about Discord?"
Enter an Instant Invite below to join an existing server. The invite will look something like these:
Enter an Instant Invite above to join an existing server.
Join a Server
- Join this server?
Join Video Call
Join Voice Call
Connect to this voice channel?
diff --git a/com.discord/res/values/styles.xml b/com.discord/res/values/styles.xml
index 88307aef0f..6e7a2b6857 100644
--- a/com.discord/res/values/styles.xml
+++ b/com.discord/res/values/styles.xml
@@ -845,11 +845,6 @@
- @dimen/avatar_size_large
- @drawable/asset_default_avatar_64dp
-
-
-
-