Merge remote-tracking branch 'upstream/dev' into dev

LiuYi0526 · May 4, 2024 · d494c8e · d494c8e
2 parents 7621379 + 113836c
commit d494c8e
Show file tree

Hide file tree

Showing 23 changed files with 36 additions and 5 deletions.
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatRightsEditActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatRightsEditActivity.java
@@ -578,9 +578,9 @@ public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
                 sendMediaExpanded = !sendMediaExpanded;
                 updateRows(false);
                 if (sendMediaExpanded) {
-                    listViewAdapter.notifyItemRangeInserted(sendMediaRow + 1, 9);
+                    listViewAdapter.notifyItemRangeInserted(sendMediaRow + 1, 12);
                 } else {
-                    listViewAdapter.notifyItemRangeRemoved(sendMediaRow + 1, 9);
+                    listViewAdapter.notifyItemRangeRemoved(sendMediaRow + 1, 12);
                 }
                 return;
             } else if (position == channelMessagesRow) {
@@ -2150,6 +2150,15 @@ private int getSendMediaSelectedCount() {
         if (!bannedRights.send_polls && !defaultBannedRights.send_polls) {
             i++;
         }
+        if (!bannedRights.send_gifs && !defaultBannedRights.send_gifs) {
+            i++;
+        }
+        if (!bannedRights.send_games && !defaultBannedRights.send_games) {
+            i++;
+        }
+        if (!bannedRights.send_inline && !defaultBannedRights.send_inline) {
+            i++;
+        }
         return i;
     }
 

diff --git a/TMessagesProj/src/main/res/values-ar-rSA/strings_na.xml b/TMessagesProj/src/main/res/values-ar-rSA/strings_na.xml
@@ -139,4 +139,5 @@
     <string name="DisableChannelMuteButton">تعطيل زر كتم القناة</string>
     <string name="DisablePreviewVideoSoundShortcut">تعطيل إختصار صوت معاينة الفيديو</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">تعطيل مفاتيح الصوت لتمكين معاينة صوت الفيديو</string>
+    <string name="DisableAutoWebLogin">تعطيل تسجيل الدخول التلقائي</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-cs-rCZ/strings_na.xml b/TMessagesProj/src/main/res/values-cs-rCZ/strings_na.xml
@@ -139,4 +139,5 @@
     <string name="DisableChannelMuteButton">Zakázat tlačítko ztlumit kanál</string>
     <string name="DisablePreviewVideoSoundShortcut">Zakázat zástupce zvuku videa</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Zakázat tlačítka hlasitosti pro zapnutí náhledu zvuku videa</string>
+    <string name="DisableAutoWebLogin">Zakázat automatické přihlášení k webu</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-da-rDK/strings_na.xml b/TMessagesProj/src/main/res/values-da-rDK/strings_na.xml
@@ -139,4 +139,5 @@
     <string name="DisableChannelMuteButton">Deaktivér kanal mute knap</string>
     <string name="DisablePreviewVideoSoundShortcut">Deaktivér forhåndsvisning af videolyd genvej</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Deaktivér lydstyrkeknapper for at aktivere forhåndsvisning af videolyd</string>
+    <string name="DisableAutoWebLogin">Deaktivér auto weblogin</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-de-rDE/strings_na.xml b/TMessagesProj/src/main/res/values-de-rDE/strings_na.xml
@@ -139,4 +139,5 @@
     <string name="DisableChannelMuteButton">Sendermute-Schaltfläche deaktivieren</string>
     <string name="DisablePreviewVideoSoundShortcut">Vorschau Video Ton Verknüpfung deaktivieren</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Lautstärketasten deaktivieren, um Videovorschau zu aktivieren</string>
+    <string name="DisableAutoWebLogin">Auto-Web-Login deaktivieren</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-el-rGR/strings_na.xml b/TMessagesProj/src/main/res/values-el-rGR/strings_na.xml
@@ -139,4 +139,5 @@
     <string name="DisableChannelMuteButton">Απενεργοποίηση κουμπιού σίγασης καναλιού</string>
     <string name="DisablePreviewVideoSoundShortcut">Απενεργοποίηση συντόμευσης ήχου βίντεο προεπισκόπησης</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Απενεργοποίηση πλήκτρων έντασης για ενεργοποίηση προεπισκόπησης ήχου βίντεο</string>
+    <string name="DisableAutoWebLogin">Απενεργοποίηση αυτόματης σύνδεσης στον ιστό</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-es-rES/strings_na.xml b/TMessagesProj/src/main/res/values-es-rES/strings_na.xml
@@ -139,4 +139,5 @@
     <string name="DisableChannelMuteButton">Deshabilitar botón de silenciar canal</string>
     <string name="DisablePreviewVideoSoundShortcut">Desactivar acceso directo al sonido de un video</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Desactivar las teclas de volumen para reproducir el sonido de la vista previa del video</string>
+    <string name="DisableAutoWebLogin">Desactivar inicio de sesión web automático</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-fa-rIR/strings_na.xml b/TMessagesProj/src/main/res/values-fa-rIR/strings_na.xml
@@ -139,4 +139,5 @@
     <string name="DisableChannelMuteButton">Disable channel mute button</string>
     <string name="DisablePreviewVideoSoundShortcut">Disable preview video sound shortcut</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Disable volume keys to enable preview video sound</string>
+    <string name="DisableAutoWebLogin">Disable auto web login</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-fi-rFI/strings_na.xml b/TMessagesProj/src/main/res/values-fi-rFI/strings_na.xml
@@ -139,4 +139,5 @@
     <string name="DisableChannelMuteButton">Poista kanavan mykistyspainike käytöstä</string>
     <string name="DisablePreviewVideoSoundShortcut">Poista esikatseluvideon pikakuvake käytöstä</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Poista äänenvoimakkuusnäppäimet käytöstä, jos haluat ottaa esikatsella videon ääntä</string>
+    <string name="DisableAutoWebLogin">Poista automaattinen web kirjautuminen käytöstä</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-fr-rFR/strings_na.xml b/TMessagesProj/src/main/res/values-fr-rFR/strings_na.xml
@@ -139,4 +139,5 @@
     <string name="DisableChannelMuteButton">Désactiver le bouton de mise en sourdine</string>
     <string name="DisablePreviewVideoSoundShortcut">Désactiver le raccourci de l\'aperçu du son vidéo</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Désactiver les boutons de volume pour activer la prévisualisation du son vidéo</string>
+    <string name="DisableAutoWebLogin">Désactiver la connexion web automatique</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-it-rIT/strings_na.xml b/TMessagesProj/src/main/res/values-it-rIT/strings_na.xml
@@ -139,4 +139,5 @@
     <string name="DisableChannelMuteButton">Disabilita il pulsante Silenzia canale</string>
     <string name="DisablePreviewVideoSoundShortcut">Disabilita la scorciatoia audio anteprima video</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Disabilita i tasti volume per abilitare l\'anteprima del suono video</string>
+    <string name="DisableAutoWebLogin">Disabilita il login automatico</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-ja-rJP/strings_na.xml b/TMessagesProj/src/main/res/values-ja-rJP/strings_na.xml
@@ -139,4 +139,5 @@
     <string name="DisableChannelMuteButton">チャンネルミュートボタンを無効にする</string>
     <string name="DisablePreviewVideoSoundShortcut">プレビュービデオサウンドのショートカットを無効にする</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">ビデオのプレビューを有効にするには音量キーを無効にしてください</string>
+    <string name="DisableAutoWebLogin">自動ウェブログインを無効にする</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-nl-rNL/strings_na.xml b/TMessagesProj/src/main/res/values-nl-rNL/strings_na.xml
@@ -139,4 +139,5 @@
     <string name="DisableChannelMuteButton">Kanaaldemping knop uitschakelen</string>
     <string name="DisablePreviewVideoSoundShortcut">Snelkoppeling voor preview video uitschakelen</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Volumeknoppen uitschakelen om preview videogeluid in te schakelen</string>
+    <string name="DisableAutoWebLogin">Automatisch web inloggen uitschakelen</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-no-rNO/strings_na.xml b/TMessagesProj/src/main/res/values-no-rNO/strings_na.xml
@@ -139,4 +139,5 @@
     <string name="DisableChannelMuteButton">Deaktiver knappen for å slå av kanal</string>
     <string name="DisablePreviewVideoSoundShortcut">Deaktivere forhåndsvise video lyd snarvei</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Deaktiver volumtastene for å aktivere forhåndsvisningsvideo lyd</string>
+    <string name="DisableAutoWebLogin">Deaktiver innlogging med automatisk</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-pl-rPL/strings_na.xml b/TMessagesProj/src/main/res/values-pl-rPL/strings_na.xml
@@ -139,4 +139,5 @@
     <string name="DisableChannelMuteButton">Wyłącz przycisk wyciszenia kanału</string>
     <string name="DisablePreviewVideoSoundShortcut">Wyłącz podgląd skrótu dźwięku wideo</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Wyłącz przyciski głośności, aby włączyć podgląd dźwięku wideo</string>
+    <string name="DisableAutoWebLogin">Wyłącz automatyczne logowanie</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-pt-rBR/strings_na.xml b/TMessagesProj/src/main/res/values-pt-rBR/strings_na.xml
@@ -139,4 +139,5 @@
     <string name="DisableChannelMuteButton">Desativar botão de silenciar canal</string>
     <string name="DisablePreviewVideoSoundShortcut">Desativar pré-visualização de atalho sonoro de vídeo</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Desativar as teclas de volume para habilitar a visualização do som de vídeo</string>
+    <string name="DisableAutoWebLogin">Desativar o login via web automático</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-pt-rPT/strings_na.xml b/TMessagesProj/src/main/res/values-pt-rPT/strings_na.xml
@@ -139,4 +139,5 @@
     <string name="DisableChannelMuteButton">Desativar botão de silenciar canal</string>
     <string name="DisablePreviewVideoSoundShortcut">Desativar pré-visualização de atalho sonoro de vídeo</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Desativar as teclas de volume para habilitar a visualização do som de vídeo</string>
+    <string name="DisableAutoWebLogin">Desativar o login via web automático</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-ro-rRO/strings_na.xml b/TMessagesProj/src/main/res/values-ro-rRO/strings_na.xml
@@ -139,4 +139,5 @@
     <string name="DisableChannelMuteButton">Dezactivare buton mut canal</string>
     <string name="DisablePreviewVideoSoundShortcut">Dezactivează scurtătură sunet previzualizare</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Dezactivează tastele de volum pentru a activa previzualizarea sunetului video</string>
+    <string name="DisableAutoWebLogin">Dezactivează autentificarea automată pe web</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-ru-rRU/strings_na.xml b/TMessagesProj/src/main/res/values-ru-rRU/strings_na.xml
@@ -139,4 +139,5 @@
     <string name="DisableChannelMuteButton">Отключить кнопку отключения канала</string>
     <string name="DisablePreviewVideoSoundShortcut">Отключить ярлык предварительного просмотра звука видео</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Отключить кнопки громкости для предварительного просмотра звука видео</string>
+    <string name="DisableAutoWebLogin">Отключить автоматический веб-логин</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-sv-rSE/strings_na.xml b/TMessagesProj/src/main/res/values-sv-rSE/strings_na.xml
@@ -139,4 +139,5 @@
     <string name="DisableChannelMuteButton">Inaktivera kanalavstängningsknapp</string>
     <string name="DisablePreviewVideoSoundShortcut">Inaktivera förhandsgranskning av videoljudgenväg</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Inaktivera volymknappar för att förhandsgranska videoljud</string>
+    <string name="DisableAutoWebLogin">Inaktivera automatisk webbinloggning</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-tr-rTR/strings_na.xml b/TMessagesProj/src/main/res/values-tr-rTR/strings_na.xml
@@ -3,8 +3,8 @@
     <string name="N_Config">N-Config</string>
     <string name="ForceCopy">Kopyalamaya Zorla</string>
     <string name="InvertReply">Tersine Çevir</string>
-    <string name="Great">Great</string>
-    <string name="Poor">Poor</string>
+    <string name="Great">Harika</string>
+    <string name="Poor">Fakir</string>
     <string name="CombineMessage">Mesajı Birleştir</string>
     <string name="TextStyle">Metin Stili</string>
     <string name="CombineMessageEnabledWithReply">Etkinleştirilmiş İletiyi Yanıtla Birleştir</string>
@@ -75,7 +75,7 @@
     <string name="NotificationIcon">Bildirim Simgesi</string>
     <string name="Official">Resmi</string>
     <string name="Nekogram">Nekogram</string>
-    <string name="HalloWeen">HalloWeen</string>
+    <string name="HalloWeen">Cadılar bayramı</string>
     <string name="ShowOnlineStatus">Çevrimiçi Durumu Göster</string>
     <string name="ShowOnlineStatusNotice">Gruplardaki diğer kişilerin çevrimiçi durumunu profil fotoğraflarının yanında gösterin</string>
     <string name="ShowRecentOnlineStatus">Son Çevrimiçi Durumu Göster</string>
@@ -139,4 +139,5 @@
     <string name="DisableChannelMuteButton">Kanal sesini kapatma düğmesini devre dışı bırak</string>
     <string name="DisablePreviewVideoSoundShortcut">Önizleme videosu ses kısayolunu devre dışı bırak</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Önizleme video sesini etkinleştirmek için ses seviyesi tuşlarını devre dışı bırakın</string>
+    <string name="DisableAutoWebLogin">Disable auto web login</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-uk-rUA/strings_na.xml b/TMessagesProj/src/main/res/values-uk-rUA/strings_na.xml
@@ -139,4 +139,5 @@
     <string name="DisableChannelMuteButton">Вимкнути кнопку вимкнення звуку каналу</string>
     <string name="DisablePreviewVideoSoundShortcut">Вимкнути ярлик під час перегляду відео звукового звуку</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Вимкніть клавіші гучності, щоб увімкнути попередній перегляд відео звуку</string>
+    <string name="DisableAutoWebLogin">Вимкнути автоматичний веб-логін</string>
 </resources>
diff --git a/TMessagesProj/src/main/res/values-zh-rTW/strings_na.xml b/TMessagesProj/src/main/res/values-zh-rTW/strings_na.xml
@@ -140,4 +140,5 @@
     <string name="DisableChannelMuteButton">Disable channel mute button</string>
     <string name="DisablePreviewVideoSoundShortcut">Disable preview video sound shortcut</string>
     <string name="DisablePreviewVideoSoundShortcutNotice">Disable volume keys to enable preview video sound</string>
+    <string name="DisableAutoWebLogin">Disable auto web login</string>
 </resources>