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

4 files changed, 18 insertions, 7 deletions

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 719e7e435..1a7dbfaff 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -318,7 +318,7 @@
     <string name="block_domain">Blockiere Domäne</string>
     <string name="toast_block_domain">Die Domäne ist geblockt</string>
     <string name="retrieve_remote_status">Rufe entfernten Status ab</string>
-    <string name="peertube_instance">Peertube Instanz</string>
+    <string name="peertube_instance">Peertube-Instanz</string>
     <string name="set_display_emoji">Emoji One verwenden</string>
     <string name="information">Information</string>
     <string name="set_display_card">Vorschau in allen Beiträgen anzeigen</string>
@@ -365,7 +365,7 @@
     <string name="some_words_all">Alle dieser Hashtags (durch Leerzeichen getrennt)</string>
     <string name="some_tags">Hashtags zum Filter hinzufügen (durch Leerzeichen getrennt)</string>
     <string name="change_tag_column">Spaltenname ändern</string>
-    <string name="misskey_instance">Misskey Instanz</string>
+    <string name="misskey_instance">Misskey-Instanz</string>
     <string name="trending">Angesagt</string>
     <string name="local">Lokal</string>
     <string name="category">Kategorie</string>
@@ -1056,4 +1056,6 @@
     <string name="set_custom_accent">Benutzerdefinierte Akzentfarbe</string>
     <string name="set_custom_accent_value_light_description">Farbe, die für das helle Thema verwendet wird</string>
     <string name="lemmy_instance">Lemmy-Instanz</string>
+    <string name="set_remote_conversation_title">Entfernte Unterhaltungen</string>
+    <string name="set_remote_conversation">Die App zeigt öffentliche Unterhaltungen an, um alle Nachrichten zu erhalten. Für Interaktionen ist ein zusätzlicher Schritt erforderlich, um Nachrichten zu verbinden.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml
index d156ec1c2..83f045831 100644
--- a/app/src/main/res/values-gd/strings.xml
+++ b/app/src/main/res/values-gd/strings.xml
@@ -1003,4 +1003,7 @@
     <string name="fetching_messages">A’ faighinn nan teachdaireachdan</string>
     <string name="retrieve_remote_account">Faigh an cunntas cèin!</string>
     <string name="about_peertube">“’S e inneal airson videothan a cho-roinneadh air loidhne a th’ ann am PeerTube a tha ’ga leasachadh le buidheann neo-phrothaideach Frangach.…Leigidh PeerTube le ùrlaran ceangal ri chèile, a’ cruthachadh lìonra mòr de dh’ùrlaran a tha an dà chuid neo-eisimeileach agus ceangailte ri chèile.”</string>
+    <string name="lemmy_instance">Ionstans Lemmy</string>
+    <string name="set_remote_conversation_title">Còmhraidhean cèine</string>
+    <string name="set_remote_conversation">Seallaidh an aplacaid còmhraidhean poblach airson a h-uile teachdaireachd fhaighinn. Bidh eadar-ghabhail feumach air ceum a bharrachd airson co-nasgadh nan teachdaireachdan.</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 a3f2dbc5b..a6d711120 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -430,7 +430,7 @@
     <string name="category_food">Comida</string>
     <string name="instance_logo">Logo da instancia</string>
     <string name="join_mastodon">Únirse a Mastodon</string>
-    <string name="pickup_instance_category">Escolla unha instancia escollendo unha categoría, despois pulse no botón de marca.</string>
+    <string name="pickup_instance_category">Elixe unha categoría para ter unha lista de instancias, despois preme na instancia que queiras.</string>
     <string name="users">%1$s usuarias</string>
     <string name="password_confirm">Confirmar contrasinal</string>
     <string name="agreement_check">Acepto as %1$s e os %2$s</string>
@@ -598,7 +598,7 @@
     <string name="pref_custom_theme_new_summary">Permitir crear o teu propio decorado</string>
     <string name="pref_contributor">Decorados da comunidade</string>
     <string name="poll_type">Tipo de enquisa:</string>
-    <string name="pref_contributor_summary">Elixe un decorado que foi creado por persoas da comunidade</string>
+    <string name="pref_contributor_summary">Elixe un decorado dos creados pola comunidade</string>
     <string name="poll_duration">Duración da enquisa:</string>
     <string name="icon_size">Tamaño das iconas</string>
     <string name="toots_visibility_title">Visibilidade por defecto para as mensaxes:</string>
@@ -1049,4 +1049,7 @@
     <string name="set_custom_accent">Cor persoal para resaltar</string>
     <string name="set_custom_accent_value_dark_description">Cor que se aplicará no decorado escuro</string>
     <string name="lemmy_instance">Instancia Lemmy</string>
+    <string name="set_remote_conversation_title">Conversas remotas</string>
+    <string name="set_remote_conversation">A app mostrará todas as mensaxes das conversas públicas. As interacción precisarán un paso extra para federar as mensaxes.</string>
+    <string name="track_selection_title">Elexir calidade</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index 307cec590..95774a3c1 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -125,7 +125,7 @@
     <string name="toot_error_no_content">Your toot is empty!</string>
     <string name="toot_sent">The toot has been sent!</string>
     <string name="toot_sensitive">සංවේදී අන්තර්ගතයක් ද?</string>
-    <string name="no_draft">No drafts!</string>
+    <string name="no_draft">කටුසටහන් නැත!</string>
     <string name="choose_accounts">ගිණුමක් තෝරන්න</string>
     <string name="select_accounts">ගිණුම් කිහිපයක් තෝරන්න</string>
     <string name="remove_draft">කටුසටහන ඉවත් කරනවා ද?</string>
@@ -243,8 +243,8 @@
     <!-- ACTIVITY CACHE -->
     <string name="v_public">ප්‍රසිද්ධ</string>
     <string name="v_unlisted">ලැයිස්තුගත නොකළ</string>
-    <string name="v_private">Private</string>
-    <string name="v_direct">Direct</string>
+    <string name="v_private">අනුගාමිකයින්ට පමණි</string>
+    <string name="v_direct">සඳහන් කළ අයට පමණි</string>
     <!-- PRIVACY -->
     <string name="filter_regex">Filter out by regular expressions</string>
     <string name="search">සෙවීම</string>
@@ -574,4 +574,7 @@
     <string name="icon_size">ලාංඡනවල ප්‍රමාණය</string>
     <string name="hide_content">අන්තර්ගතය සඟවන්න &gt;</string>
     <string name="stop_recording">පටිගත කිරීම නවත්වන්න</string>
+    <string name="number_of_media">මාධ්‍ය සංඛ්‍යාව</string>
+    <string name="number_of_replies">ප්‍රතිචාර සංඛ්‍යාව</string>
+    <string name="followers_only">අනුගාමිකයින්ට පමණි</string>
 </resources>
\ No newline at end of file