diff --git a/com.discord/AndroidManifest.xml b/com.discord/AndroidManifest.xml index 71c2abf61b..1f8172cc21 100644 --- a/com.discord/AndroidManifest.xml +++ b/com.discord/AndroidManifest.xml @@ -37,6 +37,23 @@ + + + + + + + + + + + + + + + + + diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 0ee40c46aa..572f72238c 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1077.apk +apkFileName: com.discord-1078.apk compressionType: false doNotCompress: - arsc @@ -190,5 +190,5 @@ usesFramework: tag: null version: 2.4.1-197d46-SNAPSHOT versionInfo: - versionCode: '1077' - versionName: '15.1' + versionCode: '1078' + versionName: 16-alpha4 diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index a2b05f03ed..a025200cb7 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 25 21:14:48 UTC 2020 -version_name=15.1 +#Thu Mar 26 01:19:05 UTC 2020 +version_name=16-alpha4 package_name=com.discord -build_id=cec8c70c-6223-4b6e-baf8-ca0e1a65c9bc -version_code=1077 +build_id=97f5d408-a3b3-443f-9297-7b7ad299ca1a +version_code=1078 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index 9afef6cd66..1688447100 100644 Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ diff --git a/com.discord/res/color/chat_send_btn_bg_dark.xml b/com.discord/res/color/chat_send_btn_bg_dark.xml new file mode 100644 index 0000000000..57073790c5 --- /dev/null +++ b/com.discord/res/color/chat_send_btn_bg_dark.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/color/chat_send_btn_bg_light.xml b/com.discord/res/color/chat_send_btn_bg_light.xml new file mode 100644 index 0000000000..4f29442200 --- /dev/null +++ b/com.discord/res/color/chat_send_btn_bg_light.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/color/chat_send_btn_dark.xml b/com.discord/res/color/chat_send_btn_dark.xml new file mode 100644 index 0000000000..75044e231b --- /dev/null +++ b/com.discord/res/color/chat_send_btn_dark.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/color/chat_send_btn_light.xml b/com.discord/res/color/chat_send_btn_light.xml new file mode 100644 index 0000000000..928e05b07e --- /dev/null +++ b/com.discord/res/color/chat_send_btn_light.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/ic_add_friend_send.xml b/com.discord/res/drawable-anydpi-v24/ic_add_friend_send.xml new file mode 100644 index 0000000000..bd70910301 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/ic_add_friend_send.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/ic_carot_right_24dp.xml b/com.discord/res/drawable-anydpi-v24/ic_carot_right_24dp.xml new file mode 100644 index 0000000000..d4685a4ff4 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/ic_carot_right_24dp.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/ic_gallery_24dp.xml b/com.discord/res/drawable-anydpi-v24/ic_gallery_24dp.xml new file mode 100644 index 0000000000..33bfc4cce4 --- /dev/null +++ b/com.discord/res/drawable-anydpi-v24/ic_gallery_24dp.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable-hdpi/ic_add_friend_send.png b/com.discord/res/drawable-hdpi/ic_add_friend_send.png new file mode 100644 index 0000000000..c53b45ecc0 Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_add_friend_send.png differ diff --git a/com.discord/res/drawable-hdpi/ic_carot_right_24dp.png b/com.discord/res/drawable-hdpi/ic_carot_right_24dp.png new file mode 100644 index 0000000000..e4db17e9a1 Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_carot_right_24dp.png differ diff --git a/com.discord/res/drawable-hdpi/ic_gallery_24dp.png b/com.discord/res/drawable-hdpi/ic_gallery_24dp.png new file mode 100644 index 0000000000..93d3d04d33 Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_gallery_24dp.png differ diff --git a/com.discord/res/drawable-ldpi/ic_add_friend_send.png b/com.discord/res/drawable-ldpi/ic_add_friend_send.png new file mode 100644 index 0000000000..65226f4e40 Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_add_friend_send.png differ diff --git a/com.discord/res/drawable-ldpi/ic_carot_right_24dp.png b/com.discord/res/drawable-ldpi/ic_carot_right_24dp.png new file mode 100644 index 0000000000..5ce1301615 Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_carot_right_24dp.png differ diff --git a/com.discord/res/drawable-ldpi/ic_gallery_24dp.png b/com.discord/res/drawable-ldpi/ic_gallery_24dp.png new file mode 100644 index 0000000000..7395c13f28 Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_gallery_24dp.png differ diff --git a/com.discord/res/drawable-mdpi/ic_add_friend_send.png b/com.discord/res/drawable-mdpi/ic_add_friend_send.png new file mode 100644 index 0000000000..891abf5cd9 Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_add_friend_send.png differ diff --git a/com.discord/res/drawable-mdpi/ic_carot_right_24dp.png b/com.discord/res/drawable-mdpi/ic_carot_right_24dp.png new file mode 100644 index 0000000000..492a36f901 Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_carot_right_24dp.png differ diff --git a/com.discord/res/drawable-mdpi/ic_gallery_24dp.png b/com.discord/res/drawable-mdpi/ic_gallery_24dp.png new file mode 100644 index 0000000000..f4608072ae Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_gallery_24dp.png differ diff --git a/com.discord/res/drawable-xhdpi/ic_add_friend_send.png b/com.discord/res/drawable-xhdpi/ic_add_friend_send.png new file mode 100644 index 0000000000..7f0fa40a93 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_add_friend_send.png differ diff --git a/com.discord/res/drawable-xhdpi/ic_carot_right_24dp.png b/com.discord/res/drawable-xhdpi/ic_carot_right_24dp.png new file mode 100644 index 0000000000..d05330fd75 Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_carot_right_24dp.png differ diff --git a/com.discord/res/drawable-xhdpi/ic_gallery_24dp.png b/com.discord/res/drawable-xhdpi/ic_gallery_24dp.png new file mode 100644 index 0000000000..685002424c Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_gallery_24dp.png differ diff --git a/com.discord/res/drawable-xxhdpi/ic_add_friend_send.png b/com.discord/res/drawable-xxhdpi/ic_add_friend_send.png new file mode 100644 index 0000000000..127cdaeabf Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_add_friend_send.png differ diff --git a/com.discord/res/drawable-xxhdpi/ic_carot_right_24dp.png b/com.discord/res/drawable-xxhdpi/ic_carot_right_24dp.png new file mode 100644 index 0000000000..ebcf40a2c1 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_carot_right_24dp.png differ diff --git a/com.discord/res/drawable-xxhdpi/ic_gallery_24dp.png b/com.discord/res/drawable-xxhdpi/ic_gallery_24dp.png new file mode 100644 index 0000000000..c45c038b46 Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_gallery_24dp.png differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_add_friend_send.png b/com.discord/res/drawable-xxxhdpi/ic_add_friend_send.png new file mode 100644 index 0000000000..ade10ebd4d Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_add_friend_send.png differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_carot_right_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_carot_right_24dp.png new file mode 100644 index 0000000000..1f9ae552ff Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_carot_right_24dp.png differ diff --git a/com.discord/res/drawable-xxxhdpi/ic_gallery_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_gallery_24dp.png new file mode 100644 index 0000000000..2a8eaedff7 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_gallery_24dp.png differ diff --git a/com.discord/res/drawable-xxxhdpi/img_channels_onboarding_dark.png b/com.discord/res/drawable-xxxhdpi/img_channels_onboarding_dark.png new file mode 100644 index 0000000000..7d7ed4eb85 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_channels_onboarding_dark.png differ diff --git a/com.discord/res/drawable-xxxhdpi/img_channels_onboarding_light.png b/com.discord/res/drawable-xxxhdpi/img_channels_onboarding_light.png new file mode 100644 index 0000000000..c11f8c0e77 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_channels_onboarding_light.png differ diff --git a/com.discord/res/drawable-xxxhdpi/img_voice_onboarding.png b/com.discord/res/drawable-xxxhdpi/img_voice_onboarding.png new file mode 100644 index 0000000000..f7937313c4 Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/img_voice_onboarding.png differ diff --git a/com.discord/res/drawable/drawable_bg_corners_20dp.xml b/com.discord/res/drawable/drawable_bg_corners_20dp.xml new file mode 100644 index 0000000000..21f23a5299 --- /dev/null +++ b/com.discord/res/drawable/drawable_bg_corners_20dp.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_add_24dp.xml b/com.discord/res/drawable/ic_add_24dp.xml index fa3970e111..af48bd43f4 100644 --- a/com.discord/res/drawable/ic_add_24dp.xml +++ b/com.discord/res/drawable/ic_add_24dp.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_add_friend_green_check.xml b/com.discord/res/drawable/ic_add_friend_green_check.xml new file mode 100644 index 0000000000..481e75122e --- /dev/null +++ b/com.discord/res/drawable/ic_add_friend_green_check.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_clear_24dp.xml b/com.discord/res/drawable/ic_clear_24dp.xml index 4e704c3d69..ca62763926 100644 --- a/com.discord/res/drawable/ic_clear_24dp.xml +++ b/com.discord/res/drawable/ic_clear_24dp.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_24dp.xml b/com.discord/res/drawable/ic_emoji_24dp.xml new file mode 100644 index 0000000000..248590c83c --- /dev/null +++ b/com.discord/res/drawable/ic_emoji_24dp.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_insert_emoticon_24dp.xml b/com.discord/res/drawable/ic_insert_emoticon_24dp.xml deleted file mode 100644 index e18a78d391..0000000000 --- a/com.discord/res/drawable/ic_insert_emoticon_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_launch_24dp.xml b/com.discord/res/drawable/ic_launch_24dp.xml index f5103df222..f3864480f4 100644 --- a/com.discord/res/drawable/ic_launch_24dp.xml +++ b/com.discord/res/drawable/ic_launch_24dp.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_send_24dp.xml b/com.discord/res/drawable/ic_send_24dp.xml index f4b093c925..3e4d486b62 100644 --- a/com.discord/res/drawable/ic_send_24dp.xml +++ b/com.discord/res/drawable/ic_send_24dp.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/com.discord/res/drawable/img_save_your_group.xml b/com.discord/res/drawable/img_save_your_group.xml new file mode 100644 index 0000000000..af34c7b239 --- /dev/null +++ b/com.discord/res/drawable/img_save_your_group.xml @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout-v22/widget_chat_input_edit_text.xml b/com.discord/res/layout-v22/widget_chat_input_edit_text.xml index b74bce51a6..80b14fe589 100644 --- a/com.discord/res/layout-v22/widget_chat_input_edit_text.xml +++ b/com.discord/res/layout-v22/widget_chat_input_edit_text.xml @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/com.discord/res/layout/flex_input_widget.xml b/com.discord/res/layout/flex_input_widget.xml index 2d74551cac..679fc073cd 100644 --- a/com.discord/res/layout/flex_input_widget.xml +++ b/com.discord/res/layout/flex_input_widget.xml @@ -1,15 +1,23 @@ - - - - + + + - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/fragment_camera.xml b/com.discord/res/layout/fragment_camera.xml index f449112e6f..25074e67c8 100644 --- a/com.discord/res/layout/fragment_camera.xml +++ b/com.discord/res/layout/fragment_camera.xml @@ -5,7 +5,7 @@ - + diff --git a/com.discord/res/layout/widget_add_friend_user_list_item.xml b/com.discord/res/layout/widget_add_friend_user_list_item.xml index c0e41feede..724344fc1b 100644 --- a/com.discord/res/layout/widget_add_friend_user_list_item.xml +++ b/com.discord/res/layout/widget_add_friend_user_list_item.xml @@ -1,11 +1,14 @@ - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_channel_onboarding.xml b/com.discord/res/layout/widget_channel_onboarding.xml new file mode 100644 index 0000000000..6626826d6d --- /dev/null +++ b/com.discord/res/layout/widget_channel_onboarding.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_chat_input.xml b/com.discord/res/layout/widget_chat_input.xml index 1c9860bb0d..923075ddb4 100644 --- a/com.discord/res/layout/widget_chat_input.xml +++ b/com.discord/res/layout/widget_chat_input.xml @@ -2,14 +2,13 @@ - + - + - \ No newline at end of file diff --git a/com.discord/res/layout/widget_chat_input_edit_text.xml b/com.discord/res/layout/widget_chat_input_edit_text.xml index 787dd407ae..c4b7a3b21c 100644 --- a/com.discord/res/layout/widget_chat_input_edit_text.xml +++ b/com.discord/res/layout/widget_chat_input_edit_text.xml @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/com.discord/res/layout/widget_friends_add.xml b/com.discord/res/layout/widget_friends_add.xml index 6e91ac96f5..b05b26078f 100644 --- a/com.discord/res/layout/widget_friends_add.xml +++ b/com.discord/res/layout/widget_friends_add.xml @@ -1,18 +1,15 @@ + 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_friends_add_by_id.xml b/com.discord/res/layout/widget_friends_add_by_id.xml new file mode 100644 index 0000000000..fae0521bf1 --- /dev/null +++ b/com.discord/res/layout/widget_friends_add_by_id.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_friends_nearby.xml b/com.discord/res/layout/widget_friends_nearby.xml index e7dd692506..c3836b117d 100644 --- a/com.discord/res/layout/widget_friends_nearby.xml +++ b/com.discord/res/layout/widget_friends_nearby.xml @@ -1,22 +1,12 @@ - - - - - - - - - - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/widget_guild_call_onboarding.xml b/com.discord/res/layout/widget_guild_call_onboarding.xml new file mode 100644 index 0000000000..fc0ae39473 --- /dev/null +++ b/com.discord/res/layout/widget_guild_call_onboarding.xml @@ -0,0 +1,9 @@ + + + + + + + + \ 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 e38b5fbc11..8db86841ce 100644 --- a/com.discord/res/layout/widget_guild_profile_sheet_v2.xml +++ b/com.discord/res/layout/widget_guild_profile_sheet_v2.xml @@ -6,7 +6,7 @@ - + diff --git a/com.discord/res/layout/widget_home_overlapping_panels.xml b/com.discord/res/layout/widget_home_overlapping_panels.xml index c3af837c7b..c50bbbaba5 100644 --- a/com.discord/res/layout/widget_home_overlapping_panels.xml +++ b/com.discord/res/layout/widget_home_overlapping_panels.xml @@ -2,7 +2,7 @@ - + diff --git a/com.discord/res/layout/widget_mute_settings_sheet.xml b/com.discord/res/layout/widget_mute_settings_sheet.xml index e06d7fcc80..a3ca94bd3d 100644 --- a/com.discord/res/layout/widget_mute_settings_sheet.xml +++ b/com.discord/res/layout/widget_mute_settings_sheet.xml @@ -1,15 +1,33 @@ + 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/values-bg/strings.xml b/com.discord/res/values-bg/strings.xml index 6e016f954a..82ae204bce 100644 --- a/com.discord/res/values-bg/strings.xml +++ b/com.discord/res/values-bg/strings.xml @@ -4552,6 +4552,7 @@ NSFW каналите нямат филтър за нецензурно съдъ За достъп до **твоята камера, трябва да ни дадеш разрешение**. За достъп до **твоите внушителни файлове, трябва да ни дадеш разрешение**. Лента с раздели + Направи снимка Кафеникаво Докосни, за да добавиш псевдоним Синьозелено diff --git a/com.discord/res/values-cs/strings.xml b/com.discord/res/values-cs/strings.xml index 24b59ea8e3..0938df8ed2 100644 --- a/com.discord/res/values-cs/strings.xml +++ b/com.discord/res/values-cs/strings.xml @@ -4512,6 +4512,7 @@ Určitě to chceš udělat?" Pro přístup k **tvé kameře nám budeš muset udělit oprávnění**. Pro přístup k **tvým působivým souborům nám budeš muset udělit oprávnění**. Lišta karet + Vyfotit Světle hnědá Klepnutím přidej přezdívku Modrozelená diff --git a/com.discord/res/values-da/strings.xml b/com.discord/res/values-da/strings.xml index 4febcfdf05..06d2c1c89c 100644 --- a/com.discord/res/values-da/strings.xml +++ b/com.discord/res/values-da/strings.xml @@ -4486,6 +4486,7 @@ Er du sikker på, at du vil gøre dette?" For at få adgang til **dit kamera, er du nødt til at give os tilladelse**. For at få adgang til **dine imponerende filer, er du nødt til at give os tilladelse**. Fanebjælke + Tag et foto Gyldenbrun Tryk for at tilføje et kælenavn "Midlertidige medlemmer bliver automatisk smidt ud, når de frakobler sig, medmindre en rolle diff --git a/com.discord/res/values-de/strings.xml b/com.discord/res/values-de/strings.xml index a14b754a42..99681ef810 100644 --- a/com.discord/res/values-de/strings.xml +++ b/com.discord/res/values-de/strings.xml @@ -4510,6 +4510,7 @@ Bist du sicher, dass du das tun möchtest?" Um auf **deine Kamera zugreifen zu können, musst du uns erst die Erlaubnis dazu geben**. Um auf **deine beeindruckenden Dateien zugreifen zu können, musst du uns erst die Erlaubnis dazu geben**. Registerkartenleiste + Ein Foto schießen Hellbraun Tippe, um einen Nickname hinzuzufügen Türkis diff --git a/com.discord/res/values-el/strings.xml b/com.discord/res/values-el/strings.xml index 1395f5d042..bd9c304478 100644 --- a/com.discord/res/values-el/strings.xml +++ b/com.discord/res/values-el/strings.xml @@ -4546,6 +4546,7 @@ ping ήταν **%3$s ms**. Ο ρυθμός απώλειας εξερχόμενω Για να αποκτήσουμε πρόσβαση **στην κάμερά σου, πρέπει πρώτα να μας δώσεις άδεια**. Για να αποκτήσουμε πρόσβαση **στα εντυπωσιακά σου αρχεία, πρέπει πρώτα να μας δώσεις άδεια**. Μπάρα καρτέλας + Βγάλε μια φωτογραφία Ανοιχτό καφέ Πάτησε για να προσθέσεις ένα ψευδώνυμο Γαλαζοπράσινο diff --git a/com.discord/res/values-es-rES/strings.xml b/com.discord/res/values-es-rES/strings.xml index 60b9241ccc..1421c74465 100644 --- a/com.discord/res/values-es-rES/strings.xml +++ b/com.discord/res/values-es-rES/strings.xml @@ -4503,6 +4503,7 @@ Información del servidor es una característica experimental que está sujeta a Para acceder **a tu cámara, tendrás que concedernos permiso**. Para acceder **a tus impresionantes archivos, tendrás que concedernos permiso**. Barra de pestañas + Tomar una foto Bronceado Toca para añadir un apodo Verde azulado diff --git a/com.discord/res/values-fi/strings.xml b/com.discord/res/values-fi/strings.xml index b29f405910..3cc52d8b27 100644 --- a/com.discord/res/values-fi/strings.xml +++ b/com.discord/res/values-fi/strings.xml @@ -4555,6 +4555,7 @@ Haluatko varmasti tehdä tämän?" Jotta voimme käyttää **kameraasi, sinun täytyy antaa meille lupa siihen**. Jotta pääsemme käsiksi **vaikuttaviin tiedostoihisi, sinun täytyy antaa meille lupa siihen**. Välilehtipalkki + Ota valokuva Kellanruskea Lisää nimimerkki napauttamalla Sinivihreä diff --git a/com.discord/res/values-fr/strings.xml b/com.discord/res/values-fr/strings.xml index 580599c3b6..17bb6eafe5 100644 --- a/com.discord/res/values-fr/strings.xml +++ b/com.discord/res/values-fr/strings.xml @@ -4537,6 +4537,7 @@ Tu es sûr(e) de vouloir faire ça ?" Pour accéder à **ta caméra, nous avons besoin de ton autorisation**. Pour accéder à **tes incroyables fichiers, nous avons besoin de ton autorisation**. Touche de tabulation + Prendre une photo Brun clair Appuie pour ajouter un pseudo Turquoise diff --git a/com.discord/res/values-hr/strings.xml b/com.discord/res/values-hr/strings.xml index 4e2ed01c65..04c57fea79 100644 --- a/com.discord/res/values-hr/strings.xml +++ b/com.discord/res/values-hr/strings.xml @@ -4461,6 +4461,7 @@ Razrada servera je eksperimentalna funkcija i u budućnosti se može promijeniti Za pristup **tvojoj kameri, morat ćeš nam dati dozvolu**. Za pristup **tvojim impresivnim datotekama, morat ćeš nam dati dozvolu**. Traka s karticama + Snimi fotografiju Bež Dodirni za dodavanje nadimka Privremeni članovi su automatski izbačeni čim se odspoje, osim ako im je pridružena neka uloga diff --git a/com.discord/res/values-hu/strings.xml b/com.discord/res/values-hu/strings.xml index b2cad365fd..ee0d235804 100644 --- a/com.discord/res/values-hu/strings.xml +++ b/com.discord/res/values-hu/strings.xml @@ -4539,6 +4539,7 @@ Biztosan ezt szeretnéd?" Szükségünk van **az engedélyedre, hogy hozzáférjünk a kamerádhoz**. Szükségünk van **az engedélyedre, hogy hozzáférjünk a lenyűgöző fájljaidhoz**. Ikonsáv + Fotó készítése Vörösesbarna Koppints ide becenév beállításához Pávakék diff --git a/com.discord/res/values-it/strings.xml b/com.discord/res/values-it/strings.xml index d16547a18c..cef8f7c23a 100644 --- a/com.discord/res/values-it/strings.xml +++ b/com.discord/res/values-it/strings.xml @@ -4531,6 +4531,7 @@ Procedere?" Per accedere **alla tua webcam, dovrai concederci il permesso**. Per accedere **ai tuoi importanti file, dovrai concederci il permesso**. Barra delle schede + Scatta una foto Beige Tocca per aggiungere un nickname Foglia di tè diff --git a/com.discord/res/values-ja/strings.xml b/com.discord/res/values-ja/strings.xml index 2b924349c3..0ade8210a8 100644 --- a/com.discord/res/values-ja/strings.xml +++ b/com.discord/res/values-ja/strings.xml @@ -4587,6 +4587,7 @@ Discordについて詳しい情報が必要ですか？" **あなたのカメラにアクセスするために、権限の許可をお願いします**。 **あなたの素晴らしいファイルにアクセスするために、権限の許可をお願いします**。 タブバー + 写真を撮る タン タップしてニックネームを追加 ティール diff --git a/com.discord/res/values-ko/strings.xml b/com.discord/res/values-ko/strings.xml index 4dc2b1ea5f..1044d22cdc 100644 --- a/com.discord/res/values-ko/strings.xml +++ b/com.discord/res/values-ko/strings.xml @@ -4578,6 +4578,7 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)" **Discord가 카메라에 엑세스할 수 있도록 엑세스 권한을 허용해 주세요**. **Discord가 이 근사한 파일에 엑세스할 수 있도록 엑세스 권한을 허용해 주세요**. 탭바 + 사진 찍기 탠 탭하여 별명 추가하기 청록색 diff --git a/com.discord/res/values-lt/strings.xml b/com.discord/res/values-lt/strings.xml index caf80d7544..03b559338f 100644 --- a/com.discord/res/values-lt/strings.xml +++ b/com.discord/res/values-lt/strings.xml @@ -4560,6 +4560,7 @@ Ar tikrai norite tęsti?" Kad prieitume **tavo kamerą, turi duoti mums leidimą**. Norint pasiekti **savo įspūdingus failus, turi duoti mums leidimą**. Skirtukų juosta + Fotografuoti Gelsvai rudas Bakstelėk, kad pridėti slapyvardį Žalsvai mėlynas diff --git a/com.discord/res/values-nl/strings.xml b/com.discord/res/values-nl/strings.xml index 3d0d8c516b..a57f33a141 100644 --- a/com.discord/res/values-nl/strings.xml +++ b/com.discord/res/values-nl/strings.xml @@ -4495,6 +4495,7 @@ Weet je zeker dat je dit wilt doen?" Voor toegang tot **je camera, moet je ons toegang geven**. Voor toegang tot **je indrukwekkende bestanden moet je ons toegang geven**. Tabbalk + Een foto maken Geelbruin Tik om een bijnaam toe te voegen Groenblauw diff --git a/com.discord/res/values-no/strings.xml b/com.discord/res/values-no/strings.xml index b77d1b3b56..2cac8d2715 100644 --- a/com.discord/res/values-no/strings.xml +++ b/com.discord/res/values-no/strings.xml @@ -4444,6 +4444,7 @@ Er du sikker på at du vil gjøre dette?" For å få tilgang til **kameraet ditt må du gi oss tillatelse**. For å få tilgang til **de imponerende filene dine må du gi oss tillatelse**. Fanelinje + Ta et bilde Solbrun Trykk for å legge til et kallenavn Blågrønn diff --git a/com.discord/res/values-pl/strings.xml b/com.discord/res/values-pl/strings.xml index b31b79bfb1..68566b0d5e 100644 --- a/com.discord/res/values-pl/strings.xml +++ b/com.discord/res/values-pl/strings.xml @@ -4568,6 +4568,7 @@ Czy na pewno chcesz to zrobić?" Aby mieć dostęp **do Twojej kamery, musisz przyznać nam uprawnienie**. Abyśmy otrzymali dostęp **do Twoich pokaźnych plików, musisz przyznać nam uprawnienie**. Pasek kart + Zrób zdjęcie Jasnobrązowy Dotknij, aby dodać pseudonim Morski diff --git a/com.discord/res/values-pt-rBR/strings.xml b/com.discord/res/values-pt-rBR/strings.xml index 3c4a586077..3e75426130 100644 --- a/com.discord/res/values-pt-rBR/strings.xml +++ b/com.discord/res/values-pt-rBR/strings.xml @@ -4551,6 +4551,7 @@ Deseja mesmo fazer isso?" Para acessar **sua câmera, você precisará nos conceder permissão**. Para acessar **seus preciosos arquivos, você precisará nos conceder permissão**. Barra de abas + Tire uma foto Bege Toque para adicionar um apelido Ciano diff --git a/com.discord/res/values-ro/strings.xml b/com.discord/res/values-ro/strings.xml index 7b9282d57b..d77b06053d 100644 --- a/com.discord/res/values-ro/strings.xml +++ b/com.discord/res/values-ro/strings.xml @@ -4506,6 +4506,7 @@ Ești sigur că vrei să continui?" Pentru a-ți accesa **camera, trebuie să ne acorzi permisiunea**. Pentru a accesa **fișierele tale minunate, va trebui să ne acorzi permisiunea**. Bara de file + Fă o poză Bej Atinge pentru a adăuga o poreclă Turcoaz diff --git a/com.discord/res/values-ru/strings.xml b/com.discord/res/values-ru/strings.xml index 95ff4a8caa..f3883afce7 100644 --- a/com.discord/res/values-ru/strings.xml +++ b/com.discord/res/values-ru/strings.xml @@ -4600,6 +4600,7 @@ Чтобы у нас был доступ к **вашей камере, вам надо предоставить нам разрешение**. Чтобы у нас был доступ к **вашим классным файлам, вам надо предоставить нам разрешение**. Панель вкладок + Сделать фото Песочно-коричневый Нажмите, чтобы добавить никнейм Бирюзовый diff --git a/com.discord/res/values-sv-rSE/strings.xml b/com.discord/res/values-sv-rSE/strings.xml index 3c757f58e8..5de4bdc17f 100644 --- a/com.discord/res/values-sv-rSE/strings.xml +++ b/com.discord/res/values-sv-rSE/strings.xml @@ -4477,6 +4477,7 @@ Server Insights är en experimentell funktion som kan komma att ändras eller ta För att få tillgång till **din kamera, behöver du ge oss tillåtelse**. För att få tillgång till **dina imponerande filer, behöver du ge oss tillåtelse**. Flikfält + Ta ett foto Mellanbrun Tryck för att lägga till ett smeknamn Blågrön diff --git a/com.discord/res/values-th/strings.xml b/com.discord/res/values-th/strings.xml index f3e8897ae8..4818c2f3b8 100644 --- a/com.discord/res/values-th/strings.xml +++ b/com.discord/res/values-th/strings.xml @@ -4547,6 +4547,7 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ เพื่อเข้าถึง **กล้องของคุณ คุณต้องให้อนุญาตกับเรา** เพื่อเข้าถึง **ไฟล์ของคุณ คุณต้องให้อนุญาตกับเรา** แถบแท็บ + ถ่ายรูป สีแทน คลิกเพื่อเพิ่มชื่อเล่น สีเขียวอมน้ำเงิน diff --git a/com.discord/res/values-tr/strings.xml b/com.discord/res/values-tr/strings.xml index d7486c801c..a6ff93a3c0 100644 --- a/com.discord/res/values-tr/strings.xml +++ b/com.discord/res/values-tr/strings.xml @@ -4531,6 +4531,7 @@ Bunu yapmak istediğine emin misin?" Kamerana **erişmemiz için bize izin vermen gerekecek**. Etkileyici dosyalarına **erişmemiz için bize izin vermen gerekecek**. Sekme çubuğu + Bir Fotoğraf çek Bronz Bir kullanıcı adı eklemek için dokunun Deniz mavisi diff --git a/com.discord/res/values-uk/strings.xml b/com.discord/res/values-uk/strings.xml index bb9d11edcd..733c27da06 100644 --- a/com.discord/res/values-uk/strings.xml +++ b/com.discord/res/values-uk/strings.xml @@ -4567,6 +4567,7 @@ AFK. Це не впливає на браузери." Щоб ми мали змогу отримати доступ до **твоєї камери, ти маєш надати нам дозвіл**. Щоб ми мали змогу отримати доступ до **твоїх вражаючих файлів, ти маєш надати нам дозвіл**. Панель вкладок + Зробити знімок Світло-коричневий Торкнись, щоб додати нікнейм Синьо-зелений diff --git a/com.discord/res/values-vi/strings.xml b/com.discord/res/values-vi/strings.xml index 99dcf33f77..bc2f276175 100644 --- a/com.discord/res/values-vi/strings.xml +++ b/com.discord/res/values-vi/strings.xml @@ -4522,6 +4522,7 @@ Bạn có chắc muốn thực hiện không?" Để truy cập vào **camera, trước tiên bạn cần cấp quyền cho chúng tôi đã**. Để truy cập **các tệp hay ho, trước tiên bạn cần phải cấp quyền cho chúng tôi đã**. Thanh tab + Chụp Ảnh Nâu vàng Nhấn vào để thêm biệt danh Xanh mòng két diff --git a/com.discord/res/values-zh-rCN/strings.xml b/com.discord/res/values-zh-rCN/strings.xml index 892126c083..19e5197f3b 100644 --- a/com.discord/res/values-zh-rCN/strings.xml +++ b/com.discord/res/values-zh-rCN/strings.xml @@ -4562,6 +4562,7 @@ ping为**%3$s ms**。出站丢包率为 **%4$s%%**. 为使用 **您的相机，您需要授予我们权限**。 为访问 **您的文件，您需要授予我们权限**。 选项卡栏 + 拍摄照片 棕褐色 点击添加昵称 凫蓝色 diff --git a/com.discord/res/values-zh-rTW/strings.xml b/com.discord/res/values-zh-rTW/strings.xml index 84be776ce1..c7e9b34cab 100644 --- a/com.discord/res/values-zh-rTW/strings.xml +++ b/com.discord/res/values-zh-rTW/strings.xml @@ -4560,6 +4560,7 @@ Server Insights 是實驗性功能，未來有可能變更或移除。" 存取 **您的相機，需要您授予我們權限**。 存取 **讓您印象深刻的檔案，需要您授予我們權限**。 索引標籤列 + 拍照 古銅色 點選可加入暱稱 青綠色 diff --git a/com.discord/res/values/attrs.xml b/com.discord/res/values/attrs.xml index cd813b379c..7fe1bd06ba 100644 --- a/com.discord/res/values/attrs.xml +++ b/com.discord/res/values/attrs.xml @@ -281,6 +281,8 @@ + + @@ -558,6 +560,7 @@ + @@ -1646,8 +1649,6 @@ - - diff --git a/com.discord/res/values/colors.xml b/com.discord/res/values/colors.xml index 8dac336bb1..aa2e453bb3 100644 --- a/com.discord/res/values/colors.xml +++ b/com.discord/res/values/colors.xml @@ -227,7 +227,6 @@ #ff424242 #ff4087ed #ff4087ed - #ffdadddf #ff008577 #ff3e70dd #ff3e70dd diff --git a/com.discord/res/values/dimens.xml b/com.discord/res/values/dimens.xml index 981cd216df..ae606beaf6 100644 --- a/com.discord/res/values/dimens.xml +++ b/com.discord/res/values/dimens.xml @@ -207,9 +207,6 @@ 0.38 0.7 0.54 - 1472.0dip - 8.0dip - 4.0dip 20.0dip 800.0dip 120.0dip @@ -388,6 +385,10 @@ 13.0sp 10.0dip 5.0dip + 8.0dip + 32.0dip + 1600.0dip + 8.0dip 56.0dip 16.0dip 88.0dip diff --git a/com.discord/res/values/ids.xml b/com.discord/res/values/ids.xml index 79962971bc..065e204d5f 100644 --- a/com.discord/res/values/ids.xml +++ b/com.discord/res/values/ids.xml @@ -46,6 +46,7 @@ + @@ -75,17 +76,17 @@ - - + + - - + + @@ -117,9 +118,6 @@ - - - @@ -274,6 +272,7 @@ + @@ -689,8 +688,6 @@ - - @@ -747,11 +744,26 @@ + + + + + + + + + + + + + + + - + @@ -823,6 +835,7 @@ + @@ -1109,7 +1122,6 @@ - @@ -1238,6 +1250,12 @@ + + + + + + @@ -1245,21 +1263,21 @@ + + + - - - - - + + @@ -1657,7 +1675,6 @@ - @@ -2051,6 +2068,8 @@ + + @@ -2083,7 +2102,6 @@ - diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml index 91719b848f..3d50e863c8 100644 --- a/com.discord/res/values/public.xml +++ b/com.discord/res/values/public.xml @@ -270,1140 +270,1141 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1527,547 +1528,550 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2276,268 +2280,269 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2634,780 +2639,783 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3423,195 +3431,198 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3665,18 +3676,18 @@ - - - - - - - - + + + + + + + + - - + + @@ -3687,70 +3698,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3759,59 +3770,59 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3824,18 +3835,21 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -3920,2459 +3934,2477 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6725,312 +6757,315 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10474,5411 +10509,5426 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -15886,1066 +15936,1062 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 82eac6605f..9539d3793a 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -128,6 +128,8 @@ Add a Server Tap to add a server! Add Friends + You will need both their username and a tag. For example, Wumpus#6318. Keep in mind that username is case sensitive. + Add your friend on Discord Add a Channel or Category Add a channel to override its default notification settings Add Content @@ -146,16 +148,20 @@ Friend Username#0000 Nearby + Make sure your friends are on this page and scanning too. Please turn on location services, Bluetooth, and WiFi (all the things!). Then reconnect to the internet to activate Nearby. Please turn on Bluetooth and WiFi to activate Nearby. Disable Nearby Scanning Start Nearby Scanning Enable Nearby in System Settings -> Google -> Nearby to find nearby friends nearby! + Still scanning the airwaves. You will see more friends pop up here if we find them. + We found some friends! There was a problem using Nearby. Please try again "Find friends near you with Nearby! Make sure they're using Nearby too." [Learn More](%1$s) Scanning the airwaves for friends. Make sure your future friends are on this screen and using nearby too! Nearby connection was stopped. + Scanning the airwaves… Usernames are case sensitive and need a tag. Enter a Username#0000 Success! Your friend request to **%1$s** is being escorted by the most elite Discord samurai. @@ -1006,11 +1012,13 @@ Fixes and Updates {fixed} Choose an application Claim Account Claim your account to keep all your servers and chats even after you close the browser. + Keep all your chats and servers even after you close the browser. "Thanks! We've sent a confirmation link to: **%1$s**" Get the Desktop App Get our Desktop App to take full advantage of Discord with an in-game overlay, desktop notifications and global hotkeys. Please claim your account to use the desktop app. "Thanks! We've sent a confirmation link to **%1$s**. Please click the link to verify your account." + Claim your account Clear Attachments Clear Role Permissions Clear text @@ -1039,7 +1047,7 @@ Fixes and Updates {fixed} OR Collapse Collapse Category - cec8c70c-6223-4b6e-baf8-ca0e1a65c9bc + 97f5d408-a3b3-443f-9297-7b7ad299ca1a Coming Soon Search Animated GIFs on the Web Displays text with emphasis. @@ -1505,6 +1513,7 @@ Fixes and Updates {fixed} Examples Exit Full Screen Advanced + Expand Buttons Howdy Friend! Why don’t you saddle up with Discord for your desktop computer? Here’s the link to grab the desktop app: %1$s Experimental Encoders @@ -2149,6 +2158,9 @@ Fixes and Updates {fixed} Upload a Server Icon Server Icon Recommended size: **512x512** + Visit the community-run Coronavirus Discord to talk about COVID-19, and head to [CDC.gov](%1$s) for more information. + Visit COVID-19 Discord + Stay safe and informed Servers for games you play Popular servers and communities %1$s for %2$s @@ -2556,6 +2568,7 @@ Servers that have set up a Welcome Screen see improvements in more people sticki What do people do in this channel? If enabled, this Welcome Screen appears for new members when they join your server. This screen helps new members discover all the cool things they can do in your server! Welcome to **%1$s!** + Something went wrong while saving your changes Server Banner Server Invite Background This image will display when users receive an invite to the server. @@ -3035,7 +3048,6 @@ Want to know more about Discord?" Not what you’re looking for? Browse your photo library for that perfect picture. Enable permissions to access your photo library. Show everyone how cute your pet is. You don’t have any photos in your photo library. The best time to start is now. - Take a Photo Tap to see full message. In a voice call Open Voice Channel @@ -3306,7 +3318,7 @@ Want to know more about Discord?" 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." + "Please make your message of %1$s characters shorter. We've set the limit at %2$s characters to be courteous to others." Your message is too long. %1$s said %2$s Deleted Role @@ -3490,10 +3502,10 @@ Want to know more about Discord?" No thanks No Limit No Video Devices - Suppress background noise from your mic. Make some noise, like clapping your hands, while talking and hear the magic at work. Got it While speaking, suppress background noise and showcase your wonderful voice. Noise Suppression is here! + Suppress background noise from your mic. Make some noise while talking, like clapping your hands, and hear the magic at work. Powered by Noise Suppression Learn More @@ -4469,6 +4481,7 @@ The changes to your subscription are reflected below:" bilbo.baggins@hotmail.net Deutsch + \@Mentions Only Ok ?? 9 99 999 @@ -5002,6 +5015,7 @@ Server Insights is an experimental feature and is subject to change or removal i Mentions tab Search tab Settings tab + Take a Photo Tan Tap to add a nickname TAR @@ -5373,6 +5387,7 @@ You cannot take any moderation actions until you enable it." Minimize to Tray My Account Noise Suppression + Suppress background noise from your mic. Shows a red badge on the app icon when you have unread messages. Enable Unread Message Badge Flashes the app in your taskbar when you have new notifications. @@ -5598,5 +5613,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 41a926705c..c54a6167e8 100644 --- a/com.discord/res/values/styles.xml +++ b/com.discord/res/values/styles.xml @@ -13,6 +13,11 @@ @anim/mtrl_bottom_sheet_slide_in @anim/mtrl_bottom_sheet_slide_out + - - - - -