Commit 24303915 authored by Thomas's avatar Thomas
Browse files

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

parents e66ca471 d2b1ebe7
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -1058,4 +1058,5 @@
    <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>
    <string name="markdown_support">Markdown-Unterstützung</string>
</resources>
 No newline at end of file
+3 −0
Original line number Diff line number Diff line
@@ -1054,4 +1054,7 @@
    <string name="about_peertube">\"PeerTube est un outil de partage de vidéos en ligne développé par Framasoft, une association française à but non-lucratif ... PeerTube permet à ses plate-formes d\'être connectées les unes aux autres, créant un grand réseau de plate-formes qui sont autonomes et inter-connectées.\"</string>
    <string name="self">Soi-même</string>
    <string name="exit">Sortir</string>
    <string name="set_remote_conversation_title">Conversations distantes</string>
    <string name="markdown_support">Prise en charge de Markdown</string>
    <string name="lemmy_instance">Instance Lemmy</string>
</resources>
 No newline at end of file
+3 −0
Original line number Diff line number Diff line
@@ -1054,4 +1054,7 @@
    <string name="set_custom_accent_dark_value">Koyu vurgu rengi</string>
    <string name="set_custom_accent_value_dark_description">Koyu temaya uygulanacak renk</string>
    <string name="lemmy_instance">Lemmy sunucusu</string>
    <string name="markdown_support">Markdown desteği</string>
    <string name="set_remote_conversation_title">Uzak görüşmeler</string>
    <string name="set_remote_conversation">Uygulama, tüm mesajları almak için herkese açık görüşmeleri görüntüleyecektir. Etkileşimlerin mesajları birleştirmek için ek bir adıma ihtiyacı olacaktır.</string>
</resources>
 No newline at end of file