From cec7961d188f7a1e302a31fedfd40aed29a46de0 Mon Sep 17 00:00:00 2001
From: harshil Sharma <harshilsharma63@gmail.com>
Date: Thu, 16 Nov 2023 17:06:39 +0530
Subject: [PATCH 01/19] Displayed channel related error with name field

---
 app/constants/server_errors.ts                      |  1 +
 .../convert_gm_to_channel_form.tsx                  | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/constants/server_errors.ts b/app/constants/server_errors.ts
index 39810710d..5ca22c999 100644
--- a/app/constants/server_errors.ts
+++ b/app/constants/server_errors.ts
@@ -7,4 +7,5 @@ export default {
     PLUGIN_DISMISSED_POST_ERROR: 'plugin.message_will_be_posted.dismiss_post',
     SEND_EMAIL_WITH_DEFAULTS_ERROR: 'api.team.invite_members.unable_to_send_email_with_defaults.app_error',
     TEAM_MEMBERSHIP_DENIAL_ERROR_ID: 'api.team.add_members.user_denied',
+    DUPLICATE_CHANNEL_NAME: 'store.sql_channel.save_channel.exists.app_error',
 };
diff --git a/app/screens/convert_gm_to_channel/convert_gm_to_channel_form/convert_gm_to_channel_form.tsx b/app/screens/convert_gm_to_channel/convert_gm_to_channel_form/convert_gm_to_channel_form.tsx
index acfaad9ea..a38f0392e 100644
--- a/app/screens/convert_gm_to_channel/convert_gm_to_channel_form/convert_gm_to_channel_form.tsx
+++ b/app/screens/convert_gm_to_channel/convert_gm_to_channel_form/convert_gm_to_channel_form.tsx
@@ -8,9 +8,10 @@ import {Text, View} from 'react-native';
 import {convertGroupMessageToPrivateChannel, switchToChannelById} from '@actions/remote/channel';
 import Button from '@components/button';
 import Loading from '@components/loading';
+import {ServerErrors} from '@constants';
 import {useServerUrl} from '@context/server';
 import {useTheme} from '@context/theme';
-import {isErrorWithMessage} from '@utils/errors';
+import {isErrorWithMessage, isServerError} from '@utils/errors';
 import {logError} from '@utils/log';
 import {preventDoubleTap} from '@utils/tap';
 import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme';
@@ -65,6 +66,7 @@ export const ConvertGMToChannelForm = ({
     const [selectedTeam, setSelectedTeam] = useState<Team>(commonTeams[0]);
     const [newChannelName, setNewChannelName] = useState<string>('');
     const [errorMessage, setErrorMessage] = useState<string>('');
+    const [channelNameErrorMessage, setChannelNameErrorMessage] = useState<string>('');
     const [conversionInProgress, setConversionInProgress] = useState(false);
 
     const userDisplayNames = useMemo(() => profiles.map((profile) => displayUsername(profile, locale, teammateNameDisplay)), [profiles, teammateNameDisplay, locale]);
@@ -79,7 +81,9 @@ export const ConvertGMToChannelForm = ({
 
         const {updatedChannel, error} = await convertGroupMessageToPrivateChannel(serverUrl, channelId, selectedTeam.id, newChannelName);
         if (error) {
-            if (isErrorWithMessage(error)) {
+            if (isServerError(error) && error.server_error_id === ServerErrors.DUPLICATE_CHANNEL_NAME && isErrorWithMessage(error)) {
+                setChannelNameErrorMessage(error.message);
+            } else if (isErrorWithMessage(error)) {
                 setErrorMessage(error.message);
             } else {
                 setErrorMessage(formatMessage({id: 'channel_info.convert_gm_to_channel.conversion_error', defaultMessage: 'Something went wrong. Failed to convert Group Message to Private Channel.'}));
@@ -153,7 +157,10 @@ export const ConvertGMToChannelForm = ({
                     selectedTeamId={selectedTeam?.id}
                 />
             }
-            <ChannelNameInput onChange={setNewChannelName}/>
+            <ChannelNameInput
+                onChange={setNewChannelName}
+                error={channelNameErrorMessage}
+            />
             <Button
                 onPress={handleOnPress}
                 text={confirmButtonText}

From 1a59bd9e0e6e8f068937ba427f97e1683f440976 Mon Sep 17 00:00:00 2001
From: KyeongSoo Kim <soo@novelastudio.com>
Date: Wed, 22 Nov 2023 22:05:58 +0900
Subject: [PATCH 02/19] [MM-42586] Reaction toggle behavior (#7674)

---
 app/actions/remote/reactions.ts               | 29 +++++++++++++++++++
 .../post/body/reactions/reactions.tsx         |  8 ++---
 .../reaction_bar/reaction_bar.tsx             |  4 +--
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/app/actions/remote/reactions.ts b/app/actions/remote/reactions.ts
index d710fc868..90b601350 100644
--- a/app/actions/remote/reactions.ts
+++ b/app/actions/remote/reactions.ts
@@ -16,6 +16,35 @@ import {forceLogoutIfNecessary} from './session';
 import type {Model} from '@nozbe/watermelondb';
 import type PostModel from '@typings/database/models/servers/post';
 
+export async function getIsReactionAlreadyAddedToPost(serverUrl: string, postId: string, emojiName: string) {
+    try {
+        const {database} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
+
+        const currentUserId = await getCurrentUserId(database);
+        const emojiAlias = getEmojiFirstAlias(emojiName);
+        return await queryReaction(database, emojiAlias, postId, currentUserId).fetchCount() > 0;
+    } catch (error) {
+        logDebug('error on getIsReactionAlreadyAddedToPost', getFullErrorMessage(error));
+        forceLogoutIfNecessary(serverUrl, error);
+        return {error};
+    }
+}
+
+export async function toggleReaction(serverUrl: string, postId: string, emojiName: string) {
+    try {
+        const isReactionAlreadyAddedToPost = await getIsReactionAlreadyAddedToPost(serverUrl, postId, emojiName);
+
+        if (isReactionAlreadyAddedToPost) {
+            return removeReaction(serverUrl, postId, emojiName);
+        }
+        return addReaction(serverUrl, postId, emojiName);
+    } catch (error) {
+        logDebug('error on toggleReaction', getFullErrorMessage(error));
+        forceLogoutIfNecessary(serverUrl, error);
+        return {error};
+    }
+}
+
 export async function addReaction(serverUrl: string, postId: string, emojiName: string) {
     try {
         const client = NetworkManager.getClient(serverUrl);
diff --git a/app/components/post_list/post/body/reactions/reactions.tsx b/app/components/post_list/post/body/reactions/reactions.tsx
index 9bda75844..2ca18c922 100644
--- a/app/components/post_list/post/body/reactions/reactions.tsx
+++ b/app/components/post_list/post/body/reactions/reactions.tsx
@@ -5,7 +5,7 @@ import React, {useCallback, useRef, useState} from 'react';
 import {useIntl} from 'react-intl';
 import {Keyboard, TouchableOpacity} from 'react-native';
 
-import {addReaction, removeReaction} from '@actions/remote/reactions';
+import {addReaction, removeReaction, toggleReaction} from '@actions/remote/reactions';
 import CompassIcon from '@components/compass_icon';
 import {Screens} from '@constants';
 import {MAX_ALLOWED_REACTIONS} from '@constants/emoji';
@@ -100,8 +100,8 @@ const Reactions = ({currentUserId, canAddReaction, canRemoveReaction, disabled,
         return {reactionsByName, highlightedReactions};
     }, [sortedReactions, reactions]);
 
-    const handleAddReactionToPost = (emoji: string) => {
-        addReaction(serverUrl, postId, emoji);
+    const handleToggleReactionToPost = (emoji: string) => {
+        toggleReaction(serverUrl, postId, emoji);
     };
 
     const handleAddReaction = useCallback(preventDoubleTap(() => {
@@ -110,7 +110,7 @@ const Reactions = ({currentUserId, canAddReaction, canRemoveReaction, disabled,
             screen: Screens.EMOJI_PICKER,
             theme,
             title: formatMessage({id: 'mobile.post_info.add_reaction', defaultMessage: 'Add Reaction'}),
-            props: {onEmojiPress: handleAddReactionToPost},
+            props: {onEmojiPress: handleToggleReactionToPost},
         });
     }), [formatMessage, theme]);
 
diff --git a/app/screens/post_options/reaction_bar/reaction_bar.tsx b/app/screens/post_options/reaction_bar/reaction_bar.tsx
index 93a25af9a..14874b707 100644
--- a/app/screens/post_options/reaction_bar/reaction_bar.tsx
+++ b/app/screens/post_options/reaction_bar/reaction_bar.tsx
@@ -5,7 +5,7 @@ import React, {useCallback} from 'react';
 import {useIntl} from 'react-intl';
 import {useWindowDimensions, View} from 'react-native';
 
-import {addReaction} from '@actions/remote/reactions';
+import {toggleReaction} from '@actions/remote/reactions';
 import {Screens} from '@constants';
 import {
     LARGE_CONTAINER_SIZE,
@@ -57,7 +57,7 @@ const ReactionBar = ({bottomSheetId, recentEmojis = [], postId}: QuickReactionPr
 
     const handleEmojiPress = useCallback(async (emoji: string) => {
         await dismissBottomSheet(bottomSheetId);
-        addReaction(serverUrl, postId, emoji);
+        toggleReaction(serverUrl, postId, emoji);
     }, [bottomSheetId, postId, serverUrl]);
 
     const openEmojiPicker = useCallback(async () => {

From a26f01158baf441b19cfbf331bbff08f4f3bde61 Mon Sep 17 00:00:00 2001
From: kaakaa <stooner.hoe@gmail.com>
Date: Mon, 13 Nov 2023 12:46:56 +0000
Subject: [PATCH 03/19] Translated using Weblate (Japanese)

Currently translated at 100.0% (1090 of 1090 strings)

Translation: Mattermost/mattermost-mobile-v2
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile-v2/ja/
---
 assets/base/i18n/ja.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/assets/base/i18n/ja.json b/assets/base/i18n/ja.json
index 565baea4a..786754194 100644
--- a/assets/base/i18n/ja.json
+++ b/assets/base/i18n/ja.json
@@ -125,6 +125,7 @@
   "channel_info.convert_private_title": "{displayName} を非公開チャンネルに変更しますか?",
   "channel_info.copied": "コピーしました",
   "channel_info.copy_link": "リンクをコピー",
+  "channel_info.copy_purpose_text": "目的のテキストをコピーする",
   "channel_info.custom_status": "カスタムステータス:",
   "channel_info.edit_header": "ヘッダーを編集する",
   "channel_info.error_close": "閉じる",
@@ -611,6 +612,7 @@
   "mobile.managed.settings": "設定へ移動する",
   "mobile.markdown.code.copy_code": "コードのコピー",
   "mobile.markdown.code.plusMoreLines": "あと {count, number} {count, plural, one {line} other {lines}} あります",
+  "mobile.markdown.copy_header": "ヘッダーテキストをコピーする",
   "mobile.markdown.image.too_large": "画像が {maxWidth} x {maxHeight} の上限を超えています:",
   "mobile.markdown.link.copy_url": "URL のコピー",
   "mobile.mention.copy_mention": "メンションをコピーする",
@@ -708,6 +710,9 @@
   "mobile.server_url.empty": "有効なサーバーURLを入力してください",
   "mobile.server_url.invalid_format": "URLはhttp://またはhttps://から始まらなくてはいけません",
   "mobile.session_expired.title": "セッション有効期限切れ",
+  "mobile.session_expired_days": "引き続き通知を受け取るにはログインしてください。{siteName} へのセッションは {daysCount, number} {daysCount, plural, one {日} other {日}} 毎に期限切れになるよう設定されています。",
+  "mobile.session_expired_days_hrs": "引き続き通知を受け取るにはログインしてください。{siteName} へのセッションは {daysCount, number} {daysCount, plural, one {日} other {日}} {hoursCount, number} {hoursCount, plural, one {時間} other {時間}} 毎に期限切れになるよう設定されています。",
+  "mobile.session_expired_hrs": "引き続き通知を受け取るにはログインしてください。{siteName} へのセッションは {hoursCount, number} {hoursCount, plural, one {時間} other {時間}} 毎に期限切れになるよう設定されています。",
   "mobile.set_status.dnd": "取り込み中",
   "mobile.storage_permission_denied_description": "サーバーにファイルをアップロードします。設定を開き、{applicationName} にこのデバイスのファイルへの読み取りと書き込みのアクセス権を付与してください。",
   "mobile.storage_permission_denied_title": "{applicationName} があなたのファイルへアクセスしようとしています",

From 72d2984f46daf469cf8fb79d9f9acd672fee8748 Mon Sep 17 00:00:00 2001
From: master7 <marcin.karkosz@rajska.info>
Date: Mon, 13 Nov 2023 12:00:57 +0000
Subject: [PATCH 04/19] Translated using Weblate (Polish)

Currently translated at 100.0% (1090 of 1090 strings)

Translation: Mattermost/mattermost-mobile-v2
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile-v2/pl/
---
 assets/base/i18n/pl.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/assets/base/i18n/pl.json b/assets/base/i18n/pl.json
index 3801ed8f0..33d07f8e7 100644
--- a/assets/base/i18n/pl.json
+++ b/assets/base/i18n/pl.json
@@ -710,6 +710,9 @@
   "mobile.server_url.empty": "Proszę wprowadzić prawidłowy adres URL serwera",
   "mobile.server_url.invalid_format": "Adres musi zaczynać się od http:// lub https://",
   "mobile.session_expired.title": "Sesja Wygasła",
+  "mobile.session_expired_days": "Zaloguj się, aby nadal otrzymywać powiadomienia. Sesje dla {siteName} są skonfigurowane tak, aby wygasały co {daysCount, number} {daysCount, plural, one {dzień} other {dni}}.",
+  "mobile.session_expired_days_hrs": "Zaloguj się, aby nadal otrzymywać powiadomienia. Sesje dla {siteName} są skonfigurowane tak, aby wygasały co {daysCount, number} {daysCount, plural, one {dzień} other {dni}} i {hoursCount, number} {hoursCount, plural, one {godzinę} other {godziny}}.",
+  "mobile.session_expired_hrs": "Zaloguj się, aby nadal otrzymywać powiadomienia. Sesje dla {siteName} są skonfigurowane tak, aby wygasały co {hoursCount, number} {hoursCount, plural, one {godzinę} other {godziny}}.",
   "mobile.set_status.dnd": "Nie przeszkadzać",
   "mobile.storage_permission_denied_description": "Prześlij pliki na swój serwer. Otwórz Ustawienia, aby przyznać {applicationName} dostęp do odczytu i zapisu plików na tym urządzeniu.",
   "mobile.storage_permission_denied_title": "{applicationName} chce otrzymać dostęp do twoich plików",

From 4d97b25f034503ef88bd3609bf8c358ba814cda4 Mon Sep 17 00:00:00 2001
From: Milo Ivir <mail@milotype.de>
Date: Mon, 13 Nov 2023 14:46:08 +0000
Subject: [PATCH 05/19] Translated using Weblate (Croatian)

Currently translated at 46.5% (507 of 1090 strings)

Translation: Mattermost/mattermost-mobile-v2
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile-v2/hr/
---
 assets/base/i18n/hr.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/assets/base/i18n/hr.json b/assets/base/i18n/hr.json
index 3a88e28d8..58a0c9ee2 100644
--- a/assets/base/i18n/hr.json
+++ b/assets/base/i18n/hr.json
@@ -200,6 +200,8 @@
   "last_users_message.first": "{firstUser} i ",
   "last_users_message.others": "{numOthers} drugih ",
   "login.email": "E-mail",
+  "login.forgot": "Ne sjećaš se lozinke?",
+  "login.ldapUsername": "AD/LDAP korisničko ime",
   "login.or": "ili",
   "login.password": "Lozinka",
   "login.signIn": "Prijavi se",

From 5a6e8c1df159bc9819ca9b1c89f12ee145b6368a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csaba=20T=C3=B3th?= <csaba.toth@odootech.hu>
Date: Tue, 14 Nov 2023 09:15:48 +0000
Subject: [PATCH 06/19] Translated using Weblate (Hungarian)

Currently translated at 37.5% (410 of 1091 strings)

Translation: Mattermost/mattermost-mobile-v2
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile-v2/hu/
---
 assets/base/i18n/hu.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/assets/base/i18n/hu.json b/assets/base/i18n/hu.json
index 8a37a0a9e..edeb92937 100644
--- a/assets/base/i18n/hu.json
+++ b/assets/base/i18n/hu.json
@@ -69,10 +69,10 @@
   "apps.error.parser.unexpected_squared_bracket": "Nem várt lista nyitás.",
   "apps.error.parser.unexpected_state": "Nem elérhető: Váratlan állapot a matchBinding-ben: `{state}`.",
   "apps.error.parser.unexpected_whitespace": "Nem elérhető: Váratlan szóköz.",
-  "apps.error.responses.form.no_form": "",
+  "apps.error.responses.form.no_form": "A válasz típusa `űrlap`, de a válasz nem tartalmazott űrlapot.",
   "apps.error.responses.navigate.no_url": "Válasz típusa `navigate`, de nem volt url megadva a válaszban.",
   "apps.error.responses.unexpected_error": "Váratlan hiba érkezett.",
-  "apps.error.responses.unexpected_type": "",
+  "apps.error.responses.unexpected_type": "Az alkalmazás válaszának típusa nem várt. Válasz típusa: {type}",
   "apps.error.responses.unknown_field_error": "Hiba érkezett egy ismeretlen mezőhöz. Mező neve: `{field}`. Hiba: `{error}`.",
   "apps.error.responses.unknown_type": "Az alkalmazás válasz típusa nem támogatott. Válasz típusa: {type}.",
   "apps.error.unknown": "Ismeretlen hiba történt.",
@@ -104,11 +104,11 @@
   "channel_header.info": "Infó megtekintése",
   "channel_header.member_count": "{count, plural, one {# tag} other {# tag}}",
   "channel_info.add_members": "Tagok hozzáadása",
-  "channel_info.alertNo": "",
-  "channel_info.alertYes": "",
-  "channel_info.alert_retry": "",
-  "channel_info.archive": "",
-  "channel_info.archive_description.can_view_archived": "",
+  "channel_info.alertNo": "Nem",
+  "channel_info.alertYes": "Igen",
+  "channel_info.alert_retry": "Próbálja újra",
+  "channel_info.archive": "Csatorna archiválása",
+  "channel_info.archive_description.can_view_archived": "Ez archiválja a csatornát a csapattól. A csatorna tartalma továbbra is elérhető marad a csatornatagok számára.\n\nBiztos, hogy archiválni szeretné a {term} {name} csatornát?",
   "channel_info.archive_description.cannot_view_archived": "",
   "channel_info.archive_failed": "",
   "channel_info.archive_title": "",

From 1a75c533804430cfbffa7381c53b053e01c069ae Mon Sep 17 00:00:00 2001
From: Milo Ivir <mail@milotype.de>
Date: Tue, 14 Nov 2023 14:43:49 +0000
Subject: [PATCH 07/19] Translated using Weblate (Croatian)

Currently translated at 46.9% (512 of 1091 strings)

Translation: Mattermost/mattermost-mobile-v2
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile-v2/hr/
---
 assets/base/i18n/hr.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/assets/base/i18n/hr.json b/assets/base/i18n/hr.json
index 58a0c9ee2..d9c8e9977 100644
--- a/assets/base/i18n/hr.json
+++ b/assets/base/i18n/hr.json
@@ -166,6 +166,7 @@
   "global_threads.markAllRead.cancel": "Odustani",
   "global_threads.options.mark_as_read": "Označi kao pročitano",
   "global_threads.options.open_in_channel": "Otvori u kanalu",
+  "global_threads.unreads": "Nepročitani",
   "home.header.plus_menu": "Opcije",
   "integration_selector.multiselect.submit": "Obavljeno",
   "interactive_dialog.submit": "Pošalji",
@@ -230,6 +231,7 @@
   "mobile.channel_info.alertNo": "Ne",
   "mobile.channel_info.alertYes": "Da",
   "mobile.channel_list.recent": "Nedavno",
+  "mobile.channel_list.unreads": "Nepročitani",
   "mobile.components.select_server_view.connect": "Poveži",
   "mobile.components.select_server_view.connecting": "Povezivanje",
   "mobile.components.select_server_view.enterServerUrl": "Upiši URL servera",
@@ -325,6 +327,9 @@
   "notification_settings.mentions": "Spominjanja",
   "notification_settings.mentions_replies": "Spominjanja i odgovori",
   "notification_settings.ooo_auto_responder": "Automatki odgovori",
+  "password_send.description": "Za resetiranje lozinke upiši korištenu e-mail adresu za registraciju",
+  "password_send.error": "Upiši važeću e-mail adresu.",
+  "password_send.link": "Ako račun postoji, poslat će se e-mail za ponovno postavljanje lozinke na:",
   "password_send.reset": "Resetiraj tvoju lozinku",
   "permalink.error.cancel": "Odustani",
   "permalink.error.okay": "U redu",

From 1c1542e6f169e89292d4b4762c3bd65c53079ca9 Mon Sep 17 00:00:00 2001
From: jprusch <rs@schaeferbarthold.de>
Date: Wed, 15 Nov 2023 07:24:31 +0000
Subject: [PATCH 08/19] Translated using Weblate (German)

Currently translated at 100.0% (1091 of 1091 strings)

Translation: Mattermost/mattermost-mobile-v2
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile-v2/de/
---
 assets/base/i18n/de.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/base/i18n/de.json b/assets/base/i18n/de.json
index 99c274635..903bd5f95 100644
--- a/assets/base/i18n/de.json
+++ b/assets/base/i18n/de.json
@@ -112,6 +112,7 @@
   "channel_info.archive_description.cannot_view_archived": "Dies wird den Kanal für das Team archivieren und aus der Benutzeroberfläche entfernen. Archivierte Kanäle könne bei Bedard wieder aktiviert werden. \n \nBist du dir sicher, dass du {term} {name} archivieren möchtest?",
   "channel_info.archive_failed": "Beim Versuch, den Kanal {displayName} zu archivieren, ist ein Fehler aufgetreten",
   "channel_info.archive_title": "{term} archivieren",
+  "channel_info.channel_auto_follow_threads": "Allen Unterhaltungen in diesem Kanal folgen",
   "channel_info.channel_files": "Dateien",
   "channel_info.close": "Schliessen",
   "channel_info.close_dm": "Direktnachricht schließen",

From 14980a9a6f2e63dabfd500a63645b6feb7eb1ed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csaba=20T=C3=B3th?= <csaba.toth@odootech.hu>
Date: Wed, 15 Nov 2023 06:49:09 +0000
Subject: [PATCH 09/19] Translated using Weblate (Hungarian)

Currently translated at 43.4% (474 of 1091 strings)

Translation: Mattermost/mattermost-mobile-v2
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile-v2/hu/
---
 assets/base/i18n/hu.json | 115 ++++++++++++++++++++++-----------------
 1 file changed, 64 insertions(+), 51 deletions(-)

diff --git a/assets/base/i18n/hu.json b/assets/base/i18n/hu.json
index edeb92937..560478b0b 100644
--- a/assets/base/i18n/hu.json
+++ b/assets/base/i18n/hu.json
@@ -111,69 +111,82 @@
   "channel_info.archive_description.can_view_archived": "Ez archiválja a csatornát a csapattól. A csatorna tartalma továbbra is elérhető marad a csatornatagok számára.\n\nBiztos, hogy archiválni szeretné a {term} {name} csatornát?",
   "channel_info.archive_description.cannot_view_archived": "",
   "channel_info.archive_failed": "",
-  "channel_info.archive_title": "",
-  "channel_info.close": "",
-  "channel_info.close_dm": "",
-  "channel_info.close_dm_channel": "",
-  "channel_info.close_gm": "",
-  "channel_info.close_gm_channel": "",
+  "channel_info.archive_title": "{term} archiválása",
+  "channel_info.channel_auto_follow_threads": "Kövesse az összes üzenetszálat ezen a csatornán",
+  "channel_info.channel_files": "Fájlok",
+  "channel_info.close": "Bezárás",
+  "channel_info.close_dm": "Közvetlen üzenet bezárása",
+  "channel_info.close_dm_channel": "Biztos, hogy be kívánja zárni ezt a közvetlen üzenetet? Ezzel eltávolítja a kezdőképernyőről, de bármikor újra megnyithatja.",
+  "channel_info.close_gm": "Csoport üzenetet bezárása",
+  "channel_info.close_gm_channel": "Biztos, hogy be kívánja zárni ezt a csoport üzenetet? Ezzel eltávolítja a kezdőképernyőről, de bármikor újra megnyithatja.",
   "channel_info.convert_failed": "",
-  "channel_info.convert_private": "",
+  "channel_info.convert_private": "Átalakítás privát csatornává",
   "channel_info.convert_private_description": "",
-  "channel_info.convert_private_success": "",
-  "channel_info.convert_private_title": "",
-  "channel_info.copied": "",
-  "channel_info.copy_link": "",
-  "channel_info.custom_status": "",
-  "channel_info.edit_header": "",
-  "channel_info.error_close": "",
-  "channel_info.favorite": "",
+  "channel_info.convert_private_success": "{displayName} mostantól privát csatorna.",
+  "channel_info.convert_private_title": "Átalakítja a {displayName} csatornát privát csatornává?",
+  "channel_info.copied": "Másolt",
+  "channel_info.copy_link": "Link másolása",
+  "channel_info.custom_status": "Egyéni állapot:",
+  "channel_info.edit_header": "Fejléc szerkesztése",
+  "channel_info.error_close": "Bezárás",
+  "channel_info.favorite": "Kedvenc",
   "channel_info.favorited": "",
   "channel_info.header": "Fejléc:",
-  "channel_info.ignore_mentions": "",
-  "channel_info.leave": "",
-  "channel_info.leave_channel": "",
+  "channel_info.ignore_mentions": "@channel, @here, @all figyelmen kívül hagyása",
+  "channel_info.leave": "Kilépés",
+  "channel_info.leave_channel": "Kilépés a csatornából",
   "channel_info.leave_private_channel": "",
   "channel_info.leave_public_channel": "",
-  "channel_info.local_time": "",
-  "channel_info.members": "",
-  "channel_info.mention": "",
-  "channel_info.mobile_notifications": "",
-  "channel_info.muted": "",
-  "channel_info.nickname": "",
-  "channel_info.notification.all": "",
-  "channel_info.notification.default": "",
-  "channel_info.notification.mention": "",
-  "channel_info.notification.none": "",
-  "channel_info.pinned_messages": "",
-  "channel_info.position": "",
-  "channel_info.private_channel": "",
-  "channel_info.public_channel": "",
-  "channel_info.send_a_mesasge": "",
-  "channel_info.send_mesasge": "",
-  "channel_info.set_header": "",
-  "channel_info.unarchive": "",
+  "channel_info.local_time": "Helyi idő",
+  "channel_info.members": "Tagok",
+  "channel_info.mention": "Említés",
+  "channel_info.mobile_notifications": "Mobil értesítések",
+  "channel_info.muted": "Némítás",
+  "channel_info.nickname": "Becenév",
+  "channel_info.notification.all": "Minden",
+  "channel_info.notification.default": "Alapértelmezett",
+  "channel_info.notification.mention": "Említések",
+  "channel_info.notification.none": "Soha",
+  "channel_info.pinned_messages": "Kitűzött üzenetek",
+  "channel_info.position": "Pozíció",
+  "channel_info.private_channel": "Privát csatorna",
+  "channel_info.public_channel": "Nyilvános csatorna",
+  "channel_info.send_a_mesasge": "Üzenet küldése",
+  "channel_info.send_mesasge": "Üzenet küldése",
+  "channel_info.set_header": "Fejléc beállítása",
+  "channel_info.unarchive": "Csatorna visszaaktiválása",
   "channel_info.unarchive_description": "",
   "channel_info.unarchive_failed": "",
-  "channel_info.unarchive_title": "",
-  "channel_intro.createdBy": "",
-  "channel_intro.createdOn": "",
-  "channel_list.channels_category": "",
-  "channel_list.dms_category": "",
-  "channel_list.favorites_category": "",
-  "channel_list.find_channels": "",
+  "channel_info.unarchive_title": "{term} visszaaktiválása",
+  "channel_intro.createdBy": "Létrehozta {user} {date} napon",
+  "channel_intro.createdOn": "Létrehozva {date} napon",
+  "channel_list.channels_category": "Csatornák",
+  "channel_list.dms_category": "Közvetlen üzenetek",
+  "channel_list.favorites_category": "Kedvencek",
+  "channel_list.find_channels": "Csatornák keresése...",
   "channel_loader.someone": "Valaki",
   "channel_modal.descriptionHelp": "Írja le hogyan kell ezt a beszélgetést használni.",
   "channel_modal.header": "Fejléc",
-  "channel_modal.headerEx": "",
+  "channel_modal.headerEx": "Használjon Markdown formázást a fejléc szövegében",
   "channel_modal.headerHelp": "",
-  "channel_modal.makePrivate.description": "",
-  "channel_modal.makePrivate.label": "",
+  "channel_modal.makePrivate.description": "Ha egy csatorna privátra van állítva, csak a meghívott csapattagok férhetnek hozzá és vehetnek részt a csatornán",
+  "channel_modal.makePrivate.label": "Legyen privát",
   "channel_modal.name": "Név",
-  "channel_modal.nameEx": "",
+  "channel_modal.nameEx": "Hibák, Marketing",
   "channel_modal.optional": "(nem kötelező)",
   "channel_modal.purpose": "Cél",
   "channel_modal.purposeEx": "",
+  "channel_notification_preferences.default": "(alapértelmezett)",
+  "channel_notification_preferences.muted_content": "Megváltoztathatja az értesítési beállításokat, de addig nem kap értesítést, amíg a csatorna némítása fel nem oldódik.",
+  "channel_notification_preferences.muted_title": "Ez a csatorna némítva van",
+  "channel_notification_preferences.notification.all": "Minden új üzenet",
+  "channel_notification_preferences.notification.mention": "Csak említések",
+  "channel_notification_preferences.notification.none": "Semmi",
+  "channel_notification_preferences.notification.thread_replies": "Értesítsen az általam követett témákra adott válaszokról ebben a csatornában",
+  "channel_notification_preferences.notify_about": "Értesítést kérek...",
+  "channel_notification_preferences.reset_default": "Visszaállítás az alapértelmezettre",
+  "channel_notification_preferences.thread_replies": "Üzenetszál válaszok",
+  "channel_notification_preferences.unmute_content": "Csatorna némításának feloldása",
   "combined_system_message.added_to_channel.many_expanded": "{users} és {lastUser} **hozzá lett adva a beszélgetéshez** {actor} által.",
   "combined_system_message.added_to_channel.one": "{firstUser} **hozzá lett adva a beszélgetészhez** {actor} által.",
   "combined_system_message.added_to_channel.one_you": "Ön **hozzá lett adva a beszélgetéshez** {actor} által.",
@@ -207,10 +220,10 @@
   "combined_system_message.removed_from_team.one_you": "Önt **eltávolították a csapatból**.",
   "combined_system_message.removed_from_team.two": "{firstUser} és {secondUser} **el lett távolítva a csapatból**.",
   "combined_system_message.you": "Ön",
-  "connection_banner.connected": "",
-  "connection_banner.connecting": "",
-  "connection_banner.not_connected": "",
-  "connection_banner.not_reachable": "",
+  "connection_banner.connected": "Kapcsolat helyreállítva",
+  "connection_banner.connecting": "Kapcsolódás...",
+  "connection_banner.not_connected": "Nincs internet kapcsolat",
+  "connection_banner.not_reachable": "A kiszolgáló nem érhető el",
   "create_direct_message.title": "",
   "create_post.deactivated": "Letiltott felhasználóval archivált beszélgetést néz.",
   "create_post.thread_reply": "",

From 3a016ea3c28974d01cd71a223c5485666572d42d Mon Sep 17 00:00:00 2001
From: master7 <marcin.karkosz@rajska.info>
Date: Wed, 15 Nov 2023 06:43:32 +0000
Subject: [PATCH 10/19] Translated using Weblate (Polish)

Currently translated at 100.0% (1091 of 1091 strings)

Translation: Mattermost/mattermost-mobile-v2
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile-v2/pl/
---
 assets/base/i18n/pl.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/base/i18n/pl.json b/assets/base/i18n/pl.json
index 33d07f8e7..5ac3eabc8 100644
--- a/assets/base/i18n/pl.json
+++ b/assets/base/i18n/pl.json
@@ -112,6 +112,7 @@
   "channel_info.archive_description.cannot_view_archived": "Spowoduje to zarchiwizowanie kanału z zespołu i usunięcie go z interfejsu użytkownika. Zarchiwizowane kanały mogą zostać odarchiwizowane, jeśli będą ponownie potrzebne.\n\nCzy na pewno chcesz zarchiwizować kanał {term} {name}?",
   "channel_info.archive_failed": "Wystąpił błąd podczas próby archiwizacji kanału {displayName}",
   "channel_info.archive_title": "Archiwizuj {term}",
+  "channel_info.channel_auto_follow_threads": "Śledź wszystkie wątki w tym kanale",
   "channel_info.channel_files": "Pliki",
   "channel_info.close": "Zamknij",
   "channel_info.close_dm": "Zamknij wiadomość bezpośrednią",

From 1ea59acd7b1da0201ab6c88c5107bc14f7490b79 Mon Sep 17 00:00:00 2001
From: ThrRip <coding@thrrip.space>
Date: Wed, 15 Nov 2023 14:02:15 +0000
Subject: [PATCH 11/19] Translated using Weblate (Chinese (Simplified))

Currently translated at 99.5% (1086 of 1091 strings)

Translation: Mattermost/mattermost-mobile-v2
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile-v2/zh_Hans/
---
 assets/base/i18n/zh-CN.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/base/i18n/zh-CN.json b/assets/base/i18n/zh-CN.json
index c815978d3..ae34318cd 100644
--- a/assets/base/i18n/zh-CN.json
+++ b/assets/base/i18n/zh-CN.json
@@ -725,11 +725,11 @@
   "mobile.tos_link": "服务条款",
   "mobile.user_list.deactivated": "已停用",
   "mobile.write_storage_permission_denied_description": "保存文件到你的设备。打开设定并允许 {applicationName} 读写此设备上的文件。",
-  "modal.manual_status.auto_responder.message_": "您想切换您的状态到 \"{status}\" 并停用自动回复吗？",
-  "modal.manual_status.auto_responder.message_away": "您想切换您的状态到 \"离开\" 并停用自动回复吗？",
-  "modal.manual_status.auto_responder.message_dnd": "您想切换您的状态到 \"请勿打扰\" 并停用自动回复吗？",
-  "modal.manual_status.auto_responder.message_offline": "您想切换您的状态到 \"离线\" 并停用自动回复吗？",
-  "modal.manual_status.auto_responder.message_online": "您想切换您的状态到 \"在线\" 并停用自动回复吗？",
+  "modal.manual_status.auto_responder.message_": "您想切换您的状态到“{status}\" 并停用自动回复吗？",
+  "modal.manual_status.auto_responder.message_away": "您想切换您的状态到“离开\" 并停用自动回复吗？",
+  "modal.manual_status.auto_responder.message_dnd": "您想切换您的状态到“请勿打扰\" 并停用自动回复吗？",
+  "modal.manual_status.auto_responder.message_offline": "您想切换您的状态到“离线\" 并停用自动回复吗？",
+  "modal.manual_status.auto_responder.message_online": "您想切换您的状态到“在线\" 并停用自动回复吗？",
   "more_messages.text": "{count} new {count, plural, one {消息} other {消息}}",
   "msg_typing.areTyping": "{users}和{last}正在输入…",
   "msg_typing.isTyping": "{user}正在输入…",

From f603a4a61e6ba409432a634bca9e49cb7c581ae9 Mon Sep 17 00:00:00 2001
From: ThrRip <coding@thrrip.space>
Date: Wed, 15 Nov 2023 14:35:24 +0000
Subject: [PATCH 12/19] Translated using Weblate (Chinese (Simplified))

Currently translated at 99.4% (1086 of 1092 strings)

Translation: Mattermost/mattermost-mobile-v2
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile-v2/zh_Hans/
---
 assets/base/i18n/zh-CN.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/base/i18n/zh-CN.json b/assets/base/i18n/zh-CN.json
index ae34318cd..771bf8a10 100644
--- a/assets/base/i18n/zh-CN.json
+++ b/assets/base/i18n/zh-CN.json
@@ -725,11 +725,11 @@
   "mobile.tos_link": "服务条款",
   "mobile.user_list.deactivated": "已停用",
   "mobile.write_storage_permission_denied_description": "保存文件到你的设备。打开设定并允许 {applicationName} 读写此设备上的文件。",
-  "modal.manual_status.auto_responder.message_": "您想切换您的状态到“{status}\" 并停用自动回复吗？",
-  "modal.manual_status.auto_responder.message_away": "您想切换您的状态到“离开\" 并停用自动回复吗？",
-  "modal.manual_status.auto_responder.message_dnd": "您想切换您的状态到“请勿打扰\" 并停用自动回复吗？",
-  "modal.manual_status.auto_responder.message_offline": "您想切换您的状态到“离线\" 并停用自动回复吗？",
-  "modal.manual_status.auto_responder.message_online": "您想切换您的状态到“在线\" 并停用自动回复吗？",
+  "modal.manual_status.auto_responder.message_": "您想切换您的状态到“{status}”并停用自动回复吗？",
+  "modal.manual_status.auto_responder.message_away": "您想切换您的状态到“离开”并停用自动回复吗？",
+  "modal.manual_status.auto_responder.message_dnd": "您想切换您的状态到“请勿打扰”并停用自动回复吗？",
+  "modal.manual_status.auto_responder.message_offline": "您想切换您的状态到“离线”并停用自动回复吗？",
+  "modal.manual_status.auto_responder.message_online": "您想切换您的状态到“在线”并停用自动回复吗？",
   "more_messages.text": "{count} new {count, plural, one {消息} other {消息}}",
   "msg_typing.areTyping": "{users}和{last}正在输入…",
   "msg_typing.isTyping": "{user}正在输入…",

From fb57ec1132cf5c96a9781ef32031e875ec6b66c6 Mon Sep 17 00:00:00 2001
From: jprusch <rs@schaeferbarthold.de>
Date: Thu, 16 Nov 2023 10:20:42 +0000
Subject: [PATCH 13/19] Translated using Weblate (German)

Currently translated at 100.0% (1092 of 1092 strings)

Translation: Mattermost/mattermost-mobile-v2
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile-v2/de/
---
 assets/base/i18n/de.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/base/i18n/de.json b/assets/base/i18n/de.json
index 903bd5f95..403146cc7 100644
--- a/assets/base/i18n/de.json
+++ b/assets/base/i18n/de.json
@@ -113,6 +113,7 @@
   "channel_info.archive_failed": "Beim Versuch, den Kanal {displayName} zu archivieren, ist ein Fehler aufgetreten",
   "channel_info.archive_title": "{term} archivieren",
   "channel_info.channel_auto_follow_threads": "Allen Unterhaltungen in diesem Kanal folgen",
+  "channel_info.channel_auto_follow_threads_failed": "Beim Versuch, allen Unterhaltungen im Kanal automatisch zu verfolgen, ist ein Fehler aufgetreten {displayName}",
   "channel_info.channel_files": "Dateien",
   "channel_info.close": "Schliessen",
   "channel_info.close_dm": "Direktnachricht schließen",

From 7965f129b06820037c54ccd2bd2f218e1bbb7c67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csaba=20T=C3=B3th?= <csaba.toth@odootech.hu>
Date: Thu, 16 Nov 2023 07:02:41 +0000
Subject: [PATCH 14/19] Translated using Weblate (Hungarian)

Currently translated at 43.4% (475 of 1092 strings)

Translation: Mattermost/mattermost-mobile-v2
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile-v2/hu/
---
 assets/base/i18n/hu.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/base/i18n/hu.json b/assets/base/i18n/hu.json
index 560478b0b..28f24789b 100644
--- a/assets/base/i18n/hu.json
+++ b/assets/base/i18n/hu.json
@@ -110,7 +110,7 @@
   "channel_info.archive": "Csatorna archiválása",
   "channel_info.archive_description.can_view_archived": "Ez archiválja a csatornát a csapattól. A csatorna tartalma továbbra is elérhető marad a csatornatagok számára.\n\nBiztos, hogy archiválni szeretné a {term} {name} csatornát?",
   "channel_info.archive_description.cannot_view_archived": "",
-  "channel_info.archive_failed": "",
+  "channel_info.archive_failed": "Hiba történt a {displayName} csatorna archiválása közben",
   "channel_info.archive_title": "{term} archiválása",
   "channel_info.channel_auto_follow_threads": "Kövesse az összes üzenetszálat ezen a csatornán",
   "channel_info.channel_files": "Fájlok",

From 209363416c67e4aefad177afbea669c4bd61e19b Mon Sep 17 00:00:00 2001
From: master7 <marcin.karkosz@rajska.info>
Date: Thu, 16 Nov 2023 06:51:26 +0000
Subject: [PATCH 15/19] Translated using Weblate (Polish)

Currently translated at 100.0% (1092 of 1092 strings)

Translation: Mattermost/mattermost-mobile-v2
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile-v2/pl/
---
 assets/base/i18n/pl.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/base/i18n/pl.json b/assets/base/i18n/pl.json
index 5ac3eabc8..b90f29353 100644
--- a/assets/base/i18n/pl.json
+++ b/assets/base/i18n/pl.json
@@ -113,6 +113,7 @@
   "channel_info.archive_failed": "Wystąpił błąd podczas próby archiwizacji kanału {displayName}",
   "channel_info.archive_title": "Archiwizuj {term}",
   "channel_info.channel_auto_follow_threads": "Śledź wszystkie wątki w tym kanale",
+  "channel_info.channel_auto_follow_threads_failed": "Wystąpił błąd podczas próby automatycznego śledzenia wszystkich wątków na kanale {displayName}",
   "channel_info.channel_files": "Pliki",
   "channel_info.close": "Zamknij",
   "channel_info.close_dm": "Zamknij wiadomość bezpośrednią",

From 24ba082287b79c1cbcc76bb0929acee081052223 Mon Sep 17 00:00:00 2001
From: Tom De Moor <tom@controlaltdieliet.be>
Date: Fri, 17 Nov 2023 08:08:00 +0000
Subject: [PATCH 16/19] Translated using Weblate (Dutch)

Currently translated at 100.0% (1092 of 1092 strings)

Translation: Mattermost/mattermost-mobile-v2
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile-v2/nl/
---
 assets/base/i18n/nl.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/assets/base/i18n/nl.json b/assets/base/i18n/nl.json
index 9679212ad..f80da9273 100644
--- a/assets/base/i18n/nl.json
+++ b/assets/base/i18n/nl.json
@@ -112,6 +112,8 @@
   "channel_info.archive_description.cannot_view_archived": "Dit archiveert het kanaal van het team en verwijdert het uit de gebruikersinterface. Gearchiveerde kanalen kunnen worden gearchiveerd als ze weer nodig zijn.\n\nWeet je zeker dat je de {term} {name} wil archiveren?",
   "channel_info.archive_failed": "Er is een fout opgetreden bij het archiveren van het kanaal {displayName}",
   "channel_info.archive_title": "Archiveer {term}",
+  "channel_info.channel_auto_follow_threads": "Volg alle draadjes in dit kanaal",
+  "channel_info.channel_auto_follow_threads_failed": "Er is een fout opgetreden bij het automatisch volgen van alle draadjes in kanaal {displayName}",
   "channel_info.channel_files": "Bestanden",
   "channel_info.close": "Sluiten",
   "channel_info.close_dm": "Direct bericht sluiten",

From c3e831b361116141fb302ac71de0481c1a4e9631 Mon Sep 17 00:00:00 2001
From: Konstantin <eleferen@gmail.com>
Date: Mon, 20 Nov 2023 07:10:13 +0000
Subject: [PATCH 17/19] Translated using Weblate (Russian)

Currently translated at 100.0% (1092 of 1092 strings)

Translation: Mattermost/mattermost-mobile-v2
Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-mobile-v2/ru/
---
 assets/base/i18n/ru.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/assets/base/i18n/ru.json b/assets/base/i18n/ru.json
index 872283598..6336e4e84 100644
--- a/assets/base/i18n/ru.json
+++ b/assets/base/i18n/ru.json
@@ -112,6 +112,8 @@
   "channel_info.archive_description.cannot_view_archived": "Это архивирует канал из команды и удаляет его из пользовательского интерфейса. Заархивированные каналы могут быть разархивированы при необходимости.\n\nВы уверены, что хотите архивировать {term} {name}?",
   "channel_info.archive_failed": "Произошла ошибка при попытке архивирования канала {displayName}",
   "channel_info.archive_title": "Архивировать {term}",
+  "channel_info.channel_auto_follow_threads": "Следить за всеми обсуждениями в этом канале",
+  "channel_info.channel_auto_follow_threads_failed": "Произошла ошибка при попытке автоматического отслеживания всех обсуждений в канале {displayName}",
   "channel_info.channel_files": "Файлы",
   "channel_info.close": "Закрыть",
   "channel_info.close_dm": "Закрыть личную переписку",

From 093d3718332aedc3721f942f64393f8e56f6443b Mon Sep 17 00:00:00 2001
From: Tom De Moor <tom@controlaltdieliet.be>
Date: Wed, 22 Nov 2023 20:25:27 +0100
Subject: [PATCH 18/19] resolve weblate merge conflicts

---
 assets/base/i18n/de.json    |   2 +-
 assets/base/i18n/hu.json    | 131 ++++++++++++++++--------------------
 assets/base/i18n/ja.json    |  23 ++++++-
 assets/base/i18n/pl.json    |   6 +-
 assets/base/i18n/ru.json    |   2 -
 assets/base/i18n/sv.json    |   2 +
 assets/base/i18n/zh-CN.json |  10 +--
 7 files changed, 90 insertions(+), 86 deletions(-)

diff --git a/assets/base/i18n/de.json b/assets/base/i18n/de.json
index 403146cc7..d15786f12 100644
--- a/assets/base/i18n/de.json
+++ b/assets/base/i18n/de.json
@@ -113,7 +113,7 @@
   "channel_info.archive_failed": "Beim Versuch, den Kanal {displayName} zu archivieren, ist ein Fehler aufgetreten",
   "channel_info.archive_title": "{term} archivieren",
   "channel_info.channel_auto_follow_threads": "Allen Unterhaltungen in diesem Kanal folgen",
-  "channel_info.channel_auto_follow_threads_failed": "Beim Versuch, allen Unterhaltungen im Kanal automatisch zu verfolgen, ist ein Fehler aufgetreten {displayName}",
+  "channel_info.channel_auto_follow_threads_failed": "Beim Versuch, allen Unterhaltungen im Kanal {displayName} automatisch zu verfolgen, ist ein Fehler aufgetreten",
   "channel_info.channel_files": "Dateien",
   "channel_info.close": "Schliessen",
   "channel_info.close_dm": "Direktnachricht schließen",
diff --git a/assets/base/i18n/hu.json b/assets/base/i18n/hu.json
index 28f24789b..8a37a0a9e 100644
--- a/assets/base/i18n/hu.json
+++ b/assets/base/i18n/hu.json
@@ -69,10 +69,10 @@
   "apps.error.parser.unexpected_squared_bracket": "Nem várt lista nyitás.",
   "apps.error.parser.unexpected_state": "Nem elérhető: Váratlan állapot a matchBinding-ben: `{state}`.",
   "apps.error.parser.unexpected_whitespace": "Nem elérhető: Váratlan szóköz.",
-  "apps.error.responses.form.no_form": "A válasz típusa `űrlap`, de a válasz nem tartalmazott űrlapot.",
+  "apps.error.responses.form.no_form": "",
   "apps.error.responses.navigate.no_url": "Válasz típusa `navigate`, de nem volt url megadva a válaszban.",
   "apps.error.responses.unexpected_error": "Váratlan hiba érkezett.",
-  "apps.error.responses.unexpected_type": "Az alkalmazás válaszának típusa nem várt. Válasz típusa: {type}",
+  "apps.error.responses.unexpected_type": "",
   "apps.error.responses.unknown_field_error": "Hiba érkezett egy ismeretlen mezőhöz. Mező neve: `{field}`. Hiba: `{error}`.",
   "apps.error.responses.unknown_type": "Az alkalmazás válasz típusa nem támogatott. Válasz típusa: {type}.",
   "apps.error.unknown": "Ismeretlen hiba történt.",
@@ -104,89 +104,76 @@
   "channel_header.info": "Infó megtekintése",
   "channel_header.member_count": "{count, plural, one {# tag} other {# tag}}",
   "channel_info.add_members": "Tagok hozzáadása",
-  "channel_info.alertNo": "Nem",
-  "channel_info.alertYes": "Igen",
-  "channel_info.alert_retry": "Próbálja újra",
-  "channel_info.archive": "Csatorna archiválása",
-  "channel_info.archive_description.can_view_archived": "Ez archiválja a csatornát a csapattól. A csatorna tartalma továbbra is elérhető marad a csatornatagok számára.\n\nBiztos, hogy archiválni szeretné a {term} {name} csatornát?",
+  "channel_info.alertNo": "",
+  "channel_info.alertYes": "",
+  "channel_info.alert_retry": "",
+  "channel_info.archive": "",
+  "channel_info.archive_description.can_view_archived": "",
   "channel_info.archive_description.cannot_view_archived": "",
-  "channel_info.archive_failed": "Hiba történt a {displayName} csatorna archiválása közben",
-  "channel_info.archive_title": "{term} archiválása",
-  "channel_info.channel_auto_follow_threads": "Kövesse az összes üzenetszálat ezen a csatornán",
-  "channel_info.channel_files": "Fájlok",
-  "channel_info.close": "Bezárás",
-  "channel_info.close_dm": "Közvetlen üzenet bezárása",
-  "channel_info.close_dm_channel": "Biztos, hogy be kívánja zárni ezt a közvetlen üzenetet? Ezzel eltávolítja a kezdőképernyőről, de bármikor újra megnyithatja.",
-  "channel_info.close_gm": "Csoport üzenetet bezárása",
-  "channel_info.close_gm_channel": "Biztos, hogy be kívánja zárni ezt a csoport üzenetet? Ezzel eltávolítja a kezdőképernyőről, de bármikor újra megnyithatja.",
+  "channel_info.archive_failed": "",
+  "channel_info.archive_title": "",
+  "channel_info.close": "",
+  "channel_info.close_dm": "",
+  "channel_info.close_dm_channel": "",
+  "channel_info.close_gm": "",
+  "channel_info.close_gm_channel": "",
   "channel_info.convert_failed": "",
-  "channel_info.convert_private": "Átalakítás privát csatornává",
+  "channel_info.convert_private": "",
   "channel_info.convert_private_description": "",
-  "channel_info.convert_private_success": "{displayName} mostantól privát csatorna.",
-  "channel_info.convert_private_title": "Átalakítja a {displayName} csatornát privát csatornává?",
-  "channel_info.copied": "Másolt",
-  "channel_info.copy_link": "Link másolása",
-  "channel_info.custom_status": "Egyéni állapot:",
-  "channel_info.edit_header": "Fejléc szerkesztése",
-  "channel_info.error_close": "Bezárás",
-  "channel_info.favorite": "Kedvenc",
+  "channel_info.convert_private_success": "",
+  "channel_info.convert_private_title": "",
+  "channel_info.copied": "",
+  "channel_info.copy_link": "",
+  "channel_info.custom_status": "",
+  "channel_info.edit_header": "",
+  "channel_info.error_close": "",
+  "channel_info.favorite": "",
   "channel_info.favorited": "",
   "channel_info.header": "Fejléc:",
-  "channel_info.ignore_mentions": "@channel, @here, @all figyelmen kívül hagyása",
-  "channel_info.leave": "Kilépés",
-  "channel_info.leave_channel": "Kilépés a csatornából",
+  "channel_info.ignore_mentions": "",
+  "channel_info.leave": "",
+  "channel_info.leave_channel": "",
   "channel_info.leave_private_channel": "",
   "channel_info.leave_public_channel": "",
-  "channel_info.local_time": "Helyi idő",
-  "channel_info.members": "Tagok",
-  "channel_info.mention": "Említés",
-  "channel_info.mobile_notifications": "Mobil értesítések",
-  "channel_info.muted": "Némítás",
-  "channel_info.nickname": "Becenév",
-  "channel_info.notification.all": "Minden",
-  "channel_info.notification.default": "Alapértelmezett",
-  "channel_info.notification.mention": "Említések",
-  "channel_info.notification.none": "Soha",
-  "channel_info.pinned_messages": "Kitűzött üzenetek",
-  "channel_info.position": "Pozíció",
-  "channel_info.private_channel": "Privát csatorna",
-  "channel_info.public_channel": "Nyilvános csatorna",
-  "channel_info.send_a_mesasge": "Üzenet küldése",
-  "channel_info.send_mesasge": "Üzenet küldése",
-  "channel_info.set_header": "Fejléc beállítása",
-  "channel_info.unarchive": "Csatorna visszaaktiválása",
+  "channel_info.local_time": "",
+  "channel_info.members": "",
+  "channel_info.mention": "",
+  "channel_info.mobile_notifications": "",
+  "channel_info.muted": "",
+  "channel_info.nickname": "",
+  "channel_info.notification.all": "",
+  "channel_info.notification.default": "",
+  "channel_info.notification.mention": "",
+  "channel_info.notification.none": "",
+  "channel_info.pinned_messages": "",
+  "channel_info.position": "",
+  "channel_info.private_channel": "",
+  "channel_info.public_channel": "",
+  "channel_info.send_a_mesasge": "",
+  "channel_info.send_mesasge": "",
+  "channel_info.set_header": "",
+  "channel_info.unarchive": "",
   "channel_info.unarchive_description": "",
   "channel_info.unarchive_failed": "",
-  "channel_info.unarchive_title": "{term} visszaaktiválása",
-  "channel_intro.createdBy": "Létrehozta {user} {date} napon",
-  "channel_intro.createdOn": "Létrehozva {date} napon",
-  "channel_list.channels_category": "Csatornák",
-  "channel_list.dms_category": "Közvetlen üzenetek",
-  "channel_list.favorites_category": "Kedvencek",
-  "channel_list.find_channels": "Csatornák keresése...",
+  "channel_info.unarchive_title": "",
+  "channel_intro.createdBy": "",
+  "channel_intro.createdOn": "",
+  "channel_list.channels_category": "",
+  "channel_list.dms_category": "",
+  "channel_list.favorites_category": "",
+  "channel_list.find_channels": "",
   "channel_loader.someone": "Valaki",
   "channel_modal.descriptionHelp": "Írja le hogyan kell ezt a beszélgetést használni.",
   "channel_modal.header": "Fejléc",
-  "channel_modal.headerEx": "Használjon Markdown formázást a fejléc szövegében",
+  "channel_modal.headerEx": "",
   "channel_modal.headerHelp": "",
-  "channel_modal.makePrivate.description": "Ha egy csatorna privátra van állítva, csak a meghívott csapattagok férhetnek hozzá és vehetnek részt a csatornán",
-  "channel_modal.makePrivate.label": "Legyen privát",
+  "channel_modal.makePrivate.description": "",
+  "channel_modal.makePrivate.label": "",
   "channel_modal.name": "Név",
-  "channel_modal.nameEx": "Hibák, Marketing",
+  "channel_modal.nameEx": "",
   "channel_modal.optional": "(nem kötelező)",
   "channel_modal.purpose": "Cél",
   "channel_modal.purposeEx": "",
-  "channel_notification_preferences.default": "(alapértelmezett)",
-  "channel_notification_preferences.muted_content": "Megváltoztathatja az értesítési beállításokat, de addig nem kap értesítést, amíg a csatorna némítása fel nem oldódik.",
-  "channel_notification_preferences.muted_title": "Ez a csatorna némítva van",
-  "channel_notification_preferences.notification.all": "Minden új üzenet",
-  "channel_notification_preferences.notification.mention": "Csak említések",
-  "channel_notification_preferences.notification.none": "Semmi",
-  "channel_notification_preferences.notification.thread_replies": "Értesítsen az általam követett témákra adott válaszokról ebben a csatornában",
-  "channel_notification_preferences.notify_about": "Értesítést kérek...",
-  "channel_notification_preferences.reset_default": "Visszaállítás az alapértelmezettre",
-  "channel_notification_preferences.thread_replies": "Üzenetszál válaszok",
-  "channel_notification_preferences.unmute_content": "Csatorna némításának feloldása",
   "combined_system_message.added_to_channel.many_expanded": "{users} és {lastUser} **hozzá lett adva a beszélgetéshez** {actor} által.",
   "combined_system_message.added_to_channel.one": "{firstUser} **hozzá lett adva a beszélgetészhez** {actor} által.",
   "combined_system_message.added_to_channel.one_you": "Ön **hozzá lett adva a beszélgetéshez** {actor} által.",
@@ -220,10 +207,10 @@
   "combined_system_message.removed_from_team.one_you": "Önt **eltávolították a csapatból**.",
   "combined_system_message.removed_from_team.two": "{firstUser} és {secondUser} **el lett távolítva a csapatból**.",
   "combined_system_message.you": "Ön",
-  "connection_banner.connected": "Kapcsolat helyreállítva",
-  "connection_banner.connecting": "Kapcsolódás...",
-  "connection_banner.not_connected": "Nincs internet kapcsolat",
-  "connection_banner.not_reachable": "A kiszolgáló nem érhető el",
+  "connection_banner.connected": "",
+  "connection_banner.connecting": "",
+  "connection_banner.not_connected": "",
+  "connection_banner.not_reachable": "",
   "create_direct_message.title": "",
   "create_post.deactivated": "Letiltott felhasználóval archivált beszélgetést néz.",
   "create_post.thread_reply": "",
diff --git a/assets/base/i18n/ja.json b/assets/base/i18n/ja.json
index 786754194..8d463d9fd 100644
--- a/assets/base/i18n/ja.json
+++ b/assets/base/i18n/ja.json
@@ -112,6 +112,8 @@
   "channel_info.archive_description.cannot_view_archived": "これによりチームからチャンネルがアーカイブされ、ユーザーインターフェースから削除されます。アーカイブされたチャンネルは、復元することもできます。\n \n{term} {name} を本当にアーカイブしますか？",
   "channel_info.archive_failed": "チャンネル {displayName} をアーカイブする際にエラーが発生しました",
   "channel_info.archive_title": "{term} をアーカイブする",
+  "channel_info.channel_auto_follow_threads": "このチャンネルのすべてのスレッドをフォローする",
+  "channel_info.channel_auto_follow_threads_failed": "このチャンネル {displayName} のすべてのスレッドを自動フォローする際にエラーが発生しました",
   "channel_info.channel_files": "ファイル",
   "channel_info.close": "閉じる",
   "channel_info.close_dm": "ダイレクトメッセージを閉じる",
@@ -119,6 +121,18 @@
   "channel_info.close_gm": "グループメッセージを閉じる",
   "channel_info.close_gm_channel": "本当にこのグループメッセージを閉じますか? ホーム画面から削除されますが、いつでも再び開くことができます。",
   "channel_info.convert_failed": "{displayName} を非公開チャンネルに変更できませんでした。",
+  "channel_info.convert_gm_to_channel": "非公開チャンネルに変換する",
+  "channel_info.convert_gm_to_channel.button_text": "非公開チャンネルに変換する",
+  "channel_info.convert_gm_to_channel.button_text_converting": "変換中...",
+  "channel_info.convert_gm_to_channel.conversion_error": "問題が発生しました。グループメッセージを非公開チャンネルへ変換できませんでした。",
+  "channel_info.convert_gm_to_channel.loading.footer": "詳細を取得中...",
+  "channel_info.convert_gm_to_channel.screen_title": "非公開チャンネルに変換する",
+  "channel_info.convert_gm_to_channel.team_selector_list.title": "チームを選択する",
+  "channel_info.convert_gm_to_channel.warning.body.yourself": "あなた自身",
+  "channel_info.convert_gm_to_channel.warning.bodyXXXX": "{memberNames} とのグループメッセージをチャンネルに変換しようとしています。この操作は元に戻すことはできません。",
+  "channel_info.convert_gm_to_channel.warning.header": "チャンネルメンバー全員が会話の履歴を見れるようになります",
+  "channel_info.convert_gm_to_channel.warning.no_teams.body": "メンバーが同じチームに所属していないため、グループメッセージをチャンネルに変換できません。このグループメッセージをチャンネルに変換するには、すべてのメンバーを1つのチームに追加してください。",
+  "channel_info.convert_gm_to_channel.warning.no_teams.header": "グループメンバーが異なるチームに所属しているため、チャンネルに変換できませんでした",
   "channel_info.convert_private": "非公開チャンネルに変更する",
   "channel_info.convert_private_description": "{displayName} を非公開チャンネルに変更すると、履歴やメンバーシップは保持されます。共有されたファイルはリンクを持つ全員がアクセス可能なままになります。非公開チャンネルのメンバーシップは招待によってのみ追加されます。\n\nこの変更は永続的なものであり、元に戻すことはできません。\n\n本当に {displayName} を非公開チャンネルに変更しますか?",
   "channel_info.convert_private_success": "{displayName} は非公開チャンネルになりました。",
@@ -158,6 +172,8 @@
   "channel_info.unarchive_description": "{term} {name} を本当にアーカイブから復元しますか?",
   "channel_info.unarchive_failed": "チャンネル {displayName} のアーカイブから復元する際にエラーが発生しました",
   "channel_info.unarchive_title": "{term} をアーカイブから復元",
+  "channel_into.convert_gm_to_channel.team_selector.label": "チーム",
+  "channel_into.convert_gm_to_channel.team_selector.placeholder": "チームを選択",
   "channel_intro.createdBy": "{user} によって {date} に作成されました",
   "channel_intro.createdOn": "{date} に作成されました",
   "channel_list.channels_category": "チャンネル",
@@ -320,6 +336,7 @@
   "general_settings.help": "ヘルプ",
   "general_settings.notifications": "通知",
   "general_settings.report_problem": "問題を報告する",
+  "generic.back": "戻る",
   "get_post_link_modal.title": "リンクをコピーする",
   "global_threads.allThreads": "全スレッド",
   "global_threads.emptyThreads.message": "あなたがメンションされた、または参加したことのあるスレッドが、フォローしたスレッドとともにここに表示されます。",
@@ -710,9 +727,9 @@
   "mobile.server_url.empty": "有効なサーバーURLを入力してください",
   "mobile.server_url.invalid_format": "URLはhttp://またはhttps://から始まらなくてはいけません",
   "mobile.session_expired.title": "セッション有効期限切れ",
-  "mobile.session_expired_days": "引き続き通知を受け取るにはログインしてください。{siteName} へのセッションは {daysCount, number} {daysCount, plural, one {日} other {日}} 毎に期限切れになるよう設定されています。",
-  "mobile.session_expired_days_hrs": "引き続き通知を受け取るにはログインしてください。{siteName} へのセッションは {daysCount, number} {daysCount, plural, one {日} other {日}} {hoursCount, number} {hoursCount, plural, one {時間} other {時間}} 毎に期限切れになるよう設定されています。",
-  "mobile.session_expired_hrs": "引き続き通知を受け取るにはログインしてください。{siteName} へのセッションは {hoursCount, number} {hoursCount, plural, one {時間} other {時間}} 毎に期限切れになるよう設定されています。",
+  "mobile.session_expired_days": "引き続き通知を受け取るにはログインしてください。{siteName} のセッションは {daysCount, number} {daysCount, plural, one {日} other {日}} 毎に期限切れになるよう設定されています。",
+  "mobile.session_expired_days_hrs": "引き続き通知を受け取るにはログインしてください。{siteName} のセッションは {daysCount, number} {daysCount, plural, one {日} other {日}} {hoursCount, number} {hoursCount, plural, one {時間} other {時間}} 毎に期限切れになるよう設定されています。",
+  "mobile.session_expired_hrs": "引き続き通知を受け取るにはログインしてください。{siteName} のセッションは {hoursCount, number} {hoursCount, plural, one {時間} other {時間}} 毎に期限切れになるよう設定されています。",
   "mobile.set_status.dnd": "取り込み中",
   "mobile.storage_permission_denied_description": "サーバーにファイルをアップロードします。設定を開き、{applicationName} にこのデバイスのファイルへの読み取りと書き込みのアクセス権を付与してください。",
   "mobile.storage_permission_denied_title": "{applicationName} があなたのファイルへアクセスしようとしています",
diff --git a/assets/base/i18n/pl.json b/assets/base/i18n/pl.json
index b90f29353..c6b993474 100644
--- a/assets/base/i18n/pl.json
+++ b/assets/base/i18n/pl.json
@@ -112,7 +112,7 @@
   "channel_info.archive_description.cannot_view_archived": "Spowoduje to zarchiwizowanie kanału z zespołu i usunięcie go z interfejsu użytkownika. Zarchiwizowane kanały mogą zostać odarchiwizowane, jeśli będą ponownie potrzebne.\n\nCzy na pewno chcesz zarchiwizować kanał {term} {name}?",
   "channel_info.archive_failed": "Wystąpił błąd podczas próby archiwizacji kanału {displayName}",
   "channel_info.archive_title": "Archiwizuj {term}",
-  "channel_info.channel_auto_follow_threads": "Śledź wszystkie wątki w tym kanale",
+  "channel_info.channel_auto_follow_threads": "Śledź wszystkie wątki na tym kanale",
   "channel_info.channel_auto_follow_threads_failed": "Wystąpił błąd podczas próby automatycznego śledzenia wszystkich wątków na kanale {displayName}",
   "channel_info.channel_files": "Pliki",
   "channel_info.close": "Zamknij",
@@ -713,8 +713,8 @@
   "mobile.server_url.invalid_format": "Adres musi zaczynać się od http:// lub https://",
   "mobile.session_expired.title": "Sesja Wygasła",
   "mobile.session_expired_days": "Zaloguj się, aby nadal otrzymywać powiadomienia. Sesje dla {siteName} są skonfigurowane tak, aby wygasały co {daysCount, number} {daysCount, plural, one {dzień} other {dni}}.",
-  "mobile.session_expired_days_hrs": "Zaloguj się, aby nadal otrzymywać powiadomienia. Sesje dla {siteName} są skonfigurowane tak, aby wygasały co {daysCount, number} {daysCount, plural, one {dzień} other {dni}} i {hoursCount, number} {hoursCount, plural, one {godzinę} other {godziny}}.",
-  "mobile.session_expired_hrs": "Zaloguj się, aby nadal otrzymywać powiadomienia. Sesje dla {siteName} są skonfigurowane tak, aby wygasały co {hoursCount, number} {hoursCount, plural, one {godzinę} other {godziny}}.",
+  "mobile.session_expired_days_hrs": "Zaloguj się, aby nadal otrzymywać powiadomienia. Sesje dla {siteName} są skonfigurowane tak, aby wygasały co {daysCount, number} {daysCount, plural, one {dzień} other {dni}} i {hoursCount, number} {hoursCount, plural, one {godzinę} other {godzin}}.",
+  "mobile.session_expired_hrs": "Zaloguj się, aby nadal otrzymywać powiadomienia. Sesje dla {siteName} są skonfigurowane tak, aby wygasały co {hoursCount, number} {hoursCount, plural, one {godzinę} other {godziny/godzin}}.",
   "mobile.set_status.dnd": "Nie przeszkadzać",
   "mobile.storage_permission_denied_description": "Prześlij pliki na swój serwer. Otwórz Ustawienia, aby przyznać {applicationName} dostęp do odczytu i zapisu plików na tym urządzeniu.",
   "mobile.storage_permission_denied_title": "{applicationName} chce otrzymać dostęp do twoich plików",
diff --git a/assets/base/i18n/ru.json b/assets/base/i18n/ru.json
index 6336e4e84..872283598 100644
--- a/assets/base/i18n/ru.json
+++ b/assets/base/i18n/ru.json
@@ -112,8 +112,6 @@
   "channel_info.archive_description.cannot_view_archived": "Это архивирует канал из команды и удаляет его из пользовательского интерфейса. Заархивированные каналы могут быть разархивированы при необходимости.\n\nВы уверены, что хотите архивировать {term} {name}?",
   "channel_info.archive_failed": "Произошла ошибка при попытке архивирования канала {displayName}",
   "channel_info.archive_title": "Архивировать {term}",
-  "channel_info.channel_auto_follow_threads": "Следить за всеми обсуждениями в этом канале",
-  "channel_info.channel_auto_follow_threads_failed": "Произошла ошибка при попытке автоматического отслеживания всех обсуждений в канале {displayName}",
   "channel_info.channel_files": "Файлы",
   "channel_info.close": "Закрыть",
   "channel_info.close_dm": "Закрыть личную переписку",
diff --git a/assets/base/i18n/sv.json b/assets/base/i18n/sv.json
index 8c132c7c1..442c942c2 100644
--- a/assets/base/i18n/sv.json
+++ b/assets/base/i18n/sv.json
@@ -112,6 +112,8 @@
   "channel_info.archive_description.cannot_view_archived": "Detta kommer att arkivera kanalen från teamet och ta bort den från användargränssnittet. Arkiverade kanaler kan hämtas från arkivet om de behövs igen.\n\nÄr du säker på att du vill arkivera {term} {name}?",
   "channel_info.archive_failed": "Ett fel inträffade när kanalen {displayName} skulle arkiveras",
   "channel_info.archive_title": "Arkivera {term}",
+  "channel_info.channel_auto_follow_threads": "Följ alla trådar i den här kanalen",
+  "channel_info.channel_auto_follow_threads_failed": "Ett fel uppstod när alla trådar i kanalen {displayName} skulle följas",
   "channel_info.channel_files": "Filer",
   "channel_info.close": "Stäng",
   "channel_info.close_dm": "Stäng direktmeddelande",
diff --git a/assets/base/i18n/zh-CN.json b/assets/base/i18n/zh-CN.json
index 771bf8a10..c815978d3 100644
--- a/assets/base/i18n/zh-CN.json
+++ b/assets/base/i18n/zh-CN.json
@@ -725,11 +725,11 @@
   "mobile.tos_link": "服务条款",
   "mobile.user_list.deactivated": "已停用",
   "mobile.write_storage_permission_denied_description": "保存文件到你的设备。打开设定并允许 {applicationName} 读写此设备上的文件。",
-  "modal.manual_status.auto_responder.message_": "您想切换您的状态到“{status}”并停用自动回复吗？",
-  "modal.manual_status.auto_responder.message_away": "您想切换您的状态到“离开”并停用自动回复吗？",
-  "modal.manual_status.auto_responder.message_dnd": "您想切换您的状态到“请勿打扰”并停用自动回复吗？",
-  "modal.manual_status.auto_responder.message_offline": "您想切换您的状态到“离线”并停用自动回复吗？",
-  "modal.manual_status.auto_responder.message_online": "您想切换您的状态到“在线”并停用自动回复吗？",
+  "modal.manual_status.auto_responder.message_": "您想切换您的状态到 \"{status}\" 并停用自动回复吗？",
+  "modal.manual_status.auto_responder.message_away": "您想切换您的状态到 \"离开\" 并停用自动回复吗？",
+  "modal.manual_status.auto_responder.message_dnd": "您想切换您的状态到 \"请勿打扰\" 并停用自动回复吗？",
+  "modal.manual_status.auto_responder.message_offline": "您想切换您的状态到 \"离线\" 并停用自动回复吗？",
+  "modal.manual_status.auto_responder.message_online": "您想切换您的状态到 \"在线\" 并停用自动回复吗？",
   "more_messages.text": "{count} new {count, plural, one {消息} other {消息}}",
   "msg_typing.areTyping": "{users}和{last}正在输入…",
   "msg_typing.isTyping": "{user}正在输入…",

From 6baa850d363846d8f3e71c7d48fa5482c5d9f6a1 Mon Sep 17 00:00:00 2001
From: Christopher Poile <cpoile@gmail.com>
Date: Wed, 22 Nov 2023 16:56:27 -0500
Subject: [PATCH 19/19]  MM-54277 - Calls: Add incoming banners to channel_list
 screen (#7673)

---
 .../components/floating_call_container.tsx    | 25 +++++++---
 .../components/incoming_calls_container.tsx   |  2 +-
 app/products/calls/observers/index.ts         | 46 ++++++++++++++++++-
 app/screens/channel/index.tsx                 | 45 ++----------------
 .../home/channel_list/channel_list.tsx        |  8 ++++
 app/screens/home/channel_list/index.ts        |  7 +++
 app/screens/thread/index.tsx                  | 37 ++-------------
 7 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/app/products/calls/components/floating_call_container.tsx b/app/products/calls/components/floating_call_container.tsx
index 0a88911f8..d5c264efa 100644
--- a/app/products/calls/components/floating_call_container.tsx
+++ b/app/products/calls/components/floating_call_container.tsx
@@ -22,14 +22,22 @@ const style = StyleSheet.create({
 });
 
 type Props = {
-    channelId: string;
-    showJoinCallBanner: boolean;
-    showIncomingCalls: boolean;
-    isInACall: boolean;
+    channelId?: string;
+    showJoinCallBanner?: boolean;
+    showIncomingCalls?: boolean;
+    isInACall?: boolean;
     threadScreen?: boolean;
+    channelsScreen?: boolean;
 }
 
-const FloatingCallContainer = ({channelId, showJoinCallBanner, showIncomingCalls, isInACall, threadScreen}: Props) => {
+const FloatingCallContainer = ({
+    channelId,
+    showJoinCallBanner,
+    showIncomingCalls,
+    isInACall,
+    threadScreen,
+    channelsScreen,
+}: Props) => {
     const serverUrl = useServerUrl();
     const insets = useSafeAreaInsets();
     const isTablet = useIsTablet();
@@ -39,10 +47,13 @@ const FloatingCallContainer = ({channelId, showJoinCallBanner, showIncomingCalls
     const wrapperTop = {
         top: insets.top + topBarForTablet + topBarChannel,
     };
+    const wrapperBottom = {
+        bottom: 8,
+    };
 
     return (
-        <View style={[style.wrapper, wrapperTop]}>
-            {showJoinCallBanner &&
+        <View style={[style.wrapper, channelsScreen ? wrapperBottom : wrapperTop]}>
+            {showJoinCallBanner && channelId &&
                 <JoinCallBanner
                     serverUrl={serverUrl}
                     channelId={channelId}
diff --git a/app/products/calls/components/incoming_calls_container.tsx b/app/products/calls/components/incoming_calls_container.tsx
index 8ca052423..2e51fd00a 100644
--- a/app/products/calls/components/incoming_calls_container.tsx
+++ b/app/products/calls/components/incoming_calls_container.tsx
@@ -15,7 +15,7 @@ const style = StyleSheet.create({
 });
 
 type Props = {
-    channelId: string;
+    channelId?: string;
 }
 
 export const IncomingCallsContainer = ({
diff --git a/app/products/calls/observers/index.ts b/app/products/calls/observers/index.ts
index a54bada61..a4a1a616a 100644
--- a/app/products/calls/observers/index.ts
+++ b/app/products/calls/observers/index.ts
@@ -3,7 +3,13 @@
 
 import {distinctUntilChanged, switchMap, combineLatest, Observable, of as of$} from 'rxjs';
 
-import {observeCallsConfig, observeCallsState, observeCurrentCall} from '@calls/state';
+import {
+    observeCallsConfig,
+    observeCallsState,
+    observeChannelsWithCalls,
+    observeCurrentCall,
+    observeIncomingCalls,
+} from '@calls/state';
 import {fillUserModels, userIds} from '@calls/utils';
 import {License} from '@constants';
 import DatabaseManager from '@database/manager';
@@ -88,3 +94,41 @@ export const observeCurrentSessionsDict = () => {
         )),
     ) as Observable<Dictionary<CallSession>>;
 };
+
+export const observeCallStateInChannel = (serverUrl: string, database: Database, channelId: Observable<string>) => {
+    const isCallInCurrentChannel = combineLatest([channelId, observeChannelsWithCalls(serverUrl)]).pipe(
+        switchMap(([id, calls]) => of$(Boolean(calls[id]))),
+        distinctUntilChanged(),
+    );
+    const currentCall = observeCurrentCall();
+    const ccChannelId = currentCall.pipe(
+        switchMap((call) => of$(call?.channelId)),
+        distinctUntilChanged(),
+    );
+    const isInACall = currentCall.pipe(
+        switchMap((call) => of$(Boolean(call?.connected))),
+        distinctUntilChanged(),
+    );
+    const dismissed = combineLatest([channelId, observeCallsState(serverUrl)]).pipe(
+        switchMap(([id, state]) => of$(Boolean(state.calls[id]?.dismissed[state.myUserId]))),
+        distinctUntilChanged(),
+    );
+    const isInCurrentChannelCall = combineLatest([channelId, ccChannelId]).pipe(
+        switchMap(([id, ccId]) => of$(id === ccId)),
+        distinctUntilChanged(),
+    );
+    const showJoinCallBanner = combineLatest([isCallInCurrentChannel, dismissed, isInCurrentChannelCall]).pipe(
+        switchMap(([isCall, dism, inCurrCall]) => of$(Boolean(isCall && !dism && !inCurrCall))),
+        distinctUntilChanged(),
+    );
+    const showIncomingCalls = observeIncomingCalls().pipe(
+        switchMap((ics) => of$(ics.incomingCalls.length > 0)),
+        distinctUntilChanged(),
+    );
+
+    return {
+        showJoinCallBanner,
+        isInACall,
+        showIncomingCalls,
+    };
+};
diff --git a/app/screens/channel/index.tsx b/app/screens/channel/index.tsx
index 8c7c20419..4974635e0 100644
--- a/app/screens/channel/index.tsx
+++ b/app/screens/channel/index.tsx
@@ -3,15 +3,9 @@
 
 import {withDatabase} from '@nozbe/watermelondb/DatabaseProvider';
 import withObservables from '@nozbe/with-observables';
-import {combineLatest, distinctUntilChanged, of as of$, switchMap} from 'rxjs';
+import {of as of$, switchMap} from 'rxjs';
 
-import {observeIsCallsEnabledInChannel} from '@calls/observers';
-import {
-    observeCallsState,
-    observeChannelsWithCalls,
-    observeCurrentCall,
-    observeIncomingCalls,
-} from '@calls/state';
+import {observeCallStateInChannel, observeIsCallsEnabledInChannel} from '@calls/observers';
 import {Preferences} from '@constants';
 import {withServerUrl} from '@context/server';
 import {observeCurrentChannel} from '@queries/servers/channel';
@@ -29,37 +23,6 @@ type EnhanceProps = WithDatabaseArgs & {
 
 const enhanced = withObservables([], ({database, serverUrl}: EnhanceProps) => {
     const channelId = observeCurrentChannelId(database);
-
-    const isCallInCurrentChannel = combineLatest([channelId, observeChannelsWithCalls(serverUrl)]).pipe(
-        switchMap(([id, calls]) => of$(Boolean(calls[id]))),
-        distinctUntilChanged(),
-    );
-    const currentCall = observeCurrentCall();
-    const ccChannelId = currentCall.pipe(
-        switchMap((call) => of$(call?.channelId)),
-        distinctUntilChanged(),
-    );
-    const isInACall = currentCall.pipe(
-        switchMap((call) => of$(Boolean(call?.connected))),
-        distinctUntilChanged(),
-    );
-    const dismissed = combineLatest([channelId, observeCallsState(serverUrl)]).pipe(
-        switchMap(([id, state]) => of$(Boolean(state.calls[id]?.dismissed[state.myUserId]))),
-        distinctUntilChanged(),
-    );
-    const isInCurrentChannelCall = combineLatest([channelId, ccChannelId]).pipe(
-        switchMap(([id, ccId]) => of$(id === ccId)),
-        distinctUntilChanged(),
-    );
-    const showJoinCallBanner = combineLatest([isCallInCurrentChannel, dismissed, isInCurrentChannelCall]).pipe(
-        switchMap(([isCall, dism, inCurrCall]) => of$(Boolean(isCall && !dism && !inCurrCall))),
-        distinctUntilChanged(),
-    );
-    const showIncomingCalls = observeIncomingCalls().pipe(
-        switchMap((ics) => of$(ics.incomingCalls.length > 0)),
-        distinctUntilChanged(),
-    );
-
     const dismissedGMasDMNotice = queryPreferencesByCategoryAndName(database, Preferences.CATEGORIES.SYSTEM_NOTICE, Preferences.NOTICES.GM_AS_DM).observe();
     const channelType = observeCurrentChannel(database).pipe(switchMap((c) => of$(c?.type)));
     const currentUserId = observeCurrentUserId(database);
@@ -67,9 +30,7 @@ const enhanced = withObservables([], ({database, serverUrl}: EnhanceProps) => {
 
     return {
         channelId,
-        showJoinCallBanner,
-        isInACall,
-        showIncomingCalls,
+        ...observeCallStateInChannel(serverUrl, database, channelId),
         isCallsEnabledInChannel: observeIsCallsEnabledInChannel(database, serverUrl, channelId),
         dismissedGMasDMNotice,
         channelType,
diff --git a/app/screens/home/channel_list/channel_list.tsx b/app/screens/home/channel_list/channel_list.tsx
index 6a6248d4f..9baec4ae1 100644
--- a/app/screens/home/channel_list/channel_list.tsx
+++ b/app/screens/home/channel_list/channel_list.tsx
@@ -10,6 +10,7 @@ import Animated, {useAnimatedStyle, withTiming} from 'react-native-reanimated';
 import {type Edge, SafeAreaView, useSafeAreaInsets} from 'react-native-safe-area-context';
 
 import {refetchCurrentUser} from '@actions/remote/user';
+import FloatingCallContainer from '@calls/components/floating_call_container';
 import AnnouncementBanner from '@components/announcement_banner';
 import ConnectionBanner from '@components/connection_banner';
 import TeamSidebar from '@components/team_sidebar';
@@ -40,6 +41,7 @@ type ChannelProps = {
     coldStart?: boolean;
     currentUserId?: string;
     hasCurrentUser: boolean;
+    showIncomingCalls: boolean;
 };
 
 const edges: Edge[] = ['bottom', 'left', 'right'];
@@ -197,6 +199,12 @@ const ChannelListScreen = (props: ChannelProps) => {
                         {isTablet &&
                             <AdditionalTabletView/>
                         }
+                        {props.showIncomingCalls && !isTablet &&
+                            <FloatingCallContainer
+                                showIncomingCalls={props.showIncomingCalls}
+                                channelsScreen={true}
+                            />
+                        }
                     </Animated.View>
                 </View>
             </SafeAreaView>
diff --git a/app/screens/home/channel_list/index.ts b/app/screens/home/channel_list/index.ts
index d8cfa54e3..9fd0bb259 100644
--- a/app/screens/home/channel_list/index.ts
+++ b/app/screens/home/channel_list/index.ts
@@ -6,6 +6,7 @@ import withObservables from '@nozbe/with-observables';
 import {of as of$} from 'rxjs';
 import {distinctUntilChanged, switchMap} from 'rxjs/operators';
 
+import {observeIncomingCalls} from '@calls/state';
 import {queryAllMyChannelsForTeam} from '@queries/servers/channel';
 import {observeCurrentTeamId, observeCurrentUserId, observeLicense} from '@queries/servers/system';
 import {queryMyTeams} from '@queries/servers/team';
@@ -24,6 +25,11 @@ const enhanced = withObservables([], ({database}: WithDatabaseArgs) => {
 
     const teamsCount = queryMyTeams(database).observeCount(false);
 
+    const showIncomingCalls = observeIncomingCalls().pipe(
+        switchMap((ics) => of$(ics.incomingCalls.length > 0)),
+        distinctUntilChanged(),
+    );
+
     return {
         isCRTEnabled: observeIsCRTEnabled(database),
         hasTeams: teamsCount.pipe(
@@ -46,6 +52,7 @@ const enhanced = withObservables([], ({database}: WithDatabaseArgs) => {
             switchMap((u) => of$(Boolean(u))),
             distinctUntilChanged(),
         ),
+        showIncomingCalls,
     };
 });
 
diff --git a/app/screens/thread/index.tsx b/app/screens/thread/index.tsx
index f2c6a4231..1c22a9cb0 100644
--- a/app/screens/thread/index.tsx
+++ b/app/screens/thread/index.tsx
@@ -3,9 +3,9 @@
 
 import {withDatabase} from '@nozbe/watermelondb/DatabaseProvider';
 import withObservables from '@nozbe/with-observables';
-import {distinctUntilChanged, switchMap, combineLatest, of as of$} from 'rxjs';
+import {distinctUntilChanged, switchMap, of as of$} from 'rxjs';
 
-import {observeCallsState, observeChannelsWithCalls, observeCurrentCall, observeIncomingCalls} from '@calls/state';
+import {observeCallStateInChannel} from '@calls/observers';
 import {withServerUrl} from '@context/server';
 import {observePost} from '@queries/servers/post';
 import {observeIsCRTEnabled} from '@queries/servers/thread';
@@ -28,41 +28,10 @@ const enhanced = withObservables(['rootId'], ({database, serverUrl, rootId}: Enh
         switchMap((r) => of$(r?.channelId || '')),
         distinctUntilChanged(),
     );
-    const isCallInCurrentChannel = combineLatest([channelId, observeChannelsWithCalls(serverUrl)]).pipe(
-        switchMap(([id, calls]) => of$(Boolean(calls[id]))),
-        distinctUntilChanged(),
-    );
-    const currentCall = observeCurrentCall();
-    const ccChannelId = currentCall.pipe(
-        switchMap((call) => of$(call?.channelId)),
-        distinctUntilChanged(),
-    );
-    const isInACall = currentCall.pipe(
-        switchMap((call) => of$(Boolean(call?.connected))),
-        distinctUntilChanged(),
-    );
-    const dismissed = combineLatest([channelId, observeCallsState(serverUrl)]).pipe(
-        switchMap(([id, state]) => of$(Boolean(state.calls[id]?.dismissed[state.myUserId]))),
-        distinctUntilChanged(),
-    );
-    const isInCurrentChannelCall = combineLatest([channelId, ccChannelId]).pipe(
-        switchMap(([id, ccId]) => of$(id === ccId)),
-        distinctUntilChanged(),
-    );
-    const showJoinCallBanner = combineLatest([isCallInCurrentChannel, dismissed, isInCurrentChannelCall]).pipe(
-        switchMap(([isCall, dism, inCurrCall]) => of$(Boolean(isCall && !dism && !inCurrCall))),
-        distinctUntilChanged(),
-    );
-    const showIncomingCalls = observeIncomingCalls().pipe(
-        switchMap((ics) => of$(ics.incomingCalls.length > 0)),
-        distinctUntilChanged(),
-    );
 
     return {
         isCRTEnabled: observeIsCRTEnabled(database),
-        showJoinCallBanner,
-        isInACall,
-        showIncomingCalls,
+        ...observeCallStateInChannel(serverUrl, database, channelId),
         rootId: of$(rId),
         rootPost,
     };