[IMPROVE] System messages consistency (#4461)

* fix sys messages

* update snapshot

* update snapshot

* add username

* wip

* wip

* change to switch and fix types

* wip

* new translations

* update snapshot

* Update app/containers/message/utils.ts

Co-authored-by: Reinaldo Neto <47038980+reinaldonetof@users.noreply.github.com>

* fix types and return

* remove unused translation

* fix types

* remove unused params

* minor tweak

* update story

Co-authored-by: Reinaldo Neto <47038980+reinaldonetof@users.noreply.github.com>
Co-authored-by: Reinaldo Neto <reinaldonetof@hotmail.com>

app/containers/message/Content.tsx

@@ -6,11 +6,12 @@ import I18n from '../../i18n';
 import styles from './styles';
 import Markdown, { MarkdownPreview } from '../markdown';
 import User from './User';
-import { SYSTEM_MESSAGE_TYPES_WITH_AUTHOR_NAME, getInfoMessage } from './utils';
+import { messageHaveAuthorName, getInfoMessage } from './utils';
 import MessageContext from './Context';
 import { IMessageContent } from './interfaces';
 import { useTheme } from '../../theme';
 import { themes } from '../../lib/constants';
+import { MessageTypesValues } from '../../definitions';
 
 const Content = React.memo(
 	(props: IMessageContent) => {
@@ -26,8 +27,7 @@ const Content = React.memo(
 					{infoMessage}
 				</Text>
 			);
-
+			if (messageHaveAuthorName(props.type as MessageTypesValues)) {
-			if (SYSTEM_MESSAGE_TYPES_WITH_AUTHOR_NAME.includes(props.type)) {
 				return (
 					<Text>
 						<User {...props} /> {renderMessageContent}

app/containers/message/User.tsx

@@ -7,8 +7,8 @@ import { useTheme } from '../../theme';
 import sharedStyles from '../../views/Styles';
 import messageStyles from './styles';
 import MessageContext from './Context';
-import { SYSTEM_MESSAGE_TYPES_WITH_AUTHOR_NAME } from './utils';
+import { messageHaveAuthorName } from './utils';
-import { MessageType, SubscriptionType } from '../../definitions';
+import { MessageType, MessageTypesValues, SubscriptionType } from '../../definitions';
 import { IRoomInfoParam } from '../../views/SearchMessagesView';
 import RightIcons from './Components/RightIcons';
 
@@ -88,8 +88,7 @@ const User = React.memo(
 					{aliasUsername}
 				</>
 			);
-
+			if (messageHaveAuthorName(type as MessageTypesValues)) {
-			if (SYSTEM_MESSAGE_TYPES_WITH_AUTHOR_NAME.includes(type)) {
 				return (
 					<Text
 						style={[styles.usernameInfoMessage, { color: themes[theme].titleText }]}

app/containers/message/utils.ts

@@ -1,5 +1,5 @@
 /* eslint-disable complexity */
-import { TMessageModel } from '../../definitions/IMessage';
+import { MessageTypesValues, TMessageModel } from '../../definitions/IMessage';
 import I18n from '../../i18n';
 import { DISCUSSION } from './constants';
 
@@ -26,30 +26,18 @@ export const BUTTON_HIT_SLOP = {
 	left: 4
 };
 
-export const SYSTEM_MESSAGES = [
+const messagesWithAuthorName: MessageTypesValues[] = [
 	'r',
-	'au',
 	'ru',
-	'ul',
+	'au',
-	'ult',
+	'rm',
 	'uj',
 	'ujt',
 	'ut',
-	'rm',
+	'ul',
-	'user-muted',
+	'ult',
-	'user-unmuted',
 	'message_pinned',
-	'subscription-role-added',
-	'subscription-role-removed',
-	'room_changed_description',
-	'room_changed_announcement',
-	'room_changed_topic',
-	'room_changed_privacy',
-	'room_changed_avatar',
 	'message_snippeted',
-	'thread-created',
-	'room_e2e_enabled',
-	'room_e2e_disabled',
 	'removed-user-from-team',
 	'added-user-to-team',
 	'user-added-room-to-team',
@@ -57,81 +45,39 @@ export const SYSTEM_MESSAGES = [
 	'user-converted-to-channel',
 	'user-deleted-room-from-team',
 	'user-removed-room-from-team',
-	'room-disallowed-reacting',
-	'room-allowed-reacting',
-	'room-set-read-only',
-	'room-removed-read-only',
 	'omnichannel_placed_chat_on_hold',
-	'omnichannel_on_hold_chat_resumed'
+	'omnichannel_on_hold_chat_resumed',
-];
-
-export const IGNORED_LIVECHAT_SYSTEM_MESSAGES = [
 	'livechat_navigation_history',
 	'livechat_transcript_history',
-	'livechat_transfer_history',
 	'command',
-	'livechat-close',
 	'livechat-started',
+	'livechat-close',
 	'livechat_video_call',
-	'livechat_webrtc_video_call'
+	'livechat_webrtc_video_call',
+	'livechat_transfer_history',
+	'room-archived',
+	'room-unarchived',
+	'user-muted',
+	'room_changed_description',
+	'room_changed_announcement',
+	'room_changed_topic',
+	'room_changed_privacy',
+	'room_changed_avatar',
+	'room_e2e_disabled',
+	'room_e2e_enabled',
+	'room-disallowed-reacting',
+	'room-set-read-only',
+	'room-removed-read-only',
+	'user-unmuted',
+	'room-unarchived',
+	'subscription-role-added',
+	'subscription-role-removed'
 ];
 
-export const SYSTEM_MESSAGE_TYPES = {
+export const messageHaveAuthorName = (type: MessageTypesValues): boolean => messagesWithAuthorName.includes(type);
-	MESSAGE_REMOVED: 'rm',
-	MESSAGE_PINNED: 'message_pinned',
-	MESSAGE_SNIPPETED: 'message_snippeted',
-	USER_JOINED_CHANNEL: 'uj',
-	USER_JOINED_TEAM: 'ujt',
-	USER_JOINED_DISCUSSION: 'ut',
-	USER_LEFT_CHANNEL: 'ul',
-	USER_LEFT_TEAM: 'ult',
-	REMOVED_USER_FROM_TEAM: 'removed-user-from-team',
-	ADDED_USER_TO_TEAM: 'added-user-to-team',
-	ADDED_ROOM_TO_TEAM: 'user-added-room-to-team',
-	CONVERTED_TO_TEAM: 'user-converted-to-team',
-	CONVERTED_TO_CHANNEL: 'user-converted-to-channel',
-	DELETED_ROOM_FROM_TEAM: 'user-deleted-room-from-team',
-	REMOVED_ROOM_FROM_TEAM: 'user-removed-room-from-team',
-	OMNICHANNEL_PLACED_CHAT_ON_HOLD: 'omnichannel_placed_chat_on_hold',
-	OMNICHANNEL_ON_HOLD_CHAT_RESUMED: 'omnichannel_on_hold_chat_resumed',
-	LIVECHAT_NAVIGATION_HISTORY: 'livechat_navigation_history',
-	LIVECHAT_TRANSCRIPT_HISTORY: 'livechat_transcript_history',
-	COMMAND: 'command',
-	LIVECHAT_STARTED: 'livechat-started',
-	LIVECHAT_CLOSE: 'livechat-close',
-	LIVECHAT_VIDEO_CALL: 'livechat_video_call',
-	LIVECHAT_WEBRTC_VIDEO_CALL: 'livechat_webrtc_video_call',
-	LIVECHAT_TRANSFER_HISTORY: 'livechat_transfer_history'
-};
-
-export const SYSTEM_MESSAGE_TYPES_WITH_AUTHOR_NAME = [
-	SYSTEM_MESSAGE_TYPES.MESSAGE_REMOVED,
-	SYSTEM_MESSAGE_TYPES.MESSAGE_PINNED,
-	SYSTEM_MESSAGE_TYPES.MESSAGE_SNIPPETED,
-	SYSTEM_MESSAGE_TYPES.USER_JOINED_CHANNEL,
-	SYSTEM_MESSAGE_TYPES.USER_JOINED_TEAM,
-	SYSTEM_MESSAGE_TYPES.USER_JOINED_DISCUSSION,
-	SYSTEM_MESSAGE_TYPES.USER_LEFT_CHANNEL,
-	SYSTEM_MESSAGE_TYPES.USER_LEFT_TEAM,
-	SYSTEM_MESSAGE_TYPES.REMOVED_USER_FROM_TEAM,
-	SYSTEM_MESSAGE_TYPES.ADDED_USER_TO_TEAM,
-	SYSTEM_MESSAGE_TYPES.ADDED_ROOM_TO_TEAM,
-	SYSTEM_MESSAGE_TYPES.CONVERTED_TO_TEAM,
-	SYSTEM_MESSAGE_TYPES.CONVERTED_TO_CHANNEL,
-	SYSTEM_MESSAGE_TYPES.DELETED_ROOM_FROM_TEAM,
-	SYSTEM_MESSAGE_TYPES.REMOVED_ROOM_FROM_TEAM,
-	SYSTEM_MESSAGE_TYPES.LIVECHAT_NAVIGATION_HISTORY,
-	SYSTEM_MESSAGE_TYPES.LIVECHAT_TRANSCRIPT_HISTORY,
-	SYSTEM_MESSAGE_TYPES.COMMAND,
-	SYSTEM_MESSAGE_TYPES.LIVECHAT_STARTED,
-	SYSTEM_MESSAGE_TYPES.LIVECHAT_CLOSE,
-	SYSTEM_MESSAGE_TYPES.LIVECHAT_VIDEO_CALL,
-	SYSTEM_MESSAGE_TYPES.LIVECHAT_WEBRTC_VIDEO_CALL,
-	SYSTEM_MESSAGE_TYPES.LIVECHAT_TRANSFER_HISTORY
-];
 
 type TInfoMessage = {
-	type: string;
+	type: MessageTypesValues;
 	role: string;
 	msg: string;
 	author: { username: string };
@@ -141,137 +87,109 @@ type TInfoMessage = {
 export const getInfoMessage = ({ type, role, msg, author, comment }: TInfoMessage): string => {
 	const { username } = author;
 
-	if (type === 'rm') {
+	switch (type) {
+		// with author name
+		case 'rm':
 			return I18n.t('Message_removed');
-	}
+		case 'uj':
-	if (type === 'uj') {
+			return I18n.t('User_joined_the_channel');
-		return I18n.t('Has_joined_the_channel');
+		case 'ujt':
-	}
+			return I18n.t('User_joined_the_team');
-	if (type === 'ujt') {
+		case 'ut':
-		return I18n.t('Has_joined_the_team');
+			return I18n.t('User_joined_the_conversation');
-	}
+		case 'r':
-	if (type === 'ut') {
+			return I18n.t('Room_name_changed_to', { name: msg });
-		return I18n.t('Has_joined_the_conversation');
+		case 'ru':
-	}
+			return I18n.t('User_has_been_removed', { userRemoved: msg });
-	if (type === 'r') {
+		case 'au':
-		return I18n.t('Room_name_changed', { name: msg, userBy: username });
+			return I18n.t('User_added_to', { userAdded: msg });
-	}
+		case 'user-muted':
-	if (type === 'message_pinned') {
+			return I18n.t('User_has_been_muted', { userMuted: msg });
-		return I18n.t('Message_pinned');
+		case 'room_changed_description':
-	}
+			return I18n.t('changed_room_description', { description: msg });
-	if (type === 'jitsi_call_started') {
+		case 'room_changed_announcement':
-		return I18n.t('Started_call', { userBy: username });
+			return I18n.t('changed_room_announcement', { announcement: msg });
-	}
+		case 'room_changed_topic':
-	if (type === 'ul') {
+			return I18n.t('room_changed_topic_to', { topic: msg });
-		return I18n.t('Has_left_the_channel');
+		case 'room_changed_privacy':
-	}
+			return I18n.t('room_changed_type', { type: msg });
-	if (type === 'ult') {
+		case 'room_changed_avatar':
-		return I18n.t('Has_left_the_team');
+			return I18n.t('room_avatar_changed');
-	}
+		case 'message_snippeted':
-	if (type === 'ru') {
-		return I18n.t('User_removed_by', { userRemoved: msg, userBy: username });
-	}
-	if (type === 'au') {
-		return I18n.t('User_added_by', { userAdded: msg, userBy: username });
-	}
-	if (type === 'user-muted') {
-		return I18n.t('User_muted_by', { userMuted: msg, userBy: username });
-	}
-	if (type === 'user-unmuted') {
-		return I18n.t('User_unmuted_by', { userUnmuted: msg, userBy: username });
-	}
-	if (type === 'subscription-role-added') {
-		return `${msg} was set ${role} by ${username}`;
-	}
-	if (type === 'subscription-role-removed') {
-		return `${msg} is no longer ${role} by ${username}`;
-	}
-	if (type === 'room_changed_description') {
-		return I18n.t('Room_changed_description', { description: msg, userBy: username });
-	}
-	if (type === 'room_changed_announcement') {
-		return I18n.t('Room_changed_announcement', { announcement: msg, userBy: username });
-	}
-	if (type === 'room_changed_topic') {
-		return I18n.t('Room_changed_topic', { topic: msg, userBy: username });
-	}
-	if (type === 'room_changed_privacy') {
-		return I18n.t('Room_changed_privacy', { type: msg, userBy: username });
-	}
-	if (type === 'room_changed_avatar') {
-		return I18n.t('Room_changed_avatar', { userBy: username });
-	}
-	if (type === 'message_snippeted') {
 			return I18n.t('Created_snippet');
-	}
+		case 'room_e2e_disabled':
-	if (type === 'room_e2e_disabled') {
+			return I18n.t('Disabled_E2E_Encryption_for_this_room');
-		return I18n.t('This_room_encryption_has_been_disabled_by__username_', { username });
+		case 'room_e2e_enabled':
-	}
+			return I18n.t('Enabled_E2E_Encryption_for_this_room');
-	if (type === 'room_e2e_enabled') {
+		case 'removed-user-from-team':
-		return I18n.t('This_room_encryption_has_been_enabled_by__username_', { username });
+			return I18n.t('Removed__username__from_the_team', { userRemoved: msg });
-	}
+		case 'added-user-to-team':
-	if (type === 'removed-user-from-team') {
+			return I18n.t('Added__username__to_this_team', { user_added: msg });
-		return I18n.t('Removed__username__from_team', { user_removed: msg });
+		case 'user-added-room-to-team':
-	}
+			return I18n.t('added__roomName__to_this_team', { roomName: msg });
-	if (type === 'added-user-to-team') {
+		case 'user-converted-to-team':
-		return I18n.t('Added__username__to_team', { user_added: msg });
+			return I18n.t('Converted__roomName__to_a_team', { roomName: msg });
-	}
+		case 'user-converted-to-channel':
-	if (type === 'user-added-room-to-team') {
+			return I18n.t('Converted__roomName__to_a_channel', { roomName: msg });
-		return I18n.t('added__roomName__to_team', { roomName: msg });
+		case 'user-deleted-room-from-team':
-	}
-	if (type === 'user-converted-to-team') {
-		return I18n.t('Converted__roomName__to_team', { roomName: msg });
-	}
-	if (type === 'user-converted-to-channel') {
-		return I18n.t('Converted__roomName__to_channel', { roomName: msg });
-	}
-	if (type === 'user-deleted-room-from-team') {
 			return I18n.t('Deleted__roomName__', { roomName: msg });
-	}
+		case 'user-removed-room-from-team':
-	if (type === 'user-removed-room-from-team') {
+			return I18n.t('Removed__roomName__from_the_team', { roomName: msg });
-		return I18n.t('Removed__roomName__from_this_team', { roomName: msg });
+		case 'room-disallowed-reacting':
-	}
+			return I18n.t('room_disallowed_reactions');
-	if (type === 'room-disallowed-reacting') {
+		case 'room-allowed-reacting':
-		return I18n.t('Room_disallowed_reacting', { userBy: username });
+			return I18n.t('room_allowed_reactions');
-	}
+		case 'room-set-read-only':
-	if (type === 'room-allowed-reacting') {
+			return I18n.t('room_set_read_only_permission');
-		return I18n.t('Room_allowed_reacting', { userBy: username });
+		case 'room-removed-read-only':
-	}
+			return I18n.t('room_removed_read_only_permission');
-	if (type === 'room-set-read-only') {
+		case 'user-unmuted':
-		return I18n.t('Room_set_read_only', { userBy: username });
+			return I18n.t('User_has_been_unmuted', { userUnmuted: msg });
-	}
+		case 'room-archived':
-	if (type === 'room-removed-read-only') {
+			return I18n.t('room_archived');
-		return I18n.t('Room_removed_read_only', { userBy: username });
+		case 'room-unarchived':
-	}
+			return I18n.t('room_unarchived');
-	if (type === 'omnichannel_placed_chat_on_hold') {
+		case 'subscription-role-added':
+			return I18n.t('Defined_user_as_role', { user: msg, role });
+		case 'subscription-role-removed':
+			return I18n.t('Removed_user_as_role', { user: msg, role });
+		case 'message_pinned':
+			return I18n.t('Message_pinned');
+
+		// without author name
+		case 'ul':
+			return I18n.t('User_left_this_channel');
+		case 'ult':
+			return I18n.t('Has_left_the_team');
+		case 'jitsi_call_started':
+			return I18n.t('Started_call', { userBy: username });
+		case 'omnichannel_placed_chat_on_hold':
 			return I18n.t('Omnichannel_placed_chat_on_hold', { comment });
-	}
+		case 'omnichannel_on_hold_chat_resumed':
-	if (type === 'omnichannel_on_hold_chat_resumed') {
 			return I18n.t('Omnichannel_on_hold_chat_resumed', { comment });
-	}
+		case 'command':
-	if (type === 'command') {
 			return I18n.t('Livechat_transfer_return_to_the_queue');
-	}
+		case 'livechat-started':
-	if (type === 'livechat-started') {
 			return I18n.t('Chat_started');
-	}
+		case 'livechat-close':
-	if (type === 'livechat-close') {
 			return I18n.t('Conversation_closed');
-	}
+		case 'livechat_transfer_history':
-	if (type === 'livechat_transfer_history') {
 			return I18n.t('New_chat_transfer', { agent: username });
-	}
+
+		// default value
+		default:
 			return I18n.t('Unsupported_system_message');
+	}
 };
 
-export const getMessageTranslation = (message: TMessageModel, autoTranslateLanguage: string) => {
+export const getMessageTranslation = (message: TMessageModel, autoTranslateLanguage: string): string | null => {
 	if (!autoTranslateLanguage) {
 		return null;
 	}
 	const { translations } = message;
 	if (translations) {
 		const translation = translations.find((trans: any) => trans.language === autoTranslateLanguage);
-		return translation && translation.value;
+		return translation?.value || null;
 	}
 	return null;
 };

app/definitions/IMessage.ts

@@ -8,7 +8,7 @@ import { TThreadMessageModel } from './IThreadMessage';
 import { TThreadModel } from './IThread';
 import { IUrl, IUrlFromServer } from './IUrl';
 
-export type MessageType = 'jitsi_call_started' | 'discussion-created' | 'e2e' | 'load_more' | 'rm' | 'uj' | MessageTypeLoad;
+export type MessageType = 'jitsi_call_started' | 'discussion-created' | 'e2e' | 'load_more' | 'rm' | 'uj' | MessageTypeLoad | MessageTypesValues;
 
 export interface IUserMessage {
 	_id: string;
@@ -153,3 +153,81 @@ export interface IReadReceipts {
 	ts: string;
 	user?: IUserMessage;
 }
+
+// from Rocket.Chat codebase
+type VoipMessageTypesValues =
+	| 'voip-call-started'
+	| 'voip-call-declined'
+	| 'voip-call-on-hold'
+	| 'voip-call-unhold'
+	| 'voip-call-ended'
+	| 'voip-call-duration'
+	| 'voip-call-wrapup'
+	| 'voip-call-ended-unexpectedly';
+
+type TeamMessageTypes =
+	| 'removed-user-from-team'
+	| 'added-user-to-team'
+	| 'ult'
+	| 'user-converted-to-team'
+	| 'user-converted-to-channel'
+	| 'user-removed-room-from-team'
+	| 'user-deleted-room-from-team'
+	| 'user-added-room-to-team'
+	| 'ujt';
+
+type LivechatMessageTypes =
+	| 'livechat_navigation_history'
+	| 'livechat_transfer_history'
+	| 'livechat_transcript_history'
+	| 'livechat_video_call'
+	| 'livechat_webrtc_video_call'
+	| 'livechat-started';
+
+type OmnichannelTypesValues =
+	| 'livechat_transfer_history_fallback'
+	| 'livechat-close'
+	| 'omnichannel_placed_chat_on_hold'
+	| 'omnichannel_on_hold_chat_resumed';
+
+type OtrMessageTypeValues = 'otr' | 'otr-ack';
+type OtrSystemMessages = 'user_joined_otr' | 'user_requested_otr_key_refresh' | 'user_key_refreshed_successfully';
+
+export type MessageTypesValues =
+	| 'e2e'
+	| 'uj'
+	| 'ul'
+	| 'ru'
+	| 'au'
+	| 'mute_unmute'
+	| 'r'
+	| 'ut'
+	| 'wm'
+	| 'rm'
+	| 'subscription-role-added'
+	| 'subscription-role-removed'
+	| 'room-archived'
+	| 'room-unarchived'
+	| 'room_changed_privacy'
+	| 'room_changed_description'
+	| 'room_changed_announcement'
+	| 'room_changed_avatar'
+	| 'room_changed_topic'
+	| 'room_e2e_enabled'
+	| 'room_e2e_disabled'
+	| 'user-muted'
+	| 'user-unmuted'
+	| 'room-removed-read-only'
+	| 'room-set-read-only'
+	| 'room-allowed-reacting'
+	| 'room-disallowed-reacting'
+	| 'command'
+	| LivechatMessageTypes
+	| TeamMessageTypes
+	| VoipMessageTypesValues
+	| OmnichannelTypesValues
+	| OtrMessageTypeValues
+	| OtrSystemMessages
+	| 'message_pinned'
+	| 'message_snippeted'
+	| 'jitsi_call_started';

app/i18n/locales/ar.json

@@ -244,9 +244,6 @@
   "Forward_to_user": "إعادة توجيه لمستخدم",
   "Full_table": "انقر لرؤية الجدول كاملاً",
   "Generate_New_Link": "إنشاء رابط جديد",
-  "Has_joined_the_channel": "انضم إلى القناة",
-  "Has_joined_the_conversation": "انضم إلى المحادثة",
-  "Has_left_the_channel": "غادر القناة",
   "Hide_System_Messages": "إخفاء رسائل النظام",
   "Hide_type_messages": "إخفاء رسائل \"{{type}}\"",
   "How_It_Works": "طريقة العمل",
@@ -430,15 +427,11 @@
   "Roles": "أدوار",
   "Room_actions": "إجراءات الغرفة",
   "Room_changed_announcement": "تم تغيير إعلان الغرفة إلى: {{announcement}} من قبل {{userBy}}",
-  "Room_changed_avatar": " {{userBy}}تم تغيير الصورة الرمزية للغرفة",
   "Room_changed_description": "تم تغيير وصف الغرفة إلى: {{description}} من قبل {{userBy}}",
-  "Room_changed_privacy": "تم تغيير نوع الغرفة إلى: {{type}} من قبل {{userBy}}",
-  "Room_changed_topic": "تم تغيير موضوع الغرفة إلى: {{topic}} من قبل {{userBy}}",
   "Room_Files": "ملفات الغرفة",
   "Room_Info_Edit": "تعديل معلومات الغرفة",
   "Room_Info": "معلومات الغرفة",
   "Room_Members": "أعضاء الغرفة",
-  "Room_name_changed": "تم تغيير اسم الغرفة إلى: {{name}} من قبل {{userBy}}",
   "SAVE": "حفظ",
   "Save_Changes": "حفظ التغيرات",
   "Save": "حفظ",
@@ -540,12 +533,9 @@
   "Upload_file_question_mark": "رفع الملف؟",
   "User": "مستخدم",
   "Users": "مستخدمين",
-  "User_added_by": "مستخدم {{userAdded}} أضيف من قبل {{userBy}}",
   "User_Info": "معلومات المستخدم",
   "User_has_been_key": "تمت {{key}} المستخدم!",
   "User_is_no_longer_role_by_": "تم إزالة الدور {{role}} عن المستخدم {{user}} من قبل {{userBy}}",
-  "User_muted_by": "المستخدم {{userMuted}} كتم من قبل {{userBy}}",
-  "User_removed_by": "المستخدم {{userRemoved}} حذف من قبل {{userBy}}",
   "User_sent_an_attachment": "{{user}} أرسل مرفقًا",
   "User_unmuted_by": "ألغى {{userBy}} الكتم عن {{userUnmuted}}",
   "User_was_set_role_by_": "أضيف دور {{role}} للمستخدم {{user}} من قبل {{userBy}}",

app/i18n/locales/de.json

@@ -247,10 +247,6 @@
   "Forward_to_user": "Weiterleiten an Benutzer",
   "Full_table": "Klicken, um die ganze Tabelle anzuzeigen",
   "Generate_New_Link": "Neuen Link erstellen",
-  "Has_joined_the_channel": "Ist dem Kanal beigetreten",
-  "Has_joined_the_team": "ist dem Team beigetreten",
-  "Has_joined_the_conversation": "hat sich dem Gespräch angeschlossen",
-  "Has_left_the_channel": "Hat den CHannel verlassen",
   "Has_left_the_team": "Hat das Team verlassen",
   "Hide_System_Messages": "Systemnachrichten ausblenden",
   "Hide_type_messages": "\"{{type}}\"-Nachrichten ausblenden",
@@ -436,15 +432,11 @@
   "Roles": "Rollen",
   "Room_actions": "Room-Aktionen",
   "Room_changed_announcement": "Room-Ansage geändert in: {{announcement}} von {{userBy}}",
-  "Room_changed_avatar": "Room-Avatar durch Nutzer {{userBy}} gändert",
   "Room_changed_description": "Room-beschreibung geändert in: {{description}} von {{userBy}}",
-  "Room_changed_privacy": "Room-Typ geändert in: {{type}} von {{userBy}}",
-  "Room_changed_topic": "Room-Thema geändert in: {{topic}} von {{userBy}}",
   "Room_Files": "Room-Dateien",
   "Room_Info_Edit": "Room-Info bearbeiten",
   "Room_Info": "Room-Info",
   "Room_Members": "Room-Mitglieder",
-  "Room_name_changed": "Room-Name geändert in {{name}} von {{userBy}}",
   "SAVE": "SPEICHERN",
   "Save_Changes": "Änderungen speichern",
   "Save": "speichern",
@@ -546,12 +538,9 @@
   "Upload_file_question_mark": "Datei hochladen?",
   "User": "Benutzer",
   "Users": "Benutzer",
-  "User_added_by": "Benutzer {{userAdded}} hinzugefügt von {{userBy}}",
   "User_Info": "Benutzerinfo",
   "User_has_been_key": "Benutzer wurde {{key}}",
   "User_is_no_longer_role_by_": "{{user}} ist nicht länger {{role}} von {{userBy}}",
-  "User_muted_by": "Benutzer {{userMuted}} von {{userBy}} stummgeschaltet",
-  "User_removed_by": "Benutzer {{userRemoved}} wurde von {{userBy}} entfernt",
   "User_sent_an_attachment": "{{user}}: eine Datei gesendet",
   "User_unmuted_by": "Benutzer {{userUnmuted}} nicht stummgeschaltet von {{userBy}}",
   "User_was_set_role_by_": "{{user}} wurde von {{userBy}} {{role}} festgelegt.",
@@ -695,8 +684,6 @@
   "Message_Ignored": "Nachricht ignoriert. Antippen um sie zu zeigen.",
   "Enter_workspace_URL": "Arbeitsbereich-URL",
   "Workspace_URL_Example": "z.B. https://rocketchat.deine-firma.de",
-  "This_room_encryption_has_been_enabled_by__username_": "Die Verschlüsselung dieses Rooms wurde von {{username}} aktiviert",
-  "This_room_encryption_has_been_disabled_by__username_": "Die Verschlüsselung dieses Rooms wurde von {{username}} deaktiviert",
   "Teams": "Teams",
   "No_team_channels_found": "Keine Kanäle gefunden",
   "Team_not_found": "Team nicht gefunden",
@@ -793,8 +780,6 @@
   "Message_HideType_user_converted_to_team": "Nachrichten \"Benutzer hat Channel in Team konvertiert\" ausblenden",
   "Message_HideType_user_deleted_room_from_team": "Nachrichten \"Benutzer hat Room aus Team gelöscht\" ausblenden",
   "Message_HideType_user_removed_room_from_team": "Nachrichten \"Benutzer hat Room aus Team entfernt\" ausblenden",
-  "Removed__roomName__from_this_team": "Sie entfernen {{roomName}} aus diesem Team",
-  "Removed__username__from_team": "@{{user_removed}} aus diesem Team entfernt",
   "User_joined_team": "ist dem Team beigetreten",
   "User_left_team": "hat das Team verlassen"
 }

app/i18n/locales/en.json

@@ -257,10 +257,10 @@
   "Forward_to_user": "Forward to user",
   "Full_table": "Click to see full table",
   "Generate_New_Link": "Generate New Link",
-  "Has_joined_the_channel": "has joined the channel",
+  "User_joined_the_channel": "joined the channel",
-  "Has_joined_the_team": "has joined the team",
+  "User_joined_the_conversation": "joined the conversation",
-  "Has_joined_the_conversation": "has joined the conversation",
+  "User_joined_the_team": "joined this team",
-  "Has_left_the_channel": "has left the channel",
+  "User_left_this_channel": "left the channel",
   "Has_left_the_team": "has left the team",
   "Hide_System_Messages": "Hide System Messages",
   "Hide_type_messages": "Hide \"{{type}}\" messages",
@@ -326,7 +326,7 @@
   "Message_accessibility": "Message from {{user}} at {{time}}: {{message}}",
   "Message_actions": "Message actions",
   "Message_pinned": "Message pinned",
-  "Message_removed": "Message removed",
+  "Message_removed": "message removed",
   "Message_starred": "Message starred",
   "Message_unstarred": "Message unstarred",
   "message": "message",
@@ -450,19 +450,21 @@
   "Roles": "Roles",
   "Room_actions": "Room actions",
   "Room_changed_announcement": "Room announcement changed to: {{announcement}} by {{userBy}}",
-  "Room_changed_avatar": "Room avatar changed by {{userBy}}",
+  "room_avatar_changed": "changed room avatar",
   "Room_changed_description": "Room description changed to: {{description}} by {{userBy}}",
-  "Room_changed_privacy": "Room type changed to: {{type}} by {{userBy}}",
+  "changed_room_description": "changed room description to: {{description}}",
-  "Room_changed_topic": "Room topic changed to: {{topic}} by {{userBy}}",
+  "changed_room_announcement": "changed room announcement to: {{announcement}}",
+  "room_changed_type": "changed room to {{type}}",
+  "room_changed_topic_to": "changed room topic to: {{topic}}",
   "Room_Files": "Room Files",
   "Room_Info_Edit": "Room Info Edit",
   "Room_Info": "Room Info",
   "Room_Members": "Room Members",
-  "Room_name_changed": "Room name changed to: {{name}} by {{userBy}}",
+  "Room_name_changed_to": "changed room name to: {{name}}",
-  "Room_disallowed_reacting": "Room disallowed reacting by {{userBy}}",
+  "room_disallowed_reactions": "disallowed reactions",
-  "Room_allowed_reacting": "Room allowed reacting by {{userBy}}",
+  "room_allowed_reactions": "allowed reactions",
-  "Room_set_read_only": "Room set read only by {{userBy}}",
+  "room_removed_read_only_permission": "removed read only permission",
-  "Room_removed_read_only": "Room removed read only by {{userBy}}",
+  "room_set_read_only_permission": "set room to read only",
   "SAVE": "SAVE",
   "Save_Changes": "Save Changes",
   "Save": "Save",
@@ -565,15 +567,16 @@
   "Upload_file_question_mark": "Upload file?",
   "User": "User",
   "Users": "Users",
-  "User_added_by": "User {{userAdded}} added by {{userBy}}",
+  "User_added_to": "added {{userAdded}}",
   "User_Info": "User Info",
   "User_has_been_key": "User has been {{key}}",
   "User_is_no_longer_role_by_": "{{user}} is no longer {{role}} by {{userBy}}",
-  "User_muted_by": "User {{userMuted}} muted by {{userBy}}",
+  "User_has_been_muted": "muted {{userMuted}}",
-  "User_removed_by": "User {{userRemoved}} removed by {{userBy}}",
+  "User_has_been_removed": "removed {{userRemoved}}",
   "User_sent_an_attachment": "{{user}} sent an attachment",
-  "User_unmuted_by": "User {{userUnmuted}} unmuted by {{userBy}}",
+  "User_has_been_unmuted": "unmuted {{userUnmuted}}",
-  "User_was_set_role_by_": "{{user}} was set {{role}} by {{userBy}}",
+  "Defined_user_as_role": "defined {{user}} as {{role}}",
+  "Removed_user_as_role": "removed {{user}} as {{role}}",
   "Username_is_empty": "Username is empty",
   "Username": "Username",
   "Username_or_email": "Username or email",
@@ -715,8 +718,8 @@
   "Message_Ignored": "Message ignored. Tap to display it.",
   "Enter_workspace_URL": "Enter workspace URL",
   "Workspace_URL_Example": "Ex. your-company.rocket.chat",
-  "This_room_encryption_has_been_enabled_by__username_": "This room's encryption has been enabled by {{username}}",
+  "Enabled_E2E_Encryption_for_this_room": "enabled E2E Encryption for this room",
-  "This_room_encryption_has_been_disabled_by__username_": "This room's encryption has been disabled by {{username}}",
+  "Disabled_E2E_Encryption_for_this_room": "disabled E2E Encryption for this room",
   "Teams": "Teams",
   "No_team_channels_found": "No channels found",
   "Team_not_found": "Team not found",
@@ -800,11 +803,11 @@
   "Unsupported_format": "Unsupported format",
   "Downloaded_file": "Downloaded file",
   "Error_Download_file": "Error while downloading file",
-  "added__roomName__to_team": "added #{{roomName}} to this Team",
+  "added__roomName__to_this_team": "added #{{roomName}} to this team",
-  "Added__username__to_team": "added @{{user_added}} to this Team",
+  "Added__username__to_this_team": "added @{{user_added}} to this team",
-  "Converted__roomName__to_team": "converted #{{roomName}} to a Team",
-  "Converted__roomName__to_channel": "converted #{{roomName}} to a Channel",
   "Converting_team_to_channel": "Converting Team to Channel",
+  "Converted__roomName__to_a_team": "converted #{{roomName}} to a team",
+  "Converted__roomName__to_a_channel": "converted #{{roomName}} to channel",
   "Deleted__roomName__": "deleted #{{roomName}}",
   "Message_HideType_added_user_to_team": "Hide \"User Added to Team\" messages",
   "Message_HideType_removed_user_from_team": "Hide \"User Removed from Team\" messages",
@@ -815,10 +818,10 @@
   "Message_HideType_user_converted_to_team": "Hide \"User converted channel to a Team\" messages",
   "Message_HideType_user_deleted_room_from_team": "Hide \"User deleted room from Team\" messages",
   "Message_HideType_user_removed_room_from_team": "Hide \"User removed room from Team\" messages",
-  "Removed__roomName__from_this_team": "removed #{{roomName}} from this Team",
+  "Removed__roomName__from_the_team": "removed #{{roomName}} from this team",
-  "Removed__username__from_team": "removed @{{user_removed}} from this Team",
+  "Removed__username__from_the_team": "removed @{{userRemoved}} from this team",
   "User_joined_team": "joined this Team",
-  "User_left_team": "left this Team",
+  "User_left_team": "left this team",
   "Place_chat_on_hold": "Place chat on-hold",
   "Would_like_to_place_on_hold": "Would you like to place this chat On-Hold?",
   "Open_Livechats": "Omnichannel chats in progress",
@@ -857,5 +860,7 @@
   "Team": "Team",
   "Select_Members": "Select Members",
   "Also_send_thread_message_to_channel_behavior": "Also send thread message to channel",
-  "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "Allow users to select the Also send to channel behavior"
+  "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "Allow users to select the Also send to channel behavior",
+  "room_archived": "archived room",
+  "room_unarchived": "unarchived room"
 }

app/i18n/locales/es-ES.json

@@ -185,9 +185,6 @@
   "Forgot_password": "¿Ha olvidado su contraseña?",
   "Forgot_Password": "Olvidé la contraseña",
   "Full_table": "Click para ver la tabla completa",
-  "Has_joined_the_channel": "se ha unido al canal",
-  "Has_joined_the_conversation": "se ha unido a la conversación",
-  "Has_left_the_channel": "ha dejado el canal",
   "In_App_And_Desktop": "En la aplicación y en el escritorio",
   "In_App_and_Desktop_Alert_info": "Muestra un banner en la parte superior de la pantalla cuando la aplicación esté abierta y muestra una notificación en el escritorio",
   "Invisible": "Invisible",
@@ -305,13 +302,10 @@
   "Room_actions": "Acciones de sala",
   "Room_changed_announcement": "El anuncio de la sala cambió a: {{announcement}} por {{userBy}}",
   "Room_changed_description": "La descripción de la sala cambió a: {{description}} por {{userBy}}",
-  "Room_changed_privacy": "El tipo de la sala cambió a: {{type}} por {{userBy}}",
-  "Room_changed_topic": "El asunto de la sala cambió a: {{topic}} por {{userBy}}",
   "Room_Files": "Archivos",
   "Room_Info_Edit": "Editar información de la sala",
   "Room_Info": "Información de la sala",
   "Room_Members": "Miembros de la sala",
-  "Room_name_changed": "El nombre de la sala cambió a: {{name}} por {{userBy}}",
   "SAVE": "GUARDAR",
   "Save_Changes": "Guardar cambios",
   "Save": "Guardar",
@@ -389,11 +383,8 @@
   "Uploading": "Subiendo",
   "Upload_file_question_mark": "¿Subir fichero?",
   "Users": "Usuarios",
-  "User_added_by": "Usuario {{userAdded}} añadido por {{userBy}}",
   "User_has_been_key": "El usuario ha sido {{key}}",
   "User_is_no_longer_role_by_": "{{user}} ha dejado de ser {{role}} por {{userBy}}",
-  "User_muted_by": "Usuario {{userMuted}} muteado por {{userBy}}",
-  "User_removed_by": "Usuario {{userRemoved}} eliminado por {{userBy}}",
   "User_sent_an_attachment": "{{user}} envío un adjunto",
   "User_unmuted_by": "Usuario {{userUnmuted}} desmuteado por {{userBy}}",
   "User_was_set_role_by_": "{{user}} ha comenzado a ser {{role}} por {{userBy}}",

app/i18n/locales/fr.json

@@ -249,10 +249,6 @@
   "Forward_to_user": "Transmettre à l'utilisateur",
   "Full_table": "Cliquez pour voir le tableau complet",
   "Generate_New_Link": "Générer un nouveau lien",
-  "Has_joined_the_channel": "a rejoint le canal",
-  "Has_joined_the_team": "a rejoint l'équipe",
-  "Has_joined_the_conversation": "a rejoint la conversation",
-  "Has_left_the_channel": "a quitté le canal",
   "Has_left_the_team": "a quitté l'équipe",
   "Hide_System_Messages": "Masquer les messages système",
   "Hide_type_messages": "Masquer les messages \"{{type}}\"",
@@ -440,19 +436,11 @@
   "Roles": "Rôles",
   "Room_actions": "Actions du salon",
   "Room_changed_announcement": "Annonce du salon changé en : {{announcement}} par {{userBy}}",
-  "Room_changed_avatar": "Avatar du salon modifié par {{userBy}}",
   "Room_changed_description": "Description du salon changé en : {{description}} par {{userBy}}",
-  "Room_changed_privacy": "Type de salon changé en : {{type}} par {{userBy}}",
-  "Room_changed_topic": "Le sujet de salon est changé en : {{topic}} par {{userBy}}",
   "Room_Files": "Fichiers du salon",
   "Room_Info_Edit": "Modifier les informations du salon",
   "Room_Info": "Info sur le salon",
   "Room_Members": "Membres du salon",
-  "Room_name_changed": "Nom de salon changé en : {{name}} par {{userBy}}",
-  "Room_disallowed_reacting": "Réactions non autorisées par {{userBy}}",
-  "Room_allowed_reacting": "Réactions autorisées dans le salon par {{userBy}}",
-  "Room_set_read_only": "Salon mis en lecture seule par {{userBy}}",
-  "Room_removed_read_only": "Salon n'est plus en lecture seule par {{userBy}}",
   "SAVE": "SAUVEGARDER",
   "Save_Changes": "Sauvegarder les modifications",
   "Save": "Sauvegarder",
@@ -555,12 +543,9 @@
   "Upload_file_question_mark": "Téléverser un fichier ?",
   "User": "Utilisateur",
   "Users": "Utilisateurs",
-  "User_added_by": "Utilisateur {{userAdded}} ajouté par {{userBy}}",
   "User_Info": "Info d'utilisateur",
   "User_has_been_key": "L'utilisateur a été {{key}}",
   "User_is_no_longer_role_by_": "{{user}} n'est plus {{role}} par {{userBy}}",
-  "User_muted_by": "L'utilisateur {{userMuted}} a été rendu muet par {{userBy}}",
-  "User_removed_by": "Utilisateur {{userRemoved}} supprimé par {{userBy}}",
   "User_sent_an_attachment": "{{user}} a envoyé une pièce jointe",
   "User_unmuted_by": "L'utilisateur {{userBy}} a rendu la parole à {{userUnmuted}}",
   "User_was_set_role_by_": "{{user}} a été défini {{role}} par {{userBy}}",
@@ -705,8 +690,6 @@
   "Message_Ignored": "Message ignoré. Touchez pour l'afficher.",
   "Enter_workspace_URL": "Entrez l'URL de l'espace de travail",
   "Workspace_URL_Example": "Ex. votre-société.rocket.chat",
-  "This_room_encryption_has_been_enabled_by__username_": "Le cryptage de ce salon a été activé par {{username}}",
-  "This_room_encryption_has_been_disabled_by__username_": "Le cryptage de ce salon a été désactivé par {{username}}",
   "Teams": "Equipes",
   "No_team_channels_found": "Aucun canal trouvé",
   "Team_not_found": "Equipe non trouvée",
@@ -803,8 +786,6 @@
   "Message_HideType_user_converted_to_team": "Masquer les messages \"L'utilisateur a converti le canal en équipe\"",
   "Message_HideType_user_deleted_room_from_team": "Masquer les messages \"L'utilisateur a supprimé le salon de l'équipe\"",
   "Message_HideType_user_removed_room_from_team": "Masquer les messages \"L'utilisateur a enlevé le salon de l'équipe\"",
-  "Removed__roomName__from_this_team": "#{{roomName}} supprimé de cette équipe",
-  "Removed__username__from_team": "@{{user_removed}} supprimé de cette équipe",
   "User_joined_team": "a rejoint cette équipe",
   "User_left_team": "a quitté cette équipe",
   "Place_chat_on_hold": "Mettre le chat en attente",

app/i18n/locales/it.json

@@ -241,9 +241,6 @@
   "Forward_to_user": "Inoltra ad udente",
   "Full_table": "Clicca per la tabella completa",
   "Generate_New_Link": "Genera nuovo link",
-  "Has_joined_the_channel": "si è unito al canale",
-  "Has_joined_the_conversation": "si è unito alla conversazione",
-  "Has_left_the_channel": "ha lasciato il canale",
   "Hide_System_Messages": "Nascondi messaggi di sistema",
   "Hide_type_messages": "Nascondi messaggi di \"{{type}}\"",
   "How_It_Works": "Come funziona",
@@ -424,15 +421,11 @@
   "Roles": "Ruoli",
   "Room_actions": "Azioni stanza",
   "Room_changed_announcement": "Annuncio stanza cambiato in: {{announcement}} da {{userBy}}",
-  "Room_changed_avatar": "Immagine stanza cambiata da {{userBy}}",
   "Room_changed_description": "Descrizione stanza cambiata in: {{description}} da {{userBy}}",
-  "Room_changed_privacy": "Tipo stanza cambiato in: {{type}} da {{userBy}}",
-  "Room_changed_topic": "Argomento stanza cambiato in: {{topic}} da {{userBy}}",
   "Room_Files": "File stanza",
   "Room_Info_Edit": "Modifica informazioni stanza",
   "Room_Info": "Informazioni stanza",
   "Room_Members": "Membri stanza",
-  "Room_name_changed": "Nome stanza cambiato in: {{name}} da {{userBy}}",
   "SAVE": "SALVA",
   "Save_Changes": "Salva cambiamenti",
   "Save": "Salva",
@@ -534,12 +527,9 @@
   "Upload_file_question_mark": "Carica file?",
   "User": "Utente",
   "Users": "Utenti",
-  "User_added_by": "Utente {{userAdded}} aggiunto da {{userBy}}",
   "User_Info": "Informazioni utente",
   "User_has_been_key": "Utente {{key}}",
   "User_is_no_longer_role_by_": "{{user}} non è più {{role}} da {{userBy}}",
-  "User_muted_by": "Utente {{userMuted}} silenziato da {{userBy}}",
-  "User_removed_by": "Utente {{userRemoved}} rimosso da {{userBy}}",
   "User_sent_an_attachment": "{{user}} ha inviato un allegato",
   "User_unmuted_by": "Utente {{userUnmuted}} de-silenziato da {{userBy}}",
   "User_was_set_role_by_": "{{user}} è stato impostato come {{role}} da {{userBy}}",

app/i18n/locales/ja.json

@@ -247,10 +247,6 @@
   "Forward_to_user": "ユーザーに転送する",
   "Full_table": "クリックしてテーブル全体を見る",
   "Generate_New_Link": "新しいリンクを生成",
-  "Has_joined_the_channel": "はチャンネルに参加しました",
-  "Has_joined_the_team": "チームに参加しました",
-  "Has_joined_the_conversation": "は会話に参加しました",
-  "Has_left_the_channel": "はチャンネルを退出しました",
   "Has_left_the_team": "チームを退出しました",
   "Hide_System_Messages": "システムメッセージを非表示にする",
   "Hide_type_messages": "\"{{type}}\"メッセージを非表示にする",
@@ -410,13 +406,10 @@
   "Room_actions": "ルームアクション",
   "Room_changed_announcement": "{{userBy}}がアナウンスを変更しました: {{announcement}}",
   "Room_changed_description": "{{userBy}}が概要を変更しました: {{description}}",
-  "Room_changed_privacy": "{{userBy}}がルームタイプを変更しました。: {{type}}",
-  "Room_changed_topic": "{{userBy}}がトピックを変更しました: {{topic}}",
   "Room_Files": "ルームのファイル",
   "Room_Info_Edit": "ルーム情報を編集",
   "Room_Info": "ルーム情報",
   "Room_Members": "ルームのメンバー",
-  "Room_name_changed": "ルーム名が{{userBy}}により変更されました: {{name}}",
   "SAVE": "保存",
   "Save_Changes": "変更を保存",
   "Save": "保存",
@@ -498,12 +491,9 @@
   "Upload_file_question_mark": "ファイルをアップロードしますか?",
   "User": "ユーザー",
   "Users": "ユーザー",
-  "User_added_by": "{{userBy}} が {{userAdded}} を追加しました",
   "User_Info": "ユーザー情報",
   "User_has_been_key": "ユーザーは{{key}}",
   "User_is_no_longer_role_by_": "{{userBy}} は {{user}} のロール {{role}} を削除しました。",
-  "User_muted_by": "{{userBy}} は {{userMuted}} をミュートしました。",
-  "User_removed_by": "{{userBy}} は {{userRemoved}} を退出させました。",
   "User_sent_an_attachment": "{{user}}は添付ファイルを送信しました",
   "User_unmuted_by": "{{userUnmuted}} は {{userBy}} にミュート解除されました。",
   "User_was_set_role_by_": "{{user}} was set {{role}} by {{userBy}}",

app/i18n/locales/nl.json

@@ -249,10 +249,6 @@
   "Forward_to_user": "Doorsturen naar gebruiker",
   "Full_table": "Klik om de volledige tabel te zien",
   "Generate_New_Link": "Nieuwe link genereren",
-  "Has_joined_the_channel": "is bij het kanaal gekomen",
-  "Has_joined_the_team": "is lid geworden van het team",
-  "Has_joined_the_conversation": "heeft zich bij het gesprek aangesloten",
-  "Has_left_the_channel": "heeft het kanaal verlaten",
   "Has_left_the_team": "heeft het team verlaten",
   "Hide_System_Messages": "Verberg systeemberichten",
   "Hide_type_messages": "Verberg \"{{type}}\" berichten",
@@ -440,19 +436,12 @@
   "Roles": "Rollen",
   "Room_actions": "Kameracties",
   "Room_changed_announcement": "Kameraankondiging gewijzigd in: {{announcement}} door {{userBy}}",
-  "Room_changed_avatar": "Kameravatar gewijzigd door {{userBy}}",
   "Room_changed_description": "Kamerbeschrijving gewijzigd in: {{description}} door {{userBy}}",
-  "Room_changed_privacy": "Kamertype gewijzigd in: {{type}} door {{userBy}}",
-  "Room_changed_topic": "Oonderwerp van kamer gewijzigd in: {{topic}} door {{userBy}}",
   "Room_Files": "Kamerbestanden",
   "Room_Info_Edit": "Kamer info bewerken",
   "Room_Info": "Kamer info",
   "Room_Members": "Kamerleden",
-  "Room_name_changed": "Kamernaam gewijzigd in: {{name}} door {{userBy}}",
-  "Room_disallowed_reacting": "Niet toegestaan om in de kamer te reageren door {{userBy}}",
-  "Room_allowed_reacting": "Reageren toegestaan in de kamer door {{userBy}}",
   "Room_set_read_only": "Kamer als alleen lezen ingesteld door {{userBy}}",
-  "Room_removed_read_only": "Kamer is niet meer als alleen lezen ingesteld door {{userBy}}",
   "SAVE": "OPSLAAN",
   "Save_Changes": "Wijzigingen opslaan",
   "Save": "Opslaan",
@@ -555,12 +544,9 @@
   "Upload_file_question_mark": "Bestand uploaden?",
   "User": "Gebruiker",
   "Users": "Gebruikers",
-  "User_added_by": "Gebruiker {{userAdded}} toegevoegd door {{userBy}}",
   "User_Info": "Gebruikers info",
   "User_has_been_key": "Gebruiker is {{key}}",
   "User_is_no_longer_role_by_": "{{user}} is niet langer {{role}} door {{userBy}}",
-  "User_muted_by": "Gebruiker {{userMuted}} gedempt door {{userBy}}",
-  "User_removed_by": "Gebruiker {{userRemoved}} verwijderd door {{userBy}}",
   "User_sent_an_attachment": "{{user}} stuurde een bijlage",
   "User_unmuted_by": "Dempen voor {{userUnmuted}} opgeheven door {{userBy}}",
   "User_was_set_role_by_": "{{user}} is als {{role}} ingesteld door {{userBy}}",
@@ -705,8 +691,6 @@
   "Message_Ignored": "Bericht genegeerd. Tik om het weer te geven.",
   "Enter_workspace_URL": "Voer de werkruimte-URL in",
   "Workspace_URL_Example": "Vb. uw-bedrijf.rocket.chat",
-  "This_room_encryption_has_been_enabled_by__username_": "De versleuteling van deze kamer is ingeschakeld door {{username}}",
-  "This_room_encryption_has_been_disabled_by__username_": "De versleuteling van deze kamer is uitgeschakeld door {{username}}",
   "Teams": "Teams",
   "No_team_channels_found": "Geen kanalen gevonden",
   "Team_not_found": "Team niet gevonden",
@@ -803,8 +787,6 @@
   "Message_HideType_user_converted_to_team": "Verberg \"Gebruiker heeft kanaal in team geconverteerd\" berichten",
   "Message_HideType_user_deleted_room_from_team": "Verberg \"Gebruiker heeft kamer uit team verwijderd\" berichten",
   "Message_HideType_user_removed_room_from_team": "Verberg \"Gebruiker heeft kamer uit team verwijderd\" berichten",
-  "Removed__roomName__from_this_team": "#{{roomName}} uit dit team verwijderd",
-  "Removed__username__from_team": "@{{user_removed}} uit dit team verwijderd",
   "User_joined_team": "is lid geworden van dit team",
   "User_left_team": "heeft dit team verlaten",
   "Place_chat_on_hold": "Chat in de wacht zetten",

app/i18n/locales/pt-BR.json

@@ -248,10 +248,10 @@
   "Forward_to_user": "Encaminhar para usuário",
   "Full_table": "Clique para ver a tabela completa",
   "Generate_New_Link": "Gerar novo convite",
-  "Has_joined_the_channel": "entrou no canal",
+  "User_joined_the_channel": "entrou no canal",
-  "Has_joined_the_team": "entrou na equipe",
+  "User_joined_the_team": "entrou na equipe",
-  "Has_joined_the_conversation": "entrou na conversa",
+  "User_joined_the_conversation": "entrou na conversa",
-  "Has_left_the_channel": "saiu da conversa",
+  "User_left_this_channel": "saiu da conversa",
   "Has_left_the_team": "saiu da equipe",
   "Hide_System_Messages": "Esconder mensagens do sistema",
   "Hide_type_messages": "Esconder mensagens de \"{{type}}\"",
@@ -309,7 +309,7 @@
   "Message_accessibility": "Mensagem de {{user}} às {{time}}: {{message}}",
   "Message_actions": "Ações",
   "Message_pinned": "Fixou uma mensagem",
-  "Message_removed": "Mensagem removida",
+  "Message_removed": "mensagem removida",
   "message": "mensagem",
   "messages": "mensagens",
   "Message": "Mensagem",
@@ -382,6 +382,7 @@
   "Preferences": "Preferências",
   "Preferences_saved": "Preferências salvas!",
   "Privacy_Policy": " Política de Privacidade",
+  "Private_Channel": "Canal Privado",
   "Private": "Privado",
   "Processing": "Processando...",
   "Profile_saved_successfully": "Perfil salvo com sucesso!",
@@ -426,19 +427,21 @@
   "Roles": "Papéis",
   "Room_actions": "Ações",
   "Room_changed_announcement": "O anúncio da sala foi alterado para: {{announcement}} por {{userBy}}",
-  "Room_changed_avatar": "Avatar da sala alterado por {{userBy}}",
+  "room_avatar_changed": "alterou avatar da sala",
   "Room_changed_description": "A descrição da sala foi alterada para: {{description}} por {{userBy}}",
-  "Room_changed_privacy": "Tipo da sala mudou para: {{type}} por {{userBy}}",
+  "changed_room_description": "alterou a descrição da sala para: {{description}}",
-  "Room_changed_topic": "Tópico da sala mudou para: {{topic}} por {{userBy}}",
+  "changed_room_announcement": "alterou o anúncio da sala para: {{announcement}}",
+  "room_changed_type": "mudou sala para {{type}}",
+  "room_changed_topic_to": "mudou tópico da sala para: {{topic}}",
   "Room_Files": "Arquivos",
   "Room_Info_Edit": "Editar",
   "Room_Info": "Informações da Sala",
   "Room_Members": "Membros",
-  "Room_name_changed": "Nome da sala alterado para: {{name}} por {{userBy}}",
+  "Room_name_changed_to": "alterou o nome da sala para: {{name}}",
-  "Room_disallowed_reacting": "Permissão de reagir removida da sala por {{userBy}}",
+  "room_disallowed_reactions": "removeu a permissão de reagir",
-  "Room_allowed_reacting": "Permissão de reagir adicionada à sala por {{userBy}}",
+  "room_allowed_reactions": "adicionou permissão de reagir", 
-  "Room_set_read_only": "Sala definida como somente leitura por {{userBy}}",
+  "room_removed_read_only_permission": "removeu permissão de escrita da sala",
-  "Room_removed_read_only": "Permissão de escrita adicionada à sala por {{userBy}}",
+  "room_set_read_only_permission": "adicionou permissão de escrita à sala",
   "SAVE": "SALVAR",
   "Save_Changes": "Salvar Alterações",
   "Save": "Salvar",
@@ -530,14 +533,14 @@
   "Upload_file_question_mark": "Enviar arquivo?",
   "User": "Usuário",
   "Users": "Usuários",
-  "User_added_by": "Usuário {{userAdded}} adicionado por {{userBy}}",
+  "User_added_to": "adicionou o usuário {{userAdded}}",
   "User_Info": "Informações do usuário",
   "User_has_been_key": "Usuário foi {{key}}",
   "User_is_no_longer_role_by_": "{{user}} não pertence mais à {{role}} por {{userBy}}",
-  "User_muted_by": "User {{userMuted}} muted por {{userBy}}",
+  "User_has_been_muted": "silenciou o usuário {{userMuted}}",
-  "User_removed_by": "Usuário {{userRemoved}} removido por {{userBy}}",
+  "User_has_been_removed": "removeu {{userRemoved}}",
   "User_sent_an_attachment": "{{user}} enviou um anexo",
-  "User_unmuted_by": "{{userBy}} permitiu que {{userUnmuted}} fale na sala",
+  "User_has_been_unmuted": "permitiu que {{userUnmuted}} fale na sala",
   "User_was_set_role_by_": "{{user}} foi definido como {{role}} por {{userBy}}",
   "Username_is_empty": "Usuário está vazio",
   "Username": "Usuário",
@@ -674,8 +677,8 @@
   "Message_Ignored": "Mensagem ignorada. Toque para mostrar.",
   "Enter_workspace_URL": "Digite a URL da sua workspace",
   "Workspace_URL_Example": "Ex. sua-empresa.rocket.chat",
-  "This_room_encryption_has_been_enabled_by__username_": "A criptografia para essa sala foi habilitada por {{username}}",
+  "Enabled_E2E_Encryption_for_this_room": "habilitou criptografia para essa sala",
-  "This_room_encryption_has_been_disabled_by__username_": "A criptografia para essa sala foi desabilitada por {{username}}",
+  "Disabled_E2E_Encryption_for_this_room": "desabilitou criptografia para essa sala",
   "Teams": "Times",
   "No_team_channels_found": "Nenhum canal encontrado",
   "Team_not_found": "Time não encontrado",
@@ -756,11 +759,11 @@
   "Downloaded_file": "Arquivo baixado",
   "Error_Download_file": "Erro ao baixar o arquivo",
   "error-init-video-conf": "Erro ao iniciar chamada de video",
-  "added__roomName__to_team": "#{{roomName}} adicionada a esta equipe",
+  "added__roomName__to_this_team": "adicionou #{{roomName}} a esta equipe",
-  "Added__username__to_team": "@{{user_added}} adicionado a esta equipe",
+  "Added__username__to_this_team": "adicionou @{{user_added}} a esta equipe",
-  "Converted__roomName__to_team": "#{{roomName}} convertida em equipe",
-  "Converted__roomName__to_channel": "#{{roomName}} convertida em canal",
   "Converting_team_to_channel": "Convertendo equipe em canal",
+  "Converted__roomName__to_a_team": "converteu #{{roomName}} em equipe",
+  "Converted__roomName__to_a_channel": "converteu #{{roomName}} em canal",
   "Deleted__roomName__": "#{{roomName}} apagada",
   "Message_HideType_added_user_to_team": "Ocultar mensagens de \"Usuário adicionado à equipe\"",
   "Message_HideType_removed_user_from_team": "Ocultar mensagens de \"Usuário removido da equipe\"",
@@ -771,8 +774,8 @@
   "Message_HideType_user_converted_to_team": "Ocultar mensagens de \"Usuário converteu canal em equipe\"",
   "Message_HideType_user_deleted_room_from_team": "Ocultar mensagens de \"Usuário apagou sala da equipe\"",
   "Message_HideType_user_removed_room_from_team": "Ocultar mensagens de \"Usuário removeu sala da equipe\"",
-  "Removed__roomName__from_this_team": "#{{roomName}} removida desta equipe",
+  "Removed__roomName__from_the_team": "removeu #{{roomName}} desta equipe",
-  "Removed__username__from_team": "@{{user_removed}} removido desta equipe",
+  "Removed__username__from_the_team": "removeu @{{userRemoved}} desta equipe",
   "User_joined_team": "entrou nesta equipe",
   "User_left_team": "saiu desta equipe",
   "Place_chat_on_hold": "Colocar conversa em espera",
@@ -812,5 +815,7 @@
   "Team": "Time",
   "Select_Members": "Selecionar Membros",
   "Also_send_thread_message_to_channel_behavior": "Também enviar mensagem do tópico para o canal",
-  "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "Permitir que os usuários selecionem o comportamento Também enviar para o canal"
+  "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "Permitir que os usuários selecionem o comportamento Também enviar para o canal",
+  "room_archived": "{{username}} arquivou a sala",
+  "room_unarchived": "{{username}} desarquivou a sala"
 }

app/i18n/locales/pt-PT.json

@@ -246,9 +246,6 @@
   "Forward_to_user": "Reencaminhar para o utilizador",
   "Full_table": "Clique para ver a tabela completa",
   "Generate_New_Link": "Gerar Novo Link",
-  "Has_joined_the_channel": "entrou no canal",
-  "Has_joined_the_conversation": "entrou na conversa",
-  "Has_left_the_channel": "saiu do canal",
   "Hide_System_Messages": "Esconder mensagens do sistema",
   "Hide_type_messages": "Esconder mensagens \"{{type}}\"",
   "How_It_Works": "Como Funciona",
@@ -416,13 +413,10 @@
   "Room_actions": "Ações de sala",
   "Room_changed_announcement": "Anúncio da sala alterado para: {{announcement}} por {{userBy}}",
   "Room_changed_description": "Descrição da sala alterada para: {{description}} por {{userBy}}",
-  "Room_changed_privacy": "Tipo de sala alterado para: {{type}} por {{userBy}}",
-  "Room_changed_topic": "Tópico da sala alterado para: {{topic}} por {{userBy}}",
   "Room_Files": "Fiheiros da Sala",
   "Room_Info_Edit": "Editar Informação da Sala",
   "Room_Info": "Informação da Sala",
   "Room_Members": "Membros da Sala",
-  "Room_name_changed": "Nome da sala alterado para: {{name}} por {{userBy}}",
   "SAVE": "GUARDAR",
   "Save_Changes": "Guardar Alterações",
   "Save": "Guardar",
@@ -479,11 +473,8 @@
   "Updating": "A actualizar...",
   "Uploading": "A enviar",
   "Upload_file_question_mark": "Enviar ficheiro?",
-  "User_added_by": "Utilizador {{userAdded}} adicionado por {{userBy}}",
   "User_has_been_key": "Utilizador foi {{key}}",
   "User_is_no_longer_role_by_": "{{userBy}} removeu o estatuto de {{role}} de {{user}}",
-  "User_muted_by": "Utilizador {{userMuted}} foi silenciado por {{userBy}}",
-  "User_removed_by": "Utilizador {{userRemoved}} removido por {{userBy}}",
   "User_sent_an_attachment": "{{user}} enviou um ficheiro",
   "User_unmuted_by": "{{userBy}} retirou o silêncio a {{userUnmuted}}",
   "User_was_set_role_by_": "{{userBy}} deu estatuto de {{role}} a {{user}}",

app/i18n/locales/ru.json

@@ -247,10 +247,6 @@
   "Forward_to_user": "Перенаправить пользователю",
   "Full_table": "Нажмите, чтобы увидеть полную таблицу",
   "Generate_New_Link": "Сгенерировать Новую Ссылку",
-  "Has_joined_the_channel": "присоединился к каналу",
-  "Has_joined_the_team": "присоединился к Команде",
-  "Has_joined_the_conversation": "присоединился к беседе",
-  "Has_left_the_channel": "покинул канал",
   "Has_left_the_team": "покинул Команду",
   "Hide_System_Messages": "Скрыть Системные Сообщения",
   "Hide_type_messages": "Скрыть \"{{type}}\" сообщения",
@@ -436,15 +432,11 @@
   "Roles": "Роли",
   "Room_actions": "Действия с чатом",
   "Room_changed_announcement": "Объявление чата было изменено на: {{announcement}} пользователем {{userBy}}",
-  "Room_changed_avatar": "Аватар чата изменен пользователем {{userBy}}",
   "Room_changed_description": "Описание чата было изменено на: {{description}} пользователем {{userBy}}",
-  "Room_changed_privacy": "Тип чата был изменен на: {{type}} пользователем {{userBy}}",
-  "Room_changed_topic": "Тема чата была изменена на: {{topic}} пользователем {{userBy}}",
   "Room_Files": "Файлы",
   "Room_Info_Edit": "Изменить информацию о чате",
   "Room_Info": "Информация о канале",
   "Room_Members": "Пользователи",
-  "Room_name_changed": "Название чата было изменено на: {{name}} пользователем {{userBy}}",
   "SAVE": "СОХРАНИТЬ",
   "Save_Changes": "Сохранить изменения",
   "Save": "Сохранить",
@@ -546,12 +538,9 @@
   "Upload_file_question_mark": "Загрузить файл?",
   "User": "Пользователь",
   "Users": "Пользователи",
-  "User_added_by": "Пользователь {{userAdded}} добавлен по решению {{userBy}}",
   "User_Info": "Информация о пользователе",
   "User_has_been_key": "Пользователь был {{key}}",
   "User_is_no_longer_role_by_": "{{user}} больше не {{role}} по решению {{userBy}}",
-  "User_muted_by": "Пользователь {{userMuted}} заглушен по решению {{userBy}}",
-  "User_removed_by": "Пользователь {{userRemoved}} удален по решению {{userBy}}",
   "User_sent_an_attachment": "{{user}} отправил вложение",
   "User_unmuted_by": "Пользователь {{userUnmuted}} перестал быть заглушенным по решению {{userBy}}",
   "User_was_set_role_by_": "{{user}} был назначен {{role}} пользователем {{userBy}}",
@@ -696,8 +685,6 @@
   "Message_Ignored": "Сообщение игнорируется. Тапните по нему, чтобы отобразить его.",
   "Enter_workspace_URL": "Введите URL вашего рабочего пространства",
   "Workspace_URL_Example": "Например, your-company.rocket.chat",
-  "This_room_encryption_has_been_enabled_by__username_": "Шифрование для этого чата включено {{username}}",
-  "This_room_encryption_has_been_disabled_by__username_": "Шифрование для этого чата выключено {{username}}",
   "Teams": "Команды",
   "No_team_channels_found": "Каналы не найдены",
   "Team_not_found": "Команда не найдена",
@@ -794,8 +781,6 @@
   "Message_HideType_user_converted_to_team": "Скрыть сообщения \"Пользователь преобразовал канал в Команду\"",
   "Message_HideType_user_deleted_room_from_team": "Скрыть сообщения \"Пользователь удалил чат из Команды\"",
   "Message_HideType_user_removed_room_from_team": "Скрыть сообщения \"Пользователь удалил чат из Команды\"",
-  "Removed__roomName__from_this_team": "удалил(-а) #{{roomName}} из этой рабочей группы",
-  "Removed__username__from_team": "удалил(-а) @{{user_removed}} из этой рабочей группы",
   "User_joined_team": "присоединился к Команде",
   "User_left_team": "покинул Команду",
   "Place_chat_on_hold": "Поставить чат на удержание",

app/i18n/locales/tr.json

@@ -241,9 +241,6 @@
   "Forward_to_user": "Kullanıcıya İlet",
   "Full_table": "Tam tabloyu görmek için tıklayın",
   "Generate_New_Link": "Yeni Bağlantı Oluştur",
-  "Has_joined_the_channel": "kanala katıldı",
-  "Has_joined_the_conversation": "sohbete katıldı",
-  "Has_left_the_channel": "kanaldan ayrıldı",
   "Hide_System_Messages": "Sistem İletilerını Gizle",
   "Hide_type_messages": "\"{{type}}\" iletilerini gizle",
   "How_It_Works": "Nasıl Çalışır",
@@ -425,14 +422,11 @@
   "Roles": "Roller",
   "Room_actions": "Oda işlemleri",
   "Room_changed_announcement": "Oda duyurusu, {{userBy}} tarafından {{announcement}} olarak değiştirildi",
-  "Room_changed_avatar": "Oda profil fotoğrafı {{userBy}} tarafından değiştirildi",
   "Room_changed_description": "Oda açıklaması, {{userBy}} tarafından {{description}} olarak değiştirildi",
-  "Room_changed_topic": "Oda konusu, {{userBy}} tarafından {{topic}} olarak değiştirildi",
   "Room_Files": "Oda Dosyaları",
   "Room_Info_Edit": "Oda Bilgilerini Düzenle",
   "Room_Info": "Oda Bilgisi",
   "Room_Members": "Oda Üyeleri",
-  "Room_name_changed": "Oda adı, {{userBy}} tarafından {{name}} olarak değiştirildi",
   "SAVE": "KAYDET",
   "Save_Changes": "Değişiklikleri Kaydet",
   "Save": "Kaydet",
@@ -534,12 +528,9 @@
   "Upload_file_question_mark": "Dosya gönderilsin mi?",
   "User": "Kullanıcı",
   "Users": "Kullanıcılar",
-  "User_added_by": "{{userAdded}} adlı kullanıcı {{userBy}} tarafından eklendi",
   "User_Info": "Kullanıcı bilgisi",
   "User_has_been_key": "Kullanıcı {{key}} olmuştur",
   "User_is_no_longer_role_by_": "{{user}} artık {{role}} değil ({{userBy}} tarafından)",
-  "User_muted_by": "{{userMuted}} adlı kullanıcının sesini {{userBy}} kapattı",
-  "User_removed_by": "{{userRemoved}} kullanıcısı {{userBy}} tarafından kaldırıldı",
   "User_sent_an_attachment": "{{user}} bir ek gönderdi",
   "User_unmuted_by": "{{userUnmuted}} kullanıcısının sesi {{userBy}} tarafından açıldı",
   "User_was_set_role_by_": "{{user}}, {{userBy}} tarafından {{role}} ayarlandı",

app/i18n/locales/zh-CN.json

@@ -241,9 +241,6 @@
   "Forward_to_user": "转发给用戶",
   "Full_table": "点击以查看完整表格",
   "Generate_New_Link": "产生新的链接",
-  "Has_joined_the_channel": "已加入频道",
-  "Has_joined_the_conversation": "已经加入此对话",
-  "Has_left_the_channel": "已离开频道",
   "Hide_System_Messages": "隐藏系统信息",
   "Hide_type_messages": "隐藏 \"{{type}}\" 信息",
   "How_It_Works": "运作方式",
@@ -422,15 +419,11 @@
   "Roles": "角色",
   "Room_actions": "聊天室操作",
   "Room_changed_announcement": "{{userBy}}将聊天室通知改为：{{announcement}}",
-  "Room_changed_avatar": "Room avatar changed by {{userBy}}",
   "Room_changed_description": "{{userBy}}将聊天室说明改为：{{description}}",
-  "Room_changed_privacy": "{{userBy}}将聊天室类型改为：{{type}}",
-  "Room_changed_topic": "{{userBy}}将聊天室主题改为：{{topic}}",
   "Room_Files": "聊天室文件",
   "Room_Info_Edit": "聊天室信息编辑",
   "Room_Info": "聊天室信息",
   "Room_Members": "聊天室成员",
-  "Room_name_changed": "{{userBy}} 将聊天室名称改为：{{name}}",
   "SAVE": "保存",
   "Save_Changes": "保存更改",
   "Save": "保存",
@@ -532,12 +525,9 @@
   "Upload_file_question_mark": "上传文件?",
   "User": "用戶",
   "Users": "用戶",
-  "User_added_by": "由{{userBy}}添加的用户 {{userAdded}}",
   "User_Info": "用戶资讯",
   "User_has_been_key": "用户已被{{key}}",
   "User_is_no_longer_role_by_": "{{userBy}}将角色 {{role}} 从用户 {{user}} 身上移除",
-  "User_muted_by": "用户 {{userMuted}} 被 {{userBy}} 静音",
-  "User_removed_by": "用户 {{userRemoved}} 被 {{userBy}} 移除",
   "User_sent_an_attachment": "{{user}} 寄送了一个附件",
   "User_unmuted_by": "用户 {{userUnmuted}} 被 {{userBy}} 取消静音",
   "User_was_set_role_by_": "用户 {{user}} 被 {{userBy}} 设置角色 {{role}}",

app/i18n/locales/zh-TW.json

@@ -242,9 +242,6 @@
   "Forward_to_user": "轉發給使用者",
   "Full_table": "點擊以查看完整表格",
   "Generate_New_Link": "產生新的連結",
-  "Has_joined_the_channel": "已加入頻道",
-  "Has_joined_the_conversation": "已經加入此對話",
-  "Has_left_the_channel": "已離開頻道",
   "Hide_System_Messages": "隱藏系統訊息",
   "Hide_type_messages": "隱藏 '{{type}}' 訊息",
   "How_It_Works": "運作方式",
@@ -424,15 +421,11 @@
   "Roles": "角色",
   "Room_actions": "聊天室操作",
   "Room_changed_announcement": "{{userBy}}將聊天室通知改為：{{announcement}}",
-  "Room_changed_avatar": "Room avatar changed by {{userBy}}",
   "Room_changed_description": "{{userBy}}將聊天室說明改為：{{description}}",
-  "Room_changed_privacy": "{{userBy}}將聊天室類型改為：{{type}}",
-  "Room_changed_topic": "{{userBy}}將聊天室主題改為：{{topic}}",
   "Room_Files": "聊天室檔案",
   "Room_Info_Edit": "修改聊天室資訊",
   "Room_Info": "聊天室資訊",
   "Room_Members": "聊天室成員",
-  "Room_name_changed": "{{userBy}} 將聊天室名稱改為：{{name}}",
   "SAVE": "儲存",
   "Save_Changes": "儲存更改",
   "Save": "儲存",
@@ -534,12 +527,9 @@
   "Upload_file_question_mark": "上傳文件?",
   "User": "使用者",
   "Users": "使用者",
-  "User_added_by": "由{{userBy}}添加的使用者 {{userAdded}}",
   "User_Info": "使用者資訊",
   "User_has_been_key": "使用者已被{{key}}",
   "User_is_no_longer_role_by_": "{{userBy}}將角色 {{role}} 從使用者 {{user}} 身上移除",
-  "User_muted_by": "使用者 {{userMuted}} 被 {{userBy}} 靜音",
-  "User_removed_by": "使用者 {{userRemoved}} 被 {{userBy}} 移除",
   "User_sent_an_attachment": "{{user}} 寄送了一個附件",
   "User_unmuted_by": "使用者 {{userUnmuted}} 被 {{userBy}} 取消靜音",
   "User_was_set_role_by_": "使用者 {{user}} 被 {{userBy}} 設置角色 {{role}}",