Merge branch 'master' into users

apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt

@@ -1535,11 +1535,11 @@ sealed class CIContent: ItemContent {
 
     fun preferenceText(feature: Feature, allowed: FeatureAllowed, param: Int?): String = when {
       allowed != FeatureAllowed.NO && feature.hasParam && param != null ->
-        "offered ${feature.text}: ${TimedMessagesPreference.ttlText(param)}"
+        String.format(generalGetString(R.string.feature_offered_item_with_param), feature.text, TimedMessagesPreference.ttlText(param))
       allowed != FeatureAllowed.NO ->
-        "offered ${feature.text}"
+        String.format(generalGetString(R.string.feature_offered_item), feature.text, TimedMessagesPreference.ttlText(param))
       else ->
-        "cancelled ${feature.text}"
+        String.format(generalGetString(R.string.feature_cancelled_item), feature.text, TimedMessagesPreference.ttlText(param))
     }
   }
 }

apps/android/app/src/main/res/values-de/strings.xml

@@ -990,4 +990,7 @@
     <string name="v4_2_auto_accept_contact_requests_desc">Mit optionaler Begrüßungsmeldung.</string>
     <string name="v4_3_irreversible_message_deletion_desc">Ihre Kontakte können die unwiederbringliche Löschung von Nachrichten erlauben.</string>
     <string name="icon_descr_cancel_live_message">Livenachricht abbrechen</string>
+    <string name="feature_offered_item">beginne %s</string>
+    <string name="feature_offered_item_with_param">beginne %s: %2s</string>
+    <string name="feature_cancelled_item">beende %s</string>
 </resources>

apps/android/app/src/main/res/values-fr/strings.xml

@@ -919,4 +919,7 @@
     <string name="invalid_data">données invalides</string>
     <string name="invalid_chat">chat invalide</string>
     <string name="icon_descr_cancel_live_message">Annuler le message dynamique</string>
+    <string name="feature_offered_item">offert %s</string>
+    <string name="feature_offered_item_with_param">offert %s: %2s</string>
+    <string name="feature_cancelled_item">annulé %s</string>
 </resources>

apps/android/app/src/main/res/values-it/strings.xml

@@ -919,4 +919,7 @@
     <string name="you_must_use_the_most_recent_version_of_database">Devi usare la versione più recente del tuo database della chat SOLO su un dispositivo, altrimenti potresti non ricevere più i messaggi da alcuni contatti.</string>
     <string name="database_is_not_encrypted">Il database della chat non è crittografato: imposta la password per proteggerlo.</string>
     <string name="icon_descr_cancel_live_message">Annulla messaggio in diretta</string>
+    <string name="feature_offered_item">offerto %s</string>
+    <string name="feature_offered_item_with_param">offerto %s: %2s</string>
+    <string name="feature_cancelled_item">annullato %s</string>
 </resources>

apps/android/app/src/main/res/values-ru/strings.xml

@@ -990,4 +990,7 @@
     <string name="v4_2_group_links_desc">Админы могут создать ссылки для вступления в группу.</string>
     <string name="v4_2_auto_accept_contact_requests">Автоматически принимать запросы контактов</string>
     <string name="v4_2_auto_accept_contact_requests_desc">С опциональным авто-ответом.</string>
+    <string name="feature_offered_item">предложил(a) %s</string>
+    <string name="feature_offered_item_with_param">предложил(a) %s: %2s</string>
+    <string name="feature_cancelled_item">отменил(a) %s</string>
 </resources>

apps/android/app/src/main/res/values/strings.xml

@@ -1067,6 +1067,9 @@
   <string name="ttl_week">%d week</string>
   <string name="ttl_weeks">%d weeks</string>
   <string name="ttl_w">%dw</string>
+  <string name="feature_offered_item">offered %s</string>
+  <string name="feature_offered_item_with_param">offered %s: %2s</string>
+  <string name="feature_cancelled_item">cancelled %s</string>
 
   <!-- WhatsNewView.kt -->
   <string name="whats_new">What\'s new</string>