Merge remote-tracking branch 'origin/develop' into develop

4 files changed, 64 insertions, 1 deletions

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4cf03ed69..b6b7772a3 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -215,7 +215,7 @@
     <string name="settings_time_from">Entre</string>
     <string name="settings_time_to">et</string>
     <string name="embedded_browser">Utiliser le navigateur intégré</string>
-    <string name="custom_tabs">Onglets personnalisés</string>
+    <string name="custom_tabs">Navigateur intégré</string>
     <string name="expand_cw">Afficher automatiquement le contenu masqué</string>
     <string name="set_led_colour">Couleur de la LED :</string>
     <string-array name="led_colours">
@@ -990,4 +990,28 @@
     <string name="auto_fetch_missing">Récupérer automatiquement les messages manquants</string>
     <string name="number_of_media">Nombre de médias</string>
     <string name="number_of_replies">Nombre de réponses</string>
+    <string name="fetch_home_messages">Récupérer les messages du fil principal</string>
+    <string name="set_fetch_home">Récupérer automatiquement les messages du fil principal</string>
+    <string name="home_cache">Cache du fil principal</string>
+    <string name="toast_error_peertube_not_supported">Votre Peertube est trop ancien et ne peut pas être pris en charge par l’application.</string>
+    <string name="set_mention_at_top">Mentions en haut</string>
+    <string name="check_home_cache">Vérifier le cache du fil principal</string>
+    <string name="messages">%1$d messages en cache</string>
+    <string name="last_24_h">Dernières 24 heures</string>
+    <string name="fails">Échecs</string>
+    <string name="new_messages">Nouveaux messages</string>
+    <string name="total_fetched">Total des messages récupérés</string>
+    <string name="inserted_count">%d nouveaux messages</string>
+    <string name="fail_count">%d échecs</string>
+    <string name="hide_single_media_with_card">Masquer les médias simples lorsqu’il y a un aperçu du lien</string>
+    <string name="tags_renamed">L’étiquette a été modifiée !</string>
+    <string name="translator_domain">Domaine de traduction</string>
+    <string name="follows_you">Vous suit</string>
+    <string name="set_mention_at_top_indication">Lorsque vous répondez, les mentions seront toutes ajoutées au début du message</string>
+    <string name="set_alt_text_mandatory_warn">Avertir seulement</string>
+    <string name="send_anyway">Envoyer quand-même</string>
+    <string name="truncate_links">Tronquer les liens</string>
+    <string name="truncate_links_max">Nombre maximal de caractères dans les liens</string>
+    <string name="set_remove_battery">Ignorer les optimisations de batterie</string>
+    <string name="set_autoplay_gif">Lecture automatique des médias animés</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index e1f60731f..0f9d220e0 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -1014,4 +1014,23 @@
     <string name="set_alt_text_mandatory_warn">Só avisar</string>
     <string name="set_autoplay_gif">Reprodución autom. do multimedia</string>
     <string name="set_remove_battery">Ignorar optimizacións da batería</string>
+    <string name="check_home_cache">Comprobar caché de Inicio</string>
+    <string name="new_messages">Novas mensaxes</string>
+    <string name="updated_messages">Mensaxes actualizadas</string>
+    <string name="frequency_minutes">Frecuencia (minutos)</string>
+    <string name="fail_count">%d fallos</string>
+    <string name="fetched_count">%d mensaxes obtidas</string>
+    <string name="inserted_count">%d novas mensaxes</string>
+    <string name="frequency_count_minutes">%d frecuencia (minutos)</string>
+    <string name="follows_you">Séguete</string>
+    <string name="last_24_h">Últimas 24 horas</string>
+    <string name="messages">%1$d mensaxes na memoria</string>
+    <string name="chart_home_cache_logs">Rexistro da caché de Inicio</string>
+    <string name="updated_count">%d mensaxes actualizadas</string>
+    <string name="chart_home_cache">Rexistros na caché de Inicio por hora</string>
+    <string name="fails">Falla</string>
+    <string name="total_fetched">Total de mensaxes obtidas</string>
+    <string name="no_cached_messages">Non hai mensaxes na caché de Inicio!</string>
+    <string name="toast_error_media">Non se puido cargar o multimedia!</string>
+    <string name="load_media_remotely">Cargar multimedia remoto</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index caafbb4e0..0f96d4a31 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1034,4 +1034,5 @@
     <string name="no_cached_messages">Ana sayfa önbelleğine alınan mesaj yok!</string>
     <string name="chart_home_cache_logs">Ana sayfa önbelleği günlükleri</string>
     <string name="updated_messages">Güncellenen mesajlar</string>
+    <string name="follows_you">Sizi takip ediyor</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 80f526f35..70e9375c0 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1018,4 +1018,23 @@
     <string name="set_alt_text_mandatory_description_warn">如果缺少媒体，将显示一个对话框，以发送没有媒体描述的消息</string>
     <string name="set_remove_battery">忽略电池优化</string>
     <string name="set_autoplay_gif">自动播放动画媒体</string>
+    <string name="messages">%1$d 缓存消息</string>
+    <string name="chart_home_cache">每小时主页缓存记录数</string>
+    <string name="last_24_h">最近24小时</string>
+    <string name="fails">失败</string>
+    <string name="new_messages">新消息</string>
+    <string name="frequency_minutes">频率（分钟）</string>
+    <string name="total_fetched">已获取消息总数</string>
+    <string name="fail_count">%d 失败</string>
+    <string name="frequency_count_minutes">%d 频率（分钟）</string>
+    <string name="updated_messages">已更新消息</string>
+    <string name="updated_count">%d 已更新消息</string>
+    <string name="follows_you">关注了您</string>
+    <string name="check_home_cache">检查主页缓存</string>
+    <string name="no_cached_messages">无主页缓存消息！</string>
+    <string name="chart_home_cache_logs">主页缓存日志</string>
+    <string name="fetched_count">%d 已获取消息</string>
+    <string name="inserted_count">%d 新消息</string>
+    <string name="load_media_remotely">远程加载媒体</string>
+    <string name="toast_error_media">无法加载媒体！</string>
 </resources>
\ No newline at end of file