Merge manually

src/components/notifications/Telegram.vue

@@ -43,37 +43,14 @@
         </div>
     </div>
 
-    <div class="mb-3">
-        <label for="telegram-chat-thread" class="form-label">{{ $t("Thread ID") }}</label>
-
-        <div class="input-group mb-3">
-            <input id="telegram-chat-thread" v-model="$parent.notification.telegramChatThread" type="text" class="form-control">
-        </div>
-
-        <div class="form-text">
-            {{ $t("Thread ID Description") }}
-        </div>
-    </div>
-
-    <div class="mb-3">
-        <div class="form-check form-switch">
-            <input v-model="$parent.notification.telegramSilentNotification" class="form-check-input" type="checkbox">
-            <label class="form-check-label">{{ $t("Silent Notification") }}</label>
-        </div>
-
-        <div class="form-text">
-            {{ $t("Silent Notification Description") }}
-        </div>
-    </div>
-
     <div class="mb-3">
         <div class="form-check form-switch">
             <input v-model="$parent.notification.telegramProtectContent" class="form-check-input" type="checkbox">
-            <label class="form-check-label">{{ $t("Protect Forwarding") }}</label>
+            <label class="form-check-label">{{ $t("telegramProtectContent") }}</label>
         </div>
 
         <div class="form-text">
-            {{ $t("Protect Forwarding Description") }}
+            {{ $t("telegramProtectContentDescription") }}
         </div>
     </div>
 </template>

src/lang/en.json

@@ -365,6 +365,8 @@
     "telegramMessageThreadIDDescription": "Optional Unique identifier for the target message thread (topic) of the forum; for forum supergroups only",
     "telegramSendSilently": "Send Silently",
     "telegramSendSilentlyDescription": "Sends the message silently. Users will receive a notification with no sound.",
+    "telegramProtectContent": "Protect Forwarding/Saving",
+    "telegramProtectContentDescription": "If enabled, the bot messages in Telegram will be protected from forwarding and saving.",
     "supportTelegramChatID": "Support Direct Chat / Group / Channel's Chat ID",
     "wayToGetTelegramChatID": "You can get your chat ID by sending a message to the bot and going to this URL to view the chat_id:",
     "YOUR BOT TOKEN HERE": "YOUR BOT TOKEN HERE",