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

6 files changed, 63 insertions, 35 deletions

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index f8461e2ed..f15e3f931 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -940,4 +940,6 @@
     <string name="put_all_accounts_in_home_muted">Všechny účtu budou na domovské časové ose ztlumeny.</string>
     <string name="import_data">Importovat data</string>
     <string name="add_all_users_home_muted">Přidat všechny uživatele pro ztlumený domov</string>
+    <string name="display">Zobrazit</string>
+    <string name="group_reblogs">Seskupovat reblogy v domovské časové ose</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index fc932c5e0..034a95276 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -162,62 +162,62 @@
     <string name="timed_mute_profile">%1$s silentigita ĝis %2$s.
 \nKlaku ĉi tie por malsilentigi la konton.</string>
     <!-- Notifications -->
-    <string name="no_notifications">Neniun sciigon por montri</string>
+    <string name="no_notifications">Neniu sciigo por montri</string>
     <string name="notif_mention">menciis vin</string>
-    <string name="notif_status">wrote a new message</string>
-    <string name="notif_reblog">{name} diskonigis vian mesaĝon</string>
-    <string name="notif_favourite">{name} stelumis vian mesaĝon</string>
+    <string name="notif_status">verkis novan mesaĝon</string>
+    <string name="notif_reblog">diskonigis vian mesaĝon</string>
+    <string name="notif_favourite">stelumis vian mesaĝon</string>
     <string name="notif_follow">eksekvis vin</string>
-    <string name="notif_follow_request">asked to follow you</string>
-    <string name="delete_notification_ask_all">Forigi sciigoj?</string>
-    <string name="delete_notification_all">All notifications have been deleted!</string>
+    <string name="notif_follow_request">petis sekvi vin</string>
+    <string name="delete_notification_ask_all">Forigi ĉiujn sciigojn\?</string>
+    <string name="delete_notification_all">Ĉiuj sciigoj forigitaj!</string>
     <!-- HEADER -->
-    <string name="followers">Sekvitaj</string>
+    <string name="followers">Sekvantoj</string>
     <!-- TOAST -->
-    <string name="client_error">Unable to get client id!</string>
+    <string name="client_error">Ne eblas ricevi la klientan identigilon!</string>
     <string name="toast_block">La konto estis blokita!</string>
     <string name="toast_unblock">La konto ne plu estas blokita!</string>
     <string name="toast_mute">La konto estis silentigita!</string>
     <string name="toast_unmute">La konto ne plu silentigita!</string>
-    <string name="toast_follow">La konto estis sekvita!</string>
-    <string name="toast_unfollow">La konto estas ne plu sekvas!</string>
+    <string name="toast_follow">La konto estas eksekvita!</string>
+    <string name="toast_unfollow">La konto estas ne plu estas sekvata!</string>
     <string name="toast_reblog">The toot was boosted!</string>
     <string name="toast_unreblog">The toot is no longer boosted!</string>
     <string name="toast_favourite">La hup estis aldonita al stelumoj!</string>
     <string name="toast_unfavourite">The toot was removed from your favourites!</string>
     <string name="toast_error">Ups ! Eraro okazis!</string>
-    <string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
-    <string name="toast_error_instance">The instance domain does not seem to be valid!</string>
-    <string name="toast_error_loading_account">An error occurred while switching between accounts!</string>
-    <string name="toast_error_search">An error occurred while searching!</string>
-    <string name="nothing_to_do">No action can be taken</string>
-    <string name="toast_error_translate">Eraro okazis dum traduktas!</string>
+    <string name="toast_code_error">Eraro okazis! La instanco ne donis rajtigan kodon!</string>
+    <string name="toast_error_instance">La adreso de la instanco ne ŝajnas valida!</string>
+    <string name="toast_error_loading_account">Okazis eraro dum ŝanĝado de kontoj!</string>
+    <string name="toast_error_search">Okazis eraro dum serĉado!</string>
+    <string name="nothing_to_do">Neniu ago eblas</string>
+    <string name="toast_error_translate">Eraro okazis dum tradukado!</string>
     <!-- Settings -->
     <string name="set_toots_page">Number of toots per load</string>
-    <string name="set_disable_gif">Disable GIF avatars</string>
-    <string name="set_notif_follow">Notify when someone follows you</string>
-    <string name="set_notif_follow_share">Notify when someone boosts your status</string>
-    <string name="set_notif_follow_add">Notify when someone favourites your status</string>
-    <string name="set_notif_follow_mention">Notify when someone mentions you</string>
-    <string name="set_notif_follow_poll">Notify when a poll ended</string>
-    <string name="set_notif_status">Notify for new posts</string>
-    <string name="set_share_validation">Show confirmation dialog before boosting</string>
-    <string name="set_share_validation_fav">Show confirmation dialog before adding to favourites</string>
+    <string name="set_disable_gif">Malŝalti GIF-profilbildojn</string>
+    <string name="set_notif_follow">Sciigu kiam iu eksekvas vin</string>
+    <string name="set_notif_follow_share">Sciigu kiam iu diskonigas vian afiŝon</string>
+    <string name="set_notif_follow_add">Sciigu kiam iu stelumas vian statuson</string>
+    <string name="set_notif_follow_mention">Sciigu kiam iu mencias vin</string>
+    <string name="set_notif_follow_poll">Sciigu kiam enketo finiĝas</string>
+    <string name="set_notif_status">Sciigu pri novaj afiŝoj</string>
+    <string name="set_share_validation">Montru konfirman dialogon antaŭ diskonigo</string>
+    <string name="set_share_validation_fav">Montru konfirman dialogon antaŭ aldono al legosignoj</string>
     <string name="set_notify">Sciigi?</string>
-    <string name="set_notif_silent">Silent Notifications</string>
-    <string name="set_nsfw_timeout">NSFW view timeout (seconds, 0 means off)</string>
-    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
-    <string name="settings_title_custom_sharing">Custom sharing</string>
-    <string name="settings_custom_sharing_url">Your custom sharing URL…</string>
+    <string name="set_notif_silent">Silentaj sciigoj</string>
+    <string name="set_nsfw_timeout">Tempolimo de NSFW-vido (sekundoj, 0 estas malŝalto)</string>
+    <string name="set_med_desc_timeout">Tempolimo de aŭdvida priskribo (sekundoj, 0 estas malŝalto)</string>
+    <string name="settings_title_custom_sharing">Adaptita kundivido</string>
+    <string name="settings_custom_sharing_url">URL por via adaptita kundivido…</string>
     <string name="set_lock_account">Ŝlosi konton</string>
     <string name="set_save_changes">Konservi ŝanĝojn</string>
-    <string name="set_fit_preview">Fit preview images</string>
+    <string name="set_fit_preview">Adapti antaŭvidajn bildojn</string>
     <string name="settings_time_from">Inter</string>
     <string name="settings_time_to">kaj</string>
-    <string name="embedded_browser">Use the built-in browser</string>
+    <string name="embedded_browser">Uzu la enkonstruitan retumilon</string>
     <string name="custom_tabs">Propra langetoj</string>
-    <string name="expand_cw">Automatically expand cw</string>
-    <string name="set_led_colour">Set LED colour:</string>
+    <string name="expand_cw">Aŭtomate montri enhavon sub averto</string>
+    <string name="set_led_colour">Agordi koloron de LED:</string>
     <string-array name="led_colours">
         <item>Blua</item>
         <item>Cejana</item>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index d23d38693..16a79175b 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -916,4 +916,16 @@
     <string name="toast_on_your_instance">A conversa comezou na túa instancia!</string>
     <string name="cark_custom_colors">Escuro - Cores personais</string>
     <string name="set_cardview">Tarxetas elevadas</string>
+    <string name="import_data">Importar datos</string>
+    <string name="set_display_translate_indication">Mostrar sempre botón de tradución</string>
+    <string name="mute_tag_action">Acalar cancelo</string>
+    <string name="unmute_tag_action">Restablecer cancelo</string>
+    <string name="unfollow_tag">Non seguir cancelo</string>
+    <string name="pin_tag">Fixar cancelo</string>
+    <string name="unpin_tag">Desafixar cancelo</string>
+    <string name="mute_home">Acalar para Inicio</string>
+    <string name="unmute_home">Non acalar para Inicio</string>
+    <string name="add_all_users_home_muted">Engadir tódolas usuarias ao inicio acalado</string>
+    <string name="put_all_accounts_in_home_muted">Tódalas contas serán acaladas para a cronoloxía de Inicio.</string>
+    <string name="mute_them_all">Acalalas todas</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c514e9683..c35d9b4a0 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -915,4 +915,15 @@
     <string name="unfollow_tag">Non seguire etichetta</string>
     <string name="set_language_picker_title">Selettore lingua</string>
     <string name="display_remote_conversation">Mostra conversazione remota</string>
+    <string name="report_val_more2">Link malevoli, siti ingannevoli, o risposte ripetitive</string>
+    <string name="import_data">Importa dati</string>
+    <string name="instance_health_uptime">Tempo online: %,.2f %%</string>
+    <string name="report_all_more">Seleziona tutto</string>
+    <string name="report_2_title">Ci sono dei post a supporto di questa segnalazione\?</string>
+    <string name="replace_youtube_host">Dominio frontend YouTube</string>
+    <string name="replace_twitter_host">Dominio frontend Twitter</string>
+    <string name="replace_instagram_host">Dominio frontend Instagram</string>
+    <string name="replace_reddit_host">Dominio frontend Reddit</string>
+    <string name="boosted_by">Ricondiviso da</string>
+    <string name="admin_domainblock_reject_obfuscate">Offusca parzialmente il nome di dominio nella lista se mostra le limitazioni di dominio é abilitato</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index 09fbd0dbc..eb21760b0 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -926,4 +926,6 @@
     <string name="unmute_home">Torra a ativare pro sa pàgina printzipale</string>
     <string name="put_all_accounts_in_home_muted">Totu is contos ant a abarrare a sa muda in sa lìnia de tempus printzipale.</string>
     <string name="mute_them_all">Pone·los totus a sa muda</string>
+    <string name="import_data">Importa datos</string>
+    <string name="group_reblogs">Agrupa is cumpartziduras in sa lìnia de tempus printzipale</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 2e16484ea..0f6f15ce6 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -933,4 +933,5 @@
     <string name="add_all_users_home_muted">Tüm kullanıcıları ana sayfada susturmaya ekle</string>
     <string name="mute_home">Ana sayfa için sustur</string>
     <string name="import_data">Verileri içe aktar</string>
+    <string name="group_reblogs">Ana sayfa zaman çizelgesinde yeniden blogları gruplandır</string>
 </resources>
\ No newline at end of file