From 5d0c409d7bf6dc33b8f3d2ae23a7eae7faf792dc Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Wed, 13 Mar 2024 13:07:42 +0100
Subject: [PATCH 1/2] fix to hide open conversations after returning from
 search

How to test:

pre-requirement:
There are open conversations

without this commit:
1. go to search screen
2. go back to conversation list
-> all open conversations are listed below own conversations

with this commit:
1. go to search screen
2. go back to conversation list
-> only own conversations are listed

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/conversationlist/ConversationsListActivity.kt          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
index 4df674671..388ba6235 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
@@ -592,7 +592,7 @@ class ConversationsListActivity :
 
                 override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
                     adapter!!.setHeadersShown(false)
-                    if (!filterState.containsValue(true)) filterableConversationItems = searchableConversationItems
+                    if (!filterState.containsValue(true)) filterableConversationItems = conversationItemsWithHeader
                     adapter!!.updateDataSet(filterableConversationItems, false)
                     adapter!!.hideAllHeaders()
                     if (searchHelper != null) {

From bad323280aff0e97846e5b6fdd389d7401cf7128 Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Thu, 14 Mar 2024 02:44:51 +0000
Subject: [PATCH 2/2] Fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
---
 app/src/main/res/values-ar/strings.xml |  1 +
 app/src/main/res/values-tr/strings.xml | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index b83cafc74..af97bc583 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -22,6 +22,7 @@
     <string name="clear_status_message_after">إمسح رسالة الحالة فيما بعدٌ</string>
     <string name="close">إغلاق</string>
     <string name="continuous_voice_message_recording">قَفْل التسجيل للتسجيل المستمر للرسالة الصوتية</string>
+    <string name="conversation_is_read_only">المحادثة للقراءة فقط</string>
     <string name="conversations">محادثات</string>
     <string name="create_conversation">انشاء محادثة</string>
     <string name="create_issue">تكوين إشكالية </string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 84669aac3..2be55e3f3 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -22,6 +22,7 @@
     <string name="clear_status_message_after">Durum iletisinin kaldırılma süresi</string>
     <string name="close">Kapat</string>
     <string name="continuous_voice_message_recording">Sesli iletinin sürekli olarak kaydedilmesi için kaydı kilitleyin</string>
+    <string name="conversation_is_read_only">Görüşme salt okunur</string>
     <string name="conversations">Görüşmeler</string>
     <string name="create_conversation">Görüşme oluştur</string>
     <string name="create_issue">Sorun ekle</string>
@@ -211,6 +212,9 @@
     <string name="nc_display_name_not_stored">Görüntülenecek ad kaydedilemedi, vazgeçiliyor</string>
     <string name="nc_edit_icon">Düzenle simgesi</string>
     <string name="nc_edit_message">Düzenle</string>
+    <string name="nc_edit_message_text">Mesaj Metnini Düzenle</string>
+    <string name="nc_edited_by">Tarafından düzenlendi</string>
+    <string name="nc_edited_by_admin">Yönetici tarafından düzenlendi</string>
     <string name="nc_email">E-posta</string>
     <string name="nc_expire_message_eight_hours">8 saat</string>
     <string name="nc_expire_message_four_weeks">4 hafta</string>
@@ -223,6 +227,9 @@
     <string name="nc_external_server_failed">İşaretleşme ayarları alınamadı</string>
     <string name="nc_federation_invitation_accept">Kabul et</string>
     <string name="nc_federation_invitation_reject">Reddet</string>
+    <string name="nc_federation_invited_to_room">%1$s\'den %2$s\'a kadar</string>
+    <string name="nc_federation_no_invitations">Bekleyen davetiye yok</string>
+    <string name="nc_federation_pending_invitation_hint">Bekleyen davetiyeleriniz var</string>
     <string name="nc_file_browser_back">Geri</string>
     <string name="nc_file_storage_permission">Dosyalara erişme izni gereklidir</string>
     <string name="nc_filter">Görüşmeleri süz</string>
@@ -336,6 +343,7 @@
     <string name="nc_remove_from_favorites">Sık kullanılanlardan kaldır</string>
     <string name="nc_remove_group_and_members">Grup ve üyelerini sil</string>
     <string name="nc_remove_participant">Katılımcıyı çıkar</string>
+    <string name="nc_remove_team_and_members">Ekibi ve üyeleri kaldır</string>
     <string name="nc_rename">Görüşmeyi yeniden adlandır</string>
     <string name="nc_rename_confirm">Yeniden adlandır</string>
     <string name="nc_reply">Yanıtla</string>
@@ -353,6 +361,7 @@
     <string name="nc_search">Arama</string>
     <string name="nc_select_an_account">Bir hesap seçin</string>
     <string name="nc_select_participants">Katılımcıları seçin</string>
+    <string name="nc_send_edit_message">Düzenleme Mesajı Gönder</string>
     <string name="nc_sent_a_gif" formatted="true">%1$s bir GIF gönderdi.</string>
     <string name="nc_sent_a_gif_you">Bir GIF gönderdiniz.</string>
     <string name="nc_sent_a_video" formatted="true">%1$s bir görüntü gönderdi.</string>
@@ -457,6 +466,8 @@
     <string name="nc_sort_by">Sıralama</string>
     <string name="nc_start_time">Başlangıç zamanı</string>
     <string name="nc_switch_account">Hesabı değiştir</string>
+    <string name="nc_team">Ekip</string>
+    <string name="nc_teams">Ekipler</string>
     <string name="nc_upload_choose_local_files">Dosyaları seçin</string>
     <string name="nc_upload_confirm_send_multiple">Bu dosyalar %1$s alıcısına gönderilsin mi?</string>
     <string name="nc_upload_confirm_send_single">Bu dosya %1$s alıcısına gönderilsin mi?</string>