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

4 files changed, 16 insertions, 1 deletions

diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index a5cf36110..f54ff2243 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -207,7 +207,7 @@
     <string name="settings_time_from">Antara</string>
     <string name="settings_time_to">dan</string>
     <string name="embedded_browser">Gunakan browser built-in</string>
-    <string name="custom_tabs">Tab kustom</string>
+    <string name="custom_tabs">Aplikasi peramban</string>
     <string name="expand_cw">Automatically expand cw</string>
     <string name="set_led_colour">Atur warna LED:</string>
     <string-array name="led_colours">
@@ -569,4 +569,13 @@
     <string name="icon_size">Ukuran Ikon</string>
     <string name="toots_visibility_title">Visibilitas pesan secara default:</string>
     <string name="show_anyway">Tetap tampilkan</string>
+    <string name="show_self_replies">Tampilkan balasan diri</string>
+    <string name="toast_bookmark">Pesan ditambahkan ke bookmark Anda!</string>
+    <string name="toast_unbookmark">Pesan dihapus dari bookmark Anda!</string>
+    <string name="set_accounts_page">Jumlah akun per beban</string>
+    <string name="reblog_missing_description">Pesan ini kehilangan deskripsi media. Apakah Anda yakin untuk memboostnya?</string>
+    <string name="show_privates">Tampilkan pesan langsung</string>
+    <string name="muted_menu_home">Beranda pengguna yang dibisukan</string>
+    <string name="warn_boost_no_media_description">Peringaktan jika pesan tidak memiliki deskripsi media sebelum diboosting</string>
+    <string name="set_notifications_page">Jumlah pemberitahuan per beban</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 2ca7ac091..488083772 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1057,4 +1057,7 @@
     <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>
+    <string name="show_self_replies">Kendi yanıtlarını göster</string>
+    <string name="show_self_boosts">Öz destekleri göster</string>
+    <string name="show_my_messages">Mesajlarımı göster</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-xx-rXX/strings.xml b/app/src/main/res/values-xx-rXX/strings.xml
new file mode 100644
index 000000000..a6b3daec9
--- /dev/null
+++ b/app/src/main/res/values-xx-rXX/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/src/fdroid/fastlane/metadata/android/id/title.txt b/src/fdroid/fastlane/metadata/android/id/title.txt
new file mode 100644
index 000000000..e6f369e8c
--- /dev/null
+++ b/src/fdroid/fastlane/metadata/android/id/title.txt
@@ -0,0 +1 @@
+Fedilab