From 082c7840ea23e1d29b9e844f897416820ca4776f Mon Sep 17 00:00:00 2001
From: Mariotaku Lee <mariotaku.lee@gmail.com>
Date: Mon, 3 Apr 2017 13:55:43 +0800
Subject: [PATCH] fixed crashes updated i18n

---
 twidere/src/.google.commit-id                 |  2 +-
 .../twidere/fragment/AbsStatusesFragment.kt   | 16 ++--
 .../fragment/ParcelableStatusesFragment.kt    |  5 +-
 .../main/res-localized/values-fr/strings.xml  | 61 ++++++++++++
 .../main/res-localized/values-gl/arrays.xml   |  4 +-
 .../main/res-localized/values-gl/plurals.xml  |  2 +-
 .../main/res-localized/values-gl/strings.xml  | 70 +++++++-------
 .../values-gl/strings_twitter_errors.xml      |  2 +-
 .../main/res-localized/values-ja/arrays.xml   | 16 ++--
 .../main/res-localized/values-ja/plurals.xml  | 14 +--
 .../main/res-localized/values-ja/strings.xml  | 92 +++++++++----------
 .../values-ja/strings_http_errors.xml         |  2 +-
 .../values-ja/strings_twitter_errors.xml      | 10 +-
 .../main/res-localized/values-yue/arrays.xml  |  3 +
 .../main/res-localized/values-yue/plurals.xml |  4 +
 .../main/res-localized/values-yue/strings.xml | 57 ++++++++++++
 .../values-yue/strings_http_errors.xml        |  5 +
 .../values-yue/strings_twitter_errors.xml     | 19 ++++
 .../res-localized/values-zh-rCN/strings.xml   |  6 +-
 .../res-localized/values-zh-rHK/arrays.xml    | 43 +++++----
 20 files changed, 296 insertions(+), 137 deletions(-)
 create mode 100644 twidere/src/main/res-localized/values-yue/arrays.xml
 create mode 100644 twidere/src/main/res-localized/values-yue/plurals.xml
 create mode 100644 twidere/src/main/res-localized/values-yue/strings.xml
 create mode 100644 twidere/src/main/res-localized/values-yue/strings_http_errors.xml
 create mode 100644 twidere/src/main/res-localized/values-yue/strings_twitter_errors.xml

diff --git a/twidere/src/.google.commit-id b/twidere/src/.google.commit-id
index cab93afc7..ebc4150ad 100644
--- a/twidere/src/.google.commit-id
+++ b/twidere/src/.google.commit-id
@@ -1 +1 @@
-d46bc8d067b6ada7f7d9478489a6daf0b9b1e997
+cd6c85e6afbbdc5097afdde52c93b0d9cb33383b
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt
index 996fde720..b3132414e 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt
@@ -635,17 +635,19 @@ abstract class AbsStatusesFragment : AbsContentListRecyclerViewFragment<Parcelab
             when (requestCode) {
                 AbsStatusesFragment.REQUEST_FAVORITE_SELECT_ACCOUNT -> {
                     if (resultCode != Activity.RESULT_OK || data == null) return
-                    val accountKey = data.getParcelableExtra<UserKey>(IntentConstants.EXTRA_ACCOUNT_KEY)
-                    val extras = data.getBundleExtra(IntentConstants.EXTRA_EXTRAS)
-                    val status = extras.getParcelable<ParcelableStatus>(IntentConstants.EXTRA_STATUS)
+                    val accountKey = data.getParcelableExtra<UserKey>(EXTRA_ACCOUNT_KEY)
+                    val extras = data.getBundleExtra(EXTRA_EXTRAS)
+                    val status = extras.getParcelable<ParcelableStatus>(EXTRA_STATUS)
                     fragment.twitterWrapper.createFavoriteAsync(accountKey, status)
                 }
                 AbsStatusesFragment.REQUEST_RETWEET_SELECT_ACCOUNT -> {
                     if (resultCode != Activity.RESULT_OK || data == null) return
-                    val accountKey = data.getParcelableExtra<UserKey>(IntentConstants.EXTRA_ACCOUNT_KEY)
-                    val extras = data.getBundleExtra(IntentConstants.EXTRA_EXTRAS)
-                    val status = extras.getParcelable<ParcelableStatus>(IntentConstants.EXTRA_STATUS)
-                    RetweetQuoteDialogFragment.show(fragment.childFragmentManager, status, accountKey)
+                    val accountKey = data.getParcelableExtra<UserKey>(EXTRA_ACCOUNT_KEY)
+                    val extras = data.getBundleExtra(EXTRA_EXTRAS)
+                    val status = extras.getParcelable<ParcelableStatus>(EXTRA_STATUS)
+                    fragment.executeAfterFragmentResumed {
+                        RetweetQuoteDialogFragment.show(it.childFragmentManager, status, accountKey)
+                    }
                 }
             }
         }
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableStatusesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableStatusesFragment.kt
index d1600e61e..19902c850 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableStatusesFragment.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableStatusesFragment.kt
@@ -166,8 +166,9 @@ abstract class ParcelableStatusesFragment : AbsStatusesFragment() {
     override fun triggerRefresh(): Boolean {
         super.triggerRefresh()
         val accountKeys = accountKeys
-        if (adapter.getStatusCount(true) > 0) {
-            val firstStatus = adapter.getStatus(0, true)
+        val statusStartIndex = adapter.statusStartIndex
+        if (statusStartIndex >= 0) {
+            val firstStatus = adapter.getStatus(statusStartIndex, true)
             val sinceIds = Array(accountKeys.size) {
                 return@Array if (firstStatus.account_key == accountKeys[it]) firstStatus.id else null
             }
diff --git a/twidere/src/main/res-localized/values-fr/strings.xml b/twidere/src/main/res-localized/values-fr/strings.xml
index ad2f9fbcd..65622dbff 100644
--- a/twidere/src/main/res-localized/values-fr/strings.xml
+++ b/twidere/src/main/res-localized/values-fr/strings.xml
@@ -164,6 +164,35 @@
   <string name="activity_about_me_favorite_multi"><xliff:g id="user">%1$s</xliff:g> et <xliff:g id="other">%2$s</xliff:g> ont mis en favori</string>
   <string name="activity_about_me_favorited_media_tagged"><xliff:g id="user">%s</xliff:g> a mis en favori un tweet qui te mentionne</string>
   <string name="activity_about_me_favorited_media_tagged_multi"><xliff:g id="user">%1$s</xliff:g> et <xliff:g id="other">%2$s</xliff:g> ont mis en favori un tweet qui te mentionne</string>
+  <string name="activity_about_me_favorited_mention"><xliff:g id="user">%s</xliff:g> a mis en favori un tweet où vous êtes mentionné</string>
+  <string name="activity_about_me_favorited_mention_multi"><xliff:g id="user">%1$s</xliff:g> et <xliff:g id="other">%2$s</xliff:g> ont mis en favori un tweet où vous êtes mentionné</string>
+  <string name="activity_about_me_favorited_retweet"><xliff:g id="user">%s</xliff:g> a mis en favori votre retweet</string>
+  <string name="activity_about_me_favorited_retweet_multi"><xliff:g id="user">%1$s</xliff:g> et <xliff:g id="other">%2$s</xliff:g> ont mis en favori votre retweet</string>
+  <string name="activity_about_me_follow"><xliff:g id="user">%s</xliff:g> vous suit</string>
+  <string name="activity_about_me_follow_multi"><xliff:g id="user">%1$s</xliff:g> et <xliff:g id="other">%2$s</xliff:g> vous suivent</string>
+  <string name="activity_about_me_like"><xliff:g id="user">%s</xliff:g> a liké</string>
+  <string name="activity_about_me_like_multi"><xliff:g id="user">%1$s</xliff:g> et <xliff:g id="other">%2$s</xliff:g> ont liké</string>
+  <string name="activity_about_me_liked_media_tagged"><xliff:g id="user">%s</xliff:g> a liké un tweet où vous êtes présent</string>
+  <string name="activity_about_me_liked_media_tagged_multi"><xliff:g id="user">%1$s</xliff:g> et <xliff:g id="other">%2$s</xliff:g> ont liké un tweet où vous êtes présent</string>
+  <string name="activity_about_me_liked_mention"><xliff:g id="user">%s</xliff:g> a liké un tweet où vous êtes mentionné</string>
+  <string name="activity_about_me_liked_mention_multi"><xliff:g id="user">%1$s</xliff:g> et <xliff:g id="other">%2$s</xliff:g> ont liké un tweet où vous êtes mentionné</string>
+  <string name="activity_about_me_liked_retweet"><xliff:g id="user">%s</xliff:g> a liké votre retweet</string>
+  <string name="activity_about_me_liked_retweet_multi"><xliff:g id="user">%1$s</xliff:g> et <xliff:g id="other">%2$s</xliff:g> ont liké votre retweet</string>
+  <string name="activity_about_me_list_member_added"><xliff:g id="user">%s</xliff:g> vous a ajouté à la liste</string>
+  <string name="activity_about_me_list_member_added_multi"><xliff:g id="user">%1$s</xliff:g> et <xliff:g id="other">%2$s</xliff:g> vous ont ajouté à leurs listes</string>
+  <string name="activity_about_me_list_member_added_with_name"><xliff:g id="user">%1$s</xliff:g> vous a jouté à la liste <xliff:g id="list">%2$s</xliff:g></string>
+  <string name="activity_about_me_media_tagged"><xliff:g id="user">%s</xliff:g> vous a taggué</string>
+  <string name="activity_about_me_media_tagged_multi"><xliff:g id="user">%1$s</xliff:g> et <xliff:g id="other">%2$s</xliff:g> vous ont taggué</string>
+  <string name="activity_about_me_retweet"><xliff:g id="user">%s</xliff:g> a retweeté</string>
+  <string name="activity_about_me_retweet_multi"><xliff:g id="user">%1$s</xliff:g> et <xliff:g id="other">%2$s</xliff:g> ont retweeté</string>
+  <string name="activity_about_me_retweeted_media_tagged"><xliff:g id="user">%s</xliff:g> a retweeté un tweet où vous êtes taggué</string>
+  <string name="activity_about_me_retweeted_media_tagged_multi"><xliff:g id="user">%1$s</xliff:g> et <xliff:g id="other">%2$s</xliff:g> ont retweeté un tweet où vous êtes taggué</string>
+  <string name="activity_about_me_retweeted_mention"><xliff:g id="user">%s</xliff:g> a retweeté un tweet où vous êtes mentionné</string>
+  <string name="activity_about_me_retweeted_mention_multi"><xliff:g id="user">%1$s</xliff:g> et <xliff:g id="other">%2$s</xliff:g> ont retweeté un tweet où vous êtes mentionné</string>
+  <string name="activity_about_me_retweeted_retweet"><xliff:g id="user">%s</xliff:g> a retweeté votre retweet</string>
+  <string name="activity_about_me_retweeted_retweet_multi"><xliff:g id="user">%1$s</xliff:g> et <xliff:g id="other">%2$s</xliff:g> ont retweeté votre retweet</string>
+  <string name="activity_joined_twitter"><xliff:g id="user">%s</xliff:g> a rejoint Twitter</string>
+  <string name="activity_joined_twitter_multi"><xliff:g id="user">%1$s</xliff:g> et <xliff:g id="other">%2$s</xliff:g> ont rejoint Twitter</string>
   <string name="add_account">Ajouter un compte</string>
   <string name="add_host_mapping">Ajouter un hôte personnalisé</string>
   <string name="add_image">Ajouter une image</string>
@@ -402,6 +431,7 @@
   <!-- Restricted. Under 17 requires accompanying parent or adult guardian. http://www.mpaa.org/film-ratings/ -->
   <string name="label_data_provider">Fournisseur de base de donnée pour Twidere</string>
   <string name="label_filters_subscription">Abonnement</string>
+  <string name="label_format_buffer_time_source"><xliff:g example="12:00, April 1" id="time">%1$s</xliff:g> via <xliff:g example="api" id="source">%2$s</xliff:g></string>
   <string name="label_location_coarse">Vague (ville)</string>
   <string name="label_location_no_location">Aucun</string>
   <string name="label_location_precise">Précise (coordonnées)</string>
@@ -483,12 +513,22 @@
   <string name="message_error_buffer_connection_failed">Impossible de se connecter à Buffer</string>
   <string name="message_error_buffer_media_not_supported">La programmation de médias avec Buffer n\'est pas encore supportée</string>
   <string name="message_error_invalid_account">Certaines données de compte sont corrompues, Twidere va supprimer ces comptes pour éviter de planter.</string>
+  <string name="message_format_compose_message_convert_to_status">Ce tweet sera envoyé comme un message à <xliff:g id="name">%1$s</xliff:g>, continuer ? Convertir en tweet normal utilisera un caractère supplémentaire.</string>
   <string name="message_format_conversation_avatar_update">L\'avatar de la conversation a été changé</string>
+  <string name="message_format_conversation_avatar_update_by_user"><xliff:g example="User" id="by_user">%1$s</xliff:g> a changé l\'avatar de conversation</string>
+  <string name="message_format_conversation_name_update">Nom de conversation changé en <xliff:g example="User" id="name">%1$s</xliff:g></string>
+  <string name="message_format_conversation_name_update_by_user"><xliff:g example="User" id="by_user">%1$s</xliff:g> a changé son nom de conversation en <xliff:g example="New name" id="name">%2$s</xliff:g></string>
+  <string name="message_format_participants_join"><xliff:g example="User" id="name">%1$s</xliff:g> s\'est inscrit</string>
+  <string name="message_format_participants_join_added"><xliff:g example="Sender" id="sender">%1$s</xliff:g> a ajouté <xliff:g example="Recipient" id="recipient">%2$s</xliff:g></string>
+  <string name="message_format_participants_leave"><xliff:g example="User" id="name">%1$s</xliff:g> a quitté</string>
+  <string name="message_format_sender_time"><xliff:g example="User" id="sender">%1$s</xliff:g> · <xliff:g example="12:00" id="time">%2$s</xliff:g></string>
+  <string name="message_info_buffer_queue_empty">La mémoire tampon est vide</string>
   <string name="message_join_conversation">Conversation jointe.</string>
   <string name="message_permission_request_compose_location">Twidere a besoin que vous autorisiez la localisation pour ajouter la position de vos tweets.</string>
   <string name="message_permission_request_save_media">Twidere a besoin que vous autorisiez l\'accès aux fichiers pour sauver les médias.</string>
   <string name="message_permission_request_share_media">Twidere nécessite des autorisations de stockage pour le partage de médias à certaines applications.</string>
   <string name="message_please_wait">Veuillez patienter.</string>
+  <string name="message_status_scheduling_connect_buffer_hint">Se connecter au tampon pour programmer des tweets même hors ligne</string>
   <string name="message_status_scheduling_connected_to_buffer">Twidere est maintenant connecté à Buffer</string>
   <string name="message_summary_type_sticker">[Sticker]</string>
   <string name="message_sync_data_connect_hint">Connecter Twidere à un stockage réseau pour synchroniser les données</string>
@@ -500,7 +540,9 @@
       ~ Toast messages, according to https://material.io/guidelines/style/writing.html#writing-capitalization-punctuation ,
       ~ periods should be omitted
     -->
+  <string name="message_toast_accepted_users_follow_request">Requête de suivi de <xliff:g id="user">%s</xliff:g> acceptée</string>
   <string name="message_toast_added_to_filter">Ajouté au filtre.</string>
+  <string name="message_toast_added_user_to_list">Ajouté <xliff:g id="user">%1$s</xliff:g> à la liste "<xliff:g id="list">%2$s</xliff:g>\"</string>
   <string name="message_toast_already_logged_in">Vous êtes déjà connecté.</string>
   <string name="message_toast_cannot_get_location">Impossible d\'acquérir votre position.</string>
   <string name="message_toast_compose_write_storage_no_permission">Une permission est requise pour supprimer une photo/vidéo prise</string>
@@ -518,11 +560,13 @@
   <string name="message_toast_no_account_permission">Donner la permission d\'accéder au compte est nécessaire</string>
   <string name="message_toast_no_account_selected">Aucun compte sélectionné.</string>
   <string name="message_toast_no_user_selected">Pas d\'utilisateur sélectionné</string>
+  <string name="message_toast_notification_enabled_hint">Disponible uniquement quand la diffusion est active, et pas 100% fiable.</string>
   <string name="message_toast_press_again_to_close">Appuyer une nouvelle fois pour fermer</string>
   <string name="message_toast_profile_banner_image_updated">Image d\'entête du profil mise à jour.</string>
   <string name="message_toast_retweet_cancelled">Retweet annulé</string>
   <string name="message_toast_save_media_no_storage_permission">Les autorisations de stockage sont nécessaires pour sauvegarder les médias.</string>
   <string name="message_toast_saved_to_gallery">Sauvegardé dans la galerie.</string>
+  <string name="message_toast_schedule_future_time_required">La date/l\'heure doit être à venir</string>
   <string name="message_toast_search_deleted">Recherche supprimée</string>
   <string name="message_toast_search_name_deleted">Recherche \"<xliff:g id="name">%s</xliff:g>\" supprimée</string>
   <string name="message_toast_search_name_saved">Recherche \"<xliff:g id="name">%s</xliff:g>\" sauvegardée</string>
@@ -594,6 +638,7 @@
   <string name="notification_method_vibration">Vibration</string>
   <string name="notification_status">Nouveau tweet de <xliff:g id="user">%s</xliff:g></string>
   <string name="notification_status_multiple">Nouveaux tweets de <xliff:g id="user">%1$s</xliff:g> et <xliff:g id="count">%2$d</xliff:g> autres</string>
+  <string name="notification_title_new_retweet_by_user"><xliff:g id="user">%1$s</xliff:g> a retweeté</string>
   <string name="notification_title_new_status_by_user">Nouveau tweet de <xliff:g id="user">%1$s</xliff:g></string>
   <string name="notification_type_home">Accueil</string>
   <string name="notification_type_interactions">Interactions</string>
@@ -642,26 +687,37 @@
   <string name="preference_randomize_account_name">Générer un nom de compte aléatoire</string>
   <string name="preference_randomize_account_name_summary">Interdire d\'autres applications de récupérer votre nom en accédant aux comptes, améliore le respect de la vie privée.</string>
   <string name="preference_randomize_account_rename_accounts_confirm">Renommer les comptes existants ?</string>
+  <string name="preference_summary_auto_refresh_compatibility_mode">Activer pour des intervalles de rafraichissement plus courts, augmente l\'utilisation de la batterie sur Android 5.0+</string>
   <string name="preference_summary_auto_refresh_power_saving">Arrêter l\'actualisation automatique lorsque la batterie est faible</string>
   <string name="preference_summary_background_streaming">Appuyez sur le bouton ACCUEIL à la place de RETOUR pour garder le flux ouvert</string>
   <string name="preference_summary_chrome_custom_tab">Ouvrir le lien dans un onglet Chrome</string>
   <string name="preference_summary_database_item_limit">Limite supérieure des articles stockés dans des bases de données pour chaque compte, mettre une petite valeur vous fera gagner de la place et augmentera la vitesse de chargement.</string>
   <string name="preference_summary_media_preload_non_metered_network">Précharger les médias uniquement sur des réseaux sans surcoût comme une connexion Wi-Fi</string>
+  <string name="preference_summary_streaming_non_metered_network">Diffusion seulement sur des réseaux gratuits comme le Wi-Fi</string>
+  <string name="preference_summary_streaming_power_saving">Diffusion seulement en charge</string>
+  <string name="preference_summary_trends_location">Vous pouvez maintenant fixer votre emplacement séparément dans les réglages d\'onglets.</string>
   <string name="preference_title_accounts">Comptes</string>
   <string name="preference_title_advanced">Avancé</string>
   <string name="preference_title_auto_refresh_compatibility_mode">Mode de compatibilité</string>
   <string name="preference_title_auto_refresh_power_saving">Mode économie d\'énergie</string>
+  <string name="preference_title_background_streaming">Diffusion en tâche de fond</string>
   <string name="preference_title_chrome_custom_tab">Onglet Chrome personnalisé</string>
   <string name="preference_title_database_item_limit">Limite de la taille de la base de données</string>
   <string name="preference_title_filter_manage_subscriptions">Gérer</string>
   <string name="preference_title_filter_subscriptions">Filtrer les abonnements</string>
+  <string name="preference_title_floating_detailed_view">Vue détaillée flottante</string>
   <string name="preference_title_landscape">Paysage</string>
   <string name="preference_title_light_font">Police fine</string>
   <string name="preference_title_media_preload_non_metered_network">Précharger sur les réseaux sans surcoût</string>
+  <string name="preference_title_multi_column_tab_width">Largeur des onglets multi-colonnes</string>
+  <string name="preference_title_multi_column_tabs">Onglets multi-colonnes</string>
   <string name="preference_title_notification_ringtone">Son</string>
+  <string name="preference_title_override_language">Langue de l\'application</string>
   <string name="preference_title_portrait">Potrait</string>
   <string name="preference_title_storage">Stockage</string>
+  <string name="preference_title_streaming_content">Diffusion du contenu</string>
   <string name="preference_title_streaming_enabled">Activer le streaming</string>
+  <string name="preference_title_streaming_non_metered_network">Diffusion sur le réseau gratuit</string>
   <string name="preference_title_streaming_power_saving">Mode économie d\'énergie</string>
   <string name="preference_title_tablet_mode">Mode tablette</string>
   <string name="preference_title_text_size">Taille du texte</string>
@@ -829,9 +885,11 @@
   <string name="status_shortener_default">Aucun (Annuler l\'envoi)</string>
   <!-- [noun] Accessibility label for retweet icon -->
   <string name="status_type_retweet">Retweeter</string>
+  <string name="stream_summary_notification_users">Les utilisateurs ont activé \"Notifications\", pas 100% fiable.</string>
   <string name="stream_type_home">Accueil</string>
   <string name="stream_type_interactions">Interactions</string>
   <string name="stream_type_messages">Messages</string>
+  <string name="stream_type_notification_users">Utilisateurs ayant activé les notifications</string>
   <string name="streaming">Streaming</string>
   <string name="style">Style</string>
   <string name="subscribed_to_list">Abonné à la liste \"<xliff:g id="list">%s</xliff:g>\".</string>
@@ -875,6 +933,7 @@
   <string name="title_block_user">Bloquer <xliff:g id="name">%s</xliff:g></string>
   <string name="title_blocked_users">Utilisateurs bloqués</string>
   <string name="title_browser_sign_in">Connexion via le navigateur</string>
+  <string name="title_buffer_queue_manager">Mémoire tampon</string>
   <string name="title_buffer_settings">Paramètres de Buffer</string>
   <string name="title_compose">Écrire</string>
   <string name="title_conversation">Conversation</string>
@@ -907,6 +966,7 @@
   <string name="title_quick_action">Action rapide</string>
   <string name="title_scheduled_statuses">Tweets programmés</string>
   <string name="title_search">Rechercher</string>
+  <string name="title_search_gif">Chercher un GIF</string>
   <string name="title_select_users">Sélectionner les utilisateurs</string>
   <string name="title_set_nickname">Définir le pseudo</string>
   <string name="title_sign_in_to_buffer">Connectez-vous à Buffer</string>
@@ -925,6 +985,7 @@
   <string name="title_user_list_memberships">Appartient à</string>
   <string name="title_user_list_ownerships">Créé</string>
   <string name="title_user_list_subscriptions">Abonnements</string>
+  <string name="title_user_timeline_filter">Filtre de timeline</string>
   <string name="title_users_favorited_this">Utilisateurs ayant ajouté ceci à leur favoris</string>
   <string name="title_users_liked_this">Des utilisateurs ont aimé ça</string>
   <string name="title_users_retweeted_this">Utilisateurs ont retweeté ceci</string>
diff --git a/twidere/src/main/res-localized/values-gl/arrays.xml b/twidere/src/main/res-localized/values-gl/arrays.xml
index 18b09aa25..09a284c40 100644
--- a/twidere/src/main/res-localized/values-gl/arrays.xml
+++ b/twidere/src/main/res-localized/values-gl/arrays.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string-array name="entries_auto_refresh_content">
-    <item>Inicio</item>
+    <item>Liña de tempo</item>
     <item>Interaccións</item>
     <item>Mensaxes directas</item>
     <item>Tópicos</item>
@@ -32,7 +32,7 @@
     <item>Tamaño real</item>
   </string-array>
   <string-array name="entries_notification_content">
-    <item>Inicio</item>
+    <item>Liña de tempo</item>
     <item>Interaccións</item>
     <item>Mensaxes directas</item>
   </string-array>
diff --git a/twidere/src/main/res-localized/values-gl/plurals.xml b/twidere/src/main/res-localized/values-gl/plurals.xml
index 34cd5c92b..72840e976 100644
--- a/twidere/src/main/res-localized/values-gl/plurals.xml
+++ b/twidere/src/main/res-localized/values-gl/plurals.xml
@@ -56,7 +56,7 @@
   </plurals>
   <plurals name="N_likes">
     <item quantity="one"><xliff:g id="count">%d</xliff:g> gústame</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> gústame</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> gústanme</item>
   </plurals>
   <plurals name="N_votes">
     <item quantity="one"><xliff:g id="count">%d</xliff:g> voto</item>
diff --git a/twidere/src/main/res-localized/values-gl/strings.xml b/twidere/src/main/res-localized/values-gl/strings.xml
index 02cf7441b..63624d277 100644
--- a/twidere/src/main/res-localized/values-gl/strings.xml
+++ b/twidere/src/main/res-localized/values-gl/strings.xml
@@ -16,7 +16,7 @@
   <string name="action_add_conversation_participant">Engadir membro</string>
   <!-- [verb] Add mute filter rule -->
   <string name="action_add_filter_rule">Engadir regra</string>
-  <string name="action_add_filters_subscription">Engadir suscrición</string>
+  <string name="action_add_filters_subscription">Engadir subscrición</string>
   <string name="action_add_gif">Engadir GIF</string>
   <string name="action_add_media">Engadir multimedia</string>
   <string name="action_add_member">Engadir membro</string>
@@ -108,7 +108,7 @@
   <!-- [verb] Save settings/files etc. -->
   <string name="action_save">Gardar</string>
   <string name="action_saving_search">gardando busca</string>
-  <string name="action_search">Busca</string>
+  <string name="action_search">Buscar</string>
   <string name="action_select_all">Seleccionar todo</string>
   <string name="action_select_none">Seleccionar nada</string>
   <string name="action_select_user">Escoller usuario</string>
@@ -304,7 +304,7 @@
   <string name="enable_streaming">Habilitar streaming</string>
   <string name="error_info_oauth_timestamp_error">Por favor comproba data e hora da túa configuración.</string>
   <string name="error_message">Erro: <xliff:g id="message">%s</xliff:g></string>
-  <string name="error_message_device_incompatible">Este dispositivo non é compatible con Twidere, recoméndase actualizar á última versión de Android OS.\nAbaixo podes enviar información para axudarme a informar desde problema ao fabricante.</string>
+  <string name="error_message_device_incompatible">Este dispositivo non é compatible con Twidere, recoméndase actualizar á última versión de Android OS.\nAbaixo podes enviar información para axudarme a informar deste problema ao fabricante.</string>
   <string name="error_message_media_message_attachment_not_supported">Non están soportados os adxuntos multimedia nas MD</string>
   <string name="error_message_media_message_too_many">Demasiada multimedia</string>
   <string name="error_message_media_upload_failed">Fallou a subida multimedia.</string>
@@ -317,7 +317,7 @@
   <string name="error_message_scheduler_not_available">Programador de chíos non dispoñible</string>
   <string name="error_message_status_too_long">Chío longo de máis.</string>
   <string name="error_message_tweet_shorten_failed">Fallou o acurte do chío.</string>
-  <string name="error_message_tweet_shortener_not_found">Non se atopou o acurtador de chíos, se cadra desinstalouse.</string>
+  <string name="error_message_tweet_shortener_not_found">Non se atopou xestor para acurtar chíos, se cadra eliminouse.</string>
   <string name="error_message_with_action">Erro mentres <xliff:g id="action">%1$s</xliff:g>: <xliff:g id="message">%2$s</xliff:g></string>
   <string name="error_no_access_for_credentials">A túa aplicación non pode acceder a este recurso.</string>
   <string name="error_no_dm_permission">Sen permiso de mensaxes directas, comproba a configuración da túa aplicación Twitter.</string>
@@ -343,7 +343,7 @@
   <string name="extra_features_description">Apoia Twidere e consegue características avanzadas</string>
   <string name="extra_features_pack_description">Ou compra paquete de características para conseguilas todas (incluídas as de futuros lanzamentos)</string>
   <!-- Enhanced (paid) features title -->
-  <string name="extra_features_restore_purchase_hint">Se xa compraches características avanzadas, podes usar \'Restaurar\' para recuperar a adqusición.</string>
+  <string name="extra_features_restore_purchase_hint">Se xa compraches características avanzadas, podes usar \'Restaurar\' para recuperar a adquisición.</string>
   <string name="fab_visible">Botón de Acción Flotante</string>
   <string name="fab_visible_summary">Amosar o Botón de Acción Flotante</string>
   <string name="fast_image_loading">Carga rápida de imaxe</string>
@@ -377,7 +377,7 @@
   <string name="groups">Grupos</string>
   <string name="hashtag">Hashtag</string>
   <string name="hidden_settings">Agochar configuración</string>
-  <string name="hidden_settings_warning_message">NUNCA cambies esta configuración se non sabes o que é, ou:\n * Matará o teu gato\n * Lanzará armas nucleares en Corea do Norte\n * Mudará TODO Mahou Shoujo en Majo\n * Destruirá o universo</string>
+  <string name="hidden_settings_warning_message">NUNCA cambies esta configuración se non sabes o que é, ou:\n * Matará o teu gato\n * Lanzará armas nucleares en Corea do Norte\n * Mudará A Coruña en LaCoruNeno\n * Destruirá o universo</string>
   <string name="hidden_settings_warning_title">AVISO: Esta configuración pode producir danos!</string>
   <string name="hide_card_actions">Accións de agocho de cartóns</string>
   <string name="hide_quotes">Agochar citas</string>
@@ -589,7 +589,7 @@
   <string name="message_toast_unable_to_load_more_statuses">Incapaz de cargar chíos máis recentes</string>
   <string name="message_toast_user_filters_removed">Eliminado dos filtros</string>
   <string name="message_toast_users_filters_added">Engadido aos filtros</string>
-  <string name="message_toast_wrong_api_key">URL da API ou clave cliente incorrectas, por favor comproba de novo.</string>
+  <string name="message_toast_wrong_api_key">Axustes API incorrectos</string>
   <string name="message_toast_wrong_username_password">Erro no nome de usuario ou contrasinal</string>
   <string name="message_video_too_long">Vídeo longo de máis</string>
   <string name="message_video_too_short">Vídeo curto de máis</string>
@@ -644,7 +644,7 @@
   <string name="notification_status_multiple">Novo chío de <xliff:g id="user">%1$s</xliff:g> e outros <xliff:g id="count">%2$d</xliff:g></string>
   <string name="notification_title_new_retweet_by_user">Rechouchiado por <xliff:g id="user">%1$s</xliff:g></string>
   <string name="notification_title_new_status_by_user">Novo chío de <xliff:g id="user">%1$s</xliff:g></string>
-  <string name="notification_type_home">Inicio</string>
+  <string name="notification_type_home">Liña de tempo</string>
   <string name="notification_type_interactions">Interaccións</string>
   <string name="notification_type_messages">Mensaxes</string>
   <string name="notifications">Notificacións</string>
@@ -722,7 +722,7 @@
   <string name="preference_title_streaming_content">Contido do streaming</string>
   <string name="preference_title_streaming_enabled">Activar streaming</string>
   <string name="preference_title_streaming_non_metered_network">Streaming en redes libres</string>
-  <string name="preference_title_streaming_power_saving">Modo de aforro de batería</string>
+  <string name="preference_title_streaming_power_saving">Modo aforro de batería</string>
   <string name="preference_title_tablet_mode">Modo tablet</string>
   <string name="preference_title_text_size">Tamaño do texto</string>
   <string name="preference_title_translate">Traducir</string>
@@ -775,7 +775,7 @@
   <string name="quote_original_status">Citar chío orixinal</string>
   <string name="quote_protected_status_warning_message">Chío protexido.\n\nOs usuarios protexidos normalmente non queren compartir os seus chíos publicamente.</string>
   <string name="quote_user">Citar <xliff:g id="user_name">%s</xliff:g></string>
-  <string name="rate_limit">Límite de ratio</string>
+  <string name="rate_limit">Cota límite</string>
   <string name="read_from_bottom">Ler desde abaixo</string>
   <string name="read_from_bottom_summary_off">Saltar ao último chío despois de recargar</string>
   <string name="read_from_bottom_summary_on">Gardar posición de lectura despois de recargar</string>
@@ -785,28 +785,28 @@
   <string name="refresh_interval">Intervalo de recarga</string>
   <string name="refresh_on_start">Recargar ao iniciar</string>
   <string name="refresh_on_start_summary">Recargar liña de tempo e mencións ao iniciar.</string>
-  <string name="refresh_type_home">Inicio</string>
+  <string name="refresh_type_home">Liña de tempo</string>
   <string name="refresh_type_interactions">Interaccións</string>
   <string name="refresh_type_messages">Mensaxes</string>
   <string name="refresh_type_trends">Tópicos</string>
   <string name="register">Rexistrar</string>
   <string name="remember_position">Lembrar posición</string>
-  <string name="remember_position_summary">Lembrar posición list/tab antes de pechar Twidere</string>
+  <string name="remember_position_summary">Lembrar posición das listas/lapelas antes de pechar Twidere</string>
   <string name="remove">Eliminar</string>
   <string name="remove_from_filter">Eliminar do filtro</string>
   <string name="remove_sensitive_mark">Eliminar marcado sensible</string>
   <string name="replies">Respostas</string>
   <string name="reply_to">Responder a <xliff:g id="user_name">%s</xliff:g></string>
   <string name="reply_to_name_text">Responder a <xliff:g id="name">%1$s</xliff:g>: <xliff:g id="text">%2$s</xliff:g></string>
-  <string name="report_for_spam">Reportar spam</string>
-  <string name="report_usage_statistics_now">Reportar agora estatísticas de uso</string>
-  <string name="report_user">Reportar <xliff:g id="name">%s</xliff:g></string>
-  <string name="report_user_confirm_message">Reportar <xliff:g id="name">%s</xliff:g> por spam? Tamén podes bloquear a este usuario.</string>
-  <string name="reported_user_for_spam">Reportado este usuario por spam.</string>
-  <string name="reported_users_for_spam">Reportados estes usuarios por spam.</string>
+  <string name="report_for_spam">Denunciar spam</string>
+  <string name="report_usage_statistics_now">Aportar agora estatísticas de uso</string>
+  <string name="report_user">Denunciar <xliff:g id="name">%s</xliff:g></string>
+  <string name="report_user_confirm_message">Denunciar <xliff:g id="name">%s</xliff:g> por spam? Tamén podes bloquear a este usuario.</string>
+  <string name="reported_user_for_spam">Denunciado este usuario por spam.</string>
+  <string name="reported_users_for_spam">Denunciados estes usuarios por spam.</string>
   <string name="requested">Pedido</string>
-  <string name="reset_keyboard_shortcuts_confirm">Resetear atallos de teclado aos orixinais?</string>
-  <string name="reset_to_default">Resetear a orixinal</string>
+  <string name="reset_keyboard_shortcuts_confirm">Reiniciar atallos de teclado aos orixinais?</string>
+  <string name="reset_to_default">Reiniciar a orixinal</string>
   <string name="retry_on_network_issue">Con problemas de rede, tentar de novo</string>
   <string name="retry_on_network_issue_summary">Con problemas de rede, tentar recuperar automaticamente</string>
   <string name="retweet_quote_confirm_title">Rechouchiar para os teus seguidores?</string>
@@ -822,7 +822,7 @@
   <string name="saved_searches">Buscas gardadas</string>
   <string name="saved_searches_already_saved_hint">Se cadra xa tes gardada esta busca</string>
   <string name="scheduled_statuses">Chíos programados</string>
-  <string name="scrapyard">Scrapyard</string>
+  <string name="scrapyard">Máis trebellos</string>
   <string name="search_hint">Buscar chíos ou usuarios</string>
   <string name="search_hint_users">Buscar usuarios</string>
   <string name="search_statuses">Buscar chíos</string>
@@ -843,8 +843,8 @@
   <string name="sensitive_content_warning">Este chío pode ter contido sensible, continuar?</string>
   <string name="sent_follow_request_to_user">Petición de seguimento enviada a <xliff:g id="user">%s</xliff:g>.</string>
   <string name="server_address">Enderezo do servidor</string>
-  <string name="set_consumer_key_secret_message">Twidere está chegando ao límite \"token\", terás que crear unha app en https://apps.twitter.com/ e colar abaixo as chaves cliente e secreta.\nSe continúas usando a chave por defecto, é posible que non poidas entrar.</string>
-  <string name="settings">Configuración</string>
+  <string name="set_consumer_key_secret_message">Twidere está chegando á súa cota límite, terás que crear unha app en https://apps.twitter.com/ e colar abaixo as chaves cliente e secreta.\nSe continúas usando a chave por defecto, é posible que non poidas entrar.</string>
+  <string name="settings">Axustes</string>
   <string name="settings_interface">Interface</string>
   <string name="settings_notifications">Notificacións</string>
   <string name="settings_refresh">Recargar</string>
@@ -853,7 +853,7 @@
   <string name="share_format_summary">\"[TITLE]\" = Contido título\n\"[TEXT]\" = Contido texto</string>
   <string name="share_link">Compartir ligazón</string>
   <string name="share_status">Compartir chío</string>
-  <string name="shortener_version_incompatible">Acurtador de chíos incompatible</string>
+  <string name="shortener_version_incompatible">Xestor para acurtar chíos incompatible</string>
   <string name="show_absolute_time">Amosar hora absoluta</string>
   <string name="show_absolute_time_summary">Amosar a hora absoluta nos chíos</string>
   <string name="show_in_timeline">Amosar na liña de tempo</string>
@@ -885,12 +885,12 @@
   <string name="status_not_updated_summary">O chío non se enviou e gardouse nos borradores.</string>
   <string name="status_share_subject_format_with_time">Chío de <xliff:g id="name">%1$s</xliff:g> (@<xliff:g id="screen_name">%2$s</xliff:g>), ás <xliff:g id="time">%3$s</xliff:g></string>
   <string name="status_share_text_format_with_link"><xliff:g id="text">%1$s</xliff:g>\n\n<xliff:g id="link">%2$s</xliff:g></string>
-  <string name="status_shortener">Acurtador de chíos</string>
+  <string name="status_shortener">Xestor para acurtar chíos</string>
   <string name="status_shortener_default">Ningún (Abortar envío)</string>
   <!-- [noun] Accessibility label for retweet icon -->
   <string name="status_type_retweet">Rechouchiar</string>
   <string name="stream_summary_notification_users">Usuarios que habilitaron Notificacións, non 100% fiable.</string>
-  <string name="stream_type_home">LT</string>
+  <string name="stream_type_home">Liña de tempo</string>
   <string name="stream_type_interactions">Interaccións</string>
   <string name="stream_type_messages">Mensaxes</string>
   <string name="stream_type_notification_users">Notificación usuarios habilitados</string>
@@ -908,8 +908,8 @@
   <string name="tab_display_option_icon_and_label">Icona e etiqueta</string>
   <string name="tab_display_option_label">Etiqueta</string>
   <string name="tab_editor_hint_name">Nome</string>
-  <string name="tabs">Tabuladores</string>
-  <string name="tcp_dns_query">TCP DNS Query</string>
+  <string name="tabs">Lapelas</string>
+  <string name="tcp_dns_query">Consulta TCP DNS</string>
   <string name="tcp_dns_query_summary">Usa Protocolo TCP para facer peticións DNS e evitar DNS spoofing.</string>
   <string name="text_copied">Texto copiado no portapapeis.</string>
   <string name="text_size">Tamaño do texto</string>
@@ -929,7 +929,7 @@
   <string name="thumbor_integration">Integración Thumbor</string>
   <string name="time_source"><xliff:g id="time">%1$s</xliff:g> · <xliff:g id="source">%2$s</xliff:g></string>
   <string name="timeline_streaming_running">Streaming na liña de tempo</string>
-  <string name="timeline_sync_service">Servizo de sincronización da Liña de Tempo</string>
+  <string name="timeline_sync_service">Servizo de sincronización da liña de tempo</string>
   <string name="title_about">Acerca de</string>
   <string name="title_account_delete_confirm">Eliminar conta</string>
   <string name="title_accounts">Contas</string>
@@ -960,9 +960,9 @@
   <string name="title_filters_subscription_url">URL</string>
   <string name="title_followers">Seguidores</string>
   <string name="title_following">Seguindo</string>
-  <string name="title_home">Inicio</string>
+  <string name="title_home">Liña de tempo</string>
   <!-- [noun] Like, Formerly Twitter's favorite, in the plural -->
-  <string name="title_likes">Gústame</string>
+  <string name="title_likes">Gústanme</string>
   <string name="title_manage_filter_subscriptions">Filtrar subscricións</string>
   <string name="title_mentions">Mencións</string>
   <string name="title_message_conversation_info">Información de conversa</string>
@@ -984,8 +984,8 @@
   <string name="title_subscription_name">Nome</string>
   <string name="title_subscription_url">URL</string>
   <string name="title_summary_line_format"><xliff:g id="title">%1$s</xliff:g>: <xliff:g id="summary">%2$s</xliff:g></string>
-  <string name="title_sync">Sincroniz. datos</string>
-  <string name="title_sync_settings">Sincronización de axustes</string>
+  <string name="title_sync">Sincronizar datos</string>
+  <string name="title_sync_settings">Axustes de sincronización</string>
   <string name="title_user">Usuario</string>
   <string name="title_user_colors">Cores do usuario</string>
   <string name="title_user_list_memberships">Pertence a</string>
@@ -1005,7 +1005,7 @@
   <string name="tweet_hashtag">Chiar #<xliff:g id="text">%1$s</xliff:g></string>
   <string name="twidere_test">Twidere test</string>
   <string name="type_name_to_search">Introduce nome a buscar</string>
-  <string name="type_to_compose">Tipo a compoñer</string>
+  <string name="type_to_compose">Escribir</string>
   <string name="unblocked_user"><xliff:g id="user">%s</xliff:g> desbloqueado.</string>
   <string name="underline">Subliñar</string>
   <string name="unfollow_user">Deixar de seguir a <xliff:g id="name">%s</xliff:g></string>
@@ -1021,7 +1021,7 @@
   <string name="unsubscribe_from_user_list_confirm_message">Anular subscrición da lista <xliff:g id="name">%s</xliff:g>? Podes volver a subscribirte despois.</string>
   <string name="unsubscribed_from_list">Anulada subscrición da lista \"<xliff:g id="list">%s</xliff:g>\".</string>
   <string name="unsupported_activity_action_summary">Por favor acciona o informe arriba</string>
-  <string name="unsupported_login_verification_type_name"><xliff:g id="name">%1$s</xliff:g> tipo de verificación de entrada no soportada, por favor, informa ao soporte da conta.</string>
+  <string name="unsupported_login_verification_type_name"><xliff:g id="name">%1$s</xliff:g> tipo de verificación de entrada non soportada, por favor, informa ao soporte da conta.</string>
   <string name="update_status">Enviar chío</string>
   <string name="updated_list_details">Detalles da lista \"<xliff:g id="list">%s</xliff:g>\" actualizados.</string>
   <string name="updating_status_notification">Enviando chío&#8230;</string>
diff --git a/twidere/src/main/res-localized/values-gl/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-gl/strings_twitter_errors.xml
index 7464014c4..a9c2ebe25 100644
--- a/twidere/src/main/res-localized/values-gl/strings_twitter_errors.xml
+++ b/twidere/src/main/res-localized/values-gl/strings_twitter_errors.xml
@@ -6,7 +6,7 @@
   <!-- 34 Sorry, that page does not exist: Corresponds with HTTP 404 - the specified resource was not found. -->
   <string name="error_twitter_34">Chío, usuario ou páxina non existe.</string>
   <!-- 88 Rate limit exceeded: The request limit for this resource has been reached for the current rate limit window. -->
-  <string name="error_twitter_88">Límite de ratio excedido, téntao máis tarde.</string>
+  <string name="error_twitter_88">Cota límite excedida, téntao máis tarde.</string>
   <!-- 89 Invalid or expired token: The access token used in the request is incorrect or has expired. Used in API v1.1 -->
   <string name="error_twitter_89">A túa información de entrada é incorrecta ou expirou. Por favor, entra de novo.</string>
   <!-- 64 Your account is suspended and is not permitted to access this feature: Corresponds with an HTTP 403 - the access token being used belongs to a suspended user and they can't complete the action you're trying to take -->
diff --git a/twidere/src/main/res-localized/values-ja/arrays.xml b/twidere/src/main/res-localized/values-ja/arrays.xml
index 5f98609fe..2fe153e1b 100644
--- a/twidere/src/main/res-localized/values-ja/arrays.xml
+++ b/twidere/src/main/res-localized/values-ja/arrays.xml
@@ -3,17 +3,17 @@
 <resources>
   <string-array name="entries_auto_refresh_content">
     <item>ホーム</item>
-    <item>みんなの反応</item>
+    <item>つながり</item>
     <item>ダイレクトメッセージ</item>
     <item>トレンド</item>
   </string-array>
   <string-array name="entries_compose_now_action">
-    <item>ツイートする</item>
+    <item>ツイート</item>
     <item>写真を撮る</item>
     <item>メディアを追加</item>
   </string-array>
   <string-array name="entries_home_refresh_content">
-    <item>みんなの反応</item>
+    <item>つながり</item>
     <item>ダイレクトメッセージ</item>
     <item>トレンド</item>
     <item>保存した検索</item>
@@ -33,11 +33,11 @@
   </string-array>
   <string-array name="entries_notification_content">
     <item>ホーム</item>
-    <item>みんなの反応</item>
+    <item>つながり</item>
     <item>ダイレクトメッセージ</item>
   </string-array>
   <string-array name="entries_profile_image_style">
-    <item>丸型</item>
+    <item>円形</item>
     <item>四角</item>
   </string-array>
   <string-array name="entries_proxy_type">
@@ -65,13 +65,13 @@
     <item>アイコンとラベル</item>
   </string-array>
   <string-array name="entries_theme">
-    <item>Light</item>
-    <item>ダーク</item>
+    <item>明るい</item>
+    <item>暗い</item>
     <item>自動</item>
   </string-array>
   <string-array name="entries_theme_background">
     <item>デフォルト</item>
-    <item>白/黒一色</item>
+    <item>モノクロ</item>
     <item>背景透過</item>
   </string-array>
   <string-array name="entries_quick_access_shortcut_types">
diff --git a/twidere/src/main/res-localized/values-ja/plurals.xml b/twidere/src/main/res-localized/values-ja/plurals.xml
index 1016f625d..da539e011 100644
--- a/twidere/src/main/res-localized/values-ja/plurals.xml
+++ b/twidere/src/main/res-localized/values-ja/plurals.xml
@@ -3,7 +3,7 @@
 <!-- Generated by crowdin.net -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <plurals name="Nitems_selected">
-    <item quantity="other"><xliff:g id="count">%d</xliff:g>項目を選択</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g>項目を選択しました。</item>
   </plurals>
   <plurals name="added_N_users_to_list">
     <item quantity="other"><xliff:g id="count">%1$d</xliff:g>人のユーザーをリスト「<xliff:g id="list">%2$s</xliff:g>」に追加しました。</item>
@@ -18,10 +18,10 @@
     <item quantity="other"><xliff:g id="count">%d</xliff:g>件の新しいツイート</item>
   </plurals>
   <plurals name="N_new_mentions">
-    <item quantity="other"><xliff:g id="count">%d</xliff:g>件の新しいユーザー宛のツイート</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g>件の新しいメンション</item>
   </plurals>
   <plurals name="N_new_interactions">
-    <item quantity="other"><xliff:g id="count">%d</xliff:g>件の新しいみんなの反応</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g>件の新しいつながり</item>
   </plurals>
   <plurals name="N_new_messages">
     <item quantity="other"><xliff:g id="count">%d</xliff:g>件の新しいメッセージ</item>
@@ -30,19 +30,19 @@
     <item quantity="other"><xliff:g id="count">%d</xliff:g>件のメディア</item>
   </plurals>
   <plurals name="created_at_with_N_tweets_per_day">
-    <item quantity="other"><xliff:g id="created_at">%1$s</xliff:g> (一日平均<xliff:g id="daily_tweet">%2$d</xliff:g>回ツイート)</item>
+    <item quantity="other"><xliff:g id="created_at">%1$s</xliff:g> (一日平均<xliff:g id="daily_tweet">%2$d</xliff:g>回ツイートする)</item>
   </plurals>
   <plurals name="N_others">
     <item quantity="other">他 <xliff:g id="count">%d</xliff:g> 人</item>
   </plurals>
   <plurals name="N_statuses">
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> つぶやき</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g>件のツイート</item>
   </plurals>
   <plurals name="N_favorites">
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> お気に入り</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g>件のお気に入り</item>
   </plurals>
   <plurals name="N_likes">
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> いいね</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g>件のいいね</item>
   </plurals>
   <plurals name="N_votes">
     <item quantity="other"><xliff:g id="count">%d</xliff:g>票</item>
diff --git a/twidere/src/main/res-localized/values-ja/strings.xml b/twidere/src/main/res-localized/values-ja/strings.xml
index 78898e790..17c77b037 100644
--- a/twidere/src/main/res-localized/values-ja/strings.xml
+++ b/twidere/src/main/res-localized/values-ja/strings.xml
@@ -21,7 +21,7 @@
   <string name="action_add_media">メディアを追加</string>
   <string name="action_add_member">ユーザーを追加</string>
   <string name="action_add_tab">タブを追加</string>
-  <string name="action_add_to_filter">フィルタに追加</string>
+  <string name="action_add_to_filter">フィルターに追加</string>
   <string name="action_add_to_list">リストに追加</string>
   <string name="action_adding_member">アカウントの追加</string>
   <!-- [verb] Action for blocking user -->
@@ -74,13 +74,13 @@
   <string name="action_leave_conversation">会話を退出</string>
   <!-- [verb] e.g. An action label on a tweet to like this tweet. Formerly Twitter favorite. -->
   <string name="action_like">いいね</string>
-  <string name="action_liking">いいねしています</string>
+  <string name="action_liking">いいね</string>
   <string name="action_location">場所</string>
   <string name="action_manage_in_buffer">Buffer アプリで管理</string>
   <string name="action_mark_as_read">既読としてマーク</string>
   <string name="action_modifying_lists">リストを修正する</string>
   <string name="action_mute">ミュート</string>
-  <string name="action_mute_notifications">通知をミュートにする</string>
+  <string name="action_mute_notifications">通知をミュートする</string>
   <string name="action_muting">ミュート中</string>
   <string name="action_name_saved_at_time"><xliff:g id="action">%1$s</xliff:g> - 保存日時:<xliff:g id="time">%2$s</xliff:g></string>
   <string name="action_next_step">次へ</string>
@@ -124,12 +124,12 @@
   <string name="action_start">開始</string>
   <string name="action_status_attachment">ツイートの添付ファイル</string>
   <string name="action_status_block_users">ユーザーをブロック&#8230;</string>
-  <string name="action_status_mute_users">ユーザーをミュート</string>
+  <string name="action_status_mute_users">ユーザーをミュート&#8230;</string>
   <string name="action_status_schedule">ツイートの予約</string>
-  <string name="action_subscribe">保存</string>
+  <string name="action_subscribe">購読する</string>
   <string name="action_subscribing_to_list">リストの保存</string>
   <!-- [verb] Connect to network storage like Dropbox and Google Drive etc -->
-  <string name="action_sync_connect_to_storage">接続する</string>
+  <string name="action_sync_connect_to_storage">接続</string>
   <!-- [verb] Disconnect from network storage -->
   <string name="action_sync_disconnect">切断</string>
   <string name="action_sync_settings">設定</string>
@@ -149,59 +149,59 @@
   <string name="action_unfollowing">フォローの解除</string>
   <string name="action_unmute">ミュートの解除</string>
   <string name="action_unmuting">ミュート解除中</string>
-  <string name="action_unsubscribe">保存を解除</string>
+  <string name="action_unsubscribe">購読を解除</string>
   <string name="action_unsubscribing_from_list">リストの保存解除</string>
   <string name="action_updating_details">詳細情報の更新</string>
   <string name="action_updating_profile">プロフィールの更新</string>
-  <string name="action_updating_profile_background_image">背景画像の更新</string>
+  <string name="action_updating_profile_background_image">プロフィールの背景画像を更新</string>
   <string name="action_updating_profile_banner_image">ヘッダー画像の更新</string>
   <string name="action_updating_profile_image">プロフィール画像の更新</string>
   <string name="action_updating_status">ツイート送信</string>
   <string name="action_view_map">地図</string>
   <string name="activated_accounts">アクティブアカウント</string>
   <string name="activities_about_me">みんなの反応</string>
-  <string name="activity_about_me_favorite"><xliff:g id="user">%s</xliff:g>がお気に入りしました</string>
-  <string name="activity_about_me_favorite_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> がお気に入りに登録しました</string>
-  <string name="activity_about_me_favorited_media_tagged">あなたがタグ付けされたツイートを <xliff:g id="user">%s</xliff:g> がお気に入りに登録しました</string>
-  <string name="activity_about_me_favorited_media_tagged_multi">あなたがタグ付けされたツイートを <xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> がお気に入りに登録しました</string>
-  <string name="activity_about_me_favorited_mention">あなたがメンションされたツイートを <xliff:g id="user">%s</xliff:g> がお気に入りに登録しました</string>
-  <string name="activity_about_me_favorited_mention_multi">あなたがメンションされたツイートを <xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> がお気に入りに登録しました</string>
-  <string name="activity_about_me_favorited_retweet"><xliff:g id="user">%s</xliff:g> があなたのリツイートをお気に入りに登録しました</string>
-  <string name="activity_about_me_favorited_retweet_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> あなたのリツイートをお気に入りに登録しました</string>
-  <string name="activity_about_me_follow"><xliff:g id="user">%s</xliff:g> があなたをフォローしました</string>
-  <string name="activity_about_me_follow_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> があなたをフォローしました</string>
-  <string name="activity_about_me_like"><xliff:g id="user">%s</xliff:g> がいいねしました</string>
-  <string name="activity_about_me_like_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> がいいねしました</string>
-  <string name="activity_about_me_liked_media_tagged">あなたがタグ付けされたツイートを <xliff:g id="user">%s</xliff:g> がいいねしました</string>
-  <string name="activity_about_me_liked_media_tagged_multi">あなたがタグ付けされたツイートを <xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> がいいねしました</string>
-  <string name="activity_about_me_liked_mention">あなたがメンションされたツイートを <xliff:g id="user">%s</xliff:g> がいいねしました</string>
-  <string name="activity_about_me_liked_mention_multi">あなたがメンションされたツイートを <xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> がいいねしました</string>
-  <string name="activity_about_me_liked_retweet"><xliff:g id="user">%s</xliff:g> があなたのリツイートをいいねしました</string>
-  <string name="activity_about_me_liked_retweet_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> あなたのリツイートをいいねしました</string>
-  <string name="activity_about_me_list_member_added"><xliff:g id="user">%s</xliff:g> あなたをリストに追加しました</string>
-  <string name="activity_about_me_list_member_added_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> があなたをリストに追加しました</string>
-  <string name="activity_about_me_list_member_added_with_name"><xliff:g id="user">%1$s</xliff:g> があなたをリスト <xliff:g id="list">%2$s</xliff:g>に追加しました</string>
-  <string name="activity_about_me_media_tagged"><xliff:g id="user">%s</xliff:g> があなたをタグ付けしました</string>
-  <string name="activity_about_me_media_tagged_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> があなたをタグ付けしました</string>
-  <string name="activity_about_me_retweet"><xliff:g id="user">%s</xliff:g> がリツイートしました</string>
-  <string name="activity_about_me_retweet_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> リツイートしました</string>
-  <string name="activity_about_me_retweeted_media_tagged">あなたがタグ付けされたツイートを <xliff:g id="user">%s</xliff:g> がリツイートしました</string>
-  <string name="activity_about_me_retweeted_media_tagged_multi">あなたがタグ付けされたツイートを <xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> がリツイートしました</string>
-  <string name="activity_about_me_retweeted_mention">あなたがメンションされたツイートを <xliff:g id="user">%s</xliff:g> がリツイートしました</string>
-  <string name="activity_about_me_retweeted_mention_multi">あなたがメンションされたツイートを <xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> がリツイートしました</string>
-  <string name="activity_about_me_retweeted_retweet"><xliff:g id="user">%s</xliff:g> があなたのリツイートをリツイートしました</string>
-  <string name="activity_about_me_retweeted_retweet_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> あなたのリツイートをリツイートしました</string>
-  <string name="activity_joined_twitter"><xliff:g id="user">%s</xliff:g>が Twitter をはじめました</string>
-  <string name="activity_joined_twitter_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> が Twitter をはじめました</string>
+  <string name="activity_about_me_favorite"><xliff:g id="user">%s</xliff:g>がお気に入りに登録しました。</string>
+  <string name="activity_about_me_favorite_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> がお気に入りに登録しました。</string>
+  <string name="activity_about_me_favorited_media_tagged"><xliff:g id="user">%s</xliff:g> があなたのタグ付きツイートをお気に入りに登録しました。</string>
+  <string name="activity_about_me_favorited_media_tagged_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g>  があなたのタグ付きツイートをお気に入りに登録しました。</string>
+  <string name="activity_about_me_favorited_mention"><xliff:g id="user">%s</xliff:g> があなたがメンションされたツイートを お気に入りに登録しました。</string>
+  <string name="activity_about_me_favorited_mention_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> があなたがメンションされたツイートを お気に入りに登録しました。</string>
+  <string name="activity_about_me_favorited_retweet"><xliff:g id="user">%s</xliff:g> があなたのリツイートをお気に入りに登録しました。</string>
+  <string name="activity_about_me_favorited_retweet_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> があなたのリツイートをお気に入りに登録しました。</string>
+  <string name="activity_about_me_follow"><xliff:g id="user">%s</xliff:g> があなたをフォローしました。</string>
+  <string name="activity_about_me_follow_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> があなたをフォローしました。</string>
+  <string name="activity_about_me_like"><xliff:g id="user">%s</xliff:g> がいいねしました。</string>
+  <string name="activity_about_me_like_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> がいいねしました。</string>
+  <string name="activity_about_me_liked_media_tagged"><xliff:g id="user">%s</xliff:g> があなたのタグ付きツイートをいいねしました。</string>
+  <string name="activity_about_me_liked_media_tagged_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> があなたのタグ付きツイートをいいねしました。</string>
+  <string name="activity_about_me_liked_mention"><xliff:g id="user">%s</xliff:g> があなたがメンションされたツイートをいいねしました。</string>
+  <string name="activity_about_me_liked_mention_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> があなたがメンションされたツイートをいいねしました。</string>
+  <string name="activity_about_me_liked_retweet"><xliff:g id="user">%s</xliff:g> があなたのリツイートをいいねしました。</string>
+  <string name="activity_about_me_liked_retweet_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> あなたのリツイートをいいねしました。</string>
+  <string name="activity_about_me_list_member_added"><xliff:g id="user">%s</xliff:g> あなたをリストに追加しました。</string>
+  <string name="activity_about_me_list_member_added_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> があなたをリストに追加しました。</string>
+  <string name="activity_about_me_list_member_added_with_name"><xliff:g id="user">%1$s</xliff:g> があなたをリスト <xliff:g id="list">%2$s</xliff:g>に追加しました。</string>
+  <string name="activity_about_me_media_tagged"><xliff:g id="user">%s</xliff:g> があなたをタグ付けしました。</string>
+  <string name="activity_about_me_media_tagged_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> があなたをタグ付けしました。</string>
+  <string name="activity_about_me_retweet"><xliff:g id="user">%s</xliff:g> がリツイートしました。</string>
+  <string name="activity_about_me_retweet_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> リツイートしました。</string>
+  <string name="activity_about_me_retweeted_media_tagged"><xliff:g id="user">%s</xliff:g> があなたのタグ付きツイートをリツイートしました。</string>
+  <string name="activity_about_me_retweeted_media_tagged_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> があなたのタグ付きツイートをリツイートしました。</string>
+  <string name="activity_about_me_retweeted_mention"><xliff:g id="user">%s</xliff:g> があなたがメンションされたツイートをリツイートしました。</string>
+  <string name="activity_about_me_retweeted_mention_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> があなたがメンションされたツイートをリツイートしました。</string>
+  <string name="activity_about_me_retweeted_retweet"><xliff:g id="user">%s</xliff:g> があなたのリツイートをリツイートしました。</string>
+  <string name="activity_about_me_retweeted_retweet_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> があなたのリツイートをリツイートしました。</string>
+  <string name="activity_joined_twitter"><xliff:g id="user">%s</xliff:g> が Twitter をはじめました。</string>
+  <string name="activity_joined_twitter_multi"><xliff:g id="user">%1$s</xliff:g> と <xliff:g id="other">%2$s</xliff:g> が Twitter をはじめました。</string>
   <string name="add_account">アカウントを追加</string>
   <string name="add_host_mapping">ホストマッピングを追加</string>
   <string name="add_image">画像を追加</string>
-  <string name="and_N_more">他<xliff:g id="count">%d</xliff:g></string>
+  <string name="and_N_more">他 <xliff:g id="count">%d</xliff:g></string>
   <string name="api_url_format">API URL の形式</string>
   <string name="app_description">あなた自身の Twitter アプリ</string>
   <!-- App name, normally you don't need to translate this. -->
   <string name="app_name">Twidere</string>
-  <string name="app_restart_confirm">設定を適用するため、Twidere を再起動します</string>
+  <string name="app_restart_confirm">設定を適用するため、Twidere を再起動します。</string>
   <string name="app_terminate_confirm">設定を適用するため、Twidere を終了します。</string>
   <string name="appearance">外観</string>
   <string name="auth_type_basic">Basic</string>
@@ -210,8 +210,8 @@
   <string name="auth_type_xauth">xAuth</string>
   <string name="auto_refresh">自動更新</string>
   <string name="background">背景</string>
-  <string name="bandwidth_saving_mode">データ使用量の節約モード</string>
-  <string name="bandwidth_saving_mode_summary">従量制課金接続においてメディアのプレビューを無効にします。</string>
+  <string name="bandwidth_saving_mode">データ通信節約モード</string>
+  <string name="bandwidth_saving_mode_summary">従量制通信接続の場合、メディアのプレビューを無効にします。</string>
   <string name="belongs_to">自分が含まれるリスト</string>
   <string name="block_user_confirm_message"><xliff:g id="name">%s</xliff:g> さんをブロックしますか？このユーザーは、あなたをフォローしたり返信やDMを送信したりできなくなります。</string>
   <string name="bug_reports">バグレポート</string>
@@ -279,7 +279,7 @@
   <string name="deny">いいえ</string>
   <string name="destroy_saved_search">保存した検索\"<xliff:g id="name">%s</xliff:g>\"を削除</string>
   <string name="destroy_saved_search_confirm_message">保存した検索 \"<xliff:g id="name">%s</xliff:g>\" を削除しますか？あとで再び保存することもできます。</string>
-  <string name="destroy_status">ツイートの削除</string>
+  <string name="destroy_status">ツイートを削除</string>
   <string name="destroy_status_confirm_message">このツイートを削除しますか？</string>
   <string name="developed_by">開発者</string>
   <string name="discard">破棄</string>
diff --git a/twidere/src/main/res-localized/values-ja/strings_http_errors.xml b/twidere/src/main/res-localized/values-ja/strings_http_errors.xml
index 77c7386cd..e0a56bb3b 100644
--- a/twidere/src/main/res-localized/values-ja/strings_http_errors.xml
+++ b/twidere/src/main/res-localized/values-ja/strings_http_errors.xml
@@ -2,5 +2,5 @@
 <!--Generated by crowdin.com-->
 <resources>
   <!-- HTTP 407 - Proxy authentication required -->
-  <string name="error_http_407">このプロキシには認証が必要です</string>
+  <string name="error_http_407">このプロキシには認証が必要です。</string>
 </resources>
diff --git a/twidere/src/main/res-localized/values-ja/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-ja/strings_twitter_errors.xml
index ba442b1e5..c8aefd3bf 100644
--- a/twidere/src/main/res-localized/values-ja/strings_twitter_errors.xml
+++ b/twidere/src/main/res-localized/values-ja/strings_twitter_errors.xml
@@ -6,13 +6,13 @@
   <!-- 34 Sorry, that page does not exist: Corresponds with HTTP 404 - the specified resource was not found. -->
   <string name="error_twitter_34">このツイートかユーザーは存在しません。</string>
   <!-- 88 Rate limit exceeded: The request limit for this resource has been reached for the current rate limit window. -->
-  <string name="error_twitter_88">制限を超えました、後で再試行してください。</string>
+  <string name="error_twitter_88">制限を超えました、後でお試しください。</string>
   <!-- 89 Invalid or expired token: The access token used in the request is incorrect or has expired. Used in API v1.1 -->
-  <string name="error_twitter_89">ログイン情報が不正か有効期限切れです。ログインし直してください。</string>
+  <string name="error_twitter_89">ログイン情報が正しくないか有効期限切れです。ログインし直してください。</string>
   <!-- 64 Your account is suspended and is not permitted to access this feature: Corresponds with an HTTP 403 - the access token being used belongs to a suspended user and they can't complete the action you're trying to take -->
-  <string name="error_twitter_64">アカウントは凍結され、この機能にはアクセス出来ません。</string>
+  <string name="error_twitter_64">アカウントが凍結されているのでこの機能にはアクセス出来ません。</string>
   <!-- 130 Over capacity: Corresponds with HTTP 503 - Twitter is temporarily over capacity. -->
-  <string name="error_twitter_130">Twitterは一時的に許容範囲をオーバーしました。</string>
+  <string name="error_twitter_130">Twitterは一時的にキャパシティをオーバーしました。</string>
   <!-- 131 Internal error: Corresponds with HTTP 500 - An unknown internal error occurred. -->
   <string name="error_twitter_131">Twitterのサーバーが一時的にダウンしました、後で再試行してください。</string>
   <!-- 135 Could not authenticate you: Corresponds with HTTP 401 - it means that your oauth_timestamp is either ahead or behind our acceptable range -->
@@ -28,7 +28,7 @@
   <!-- 172 There was an error creating your search: Corresponds with HTTP 403 - The saved search already exists. -->
   <string name="error_twitter_172">保存済みです。</string>
   <!-- 179 Sorry, you are not authorized to see this status: Corresponds with HTTP 403 - thrown when a Tweet cannot be viewed by the authenticating user, usually due to the tweet's author having protected their tweets. -->
-  <string name="error_twitter_179">この非公開ユーザーのツイートは表示出来ません。</string>
+  <string name="error_twitter_179">非公開ユーザーのツイートは表示出来ません。</string>
   <!-- 187 Status is a duplicate: The status text has been Tweeted already by the authenticated account. -->
   <string name="error_twitter_187">同じツイートをすでに送信しています。</string>
   <string name="error_twitter_193">アップロードする画像が大きすぎます。</string>
diff --git a/twidere/src/main/res-localized/values-yue/arrays.xml b/twidere/src/main/res-localized/values-yue/arrays.xml
new file mode 100644
index 000000000..3d87f1981
--- /dev/null
+++ b/twidere/src/main/res-localized/values-yue/arrays.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/twidere/src/main/res-localized/values-yue/plurals.xml b/twidere/src/main/res-localized/values-yue/plurals.xml
new file mode 100644
index 000000000..39fe44d74
--- /dev/null
+++ b/twidere/src/main/res-localized/values-yue/plurals.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Generated by crowdin.net -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/twidere/src/main/res-localized/values-yue/strings.xml b/twidere/src/main/res-localized/values-yue/strings.xml
new file mode 100644
index 000000000..55110271d
--- /dev/null
+++ b/twidere/src/main/res-localized/values-yue/strings.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!--Generated by crowdin.com-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [verb] Accept a friend request (follow request) -->
+  <!-- [verb] Accept a permission request like allow to use camera etc. -->
+  <!-- [verb] Add an item to a list/collection -->
+  <!-- [verb] Add a member to a message conversation -->
+  <!-- [verb] Add mute filter rule -->
+  <!-- [verb] Action for blocking user -->
+  <!-- [verb] Action for cancelling (deleting) a retweet-->
+  <!-- [verb] Action for deleting a file or a twitter object like tweet-->
+  <!-- [verb] Edit image/settings etc. -->
+  <!-- [verb] Perform import action -->
+  <!-- Used for decide something later, like permission request -->
+  <!-- [verb] e.g. An action label on a tweet to like this tweet. Formerly Twitter favorite. -->
+  <!-- [verb] Restore purchase -->
+  <!-- [verb] Action for performing retweet -->
+  <!-- [verb] Save settings/files etc. -->
+  <!-- [verb] Send tweet/message -->
+  <!-- [verb] Used for skip some settings -->
+  <!-- [verb] Connect to network storage like Dropbox and Google Drive etc -->
+  <!-- [verb] Disconnect from network storage -->
+  <!-- [verb] Action for unblocking user -->
+  <!-- App name, normally you don't need to translate this. -->
+  <!-- [noun] Count label for retweets, e.g. (N retweets)-->
+  <!-- Enhanced (paid) features description -->
+  <!-- Enhanced (paid) features title -->
+  <!-- GNU social group like https://quitter.se/group/qvitter -->
+  <!-- GNU social group like https://quitter.se/group/qvitter -->
+  <!-- General Audiences. All ages admitted. http://www.mpaa.org/film-ratings/ -->
+  <!-- Parental Guidance Suggested. Some material may not be suitable for children. http://www.mpaa.org/film-ratings/ -->
+  <!-- Parents Strongly Cautioned. Some material may be inappropriate for children under 13. http://www.mpaa.org/film-ratings/ -->
+  <!-- Restricted. Under 17 requires accompanying parent or adult guardian. http://www.mpaa.org/film-ratings/ -->
+  <!--
+      ~ Toast messages, according to https://material.io/guidelines/style/writing.html#writing-capitalization-punctuation ,
+      ~ periods should be omitted
+    -->
+  <!-- Toast message for enhanced (paid) features not purchased while trying to restore purchase -->
+  <!-- Toast message for network errors -->
+  <!-- Next item (tweet, user etc.) -->
+  <!-- Notification method, flashing LED light -->
+  <!-- Notification method, ringtone -->
+  <!-- Notification method, device vibration -->
+  <!-- Previous item (tweet, user etc.) -->
+  <!-- Normally you don't need to translate this -->
+  <!-- Fanfou is a Chinese micro blogging website http://fanfou.com/ -->
+  <!-- [noun] Accessibility label for retweet icon -->
+  <!-- Dark theme -->
+  <!-- Light theme -->
+  <!-- Enhanced (paid) features title -->
+  <!-- [noun] Twitter's favorite, in the plural -->
+  <!-- [noun] Like, Formerly Twitter's favorite, in the plural -->
+  <!-- 'Tweet' here is a verb -->
+  <!-- User list description -->
+  <!-- User list is public -->
+  <!-- User list name -->
+</resources>
diff --git a/twidere/src/main/res-localized/values-yue/strings_http_errors.xml b/twidere/src/main/res-localized/values-yue/strings_http_errors.xml
new file mode 100644
index 000000000..a9a60c6a3
--- /dev/null
+++ b/twidere/src/main/res-localized/values-yue/strings_http_errors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- HTTP 407 - Proxy authentication required -->
+</resources>
diff --git a/twidere/src/main/res-localized/values-yue/strings_twitter_errors.xml b/twidere/src/main/res-localized/values-yue/strings_twitter_errors.xml
new file mode 100644
index 000000000..2f1d8eb03
--- /dev/null
+++ b/twidere/src/main/res-localized/values-yue/strings_twitter_errors.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- 32 Could not authenticate you: Your call could not be completed as dialed. -->
+  <!-- 34 Sorry, that page does not exist: Corresponds with HTTP 404 - the specified resource was not found. -->
+  <!-- 88 Rate limit exceeded: The request limit for this resource has been reached for the current rate limit window. -->
+  <!-- 89 Invalid or expired token: The access token used in the request is incorrect or has expired. Used in API v1.1 -->
+  <!-- 64 Your account is suspended and is not permitted to access this feature: Corresponds with an HTTP 403 - the access token being used belongs to a suspended user and they can't complete the action you're trying to take -->
+  <!-- 130 Over capacity: Corresponds with HTTP 503 - Twitter is temporarily over capacity. -->
+  <!-- 131 Internal error: Corresponds with HTTP 500 - An unknown internal error occurred. -->
+  <!-- 135 Could not authenticate you: Corresponds with HTTP 401 - it means that your oauth_timestamp is either ahead or behind our acceptable range -->
+  <!-- 136 Blocked by user while retweeting: You have been blocked from retweeting this user's tweets at their request. -->
+  <!-- 144 No status found with that ID. -->
+  <!-- 172 You have been blocked from following this account at the request of the user. -->
+  <!-- 172 There was an error creating your search: Corresponds with HTTP 403 - The saved search already exists. -->
+  <!-- 179 Sorry, you are not authorized to see this status: Corresponds with HTTP 403 - thrown when a Tweet cannot be viewed by the authenticating user, usually due to the tweet's author having protected their tweets. -->
+  <!-- 187 Status is a duplicate: The status text has been Tweeted already by the authenticated account. -->
+  <!-- 215 Bad authentication data: Typically sent with 1.1 responses with HTTP code 400. The method requires authentication but it was not presented or was wholly invalid -->
+</resources>
diff --git a/twidere/src/main/res-localized/values-zh-rCN/strings.xml b/twidere/src/main/res-localized/values-zh-rCN/strings.xml
index 7c8989dff..83122dea5 100644
--- a/twidere/src/main/res-localized/values-zh-rCN/strings.xml
+++ b/twidere/src/main/res-localized/values-zh-rCN/strings.xml
@@ -457,7 +457,7 @@
   <string name="label_statuses">推文</string>
   <string name="label_statuses_replies">推文和回复</string>
   <string name="label_statuses_retweets">推文和转推</string>
-  <string name="label_statuses_retweets_replies">推文、转发和回复</string>
+  <string name="label_statuses_retweets_replies">推文、转推和回复</string>
   <string name="label_streaming_service">实时流服务</string>
   <string name="label_translate_from_language">从 <xliff:g id="language">%s</xliff:g> 翻译</string>
   <string name="label_translation">翻译</string>
@@ -526,6 +526,7 @@
   <string name="message_format_participants_join_added"><xliff:g example="Sender" id="sender">%1$s</xliff:g> 添加了 <xliff:g example="Recipient" id="recipient">%2$s</xliff:g></string>
   <string name="message_format_participants_leave"><xliff:g example="User" id="name">%1$s</xliff:g> 离开了对话</string>
   <string name="message_format_sender_time"><xliff:g example="User" id="sender">%1$s</xliff:g> · <xliff:g example="12:00" id="time">%2$s</xliff:g></string>
+  <string name="message_gif_sharing_introduction">搜索并分享 GIF 动画，由 GIPHY 提供支持</string>
   <string name="message_info_buffer_queue_empty">Buffer 列表为空</string>
   <string name="message_join_conversation">加入了对话</string>
   <string name="message_permission_request_compose_location">Twidere 需要权限来向推文添加位置</string>
@@ -533,7 +534,7 @@
   <string name="message_permission_request_share_media">Twidere 需要存储权限来向一些应用分享媒体</string>
   <string name="message_please_wait">请稍等</string>
   <string name="message_status_scheduling_connect_buffer_hint">连接到 Buffer ，即使您没有在线也可以定时发送推文</string>
-  <string name="message_status_scheduling_connected_to_buffer">Twidere 现在连接到 Buffer</string>
+  <string name="message_status_scheduling_connected_to_buffer">Twidere 已经连接到 Buffer</string>
   <string name="message_summary_type_sticker">[贴纸]</string>
   <string name="message_sync_data_connect_hint">将 Twidere 连接到网络存储来同步数据</string>
   <string name="message_sync_data_synced_with_name">Twidere 现在已经和 <xliff:g example="ownCloud" id="name">%s</xliff:g> 同步</string>
@@ -960,6 +961,7 @@
   <string name="title_filters_subscription_url">URL</string>
   <string name="title_followers">关注者</string>
   <string name="title_following">正在关注</string>
+  <string name="title_gif_sharing">GIF 分享</string>
   <string name="title_home">主页</string>
   <!-- [noun] Like, Formerly Twitter's favorite, in the plural -->
   <string name="title_likes">喜欢</string>
diff --git a/twidere/src/main/res-localized/values-zh-rHK/arrays.xml b/twidere/src/main/res-localized/values-zh-rHK/arrays.xml
index b29e8c38e..a2e64767a 100644
--- a/twidere/src/main/res-localized/values-zh-rHK/arrays.xml
+++ b/twidere/src/main/res-localized/values-zh-rHK/arrays.xml
@@ -2,19 +2,19 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string-array name="entries_auto_refresh_content">
-    <item>首頁</item>
+    <item>主頁</item>
     <item>互動</item>
-    <item>私信</item>
+    <item>短訊息</item>
     <item>話題</item>
   </string-array>
   <string-array name="entries_compose_now_action">
     <item>撰寫</item>
-    <item>拍照</item>
-    <item>添加多媒體</item>
+    <item>影相</item>
+    <item>新增媒體</item>
   </string-array>
   <string-array name="entries_home_refresh_content">
     <item>互動</item>
-    <item>私信</item>
+    <item>短訊息</item>
     <item>話題</item>
     <item>已儲存的搜尋</item>
   </string-array>
@@ -32,9 +32,9 @@
     <item>實際大小</item>
   </string-array>
   <string-array name="entries_notification_content">
-    <item>首頁</item>
+    <item>主頁</item>
     <item>互動</item>
-    <item>私信</item>
+    <item>短訊息</item>
   </string-array>
   <string-array name="entries_profile_image_style">
     <item>圓形</item>
@@ -50,19 +50,24 @@
     <item>10分鐘</item>
     <item>15分鐘</item>
     <item>30分鐘</item>
-    <item>1小時</item>
-    <item>2小時</item>
-    <item>4小時</item>
+    <item>1個鐘頭</item>
+    <item>2個鐘頭</item>
+    <item>4個鐘頭</item>
+  </string-array>
+  <string-array name="entries_tab_column_width">
+    <item>較窄</item>
+    <item>正常</item>
+    <item>較寬</item>
   </string-array>
   <string-array name="entries_tab_display_option">
-    <item>圖示</item>
+    <item>圖標</item>
     <item>標籤</item>
-    <item>圖示和標籤</item>
+    <item>圖標和標籤</item>
   </string-array>
   <string-array name="entries_theme">
-    <item>亮色</item>
-    <item>暗色</item>
-    <item>自動</item>
+    <item>白日</item>
+    <item>黑夜</item>
+    <item>自動判斷</item>
   </string-array>
   <string-array name="entries_theme_background">
     <item>預設</item>
@@ -70,10 +75,10 @@
     <item>透明</item>
   </string-array>
   <string-array name="entries_quick_access_shortcut_types">
-    <item>使用者</item>
-    <item>時間軸</item>
-    <item>User Favorites</item>
+    <item>用戶</item>
+    <item>時間綫</item>
+    <item>用戶最愛</item>
     <item>列表</item>
-    <item>列表時間軸</item>
+    <item>列表時間綫</item>
   </string-array>
 </resources>