Merge branch 'dev' into m_10.9.0

2024-03-18 21:53:12 +08:00 · 2024-03-18 21:53:12 +08:00 · 631dfbfaa5
commit 631dfbfaa5
parent df39a904c1 d6bc1ed058
28 changed files with 178 additions and 165 deletions
--- a/.github/workflows/debug.yml
+++ b/.github/workflows/debug.yml
@ -175,95 +175,6 @@ jobs:
    runs-on: ubuntu-latest
    needs:
      - native
-    strategy:
-      matrix:
-        flavor:
-          - FullRelease
-          - MiniRelease
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup Android SDK Tools
-        uses: android-actions/setup-android@v2
-      - name: Install NDK
-        run: |
-          echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.4.7075529" --sdk_root=${ANDROID_SDK_ROOT} &> /dev/null
-          echo "sdk.dir=${ANDROID_HOME}" > local.properties
-          echo "ndk.dir=${ANDROID_HOME}/ndk/21.4.7075529" >> local.properties
-      - name: Fetch Status
-        run: |
-          sed -i 's/\/\///g' settings.gradle
-          git submodule status TMessagesProj/jni/ffmpeg > ffmpeg_status
-          git submodule status TMessagesProj/jni/boringssl > boringssl_status
-          git submodule status ss-rust/src/main/rust/shadowsocks-rust > shadowsocks_status
-          git submodule status 'ssr-libev/*' > shadowsocksr_status
-          git submodule status v2ray > v2ray_status
-      - name: Native Cache (armeabi-v7a)
-        uses: actions/cache@v2
-        with:
-          path: |
-            TMessagesProj/src/main/libs
-          key: ${{ hashFiles('TMessagesProj/jni/**', 'ffmpeg_status', 'boringssl_status') }}-armeabi-v7a
-      - name: Native Cache (arm64-v8a)
-        uses: actions/cache@v2
-        with:
-          path: |
-            TMessagesProj/src/main/libs
-          key: ${{ hashFiles('TMessagesProj/jni/**', 'ffmpeg_status', 'boringssl_status') }}-arm64-v8a
-      - name: V2ray Cache
-        uses: actions/cache@v2
-        with:
-          path: |
-            TMessagesProj/libs/libv2ray.aar
-          key: ${{ hashFiles('bin/libs/v2ray/*', 'v2ray_status') }}
-      - name: Shadowsocks Cache
-        uses: actions/cache@v2
-        with:
-          path: |
-            TMessagesProj/libs/ss-rust-release.aar
-          key: ${{ hashFiles('shadowsocks_status') }}
-      - name: ShadowsocksR Cache
-        uses: actions/cache@v2
-        with:
-          path: |
-            TMessagesProj/libs/ssr-libev-release.aar
-          key: ${{ hashFiles('shadowsocksr_status') }}
-      - name: Configure Gradle
-        run: |
-          sed -i -e "s/16384/6144/g" gradle.properties
-          echo "sdk.dir=${ANDROID_HOME}" >> local.properties
-      - name: Gradle cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.gradle
-          key: gradle-${{ hashFiles('**/*.gradle') }}
-      - name: Debug Build
-        run: |
-          export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}"
-          export DEBUG_BUILD=true
-          ./gradlew TMessagesProj:assemble${{ matrix.flavor }}
-
-          APK=$(find TMessagesProj/build/outputs/apk -name '*arm64-v8a*.apk')
-          APK=$(dirname $APK)
-          echo "APK=$APK" >> $GITHUB_ENV
-      - uses: actions/upload-artifact@v2
-        with:
-          name: ${{ matrix.flavor }}
-          path: ${{ env.APK }}
-  build-nogcm:
-    name: Gradle Build (nogcm)
-    runs-on: ubuntu-latest
-    needs:
-      - native
-      - v2ray
-      - shadowsocks
-      - shadowsocksr
-      - build
-    strategy:
-      matrix:
-        flavor:
-          - FullReleaseNoGcm
-          - MiniReleaseNoGcm
    steps:
      - name: Checkout
        uses: actions/checkout@v2
@ -308,98 +219,41 @@ jobs:
      - name: Debug Build
        run: |
          export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}"
-          export DEBUG_BUILD=true
-          ./gradlew TMessagesProj:assemble${{ matrix.flavor }}
+          ./gradlew TMessagesProj:assembleRelease

          APK=$(find TMessagesProj/build/outputs/apk -name '*arm64-v8a*.apk')
          APK=$(dirname $APK)
          echo "APK=$APK" >> $GITHUB_ENV
      - uses: actions/upload-artifact@v2
        with:
-          name: ${{ matrix.flavor }}
+          name: Release
          path: ${{ env.APK }}
  upload:
    name: Upload debug
+    if: github.event.inputs.upload != 'y'
    runs-on: ubuntu-latest
-    if: ${{ !contains(github.event.head_commit.message, 'bump version') }}
    needs:
      - build
-      - build-nogcm
-      - telegram-bot-api
    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
      - name: Donwload Artifacts
        uses: actions/download-artifact@v2
        with:
          path: artifacts
-      - name: Download Telegram Bot API Binary
-        uses: actions/download-artifact@master
+      - name: Set up Python
+        uses: actions/setup-python@v5
        with:
-          name: telegram-bot-api-binary
-          path: .
+          python-version: 3.12
      - name: Send to Telegram
        run: |
-          chmod +x telegram-bot-api-binary
-          function start() {
-            ./telegram-bot-api-binary --api-id=11535358 --api-hash=33d372962fadb01df47e6ceed4e33cd6 --local 2>&1 > /dev/null &
-          }
-          start
-          curl http://127.0.0.1:8081/ || start
-          curl http://127.0.0.1:8081/ || start
-          curl http://127.0.0.1:8081/ || start
          # send release via telegram bot api
          export mini64=$(find artifacts -name "*arm64-v8a.apk")
          export mini32=$(find artifacts -name "*armeabi-v7a.apk")
-          #          export full64=$(find artifacts -name "*full-arm64-v8a.apk")
-          #          export full32=$(find artifacts -name "*full-armeabi-v7a.apk")
-          export mini64nogcm=$(find artifacts -name "*arm64-v8aNoGcm.apk")
-          export mini32nogcm=$(find artifacts -name "*armeabi-v7aNoGcm.apk")
-          #          export full64nogcm=$(find artifacts -name "*full-arm64-v8aNoGcm.apk")
-          #          export full32nogcm=$(find artifacts -name "*full-armeabi-v7aNoGcm.apk")

          echo $mini64
          echo $mini32
-          echo $full64
-          echo $full32
-          echo $mini64nogcm
-          echo $mini32nogcm
-          echo $full64nogcm
-          echo $full32nogcm

-          curl --http0.9 http://127.0.0.1:8081/bot${{ secrets.HELPER_BOT_TOKEN }}/sendMediaGroup --form-string chat_id=${{ secrets.HELPER_BOT_TARGET }} --form apk1=@"${mini64}" --form apk2=@"${mini32}" --form apk3=@"${full64}" --form apk4=@"${full32}" --form apk5=@"${mini64nogcm}" --form apk6=@"${mini32nogcm}" --form apk7=@"${full64nogcm}" --form apk8=@"${full32nogcm}" --form-string media="[{\"type\": \"document\",\"media\": \"attach://apk1\",\"caption\": \"\",\"parse_mode\": \"Markdown\"},{\"type\": \"document\",\"media\": \"attach://apk2\",\"caption\": \"\",\"parse_mode\": \"Markdown\"},{\"type\": \"document\",\"media\": \"attach://apk3\",\"caption\": \"\",\"parse_mode\": \"Markdown\"},{\"type\": \"document\",\"media\": \"attach://apk4\",\"caption\": \"\",\"parse_mode\": \"Markdown\"},{\"type\": \"document\",\"media\": \"attach://apk5\",\"caption\": \"\",\"parse_mode\": \"Markdown\"},{\"type\": \"document\",\"media\": \"attach://apk6\",\"caption\": \"\",\"parse_mode\": \"Markdown\"},{\"type\": \"document\",\"media\": \"attach://apk7\",\"caption\": \"\",\"parse_mode\": \"Markdown\"},{\"type\": \"document\",\"media\": \"attach://apk8\",\"caption\": \"Test version, ${{ github.event.head_commit.message }}\",\"parse_mode\": \"Markdown\"}]" --verbose >/dev/null
-
-          pkill telegram-bot
-  telegram-bot-api:
-    name: Telegram Bot API
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Clone Telegram Bot API
-        run: |
-          git clone --recursive https://github.com/tdlib/telegram-bot-api.git
-          git status telegram-bot-api >> telegram-bot-api-status
-      - name: Cache Bot API Binary
-        id: cache-bot-api
-        uses: actions/cache@v2
-        with:
-          path: telegram-bot-api-binary
-          key: CI-telegram-bot-api-${{ hashFiles('telegram-bot-api-status') }}
-      - name: Compile Telegram Bot API
-        if: steps.cache-bot-api.outputs.cache-hit != 'true'
-        run: |
-          sudo apt-get update
-          sudo apt-get install make git zlib1g-dev libssl-dev gperf cmake g++
-          cd telegram-bot-api
-          rm -rf build
-          mkdir build
-          cd build
-          cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=.. ..
-          cmake --build . --target install -j$(nproc)
-          cd ../..
-          ls -l telegram-bot-api/bin/telegram-bot-api*
-          cp telegram-bot-api/bin/telegram-bot-api telegram-bot-api-binary
-      - name: Upload Binary
-        uses: actions/upload-artifact@master
-        with:
-          name: telegram-bot-api-binary
-          path: telegram-bot-api-binary
+          python -m pip install -r bin/scripts/requirements.txt
+          git log -1 --pretty=format:"%s%n%n%b" > artifacts/caption.txt
+          python bin/scripts/upload.py ${{ secrets.HELPER_BOT_TOKEN }} ${{ secrets.HELPER_BOT_TARGET }} test
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@ -173,10 +173,6 @@ jobs:
    runs-on: ubuntu-latest
    needs:
      - native
-    strategy:
-      matrix:
-        flavor:
-          - MiniRelease
    steps:
      - name: Checkout
        uses: actions/checkout@v2
@ -223,12 +219,12 @@ jobs:
          export LOCAL_PROPERTIES="${{ secrets.LOCAL_PROPERTIES }}"
          export DEBUG_BUILD=true
          sed -i 's/signingConfig signingConfigs.release//g' TMessagesProj/build.gradle
-          ./gradlew TMessagesProj:assemble${{ matrix.flavor }}
+          ./gradlew TMessagesProj:assembleRelease

          APK=$(find TMessagesProj/build/outputs/apk -name '*arm64-v8a*.apk')
          APK=$(dirname $APK)
          echo "APK=$APK" >> $GITHUB_ENV
      - uses: actions/upload-artifact@v2
        with:
-          name: ${{ matrix.flavor }}
+          name: Debug
          path: ${{ env.APK }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -259,4 +259,4 @@ jobs:

          python -m pip install -r bin/scripts/requirements.txt
          git log -1 --pretty=format:"%s%n%n%b" > artifacts/caption.txt
-          python bin/scripts/upload.py ${{ secrets.HELPER_BOT_TOKEN }} ${{ secrets.HELPER_BOT_TARGET }} release
+          python bin/scripts/upload.py ${{ secrets.HELPER_BOT_TOKEN }} ${{ secrets.HELPER_BOT_TARGET }} test
--- a/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java
@ -94,6 +94,8 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;

+import xyz.nextalone.nagram.NaConfig;
+
 public class SendMessagesHelper extends BaseController implements NotificationCenter.NotificationCenterDelegate {

    public static final int MEDIA_TYPE_DICE = 11;
@ -8137,7 +8139,7 @@ public boolean retriedToSend;
                            videoEditedInfo = info.videoEditedInfo != null ? info.videoEditedInfo : createCompressionSettings(info.path);
                        }

-                        if (!forceDocument && (videoEditedInfo != null || info.path.endsWith("mp4"))) {
+                        if (NaConfig.INSTANCE.getSendMp4DocumentAsVideo().Bool() || (!forceDocument && (videoEditedInfo != null || info.path.endsWith("mp4")))) {
                            if (info.path == null && info.searchImage != null) {
                                if (info.searchImage.photo instanceof TLRPC.TL_photo) {
                                    info.path = FileLoader.getInstance(accountInstance.getCurrentAccount()).getPathToAttach(info.searchImage.photo, true).getAbsolutePath();
@ -8206,6 +8208,12 @@ public boolean retriedToSend;
                                    attributeVideo.supports_streaming = true;
                                }
                                document.attributes.add(attributeVideo);
+
+                                // na: Fix filename
+                                TLRPC.TL_documentAttributeFilename fileName = new TLRPC.TL_documentAttributeFilename();
+                                fileName.file_name = new File(path).getName();
+                                document.attributes.add(fileName);
+
                                if (videoEditedInfo != null && (videoEditedInfo.needConvert() || !info.isVideo)) {
                                    if (info.isVideo && videoEditedInfo.muted) {
                                        fillVideoAttribute(info.path, attributeVideo, videoEditedInfo);
@ -8891,6 +8899,12 @@ public boolean retriedToSend;
                    }
                    attributeVideo.round_message = isRound;
                    document.attributes.add(attributeVideo);
+
+                    // na: Fix filename
+                    TLRPC.TL_documentAttributeFilename fileName = new TLRPC.TL_documentAttributeFilename();
+                    fileName.file_name = new File(path).getName();
+                    document.attributes.add(fileName);
+
                    if (videoEditedInfo != null && videoEditedInfo.notReadyYet) {
                        attributeVideo.w = videoEditedInfo.resultWidth;
                        attributeVideo.h = videoEditedInfo.resultHeight;
--- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoExperimentalSettingsActivity.java
+++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoExperimentalSettingsActivity.java
@ -100,6 +100,7 @@ public class NekoExperimentalSettingsActivity extends BaseNekoXSettingsActivity
    private final AbstractConfigCell customArtworkApiRow = cellGroup.appendCell(new ConfigCellTextInput(null, NaConfig.INSTANCE.getCustomArtworkApi(), "", null));
    private final AbstractConfigCell fakeHighPerformanceDeviceRow = cellGroup.appendCell(new ConfigCellTextCheck(NaConfig.INSTANCE.getFakeHighPerformanceDevice()));
    private final AbstractConfigCell disableEmojiDrawLimitRow = cellGroup.appendCell(new ConfigCellTextCheck(NaConfig.INSTANCE.getDisableEmojiDrawLimit()));
+    private final AbstractConfigCell sendMp4DocumentAsVideoRow = cellGroup.appendCell(new ConfigCellTextCheck(NaConfig.INSTANCE.getSendMp4DocumentAsVideo()));
    private final AbstractConfigCell divider1 = cellGroup.appendCell(new ConfigCellDivider());

    private final AbstractConfigCell header3 = cellGroup.appendCell(new ConfigCellHeader(LocaleController.getString(R.string.ExternalStickerCache)));
--- a/TMessagesProj/src/main/kotlin/xyz/nextalone/nagram/NaConfig.kt
+++ b/TMessagesProj/src/main/kotlin/xyz/nextalone/nagram/NaConfig.kt
@ -566,6 +566,12 @@ object NaConfig {
            ConfigItem.configTypeString,
            "https://p2p.belloworld.it/"
        )
+    val sendMp4DocumentAsVideo =
+        addConfig(
+            "SendMp4DocumentAsVideo",
+            ConfigItem.configTypeBool,
+            false
+        )

    private fun addConfig(
        k: String,
--- a/TMessagesProj/src/main/res/values-ar-rSA/strings_na.xml
+++ b/TMessagesProj/src/main/res/values-ar-rSA/strings_na.xml
@ -125,4 +125,11 @@
    <string name="DisableDialogsFloatingButton">تعطيل مربعات الحوار الزر العائم</string>
    <string name="DisableFlagSecure">تعطيل العلم الآمن</string>
    <string name="CenterActionBarTitle">عنوان المركز في شريط العمل</string>
+    <string name="ShowQuickReplyInBotCommands">إظهار الرد السريع في أوامر بوت</string>
+    <string name="PushServiceType">نوع خدمة الدفع</string>
+    <string name="PushServiceTypeInApp">في التطبيق</string>
+    <string name="PushServiceTypeFCM">جوجل FCM</string>
+    <string name="PushServiceTypeUnified">دفع موحد</string>
+    <string name="PushServiceTypeInAppDialog">إظهار الإشعارات المقيمة</string>
+    <string name="PushServiceTypeUnifiedGateway">بوابة دفع موحدة</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-cs-rCZ/strings_na.xml
+++ b/TMessagesProj/src/main/res/values-cs-rCZ/strings_na.xml
@ -125,4 +125,11 @@
    <string name="DisableDialogsFloatingButton">Zakázat plovoucí tlačítko dialogů</string>
    <string name="DisableFlagSecure">Zakázat zabezpečení vlajky</string>
    <string name="CenterActionBarTitle">Vycentrovat název na panelu akcí</string>
+    <string name="ShowQuickReplyInBotCommands">Zobrazit příkazy rychlé odpovědi v Bot</string>
+    <string name="PushServiceType">Typ služby Push</string>
+    <string name="PushServiceTypeInApp">V aplikaci</string>
+    <string name="PushServiceTypeFCM">Google FCM</string>
+    <string name="PushServiceTypeUnified">Sjednocený posun</string>
+    <string name="PushServiceTypeInAppDialog">Zobrazit rezidentní oznámení</string>
+    <string name="PushServiceTypeUnifiedGateway">Sjednocená posuvná brána</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-da-rDK/strings_na.xml
+++ b/TMessagesProj/src/main/res/values-da-rDK/strings_na.xml
@ -125,4 +125,11 @@
    <string name="DisableDialogsFloatingButton">Deaktivér Dialoger Flydende Knap</string>
    <string name="DisableFlagSecure">Deaktivér Flag Sikker</string>
    <string name="CenterActionBarTitle">Centrér titel i handlingsbjælken</string>
+    <string name="ShowQuickReplyInBotCommands">Vis Hurtigt Svar I Bot Kommandoer</string>
+    <string name="PushServiceType">Push Service Type</string>
+    <string name="PushServiceTypeInApp">I App</string>
+    <string name="PushServiceTypeFCM">Google FCM</string>
+    <string name="PushServiceTypeUnified">Unified Push</string>
+    <string name="PushServiceTypeInAppDialog">Vis residente notifikationer</string>
+    <string name="PushServiceTypeUnifiedGateway">Unified Push Gateway</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-de-rDE/strings_na.xml
+++ b/TMessagesProj/src/main/res/values-de-rDE/strings_na.xml
@ -125,4 +125,11 @@
    <string name="DisableDialogsFloatingButton">Schwebende Dialoge deaktivieren</string>
    <string name="DisableFlagSecure">Sichere Flagge deaktivieren</string>
    <string name="CenterActionBarTitle">Titel in Aktionsleiste zentrieren</string>
+    <string name="ShowQuickReplyInBotCommands">Schnellantwort in Bot-Befehlen anzeigen</string>
+    <string name="PushServiceType">Push-Service-Typ</string>
+    <string name="PushServiceTypeInApp">In App</string>
+    <string name="PushServiceTypeFCM">Google FCM</string>
+    <string name="PushServiceTypeUnified">Einheitlicher Push</string>
+    <string name="PushServiceTypeInAppDialog">Resident-Benachrichtigungen anzeigen</string>
+    <string name="PushServiceTypeUnifiedGateway">Einheitliches Push-Gateway</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-el-rGR/strings_na.xml
+++ b/TMessagesProj/src/main/res/values-el-rGR/strings_na.xml
@ -125,4 +125,11 @@
    <string name="DisableDialogsFloatingButton">Απενεργοποίηση Πλωτού Κουμπιού Dialogs</string>
    <string name="DisableFlagSecure">Απενεργοποίηση Flag Secure</string>
    <string name="CenterActionBarTitle">Κεντράρισμα τίτλου στη γραμμή ενεργειών</string>
+    <string name="ShowQuickReplyInBotCommands">Εμφάνιση Γρήγορης Απάντησης Στις Εντολές Bot</string>
+    <string name="PushServiceType">Τύπος Υπηρεσίας Push</string>
+    <string name="PushServiceTypeInApp">Στην Εφαρμογή</string>
+    <string name="PushServiceTypeFCM">Google FCM</string>
+    <string name="PushServiceTypeUnified">Ενοποιημένη Προώθηση</string>
+    <string name="PushServiceTypeInAppDialog">Εμφάνιση ειδοποιήσεων κατοίκων</string>
+    <string name="PushServiceTypeUnifiedGateway">Ενοποιημένη Πύλη Ώθησης</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-es-rES/strings_na.xml
+++ b/TMessagesProj/src/main/res/values-es-rES/strings_na.xml
@ -125,4 +125,11 @@
    <string name="DisableDialogsFloatingButton">Deshabilitar botón flotante de diálogos</string>
    <string name="DisableFlagSecure">Deshabilitar Flag Secure</string>
    <string name="CenterActionBarTitle">Centrar el título en la barra de acción</string>
+    <string name="ShowQuickReplyInBotCommands">Mostrar respuestas rápidas en comandos del bot</string>
+    <string name="PushServiceType">Tipo de servicio Push</string>
+    <string name="PushServiceTypeInApp">En la App</string>
+    <string name="PushServiceTypeFCM">FCM de Google</string>
+    <string name="PushServiceTypeUnified">Unified Push</string>
+    <string name="PushServiceTypeInAppDialog">Mostrar notificación permanente</string>
+    <string name="PushServiceTypeUnifiedGateway">Gateway de Unified Push</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-fi-rFI/strings_na.xml
+++ b/TMessagesProj/src/main/res/values-fi-rFI/strings_na.xml
@ -125,4 +125,11 @@
    <string name="DisableDialogsFloatingButton">Poista Dialogien Kelluva Painike Käytöstä</string>
    <string name="DisableFlagSecure">Poista Lipun Turvallisuus Käytöstä</string>
    <string name="CenterActionBarTitle">Keskitä otsikko toimintopalkille</string>
+    <string name="ShowQuickReplyInBotCommands">Näytä Nopea Vastaus Botin Komennoissa</string>
+    <string name="PushServiceType">Push Service Type</string>
+    <string name="PushServiceTypeInApp">Sovelluksessa</string>
+    <string name="PushServiceTypeFCM">Google FCM</string>
+    <string name="PushServiceTypeUnified">Yhdistetty Työntö</string>
+    <string name="PushServiceTypeInAppDialog">Näytä kotimaiset ilmoitukset</string>
+    <string name="PushServiceTypeUnifiedGateway">Yhdistetty Push-Yhdyskäytävä</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-fr-rFR/strings_na.xml
+++ b/TMessagesProj/src/main/res/values-fr-rFR/strings_na.xml
@ -125,4 +125,11 @@
    <string name="DisableDialogsFloatingButton">Désactiver le bouton flottant des boîtes de dialogue</string>
    <string name="DisableFlagSecure">Désactiver Flag Secure</string>
    <string name="CenterActionBarTitle">Centrer le titre dans la barre d\'action</string>
+    <string name="ShowQuickReplyInBotCommands">Afficher la réponse rapide dans les commandes du bot</string>
+    <string name="PushServiceType">Type de service push</string>
+    <string name="PushServiceTypeInApp">Dans l\'application</string>
+    <string name="PushServiceTypeFCM">Google FCM</string>
+    <string name="PushServiceTypeUnified">Push unifié</string>
+    <string name="PushServiceTypeInAppDialog">Afficher les notifications des résidents</string>
+    <string name="PushServiceTypeUnifiedGateway">Passerelle Push unifiée</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-it-rIT/strings_na.xml
+++ b/TMessagesProj/src/main/res/values-it-rIT/strings_na.xml
@ -125,4 +125,11 @@
    <string name="DisableDialogsFloatingButton">Disabilita Le Finestre Pulsante Fluttuante</string>
    <string name="DisableFlagSecure">Disabilita Flag Secure</string>
    <string name="CenterActionBarTitle">Centra titolo nella barra delle azioni</string>
+    <string name="ShowQuickReplyInBotCommands">Mostra Risposta Rapida Nei Comandi Del Bot</string>
+    <string name="PushServiceType">Tipo Di Servizio Push</string>
+    <string name="PushServiceTypeInApp">In App</string>
+    <string name="PushServiceTypeFCM">Google FCM</string>
+    <string name="PushServiceTypeUnified">Push Unificato</string>
+    <string name="PushServiceTypeInAppDialog">Mostra notifiche residenti</string>
+    <string name="PushServiceTypeUnifiedGateway">Unified Push Gateway</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-ja-rJP/strings_na.xml
+++ b/TMessagesProj/src/main/res/values-ja-rJP/strings_na.xml
@ -125,4 +125,11 @@
    <string name="DisableDialogsFloatingButton">ダイアログのフローティングボタンを無効化</string>
    <string name="DisableFlagSecure">安全フラグを無効にする</string>
    <string name="CenterActionBarTitle">アクションバーのタイトルを中心にする</string>
+    <string name="ShowQuickReplyInBotCommands">Botコマンドでクイック返信を表示する</string>
+    <string name="PushServiceType">プッシュ・サービス・タイプ</string>
+    <string name="PushServiceTypeInApp">アプリ内</string>
+    <string name="PushServiceTypeFCM">Google FCM</string>
+    <string name="PushServiceTypeUnified">統一されたプッシュ</string>
+    <string name="PushServiceTypeInAppDialog">常駐通知を表示</string>
+    <string name="PushServiceTypeUnifiedGateway">Unified Push Gateway</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-nl-rNL/strings_na.xml
+++ b/TMessagesProj/src/main/res/values-nl-rNL/strings_na.xml
@ -125,4 +125,11 @@
    <string name="DisableDialogsFloatingButton">Zwevende knop dialoogknop uitschakelen</string>
    <string name="DisableFlagSecure">Vlaggenbeveiliging uitschakelen</string>
    <string name="CenterActionBarTitle">Centreer titel in actiebalk</string>
+    <string name="ShowQuickReplyInBotCommands">Toon Snel Antwoord In Bot Commando\'s</string>
+    <string name="PushServiceType">Push Service Type</string>
+    <string name="PushServiceTypeInApp">In de App</string>
+    <string name="PushServiceTypeFCM">Google FCM</string>
+    <string name="PushServiceTypeUnified">Gecombineerde Push</string>
+    <string name="PushServiceTypeInAppDialog">Toon inactieve meldingen</string>
+    <string name="PushServiceTypeUnifiedGateway">Gecombineerde Push Gateway</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-no-rNO/strings_na.xml
+++ b/TMessagesProj/src/main/res/values-no-rNO/strings_na.xml
@ -125,4 +125,11 @@
    <string name="DisableDialogsFloatingButton">Deaktiver dialoger med flytende knapp</string>
    <string name="DisableFlagSecure">Deaktiver Flag sikker</string>
    <string name="CenterActionBarTitle">Sentertittel i handlingslinjen</string>
+    <string name="ShowQuickReplyInBotCommands">Vis hurtigsvar i bot-kommandoer</string>
+    <string name="PushServiceType">Push tjenestetype</string>
+    <string name="PushServiceTypeInApp">I App</string>
+    <string name="PushServiceTypeFCM">Google FCM</string>
+    <string name="PushServiceTypeUnified">Felles Push</string>
+    <string name="PushServiceTypeInAppDialog">Vis varsling fra kunder</string>
+    <string name="PushServiceTypeUnifiedGateway">Enhetlig Push Gateway</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-pl-rPL/strings_na.xml
+++ b/TMessagesProj/src/main/res/values-pl-rPL/strings_na.xml
@ -125,4 +125,11 @@
    <string name="DisableDialogsFloatingButton">Wyłącz pływający przycisk dialogów</string>
    <string name="DisableFlagSecure">Wyłącz bezpieczne flagi</string>
    <string name="CenterActionBarTitle">Wyśrodkuj tytuł na pasku akcji</string>
+    <string name="ShowQuickReplyInBotCommands">Pokaż szybkie odpowiedzi w poleceniach bota</string>
+    <string name="PushServiceType">Typ usługi Push</string>
+    <string name="PushServiceTypeInApp">W aplikacji</string>
+    <string name="PushServiceTypeFCM">Google FCM</string>
+    <string name="PushServiceTypeUnified">Jednolite Push</string>
+    <string name="PushServiceTypeInAppDialog">Pokaż powiadomienia mieszkańców</string>
+    <string name="PushServiceTypeUnifiedGateway">Zunifikowana brama popychająca</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-pt-rBR/strings_na.xml
+++ b/TMessagesProj/src/main/res/values-pt-rBR/strings_na.xml
@ -125,4 +125,11 @@
    <string name="DisableDialogsFloatingButton">Desativar Botão de Diálogos Flutuantes</string>
    <string name="DisableFlagSecure">Desativar Sinalização Segura</string>
    <string name="CenterActionBarTitle">Centralizar título na barra de ação</string>
+    <string name="ShowQuickReplyInBotCommands">Mostrar resposta rápida nos comandos do Bot</string>
+    <string name="PushServiceType">Tipo de Serviço Push</string>
+    <string name="PushServiceTypeInApp">No aplicativo</string>
+    <string name="PushServiceTypeFCM">Google FCM</string>
+    <string name="PushServiceTypeUnified">Envio Unificado</string>
+    <string name="PushServiceTypeInAppDialog">Mostrar notificações residentes</string>
+    <string name="PushServiceTypeUnifiedGateway">Gateway Unificado</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-pt-rPT/strings_na.xml
+++ b/TMessagesProj/src/main/res/values-pt-rPT/strings_na.xml
@ -125,4 +125,11 @@
    <string name="DisableDialogsFloatingButton">Desativar Botão de Diálogos Flutuantes</string>
    <string name="DisableFlagSecure">Desativar Sinalização Segura</string>
    <string name="CenterActionBarTitle">Centralizar título na barra de ação</string>
+    <string name="ShowQuickReplyInBotCommands">Mostrar resposta rápida nos comandos do Bot</string>
+    <string name="PushServiceType">Tipo de Serviço Push</string>
+    <string name="PushServiceTypeInApp">No aplicativo</string>
+    <string name="PushServiceTypeFCM">Google FCM</string>
+    <string name="PushServiceTypeUnified">Envio Unificado</string>
+    <string name="PushServiceTypeInAppDialog">Mostrar notificações residentes</string>
+    <string name="PushServiceTypeUnifiedGateway">Gateway Unificado</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-ro-rRO/strings_na.xml
+++ b/TMessagesProj/src/main/res/values-ro-rRO/strings_na.xml
@ -125,4 +125,11 @@
    <string name="DisableDialogsFloatingButton">Dezactivează dialogul cu butonul plutitor</string>
    <string name="DisableFlagSecure">Dezactivează Steagul Securizat</string>
    <string name="CenterActionBarTitle">Titlul centrului în bara de acțiune</string>
+    <string name="ShowQuickReplyInBotCommands">Arată Rapid În Bot Comenzi</string>
+    <string name="PushServiceType">Tip serviciu Push</string>
+    <string name="PushServiceTypeInApp">În aplicație</string>
+    <string name="PushServiceTypeFCM">Google FCM</string>
+    <string name="PushServiceTypeUnified">Push unificat</string>
+    <string name="PushServiceTypeInAppDialog">Arată notificările rezidenților</string>
+    <string name="PushServiceTypeUnifiedGateway">Gateway Push Unificat</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-ru-rRU/strings_na.xml
+++ b/TMessagesProj/src/main/res/values-ru-rRU/strings_na.xml
@ -125,4 +125,11 @@
    <string name="DisableDialogsFloatingButton">Отключить плавающую кнопку диалогов</string>
    <string name="DisableFlagSecure">Отключить защиту флага</string>
    <string name="CenterActionBarTitle">Название центра в панели действий</string>
+    <string name="ShowQuickReplyInBotCommands">Показывать быстрый ответ в командах ботов</string>
+    <string name="PushServiceType">Тип службы Push</string>
+    <string name="PushServiceTypeInApp">В приложении</string>
+    <string name="PushServiceTypeFCM">Google FCM</string>
+    <string name="PushServiceTypeUnified">Единый толчок</string>
+    <string name="PushServiceTypeInAppDialog">Показывать уведомления жителя</string>
+    <string name="PushServiceTypeUnifiedGateway">Единый Push шлюз</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-sv-rSE/strings_na.xml
+++ b/TMessagesProj/src/main/res/values-sv-rSE/strings_na.xml
@ -125,4 +125,11 @@
    <string name="DisableDialogsFloatingButton">Inaktivera dialoger flytande knapp</string>
    <string name="DisableFlagSecure">Inaktivera flagga säkert</string>
    <string name="CenterActionBarTitle">Centrera titel i åtgärdsfältet</string>
+    <string name="ShowQuickReplyInBotCommands">Visa snabbsvar i botkommandon</string>
+    <string name="PushServiceType">Typ av push-tjänst</string>
+    <string name="PushServiceTypeInApp">I appen</string>
+    <string name="PushServiceTypeFCM">Google FCM</string>
+    <string name="PushServiceTypeUnified">Enhetlig Push</string>
+    <string name="PushServiceTypeInAppDialog">Visa inhemska aviseringar</string>
+    <string name="PushServiceTypeUnifiedGateway">Enhetlig Push Gateway</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-uk-rUA/strings_na.xml
+++ b/TMessagesProj/src/main/res/values-uk-rUA/strings_na.xml
@ -125,4 +125,11 @@
    <string name="DisableDialogsFloatingButton">Вимкнути плаваючу кнопку діалогу</string>
    <string name="DisableFlagSecure">Вимкнути захист прапора</string>
    <string name="CenterActionBarTitle">Центрувати заголовок в панелі дій</string>
+    <string name="ShowQuickReplyInBotCommands">Показати швидку відповідь у командах Bot</string>
+    <string name="PushServiceType">Тип Служба push</string>
+    <string name="PushServiceTypeInApp">В додатку</string>
+    <string name="PushServiceTypeFCM">Google FCM</string>
+    <string name="PushServiceTypeUnified">Одноразове штовхання</string>
+    <string name="PushServiceTypeInAppDialog">Показувати сповіщення резидента</string>
+    <string name="PushServiceTypeUnifiedGateway">Уніфікований Push-шлюз</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-zh-rCN/strings_na.xml
+++ b/TMessagesProj/src/main/res/values-zh-rCN/strings_na.xml
@ -132,4 +132,5 @@
    <string name="PushServiceTypeUnified">Unified Push</string>
    <string name="PushServiceTypeInAppDialog">显示常驻通知</string>
    <string name="PushServiceTypeUnifiedGateway">Unified Push Gateway</string>
+    <string name="SendMp4DocumentAsVideo">MP4 视频作为文件发送时可预览</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-zh-rTW/strings_na.xml
+++ b/TMessagesProj/src/main/res/values-zh-rTW/strings_na.xml
@ -125,4 +125,11 @@
    <string name="DisableDialogsFloatingButton">Disable Dialogs Floating Button</string>
    <string name="DisableFlagSecure">Disable Flag Secure</string>
    <string name="CenterActionBarTitle">Center title in action bar</string>
+    <string name="ShowQuickReplyInBotCommands">Show Quick Reply In Bot Commands</string>
+    <string name="PushServiceType">Push Service Type</string>
+    <string name="PushServiceTypeInApp">In App</string>
+    <string name="PushServiceTypeFCM">Google FCM</string>
+    <string name="PushServiceTypeUnified">Unified Push</string>
+    <string name="PushServiceTypeInAppDialog">Show resident notifications</string>
+    <string name="PushServiceTypeUnifiedGateway">Unified Push Gateway</string>
 </resources>
--- a/TMessagesProj/src/main/res/values/strings_na.xml
+++ b/TMessagesProj/src/main/res/values/strings_na.xml
@ -132,4 +132,5 @@
    <string name="PushServiceTypeUnified">Unified Push</string>
    <string name="PushServiceTypeInAppDialog">Show resident notifications</string>
    <string name="PushServiceTypeUnifiedGateway">Unified Push Gateway</string>
+    <string name="SendMp4DocumentAsVideo">Send mp4 document as video</string>
 </resources>