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

3 files changed, 15 insertions, 0 deletions

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 032da2569..c01f1f1ea 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1068,4 +1068,9 @@
     <string name="thumbnail">Vorschau</string>
     <string name="thread_long_message_message">Der Beitrag wird in mehrere Antworten aufgeteilt, um die maximale Zeichenanzahl Ihrer Instanz einzuhalten.</string>
     <string name="thread_long_this_message">Diese Beiträge in Antworten aufteilen?</string>
+    <string name="clipboard_version">Informationen wurden in die Zwischenablage kopiert</string>
+    <string name="set_display_relative_date">Zeige relatives Datum für Beiträge an</string>
+    <string name="copy_version">Informationen kopieren</string>
+    <string name="underline_links">Anklickbare Elemente unterstreichen</string>
+    <string name="tag_already_followed">Du folgst bereits diesem Tag!</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 f812b7a53..e2b37deaf 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -1062,4 +1062,9 @@
     <string name="thumbnail">Miniatura</string>
     <string name="thread_long_message_message">A mensaxe vai ser dividida en varias respostas para cumprir co número máximo de caracteres da túa instancia.</string>
     <string name="thread_long_this_message">Dividir estas mensaxes nas respostas?</string>
+    <string name="clipboard_version">Copiouse a información ao portapapeis</string>
+    <string name="set_display_relative_date">Mostrar a data relativa das mensaxes</string>
+    <string name="copy_version">Copiar información</string>
+    <string name="underline_links">Subliñar os elementos clicables</string>
+    <string name="tag_already_followed">Xa segues ese cancelo!</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 d51b8f8e3..ec90ee0b3 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1066,4 +1066,9 @@
     <string name="thumbnail">Küçük resim</string>
     <string name="thread_long_message_message">Mesaj, sunucunuzun en fazla karakter sayısına uygun olacak şekilde birkaç yanıta bölünecek.</string>
     <string name="thread_long_this_message">Bu mesajlar yanıtlara bölünsün mü?</string>
+    <string name="clipboard_version">Bilgiler panoya kopyalandı</string>
+    <string name="set_display_relative_date">Mesajlar için göreceli tarihi görüntüle</string>
+    <string name="copy_version">Bilgileri kopyala</string>
+    <string name="underline_links">Tıklanabilir ögelerin altını çiz</string>
+    <string name="tag_already_followed">Bu etiketi zaten takip ediyorsunuz!</string>
 </resources>
\ No newline at end of file