Merge branch 'master' into f/msg-signing

2026-07-27 12:21:32 +00:00 · 2026-07-09 13:37:32 +04:00
parent ead15cb5b1 00f8adb461
commit ef22d24204
26 changed files with 55 additions and 48 deletions
@@ -201,7 +201,7 @@ private fun ModalData.NewChatSheetLayout(
    ),
    Triple(
      painterResource(MR.images.ic_bigtop_updates),
-      stringResource(MR.strings.create_channel_beta_button),
+      stringResource(MR.strings.create_channel_button),
      createChannel,
    )
  )
@@ -2577,7 +2577,6 @@
    <string name="relay_conn_status_connecting">يتصل</string>
    <string name="create_channel_title">أنشئ قناة عامة</string>
    <string name="create_channel_button">أنشئ قناة عامة</string>
-    <string name="create_channel_beta_button">أنشئ قناة عامة (تجريبي)</string>
    <string name="creating_channel">ينشئ قناة</string>
    <string name="rcv_channel_events_count">%d أحداث القناة</string>
    <string name="relay_test_step_decode_link">فك ترميز الرابط</string>
@@ -3104,7 +3104,6 @@
  <!-- AddChannelView.kt -->
  <string name="create_channel_title">Create public channel</string>
  <string name="create_channel_button">Create public channel</string>
-  <string name="create_channel_beta_button">Create public channel (BETA)</string>
  <string name="channel_display_name_field">Channel name</string>
  <string name="creating_channel">Creating channel</string>
  <string name="error_creating_channel">Error creating channel</string>
@@ -2608,7 +2608,6 @@
    <string name="connect_via_link_or_qr_code">Připojení přes odkaz nebo QR kód</string>
    <string name="create_channel_title">Vytvořit veřejný kanál</string>
    <string name="create_channel_button">Vytvořit veřejný kanál</string>
-    <string name="create_channel_beta_button">Vytvořit veřejný kanál (BETA)</string>
    <string name="connect_with_someone">Vytvořte odkaz</string>
    <string name="create_your_public_address">Vytvořte si veřejnou adresu</string>
    <string name="creating_channel">Vytvářím kanál</string>
@@ -2663,7 +2663,6 @@
    <string name="relay_conn_status_connecting">Verbinde</string>
    <string name="create_channel_title">Öffentlichen Kanal erstellen</string>
    <string name="create_channel_button">Öffentlichen Kanal erstellen</string>
-    <string name="create_channel_beta_button">Öffentlichen Kanal erstellen (BETA)</string>
    <string name="creating_channel">Kanal wird erstellt</string>
    <string name="relay_test_step_decode_link">Link dekodieren</string>
    <string name="button_delete_channel">Kanal löschen</string>
@@ -2600,7 +2600,6 @@
    <string name="info_row_connection_failed">Conexión fallida</string>
    <string name="create_channel_title">Crear canal público</string>
    <string name="create_channel_button">Crear canal público</string>
-    <string name="create_channel_beta_button">Crear canal público (BETA)</string>
    <string name="creating_channel">Creando canal</string>
    <string name="rcv_channel_events_count">%d eventos del canal</string>
    <string name="button_delete_channel">Eliminar canal</string>
@@ -2535,7 +2535,6 @@
    <string name="relay_conn_status_connecting">kapcsolódás</string>
    <string name="create_channel_title">Nyilvános csatorna létrehozása</string>
    <string name="create_channel_button">Nyilvános csatorna létrehozása</string>
-    <string name="create_channel_beta_button">Nyilvános csatorna létrehozása (BÉTA)</string>
    <string name="creating_channel">Csatorna létrehozása</string>
    <string name="relay_conn_status_deleted">törölve</string>
    <string name="relay_conn_status_failed">sikertelen</string>
@@ -2606,7 +2606,6 @@
    <string name="webpage_info">Buat halaman web untuk menampilkan pratinjau saluran Anda kepada pengunjung sebelum mereka berlangganan. Anda dapat menghostingnya sendiri atau menggunakan layanan hosting statis apa pun.</string>
    <string name="create_channel_title">Buat saluran publik</string>
    <string name="create_channel_button">Buat saluran publik</string>
-    <string name="create_channel_beta_button">Buat saluran publik (BETA)</string>
    <string name="connect_with_someone">Buat tautan Anda</string>
    <string name="create_your_public_address">Buat alamat publik Anda</string>
    <string name="creating_channel">Sedang membuat saluran</string>
@@ -2593,7 +2593,6 @@
    <string name="relay_conn_status_connecting">in connessione</string>
    <string name="create_channel_title">Crea canale pubblico</string>
    <string name="create_channel_button">Crea canale pubblico</string>
-    <string name="create_channel_beta_button">Crea canale pubblico (BETA)</string>
    <string name="creating_channel">Creazione canale</string>
    <string name="relay_test_step_decode_link">Decodifica il link</string>
    <string name="button_delete_channel">Elimina canale</string>
@@ -2784,7 +2784,6 @@
    <string name="block_subscriber_for_all_question">全員に対して購読者をブロックしますか？</string>
    <string name="create_channel_title">公開チャンネルを作成</string>
    <string name="create_channel_button">公開チャンネルを作成</string>
-    <string name="create_channel_beta_button">公開チャンネルを作成（ベータ）</string>
    <string name="channel_display_name_field">チャンネル名</string>
    <string name="creating_channel">チャンネルを作成中</string>
    <string name="error_creating_channel">チャンネルの作成エラー</string>
@@ -2648,7 +2648,6 @@
    <string name="relay_conn_status_connecting">соединяется</string>
    <string name="create_channel_title">Создать публичный канал</string>
    <string name="create_channel_button">Создать публичный канал</string>
-    <string name="create_channel_beta_button">Создать публичный канал (БЕТА)</string>
    <string name="creating_channel">Создание канала</string>
    <string name="rcv_channel_events_count">%d событий канала</string>
    <string name="button_delete_channel">Удалить канал</string>
@@ -2615,7 +2615,6 @@
    <string name="webpage_info">Abone olmadan önce ziyaretçilere kanalınızın önizlemesini göstermek için bir web sayfası oluşturun. Kendiniz barındırın veya herhangi bir statik barındırma kullanın.</string>
    <string name="create_channel_title">Herkese açık kanal oluşturun</string>
    <string name="create_channel_button">Herkese açık kanal oluşturun</string>
-    <string name="create_channel_beta_button">Herkese açık kanal oluşturma (BETA)</string>
    <string name="v6_4_1_short_address_create">Adresinizi oluşturun</string>
    <string name="connect_with_someone">Bağlantınızı oluşturun</string>
    <string name="create_your_public_address">Herkese açık adresinizi oluşturun</string>
@@ -2628,7 +2628,6 @@
    <string name="webpage_info">Створіть веб-сторінку, на якій відвідувачам буде показано попередній перегляд вашого каналу ще до того, як вони підпишуться. Розмістіть її на власному хостингу або скористайтеся будь-яким сервісом статичного хостингу.</string>
    <string name="create_channel_title">Створити публічний канал</string>
    <string name="create_channel_button">Створити публічний канал</string>
-    <string name="create_channel_beta_button">Створити публічний канал (BETA)</string>
    <string name="connect_with_someone">Створити своє посилання</string>
    <string name="create_your_public_address">Створити свою публічну адресу</string>
    <string name="creating_channel">Канал створюється</string>
@@ -2579,7 +2579,6 @@
    <string name="relay_conn_status_connecting">正在连接</string>
    <string name="create_channel_title">创建公开频道</string>
    <string name="create_channel_button">创建公开频道</string>
-    <string name="create_channel_beta_button">创建公开频道（测试版）</string>
    <string name="creating_channel">正在创建频道</string>
    <string name="relay_test_step_decode_link">解码链接</string>
    <string name="button_delete_channel">删除频道</string>
@@ -2809,7 +2809,6 @@
    <string name="block_subscriber_for_all_question">要對全部封鎖訂閱者嗎？</string>
    <string name="create_channel_title">建立公開頻道</string>
    <string name="create_channel_button">建立公開頻道</string>
-    <string name="create_channel_beta_button">建立公開頻道（BETA）</string>
    <string name="channel_display_name_field">頻道名稱</string>
    <string name="creating_channel">正在建立頻道</string>
    <string name="error_creating_channel">建立頻道時發生錯誤</string>