From f07f27e8b4a54295d318f3f011fa564c7d3b785a Mon Sep 17 00:00:00 2001
From: Mariotaku Lee <mariotaku.lee@gmail.com>
Date: Fri, 12 May 2017 08:48:59 +0800
Subject: [PATCH] updated i18n

---
 twidere/src/.google.commit-id                 |  2 +-
 .../main/res-localized/values-de/strings.xml  | 16 ++++++++
 .../main/res-localized/values-es/strings.xml  | 26 ++++++-------
 .../main/res-localized/values-fr/strings.xml  | 25 +++---------
 .../main/res-localized/values-ja/strings.xml  |  1 +
 .../main/res-localized/values-ko/strings.xml  | 39 +++++++++++++++++++
 .../res-localized/values-zh-rCN/strings.xml   |  4 +-
 .../res-localized/values-zh-rHK/strings.xml   |  4 +-
 .../main/res-localized/values-zh/strings.xml  |  4 +-
 9 files changed, 85 insertions(+), 36 deletions(-)

diff --git a/twidere/src/.google.commit-id b/twidere/src/.google.commit-id
index a5f828692..86ef6d2ec 100644
--- a/twidere/src/.google.commit-id
+++ b/twidere/src/.google.commit-id
@@ -1 +1 @@
-4873b4bef9994102f90685dfa5900ccd8393744f
+19286101c7a3e07fdf2d55f23a0d9838b54db404
diff --git a/twidere/src/main/res-localized/values-de/strings.xml b/twidere/src/main/res-localized/values-de/strings.xml
index 7059d30a2..d762f1093 100644
--- a/twidere/src/main/res-localized/values-de/strings.xml
+++ b/twidere/src/main/res-localized/values-de/strings.xml
@@ -107,7 +107,9 @@
   <string name="action_status_attachment">Tweet-Anhang</string>
   <string name="action_status_block_users">Blockiere Benutzer&#8230;</string>
   <string name="action_status_mute_users">Benutzer stummschalten&#8230;</string>
+  <string name="action_status_pin">Tweet anheften</string>
   <string name="action_status_schedule">Tweet-Zeitplan</string>
+  <string name="action_status_unpin">Tweet lösen</string>
   <string name="action_subscribe">Abonnieren</string>
   <!-- [verb] Connect to network storage like Dropbox and Google Drive etc -->
   <string name="action_sync_connect_to_storage">Verbinden</string>
@@ -406,6 +408,8 @@
   <string name="label_content_rating_r">FSK 16</string>
   <string name="label_content_warning">Inhaltswarnung</string>
   <string name="label_data_provider">Twidere Datenbank-Anbieter</string>
+  <string name="label_feedback_content">Inhalt</string>
+  <string name="label_feedback_title">Betreff</string>
   <string name="label_filters_subscription">Abonnement</string>
   <string name="label_follow_request_sent">Folgeanfrage gesendet</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>
@@ -475,6 +479,7 @@
   <string name="location_countrywide">Landesweit</string>
   <string name="login_challenge_retype_email_hint">Mit deinem Twitter-Konto verbundene E-Mail-Adresse neu tippen.</string>
   <string name="login_challenge_retype_phone_hint">Mit deinem Twitter-Konto verbundene Telefonnummer neu tippen.</string>
+  <string name="login_type_default">Standard</string>
   <string name="login_verification">Login-Verifizierung</string>
   <string name="login_verification_pin_hint">Schau in deinem Telefon nach einer PIN und gebe sie ein, um dich einzuloggen.</string>
   <string name="login_verification_push_hint">Akzeptiere die Login-Verifizierungsanfrage der Twitter-App und tippe auf OK, wenn du die Anfrage bestätigt hast.</string>
@@ -521,6 +526,7 @@
   <string name="message_permission_request_compose_location">Twidere benötigt die Standortberechtigung um in Tweets den Standort hinzuzufügen.</string>
   <string name="message_permission_request_save_media">Twidere benötigt die Speicherberechtigung um Medien zu speichern.</string>
   <string name="message_permission_request_share_media">Twidere benötigt die Speicherberechtigung um Medien mit anderen Apps zu teilen.</string>
+  <string name="message_pin_status_confirm">Diesen Tweet anheften? Dies wird den vorher angehefteten Tweet ersetzen.</string>
   <string name="message_please_wait">Bitte warten.</string>
   <string name="message_status_reply_to_user_removed_explanation">Twitter erwähnt immer den Benutzer in einer Antwort. Wenn dieser Benutzer entfernt wurde, wird Twidere diese Antwort als Zitat senden, um den Kontext zu erhalten.</string>
   <string name="message_status_scheduling_connect_buffer_hint">Mit Buffer verbinden, um Tweets offline zu planen</string>
@@ -573,20 +579,24 @@
   <string name="message_toast_search_saved">Suche gespeichert.</string>
   <string name="message_toast_select_file_no_storage_permission">Speicherberechtigung notwendig um Dateien auszuwählen.</string>
   <string name="message_toast_share_media_no_storage_permission">Die Anwendung erfordert die Speicherberechtigung, um Medien zu teilen.</string>
+  <string name="message_toast_ssl_tls_error">TLS Fehler, bitte überprüfe die Systemzeit und deine Proxy Einstellungen</string>
   <string name="message_toast_status_deleted">Tweet gelöscht.</string>
   <string name="message_toast_status_favorited">Tweet favorisiert.</string>
   <string name="message_toast_status_like_removed">Like entfernt.</string>
   <string name="message_toast_status_liked">Tweet gefällt</string>
+  <string name="message_toast_status_pinned">Tweet angeheftet</string>
   <string name="message_toast_status_retweeted">Retweeted</string>
   <string name="message_toast_status_saved_to_draft">Tweet als Entwurf gespeichert.</string>
   <string name="message_toast_status_scheduled">Tweet geplant</string>
   <string name="message_toast_status_unfavorited">Tweet nicht favorisiert.</string>
+  <string name="message_toast_status_unpinned">Tweet gelöst</string>
   <string name="message_toast_status_updated">Tweet gesendet.</string>
   <string name="message_toast_unable_to_load_more_statuses">Frühere Tweets konnten nicht geladen werden</string>
   <string name="message_toast_user_filters_removed">Der Benutzer wurde von der Filterliste entfernt.</string>
   <string name="message_toast_users_filters_added">Benutzer wurden zur Filterliste hinzugefügt. Du wirst keine Tweets von diesen Benutzern in Deiner Timeline-/Erwähnungsliste sehen.</string>
   <string name="message_toast_wrong_api_key">Inkorrekte API URL oder Consumer Key/Secret. Bitte nochmals prüfen.</string>
   <string name="message_toast_wrong_username_password">Falscher Benutzername/Passwort</string>
+  <string name="message_unpin_status_confirm">Diesen Tweet lösen?</string>
   <string name="message_video_too_long">Das Video ist zu lang</string>
   <string name="message_video_too_short">Das Video ist zu kurz</string>
   <string name="multi_select">Mehrfachauswahl</string>
@@ -697,6 +707,7 @@
   <string name="preference_summary_media_preload_non_metered_network">Medien nur in freien Netzwerken wie Wi-Fi vorladen</string>
   <string name="preference_summary_streaming_non_metered_network">Streamen nur in unbeschränkten Netzen, wie z.B. WLANs</string>
   <string name="preference_summary_streaming_power_saving">Nur beim Laden streamen</string>
+  <string name="preference_summary_sync_timeline_positions">Wenn \"Position merken\" aktiviert ist</string>
   <string name="preference_summary_trends_location">Du kannst jetzt den Standort in den Tab-Einstellungen separat festlegen.</string>
   <string name="preference_title_accounts">Konten</string>
   <string name="preference_title_advanced">Erweiterte</string>
@@ -823,6 +834,7 @@
   <string name="search_hint">Tweets oder Benutzer suchen</string>
   <string name="search_hint_users">Benutzer suchen</string>
   <string name="search_statuses">Tweets suchen</string>
+  <string name="search_type_local">Lokal</string>
   <string name="search_type_media">Medien</string>
   <string name="search_type_statuses">Tweets</string>
   <string name="search_type_users">Benutzer</string>
@@ -894,6 +906,7 @@
   <string name="style">Stil</string>
   <string name="subscribed_to_list">Liste \"<xliff:g id="list">%s</xliff:g>\" abonniert.</string>
   <string name="subscribers">Abonnent</string>
+  <string name="summary_interactions_account_not_supported">Account wird nicht unterstützt</string>
   <string name="swipe_down_to_refresh">Ziehen zum Aktualisieren</string>
   <string name="sync_provider_name_dropbox">Dropbox</string>
   <string name="sync_provider_name_google_drive">Google Drive</string>
@@ -969,6 +982,7 @@
   <string name="title_network_public_timeline">Föderierte Zeitleiste</string>
   <string name="title_nicknames">Spitznamen</string>
   <string name="title_open_source_license">Open-Source-Lizenz</string>
+  <string name="title_pin_status_confirm">Tweet anheften</string>
   <string name="title_premium_features_name">Twidere ∞</string>
   <string name="title_public_timeline">Öffentliche Zeitleiste</string>
   <string name="title_quick_action">Schnellaktion</string>
@@ -989,8 +1003,10 @@
   <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">Datensynchronisierung</string>
   <string name="title_sync_settings">Synchronisierungseinstellungen</string>
+  <string name="title_unpin_status_confirm">Tweet lösen</string>
   <string name="title_user">Benutzer</string>
   <string name="title_user_colors">benutzerdefinierte Farben</string>
+  <string name="title_user_feedback">Feedback</string>
   <string name="title_user_list">Liste</string>
   <string name="title_user_list_memberships">Gehört zu</string>
   <string name="title_user_list_ownerships">Erstellt</string>
diff --git a/twidere/src/main/res-localized/values-es/strings.xml b/twidere/src/main/res-localized/values-es/strings.xml
index 08aeb5cc1..d00d4b69f 100644
--- a/twidere/src/main/res-localized/values-es/strings.xml
+++ b/twidere/src/main/res-localized/values-es/strings.xml
@@ -145,12 +145,12 @@
   <string name="activity_about_me_follow_multi"><xliff:g id="user">%1$s</xliff:g> y <xliff:g id="other">%2$s</xliff:g> te han empezado a seguir</string>
   <string name="activity_about_me_like">A <xliff:g id="user">%s</xliff:g> le gustó</string>
   <string name="activity_about_me_like_multi">A <xliff:g id="user">%1$s</xliff:g> y <xliff:g id="other">%2$s</xliff:g> les gustó</string>
-  <string name="activity_about_me_liked_media_tagged">A <xliff:g id="user">%s</xliff:g> le gustó un tweet en el que fuiste etiquetado</string>
-  <string name="activity_about_me_liked_media_tagged_multi">A <xliff:g id="user">%1$s</xliff:g> y <xliff:g id="other">%2$s</xliff:g> les gustó un tweet en el que fuiste etiquetado</string>
-  <string name="activity_about_me_liked_mention">A <xliff:g id="user">%s</xliff:g> le gustó un tweet en el que fuiste mencionado</string>
-  <string name="activity_about_me_liked_mention_multi">A <xliff:g id="user">%1$s</xliff:g> y <xliff:g id="other">%2$s</xliff:g> les gustó un tweet en el que fuiste mencionado</string>
-  <string name="activity_about_me_liked_retweet">A <xliff:g id="user">%s</xliff:g> le gustó tu retweet</string>
-  <string name="activity_about_me_liked_retweet_multi">A <xliff:g id="user">%1$s</xliff:g> y <xliff:g id="other">%2$s</xliff:g> les gustó tu reweet</string>
+  <string name="activity_about_me_liked_media_tagged">A <xliff:g id="user">%s</xliff:g> le gustó un tuit en el que fuiste etiquetado</string>
+  <string name="activity_about_me_liked_media_tagged_multi">A <xliff:g id="user">%1$s</xliff:g> y <xliff:g id="other">%2$s</xliff:g> les gustó un tuit en el que fuiste etiquetado</string>
+  <string name="activity_about_me_liked_mention">A <xliff:g id="user">%s</xliff:g> le gustó un tuit en el que fuiste mencionado</string>
+  <string name="activity_about_me_liked_mention_multi">A <xliff:g id="user">%1$s</xliff:g> y <xliff:g id="other">%2$s</xliff:g> les gustó un tuit en el que fuiste mencionado</string>
+  <string name="activity_about_me_liked_retweet">A <xliff:g id="user">%s</xliff:g> le gustó tu retuit</string>
+  <string name="activity_about_me_liked_retweet_multi">A <xliff:g id="user">%1$s</xliff:g> y <xliff:g id="other">%2$s</xliff:g> les gustó tu retuit</string>
   <string name="activity_about_me_list_member_added"><xliff:g id="user">%s</xliff:g> te añadió a la lista</string>
   <string name="activity_about_me_list_member_added_multi"><xliff:g id="user">%1$s</xliff:g> y <xliff:g id="other">%2$s</xliff:g> te añadieron a sus listas</string>
   <string name="activity_about_me_list_member_added_with_name"><xliff:g id="user">%1$s</xliff:g> te añadió a la lista <xliff:g id="list">%2$s</xliff:g></string>
@@ -372,7 +372,7 @@
   <string name="host_mapping_address">Dirección (puede ser otra dirección de host)</string>
   <string name="host_mapping_host">Host</string>
   <string name="i_want_my_stars_back">Quiero las estrellas de vuelta!</string>
-  <string name="i_want_my_stars_back_summary">Usar favorito (★) en vez de me gusta (♥︎)</string>
+  <string name="i_want_my_stars_back_summary">Usar favorito (★) en vez de Me gusta (♥︎)</string>
   <string name="icon">Icono</string>
   <string name="icon_restored_message">Icono restaurado</string>
   <string name="import_export_settings">Importar/Exportar ajustes</string>
@@ -583,8 +583,8 @@
   <string name="message_toast_ssl_tls_error">Error TLS. Por favor, comprueba tu reloj o la configuración del proxy</string>
   <string name="message_toast_status_deleted">Tweet eliminado</string>
   <string name="message_toast_status_favorited">Tweet marcado como favorito</string>
-  <string name="message_toast_status_like_removed">\"Me gusta\" borrado</string>
-  <string name="message_toast_status_liked">El twit ha gustado</string>
+  <string name="message_toast_status_like_removed">Ya no te gusta el tuit</string>
+  <string name="message_toast_status_liked">Te gusta el tuit</string>
   <string name="message_toast_status_pinned">Tweet fijado</string>
   <string name="message_toast_status_retweeted">Retwitteado</string>
   <string name="message_toast_status_saved_to_draft">Tweet guardado en borradores.</string>
@@ -705,8 +705,8 @@
   <string name="preference_summary_database_item_limit">Límite de elementos almacenados en la base de datos para cada cuenta, establece un valor más pequeño para liberar espacio e incrementar la velocidad de carga.</string>
   <string name="preference_summary_favorite_confirmation">Mostrar confirmación antes de tweet un favorito</string>
   <string name="preference_summary_like_confirmation">Mostrar confirmación antes de marcar un tweet como te gusta</string>
-  <string name="preference_summary_media_preload_non_metered_network">Precargar multimedia solo en redes sin coste como wifis</string>
-  <string name="preference_summary_streaming_non_metered_network">Streaming solo en redes libres como Wi-Fi</string>
+  <string name="preference_summary_media_preload_non_metered_network">Precargar multimedia solo en redes sin coste, como wifis</string>
+  <string name="preference_summary_streaming_non_metered_network">Streaming solo en redes sin coste, como wifis</string>
   <string name="preference_summary_streaming_power_saving">Streaming sólo durante la carga</string>
   <string name="preference_summary_sync_timeline_positions">Cuando está activado \"Recordar posición\"</string>
   <string name="preference_summary_trends_location">Ahora puede establecer la ubicación por separado en la ventana de configuración.</string>
@@ -723,7 +723,7 @@
   <string name="preference_title_floating_detailed_view">Vista detallada flotante</string>
   <string name="preference_title_landscape">Horizontal</string>
   <string name="preference_title_light_font">Fuente suave</string>
-  <string name="preference_title_like_confirmation">Me gusta confirmación</string>
+  <string name="preference_title_like_confirmation">Confirmar los Me gusta</string>
   <string name="preference_title_media_preload_non_metered_network">Precargar en redes sin coste</string>
   <string name="preference_title_multi_column_tab_width">Ancho de pestaña multicolumna</string>
   <string name="preference_title_multi_column_tabs">Pestañas multicolumna</string>
@@ -974,7 +974,7 @@
   <string name="title_following">Siguiendo</string>
   <string name="title_gif_sharing">Compartir GIF</string>
   <string name="title_home">Inicio</string>
-  <string name="title_like_confirm">¿Te gusta este tweet?</string>
+  <string name="title_like_confirm">¿Te gusta este tuit?</string>
   <!-- [noun] Like, Formerly Twitter's favorite, in the plural -->
   <string name="title_likes">Me gusta</string>
   <string name="title_manage_filter_subscriptions">Filtrar suscripciones</string>
diff --git a/twidere/src/main/res-localized/values-fr/strings.xml b/twidere/src/main/res-localized/values-fr/strings.xml
index 6f677e337..590578e30 100644
--- a/twidere/src/main/res-localized/values-fr/strings.xml
+++ b/twidere/src/main/res-localized/values-fr/strings.xml
@@ -1,23 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!--
-  ~             Twidere - Twitter client for Android
-  ~
-  ~  Copyright (C) 2012-2017 Mariotaku Lee <mariotaku.lee@gmail.com>
-  ~
-  ~  This program is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 3 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  This program is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
 <!--Generated by crowdin.com-->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="account_options">Options du compte</string>
@@ -854,6 +835,8 @@
   <string name="search_hint">Rechercher des tweets ou des utilisateurs</string>
   <string name="search_hint_users">Rechercher des utilisateurs</string>
   <string name="search_statuses">Rechercher des tweets</string>
+  <string name="search_type_federated">Fédéré</string>
+  <string name="search_type_local">Local</string>
   <string name="search_type_media">Médias</string>
   <string name="search_type_statuses">Tweets</string>
   <string name="search_type_users">Utilisateurs</string>
@@ -964,6 +947,7 @@
   <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_schedule">Planification de Buffer</string>
   <string name="title_buffer_set_schedule">Programmer avec Buffer</string>
   <string name="title_buffer_settings">Paramètres de Buffer</string>
   <string name="title_compose">Écrire</string>
@@ -999,6 +983,7 @@
   <string name="title_network_public_timeline">Fil d\'actualité fédéré</string>
   <string name="title_nicknames">Surnoms</string>
   <string name="title_open_source_license">Licence open source</string>
+  <string name="title_pin_status_confirm">Épingler le tweet</string>
   <string name="title_premium_features_name">Twidere ∞</string>
   <string name="title_public_timeline">Fil d\'actualités public</string>
   <string name="title_quick_action">Action rapide</string>
@@ -1019,8 +1004,10 @@
   <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">Synchronisation des données</string>
   <string name="title_sync_settings">Paramètres de synchronisation</string>
+  <string name="title_unpin_status_confirm">Désépingler le tweet</string>
   <string name="title_user">Utilisateur</string>
   <string name="title_user_colors">Couleurs utilisateur</string>
+  <string name="title_user_feedback">Vos commentaires</string>
   <string name="title_user_list">Liste</string>
   <string name="title_user_list_memberships">Appartient à</string>
   <string name="title_user_list_ownerships">Créé</string>
diff --git a/twidere/src/main/res-localized/values-ja/strings.xml b/twidere/src/main/res-localized/values-ja/strings.xml
index 289de2344..0fd941067 100644
--- a/twidere/src/main/res-localized/values-ja/strings.xml
+++ b/twidere/src/main/res-localized/values-ja/strings.xml
@@ -918,6 +918,7 @@
   <string name="style">スタイル</string>
   <string name="subscribed_to_list">リスト\"<xliff:g id="list">%s</xliff:g>\"を保存しました。</string>
   <string name="subscribers">購読ユーザー</string>
+  <string name="summary_interactions_account_not_supported">アカウントはサポートされていません</string>
   <string name="swipe_down_to_refresh">下にスワイプすると更新されます</string>
   <string name="sync_provider_name_dropbox">Dropbox</string>
   <string name="sync_provider_name_google_drive">Google ドライブ</string>
diff --git a/twidere/src/main/res-localized/values-ko/strings.xml b/twidere/src/main/res-localized/values-ko/strings.xml
index d0f0f3fca..acc109f6e 100644
--- a/twidere/src/main/res-localized/values-ko/strings.xml
+++ b/twidere/src/main/res-localized/values-ko/strings.xml
@@ -107,7 +107,9 @@
   <string name="action_status_attachment">첨부 파일 트윗</string>
   <string name="action_status_block_users">사용자 차단...</string>
   <string name="action_status_mute_users">사용자 뮤트...</string>
+  <string name="action_status_pin">트윗 고정하기</string>
   <string name="action_status_schedule">트윗 예약</string>
+  <string name="action_status_unpin">트윗 고정 해제하기</string>
   <string name="action_subscribe">구독</string>
   <!-- [verb] Connect to network storage like Dropbox and Google Drive etc -->
   <string name="action_sync_connect_to_storage">연결</string>
@@ -136,10 +138,33 @@
   <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>님이 트위터에 가입했습니다</string>
+  <string name="activity_joined_twitter_multi"><xliff:g id="user">%1$s </xliff:g>님과 <xliff:g id="other">%2$s</xliff:g>님이 트위터에 가입했습니다</string>
   <string name="add_account">계정 추가</string>
   <string name="add_host_mapping">호스트 매핑 추가</string>
   <string name="add_image">이미지 추가</string>
@@ -380,9 +405,13 @@
   <string name="label_background_operation_service">백그라운드 동작 서비스</string>
   <string name="label_buffer_accounts">Buffer 계정</string>
   <!-- General Audiences. All ages admitted. http://www.mpaa.org/film-ratings/ -->
+  <string name="label_content_rating_g">G</string>
   <!-- Parental Guidance Suggested. Some material may not be suitable for children. http://www.mpaa.org/film-ratings/ -->
+  <string name="label_content_rating_pg">PG</string>
   <!-- Parents Strongly Cautioned. Some material may be inappropriate for children under 13. http://www.mpaa.org/film-ratings/ -->
+  <string name="label_content_rating_pg13">PG-13</string>
   <!-- Restricted. Under 17 requires accompanying parent or adult guardian. http://www.mpaa.org/film-ratings/ -->
+  <string name="label_content_rating_r">R</string>
   <string name="label_content_warning">콘텐츠 경고</string>
   <string name="label_data_provider">Twidere 데이터베이스 제공자</string>
   <string name="label_filters_subscription">구독</string>
@@ -491,6 +520,7 @@
   <string name="message_permission_request_save_media">Twidere가 미디어를 저장하기 위해 저장소 권한이 필요합니다.</string>
   <string name="message_permission_request_share_media">Twidere는 다른 앱과 미디어를 공유하기 위해 저장소 권한이 필요합니다.</string>
   <string name="message_please_wait">기다려 주세요.</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>
@@ -912,25 +942,34 @@
   <string name="title_message_conversation_info">대화 정보</string>
   <string name="title_nicknames">별명</string>
   <string name="title_open_source_license">오픈 소스 라이센스</string>
+  <string name="title_pin_status_confirm">트윗 고정하기</string>
   <string name="title_premium_features_name">Twidere ∞</string>
   <string name="title_public_timeline">공개 타임라인</string>
+  <string name="title_quick_action">빠른 동작</string>
   <string name="title_retweet_quote_confirm">팔로워들에게 리트윗할까요?</string>
+  <string name="title_scheduled_statuses">예약된 트윗</string>
   <string name="title_search">검색</string>
+  <string name="title_search_gif">GIF 검색</string>
   <string name="title_select_users">사용자 선택</string>
   <string name="title_set_nickname">별명 설정</string>
   <string name="title_status">트윗</string>
   <string name="title_statuses">트윗</string>
+  <string name="title_statuses_and_replies">트윗 &amp; 답글</string>
   <string name="title_streaming">스트리밍</string>
   <string name="title_subscription_name">이름</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">데이터 동기화</string>
   <string name="title_sync_settings">동기화 설정</string>
+  <string name="title_unpin_status_confirm">트윗 고정 해제하기</string>
   <string name="title_user">사용자</string>
   <string name="title_user_colors">사용자 색상</string>
+  <string name="title_user_feedback">피드백</string>
+  <string name="title_user_list">리스트</string>
   <string name="title_user_list_memberships">다음에 속함:</string>
   <string name="title_user_list_ownerships">작성자</string>
   <string name="title_user_list_subscriptions">구독</string>
+  <string name="title_user_timeline_filter">타임라인 필터</string>
   <string name="title_users_favorited_this">이 트윗을 마음에 들어하는 사용자</string>
   <string name="title_users_liked_this">이 트윗을 마음에 들어하는 사용자들</string>
   <string name="title_users_retweeted_this">리트윗한 사용자</string>
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 72d798e95..2fcba3004 100644
--- a/twidere/src/main/res-localized/values-zh-rCN/strings.xml
+++ b/twidere/src/main/res-localized/values-zh-rCN/strings.xml
@@ -500,6 +500,7 @@
   <string name="message_account_delete_confirm">这个帐号将被从 Twidere 中删除。</string>
   <string name="message_api_data_corrupted">API 数据损坏</string>
   <string name="message_api_url_format_help">[DOMAIN]：Twitter API 域名\n举例： https://[DOMAIN].twitter.com/ 会被替换成 https://api.twitter.com/ 。</string>
+  <string name="message_app_crashed">Twidere 崩溃了。发送错误报告来帮我解决这个问题。</string>
   <string name="message_auto_refresh_confirm">启用自动刷新以自动获取新推文？</string>
   <string name="message_blocked_user">阻止了 <xliff:g id="user">%s</xliff:g></string>
   <string name="message_buffer_delete_schedule_confirm">删除这个排期吗？</string>
@@ -553,6 +554,7 @@
   <!-- Toast message for enhanced (paid) features not purchased while trying to restore purchase -->
   <string name="message_toast_extra_features_not_purchased">尚未购买增强功能</string>
   <string name="message_toast_filters_import_hint">按 “+” 来导入</string>
+  <string name="message_toast_internal_storage_install_required">不支持在 SD 卡中安装 Twidere，帐号信息可能在重启后丢失。</string>
   <string name="message_toast_invalid_mastodon_host">无效的 Mastodon 主机</string>
   <string name="message_toast_link_copied_to_clipboard">链接已复制到剪贴板</string>
   <string name="message_toast_livewp_daydream_enabled_message">我有一份小礼物给您，去系统设置看看吧 :)</string>
@@ -910,7 +912,7 @@
   <string name="subscribed_to_list">订阅了列表 “<xliff:g id="list">%s</xliff:g>”</string>
   <string name="subscribers">订阅者</string>
   <string name="summary_interactions_account_not_supported">不支持这个帐号</string>
-  <string name="summary_interactions_official_required">仅对官方令牌有效</string>
+  <string name="summary_interactions_streaming_required">完整的互动时间线只在实时流启用时可用</string>
   <string name="swipe_down_to_refresh">下拉以刷新</string>
   <string name="sync_provider_name_dropbox">Dropbox</string>
   <string name="sync_provider_name_google_drive">Google 云端硬盘</string>
diff --git a/twidere/src/main/res-localized/values-zh-rHK/strings.xml b/twidere/src/main/res-localized/values-zh-rHK/strings.xml
index c133d39ac..8207ab2c8 100644
--- a/twidere/src/main/res-localized/values-zh-rHK/strings.xml
+++ b/twidere/src/main/res-localized/values-zh-rHK/strings.xml
@@ -501,6 +501,7 @@
   <string name="message_account_delete_confirm">這個帳號將從 Twidere 中刪除。</string>
   <string name="message_api_data_corrupted">API 資料毀損</string>
   <string name="message_api_url_format_help">[DOMAIN]：Twitter API 域名\n舉例： https://[DOMAIN].twitter.com/ 會被替換成 https://api.twitter.com/ 。</string>
+  <string name="message_app_crashed">Twidere 崩潰了。發送錯誤報告來幫我解決這個問題。</string>
   <string name="message_auto_refresh_confirm">開啟自動更新自動取得新推文?</string>
   <string name="message_blocked_user">封鎖了 <xliff:g id="user">%s</xliff:g></string>
   <string name="message_buffer_delete_schedule_confirm">刪除這個排期？</string>
@@ -556,6 +557,7 @@
   <!-- Toast message for enhanced (paid) features not purchased while trying to restore purchase -->
   <string name="message_toast_extra_features_not_purchased">未曾購買過強化功能</string>
   <string name="message_toast_filters_import_hint">按 「+」 來匯入</string>
+  <string name="message_toast_internal_storage_install_required">不支持在 SD 卡中安裝 Twidere，帳號信息可能在重啓後丟失。</string>
   <string name="message_toast_invalid_mastodon_host">無效的 Mastodon 主機</string>
   <string name="message_toast_link_copied_to_clipboard">連結已複製到剪貼簿</string>
   <string name="message_toast_livewp_daydream_enabled_message">我有一份小禮物給您，去系統設定裡看看吧 :)</string>
@@ -913,7 +915,7 @@
   <string name="subscribed_to_list">訂閲了列表\"<xliff:g id="list">%s</xliff:g>\"</string>
   <string name="subscribers">訂閱者</string>
   <string name="summary_interactions_account_not_supported">不支援此帳號</string>
-  <string name="summary_interactions_official_required">僅對官方令牌有效</string>
+  <string name="summary_interactions_streaming_required">完整的互動時間軸只在實時流啓用時可用</string>
   <string name="swipe_down_to_refresh">下拉以更新</string>
   <string name="sync_provider_name_dropbox">Dropbox</string>
   <string name="sync_provider_name_google_drive">Google Drive</string>
diff --git a/twidere/src/main/res-localized/values-zh/strings.xml b/twidere/src/main/res-localized/values-zh/strings.xml
index c133d39ac..8207ab2c8 100644
--- a/twidere/src/main/res-localized/values-zh/strings.xml
+++ b/twidere/src/main/res-localized/values-zh/strings.xml
@@ -501,6 +501,7 @@
   <string name="message_account_delete_confirm">這個帳號將從 Twidere 中刪除。</string>
   <string name="message_api_data_corrupted">API 資料毀損</string>
   <string name="message_api_url_format_help">[DOMAIN]：Twitter API 域名\n舉例： https://[DOMAIN].twitter.com/ 會被替換成 https://api.twitter.com/ 。</string>
+  <string name="message_app_crashed">Twidere 崩潰了。發送錯誤報告來幫我解決這個問題。</string>
   <string name="message_auto_refresh_confirm">開啟自動更新自動取得新推文?</string>
   <string name="message_blocked_user">封鎖了 <xliff:g id="user">%s</xliff:g></string>
   <string name="message_buffer_delete_schedule_confirm">刪除這個排期？</string>
@@ -556,6 +557,7 @@
   <!-- Toast message for enhanced (paid) features not purchased while trying to restore purchase -->
   <string name="message_toast_extra_features_not_purchased">未曾購買過強化功能</string>
   <string name="message_toast_filters_import_hint">按 「+」 來匯入</string>
+  <string name="message_toast_internal_storage_install_required">不支持在 SD 卡中安裝 Twidere，帳號信息可能在重啓後丟失。</string>
   <string name="message_toast_invalid_mastodon_host">無效的 Mastodon 主機</string>
   <string name="message_toast_link_copied_to_clipboard">連結已複製到剪貼簿</string>
   <string name="message_toast_livewp_daydream_enabled_message">我有一份小禮物給您，去系統設定裡看看吧 :)</string>
@@ -913,7 +915,7 @@
   <string name="subscribed_to_list">訂閲了列表\"<xliff:g id="list">%s</xliff:g>\"</string>
   <string name="subscribers">訂閱者</string>
   <string name="summary_interactions_account_not_supported">不支援此帳號</string>
-  <string name="summary_interactions_official_required">僅對官方令牌有效</string>
+  <string name="summary_interactions_streaming_required">完整的互動時間軸只在實時流啓用時可用</string>
   <string name="swipe_down_to_refresh">下拉以更新</string>
   <string name="sync_provider_name_dropbox">Dropbox</string>
   <string name="sync_provider_name_google_drive">Google Drive</string>