diff --git a/package-lock.json b/package-lock.json index b93756bcc21..cdef413604d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3364,7 +3364,7 @@ }, "compression": { "version": "1.5.2", - "resolved": "http://registry.npmjs.org/compression/-/compression-1.5.2.tgz", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.5.2.tgz", "integrity": "sha1-sDuNhub4rSloPLqN+R3cb/x3s5U=", "requires": { "accepts": "1.2.13", @@ -6463,6 +6463,11 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" }, + "grapheme-splitter": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.2.tgz", + "integrity": "sha1-Y56dwb8GWJLGQ94x2qJ89YsQaOI=" + }, "gridfs-stream": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/gridfs-stream/-/gridfs-stream-1.1.1.tgz", @@ -9071,6 +9076,11 @@ } } }, + "merge": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz", + "integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=" + }, "merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", @@ -11263,6 +11273,11 @@ "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" }, + "querystringify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-1.0.0.tgz", + "integrity": "sha1-YoYkIRLFtxL6ZU5SZlK/ahP/Bcs=" + }, "quick-lru": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz", @@ -11725,6 +11740,11 @@ "resolve-from": "1.0.1" } }, + "requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=" + }, "resolve": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz", @@ -13913,6 +13933,15 @@ "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.0.tgz", "integrity": "sha1-TTNA6AfTdzvamZH4MFrNzCpmXSo=" }, + "url-parse": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.2.0.tgz", + "integrity": "sha512-DT1XbYAfmQP65M/mE6OALxmXzZ/z1+e5zk2TcSKe/KiYbNGZxgtttzC0mR/sjopbpOXcbniq7eIKmocJnUWlEw==", + "requires": { + "querystringify": "1.0.0", + "requires-port": "1.0.0" + } + }, "url-parse-lax": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", @@ -14099,6 +14128,25 @@ "resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz", "integrity": "sha1-eWkVhNmGB/UHC9O3CkDmuyLkAes=" }, + "webdav": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/webdav/-/webdav-1.5.2.tgz", + "integrity": "sha512-x81G3ahrTwM8FIkMkT93YbEQM6/BoN7O7z6WkHHVX1ZkN0OA/wzSrUtpB2LMVk77hsuw1u1hRqkKee/rG2hErQ==", + "requires": { + "merge": "1.2.0", + "node-fetch": "2.0.0", + "url-join": "4.0.0", + "url-parse": "1.2.0", + "xml2js": "0.4.19" + }, + "dependencies": { + "node-fetch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.0.0.tgz", + "integrity": "sha1-mCu6Q+zU8pIqKcwYamu7C7c/y6Y=" + } + } + }, "webdriverio": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-4.12.0.tgz", diff --git a/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.html b/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.html index ed3edac1399..9cdfbe698a9 100644 --- a/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.html +++ b/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.html @@ -15,7 +15,7 @@
{{> icon block="mail-messages__instructions-icon" icon="hand-pointer"}}
- Click the messages you would like to send by e-mail + {{_ "Click_the_messages_you_would_like_to_send_by_email"}}
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index 8b65d06cd25..02fb916952c 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -514,6 +514,7 @@ "clear_history": "Clear History", "Click_here": "Click here", "Click_here_for_more_info": "Click here for more info", + "Click_the_messages_you_would_like_to_send_by_email": "Click the messages you would like to send by e-mail", "Click_to_join": "Click to Join!", "Client_ID": "Client ID", "Client_Secret": "Client Secret", @@ -902,6 +903,7 @@ "Direct_Reply_Separator_Description": "[Alter only if you know exactly what you are doing, refer docs]
Separator between base & tag part of email", "Direct_Reply_Username": "Username", "Direct_Reply_Username_Description": "Please use absolute email, tagging is not allowed, it would be over-written", + "Directory": "Directory", "Disable_Facebook_integration": "Disable Facebook integration", "Disable_Notifications": "Disable Notifications", "Disable_two-factor_authentication": "Disable two-factor authentication", @@ -1749,6 +1751,7 @@ "Mobile_Notifications_Default_Alert": "Mobile Notifications Default Alert", "Monday": "Monday", "Monitor_history_for_changes_on": "Monitor History for Changes on", + "More": "More", "More_channels": "More channels", "More_direct_messages": "More direct messages", "More_groups": "More private groups", @@ -2265,6 +2268,7 @@ "Snippeted_a_message": "Created a snippet __snippetLink__", "Social_Network": "Social Network", "Sorry_page_you_requested_does_not_exists_or_was_deleted": "Sorry, page you requested does not exists or was deleted!", + "Sort": "Sort", "Sort_by_activity": "Sort by Activity", "Sound": "Sound", "Sound_File_mp3": "Sound File (mp3)", @@ -2409,6 +2413,7 @@ "Title_bar_color": "Title bar color", "Title_bar_color_offline": "Title bar color offline", "Title_offline": "Title offline", + "To_additional_emails": "To additional emails", "To_install_RocketChat_Livechat_in_your_website_copy_paste_this_code_above_the_last_body_tag_on_your_site": "To install Rocket.Chat Livechat in your website, copy & paste this code above the last </body> tag on your site.", "to_see_more_details_on_how_to_integrate": "to see more details on how to integrate.", "To_users": "To Users", diff --git a/packages/rocketchat-i18n/i18n/ru.i18n.json b/packages/rocketchat-i18n/i18n/ru.i18n.json index 1430a6287bf..35d8c9efc57 100644 --- a/packages/rocketchat-i18n/i18n/ru.i18n.json +++ b/packages/rocketchat-i18n/i18n/ru.i18n.json @@ -512,6 +512,7 @@ "clear_history": "Очистить историю", "Click_here": "кликните сюда", "Click_here_for_more_info": "Больше информации здесь", + "Click_the_messages_you_would_like_to_send_by_email": "Выберите щелчком мыши сообщения, которые вы хотите отправить по email", "Click_to_join": "Нажмите, чтобы присоединиться!", "Client_ID": "Идентификатор клиента", "Client_Secret": "Client Secret", @@ -900,6 +901,7 @@ "Direct_Reply_Separator_Description": "[Меняйте только в случае, если вы точно знаете, что делаете, см. документацию]
Разделитель между базой и тегом в email", "Direct_Reply_Username": "Имя пользователя", "Direct_Reply_Username_Description": "Пожалуйста, используйте абсолютную электронную почту, tagging не разрешено, оно будет переписана.", + "Directory": "Обзор", "Disable_Facebook_integration": "Отключить интеграцию с Facebook", "Disable_Notifications": "Отключить уведомления", "Disable_two-factor_authentication": "Выключить двухфакторную аутентификацию", @@ -1721,6 +1723,7 @@ "Meta_language": "Язык", "Meta_msvalidate01": "MSValidate.01", "Meta_robots": "Боты", + "Min_length_is": "Минимальная длина составляет %s", "Minimum_balance": "Минимальный баланс", "minutes": "минуты", @@ -1728,6 +1731,7 @@ "Mobile_Notifications_Default_Alert": "Уведомления на мобильных устройствах", "Monday": "Понедельник", "Monitor_history_for_changes_on": "Отслеживать историю на изменение в", + "More": "Еще", "More_channels": "Другие каналы", "More_direct_messages": "Больше личных сообщений", "More_groups": "Больше приватных групп", @@ -2242,6 +2246,7 @@ "Snippeted_a_message": "Создан сниппет __snippetLink__", "Social_Network": "Социальная сеть", "Sorry_page_you_requested_does_not_exists_or_was_deleted": "Извините, запрошенная вами страница не существует или была удалена!", + "Sort": "Сортировка", "Sort_by_activity": "Сортировать по активности", "Sound": "Звуковые оповещения", "Sound_File_mp3": "Звуковой файл (mp3)", @@ -2386,6 +2391,7 @@ "Title_bar_color": "Цвет строки заголовка", "Title_bar_color_offline": "Цвет строки заголовка при отсутствии подключения", "Title_offline": "Заголовок при отсутствии подключения", + "To_additional_emails": "Дополнительные email адреса", "To_install_RocketChat_Livechat_in_your_website_copy_paste_this_code_above_the_last_body_tag_on_your_site": "Для того, чтобы установить Rocket.Chat Livechat на вашем сайте, скопируйте и вставьте этот код выше последнего </body> тега на вашем сайте.", "to_see_more_details_on_how_to_integrate": "чтобы увидеть более подробную информацию о том, как интегрировать.", "To_users": "Пользователям",