Merge branch 'develop' of framagit.org:tom79/fedilab into develop

8 files changed, 26 insertions, 26 deletions

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index b726d1b30..556661a61 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -418,8 +418,8 @@ Pots habilitar o deshabilitar les notificacions més endavant als ajustaments (P
     <string name="data_backup_success">S\'han importat %1$s toots nous</string>
     <string name="data_backup_notification_success">%1$s notificacions noves s\'han importat</string>
     <string-array name="filter_order">
-        <item>Dates descending</item>
-        <item>Dates ascending</item>
+        <item>Dates en ordre descendent</item>
+        <item>Dates en ordre ascendent</item>
     </string-array>
     <string-array name="filter_select">
         <item>No</item>
@@ -1123,6 +1123,6 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="long_api_error">L\'aplicació ha rebut un missatge d\'error molt llarg des de l\'API %1$s</string>
     <string name="message_preview">Previsualització de missatge</string>
     <string name="report_mention">Afegeix mencions en cada missatge</string>
-    <string name="fetch_conversation">Fetching conversation</string>
-    <string name="order_by">Order by</string>
+    <string name="fetch_conversation">S\'està extraient la conversa</string>
+    <string name="order_by">Ordenar per</string>
 </resources>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index a3cc46dba..df3b9f30d 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -419,8 +419,8 @@
     <string name="data_backup_success">%1$s new toots have been imported</string>
     <string name="data_backup_notification_success">%1$s new notifications have been imported</string>
     <string-array name="filter_order">
-        <item>Dates descending</item>
-        <item>Dates ascending</item>
+        <item>Datoj malsupreniranta</item>
+        <item>Datoj supreniranta</item>
     </string-array>
     <string-array name="filter_select">
         <item>Ne</item>
@@ -1132,5 +1132,5 @@
     <string name="message_preview">Message preview</string>
     <string name="report_mention">Add mentions in each message</string>
     <string name="fetch_conversation">Fetching conversation</string>
-    <string name="order_by">Order by</string>
+    <string name="order_by">Ordigi laŭ</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 57ff59c20..aa18be5ab 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1122,8 +1122,8 @@
     <string name="set_hide_status_bar_indication">Чтобы скрыть уведомление в строке состояния, нажмите на кнопку с пиктограммой глаза и снимите флажок: \"Показывать в строке состояния\"</string>
     <string name="set_live_type_title">Включить отложенные уведомления</string>
     <string name="set_live_type_indication">Уведомления будут появляться на 30 секунд позже. Это позволит уменьшить влияние на батарею.</string>
-    <string name="live_delayed">Живое уведомление отложено</string>
-    <string name="no_live_notif">Нет живых уведомлений</string>
+    <string name="live_delayed">Live notifications delayed</string>
+    <string name="no_live_notif">No live notifications</string>
     <string name="no_live_indication">Уведомления будут поступать каждые 15 минут.</string>
     <string name="action_add_notes">Добавить примечания</string>
     <string name="note_for_account">Примечания для аккаунта</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 07c68af7a..908383d50 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -419,8 +419,8 @@
     <string name="data_backup_success">%1$s nya toots har importerats</string>
     <string name="data_backup_notification_success">%1$s nya notifieringar har importerats</string>
     <string-array name="filter_order">
-        <item>Dates descending</item>
-        <item>Dates ascending</item>
+        <item>Fallande datum</item>
+        <item>Stigande datum</item>
     </string-array>
     <string-array name="filter_select">
         <item>Nej</item>
@@ -1131,6 +1131,6 @@
     <string name="long_api_error">Appen mottog ett väldigt långt felmeddelande från API:et %1$s</string>
     <string name="message_preview">Förhandsvisning av meddelande</string>
     <string name="report_mention">Ange nämnande i varje meddelande</string>
-    <string name="fetch_conversation">Fetching conversation</string>
-    <string name="order_by">Order by</string>
+    <string name="fetch_conversation">Hämtar konversation</string>
+    <string name="order_by">Sortera efter</string>
 </resources>
diff --git a/fastlane/metadata/android/ca/full_description.txt b/fastlane/metadata/android/ca/full_description.txt
index 5d78d0c23..e46d72619 100644
--- a/fastlane/metadata/android/ca/full_description.txt
+++ b/fastlane/metadata/android/ca/full_description.txt
@@ -4,7 +4,7 @@ Pot incorporar:
 - Mastodon, Pleroma, Peertube, GNU social i Friendica.
 
 
-The app has advanced features (especially for Pleroma and Mastodon):
+L'aplicació té funcionalitats avançades (sobretot per a Pleroma i Mastodont):
 
 - Pot assumir múltiples comptes
 - Programar missatges des del dispositiu
@@ -12,7 +12,7 @@ The app has advanced features (especially for Pleroma and Mastodon):
 - Marcar missatges
 - Seguir i interactuar amb instàncies remotes
 - Silenciar comptes temporalment
-- Cross-account actions with a long press
+- Executar accions entre els comptes amb pitjada llarga
 - Funcionalitat de traducció
 - Pissarres de creació artística
 - Pissarres de vídeo
diff --git a/fastlane/metadata/android/eo/full_description.txt b/fastlane/metadata/android/eo/full_description.txt
index f5dbd68dd..3714fe379 100644
--- a/fastlane/metadata/android/eo/full_description.txt
+++ b/fastlane/metadata/android/eo/full_description.txt
@@ -1,18 +1,18 @@
-Fedilab is a multifunctional Android client to access the distributed Fediverse, consisting of micro blogging, photo sharing and video hosting.
+Fedilab estas multfunkcia klienta de Androido aliri la distribuita Fediverse, konsistanta mikraj blogoj, foto dividanta kaj video gastigado.
 
-It supports:
-- Mastodon, Pleroma, Peertube, GNU Social, Friendica.
+Subtenaj:
+Mastodono, Pleromo, Peertube, GNU Social, Friendica.
 
 
 The app has advanced features (especially for Pleroma and Mastodon):
 
-- Multi-accounts support
+- Multaj-kontoj subtena
 - Schedule messages from the device
 - Schedule boosts
-- Bookmark messages
+- Stelumaj mesaĝojn
 - Follow and interact with remote instances
 - Timed mute accounts
 - Cross-account actions with a long press
-- Translation feature
-- Art timelines
-- Video timelines
+- Tradukada ĉefaĵon
+- Artaj tempolinioj
+- Videaj tempolinioj
diff --git a/fastlane/metadata/android/eo/short_description.txt b/fastlane/metadata/android/eo/short_description.txt
index 13216e790..1b7289734 100644
--- a/fastlane/metadata/android/eo/short_description.txt
+++ b/fastlane/metadata/android/eo/short_description.txt
@@ -1 +1 @@
-Fedilab is a multifunctional Android client to access the distributed Fediverse
\ No newline at end of file
+Fedilab estas multfunkcia klienta de Androido aliri la distribuita Fediverse
\ No newline at end of file
diff --git a/fastlane/metadata/android/sv/full_description.txt b/fastlane/metadata/android/sv/full_description.txt
index 01085e79f..ba7197540 100644
--- a/fastlane/metadata/android/sv/full_description.txt
+++ b/fastlane/metadata/android/sv/full_description.txt
@@ -4,7 +4,7 @@ Den stöder:
 - Mastodon, Pleroma, Peertube, GNU Social, Friendica.
 
 
-The app has advanced features (especially for Pleroma and Mastodon):
+Appen har avancerade funktioner (särskilt för Pleroma och Mastodon):
 
 - Stöd för flera konton
 - Schemalägga meddelanden från enheten
@@ -12,7 +12,7 @@ The app has advanced features (especially for Pleroma and Mastodon):
 - Bokmärk meddelanden
 - Följ och interagera med fjärrinstanser
 Tidsinställ tystadekonton
-- Cross-account actions with a long press
+- Cross-konto åtgärder med ett långttryck
 - Översättningsfunktion
 - Konstidslinje
 - Videotidslinjer