diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 091c369ba432..be7df2b5b087 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM rocketchat/base:8
 
-ENV RC_VERSION 0.60.0-develop
+ENV RC_VERSION 0.61.0-develop
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.meteor/packages b/.meteor/packages
index 7649bcdc53a8..13e508f88f2d 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -22,7 +22,6 @@ email@1.2.3
 fastclick@1.0.13
 http@1.3.0
 jquery@1.11.10
-less@2.7.11
 logging@1.1.19
 meteor-base@1.2.0
 mobile-experience@1.0.5
@@ -160,7 +159,7 @@ jparker:gravatar
 kadira:blaze-layout
 kadira:flow-router
 keepnox:perfect-scrollbar
-#kenton:accounts-sandstorm
+kenton:accounts-sandstorm
 mizzao:autocomplete
 mizzao:timesync
 mrt:reactive-store
diff --git a/.meteor/versions b/.meteor/versions
index 56325d854e47..76cf0cb5de4e 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -64,6 +64,7 @@ jquery@1.11.10
 kadira:blaze-layout@2.3.0
 kadira:flow-router@2.12.1
 keepnox:perfect-scrollbar@0.6.8
+kenton:accounts-sandstorm@0.7.0
 konecty:change-case@2.3.0
 konecty:delayed-task@1.0.0
 konecty:mongo-counter@0.0.5_3
@@ -90,7 +91,7 @@ mizzao:autocomplete@0.5.1
 mizzao:timesync@0.3.4
 mobile-experience@1.0.5
 mobile-status-bar@1.0.14
-modules@0.11.0
+modules@0.11.2
 modules-runtime@0.9.1
 mongo@1.3.1
 mongo-dev-server@1.1.0
diff --git a/.postcssrc b/.postcssrc
index d61a64ecdaa6..f0e4aa4b697e 100644
--- a/.postcssrc
+++ b/.postcssrc
@@ -6,7 +6,7 @@
 		},
 		"postcss-media-minmax": {},
 		"postcss-selector-not": {},
-		"postcss-nesting": {},
+		"postcss-nested": {},
 		"autoprefixer": {
 			"browsers": [
 				"ie > 10",
diff --git a/.sandstorm/build.sh b/.sandstorm/build.sh
index e1e398869646..976f897db276 100755
--- a/.sandstorm/build.sh
+++ b/.sandstorm/build.sh
@@ -3,12 +3,12 @@ set -x
 set -euvo pipefail
 
 # Make meteor bundle
-export NODE_ENV=production
 sudo chown vagrant:vagrant /home/vagrant -R
 cd /opt/app
-meteor npm install --production
+meteor npm install
 meteor build --directory /home/vagrant/
 
+export NODE_ENV=production
 # Use npm and node from the Meteor dev bundle to install the bundle's dependencies.
 TOOL_VERSION=$(meteor show --ejson $(<.meteor/release) | grep '^ *"tool":' |
     sed -re 's/^.*"(meteor-tool@[^"]*)".*$/\1/g')
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index cee5416212dd..3df6feef4554 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.60.0-develop"),
+		appMarketingVersion = (defaultText = "0.61.0-develop"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 
@@ -106,6 +106,7 @@ const myCommand :Spk.Manifest.Command = (
 		# Note that this defines the *entire* environment seen by your app.
 		(key = "PATH", value = "/usr/local/bin:/usr/bin:/bin"),
 		(key = "SANDSTORM", value = "1"),
+		(key = "HOME", value = "/var"),
 		(key = "Statistics_reporting", value = "false"),
 		(key = "Accounts_AllowUserAvatarChange", value = "false"),
 		(key = "Accounts_AllowUserProfileChange", value = "false"),
diff --git a/.sandstorm/setup.sh b/.sandstorm/setup.sh
index d410dda6cb1e..bc30455ed282 100755
--- a/.sandstorm/setup.sh
+++ b/.sandstorm/setup.sh
@@ -8,7 +8,7 @@ apt-get install build-essential git -y
 cd /opt/
 
 NODE_ENV=production
-PACKAGE=meteor-spk-0.3.1
+PACKAGE=meteor-spk-0.4.0
 PACKAGE_FILENAME="$PACKAGE.tar.xz"
 CACHE_TARGET="/host-dot-sandstorm/caches/${PACKAGE_FILENAME}"
 
@@ -32,7 +32,7 @@ cp -a /lib/x86_64-linux-gnu/libtinfo.so.* /opt/meteor-spk/meteor-spk.deps/lib/x8
 # Unfortunately, Meteor does not explicitly make it easy to cache packages, but
 # we know experimentally that the package is mostly directly extractable to a
 # user's $HOME/.meteor directory.
-METEOR_RELEASE=1.4.2
+METEOR_RELEASE=1.6.0.1
 METEOR_PLATFORM=os.linux.x86_64
 METEOR_TARBALL_FILENAME="meteor-bootstrap-${METEOR_PLATFORM}.tar.gz"
 METEOR_TARBALL_URL="https://d3sqy0vbqsdhku.cloudfront.net/packages-bootstrap/${METEOR_RELEASE}/${METEOR_TARBALL_FILENAME}"
diff --git a/.scripts/set-version.js b/.scripts/set-version.js
index 74a1024168fc..14c49a5fc877 100644
--- a/.scripts/set-version.js
+++ b/.scripts/set-version.js
@@ -55,11 +55,11 @@ git.status()
 	if (status.current === 'release-candidate') {
 		return semver.inc(pkgJson.version, 'prerelease', 'rc');
 	}
-	if (status.current === 'master') {
+	if (/release-\d+\.\d+\.\d+/.test(status.current)) {
 		return semver.inc(pkgJson.version, 'patch');
 	}
-	if (status.current === 'develop') {
-		return semver.inc(semver.inc(pkgJson.version, 'minor'), 'minor')+'-develop';
+	if (status.current === 'develop-sync') {
+		return semver.inc(pkgJson.version, 'minor') + '-develop';
 	}
 	return Promise.reject(`No release action for branch ${ status.current }`);
 })
diff --git a/.snapcraft/snapcraft.yaml b/.snapcraft/snapcraft.yaml
index 63190b4510ca..010e70512a2d 100644
--- a/.snapcraft/snapcraft.yaml
+++ b/.snapcraft/snapcraft.yaml
@@ -46,8 +46,10 @@ parts:
             - build-essential
             - nodejs
     rocketchat-server:
+        build-packages:
+            - curl
         plugin: dump
-        prepare: curl -SLf "https://releases.rocket.chat/#{RC_VERSION}/download/" -o rocket.chat.tgz; tar xvf rocket.chat.tgz --strip 1; cd programs/server; npm install; cd npm/node_modules/meteor/rocketchat_google-vision; npm install grpc@1.6.6; 
+        prepare: curl -SLf "https://releases.rocket.chat/#{RC_VERSION}/download/" -o rocket.chat.tgz; tar xvf rocket.chat.tgz --strip 1; cd programs/server; npm install; cd npm/node_modules/meteor/rocketchat_google-vision; npm install grpc@1.6.6;
         after: [node]
         source: .
         stage-packages:
diff --git a/.travis/snap.sh b/.travis/snap.sh
index 05e376a3f4a1..e3a8ee703866 100755
--- a/.travis/snap.sh
+++ b/.travis/snap.sh
@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.60.0-develop
+    RC_VERSION=0.61.0-develop
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"
diff --git a/HISTORY.md b/HISTORY.md
index 7a361a4d93c1..3fdd76307d01 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,748 @@
+<a name="0.60.0"></a>
+# 0.60.0 (2017-12-27)
+
+<a name="0.60.0"></a>
+# 0.60.0 (2017-12-27)
+
+### New Features
+
+- [#8915](https://github.com/RocketChat/Rocket.Chat/pull/8915)  Add "Favorites" and "Mark as read" options to the room list
+- [#8739](https://github.com/RocketChat/Rocket.Chat/pull/8739) Add "real name change" setting
+- [#8626](https://github.com/RocketChat/Rocket.Chat/pull/8626) Add icon art in Tokenpass channel title
+- [#8947](https://github.com/RocketChat/Rocket.Chat/pull/8947) Add new API endpoints
+- [#8304](https://github.com/RocketChat/Rocket.Chat/pull/8304) Add RD Station integration to livechat
+- [#8066](https://github.com/RocketChat/Rocket.Chat/pull/8066) Add settings for allow user direct messages to yourself
+- [#8108](https://github.com/RocketChat/Rocket.Chat/pull/8108) Add sweet alert to video call tab
+- [#8037](https://github.com/RocketChat/Rocket.Chat/pull/8037) Add yunohost.org installation method to Readme.md
+- [#8902](https://github.com/RocketChat/Rocket.Chat/pull/8902) Added support for Dataporten's userid-feide scope
+- [#7641](https://github.com/RocketChat/Rocket.Chat/pull/7641) Adds admin option to globally set mobile devices to always be notified regardless of presence status.
+- [#7285](https://github.com/RocketChat/Rocket.Chat/pull/7285) Allow user's default preferences configuration
+- [#8857](https://github.com/RocketChat/Rocket.Chat/pull/8857) code to get the updated messages
+- [#8924](https://github.com/RocketChat/Rocket.Chat/pull/8924) Describe file uploads when notifying by email
+- [#8143](https://github.com/RocketChat/Rocket.Chat/pull/8143) Displays QR code for manually entering when enabling 2fa
+- [#8260](https://github.com/RocketChat/Rocket.Chat/pull/8260) Enable read only channel creation
+- [#8807](https://github.com/RocketChat/Rocket.Chat/pull/8807) Facebook livechat integration
+- [#8149](https://github.com/RocketChat/Rocket.Chat/pull/8149) Feature/livechat hide email
+- [#9009](https://github.com/RocketChat/Rocket.Chat/pull/9009) Improve room types API and usages
+- [#8882](https://github.com/RocketChat/Rocket.Chat/pull/8882) New Modal component
+- [#8029](https://github.com/RocketChat/Rocket.Chat/pull/8029) Option to enable/disable auto away and configure timer
+- [#8866](https://github.com/RocketChat/Rocket.Chat/pull/8866) Room counter sidebar preference
+- [#8979](https://github.com/RocketChat/Rocket.Chat/pull/8979) Save room's last message
+- [#8905](https://github.com/RocketChat/Rocket.Chat/pull/8905) Send category and title fields to iOS push notification
+- [#7999](https://github.com/RocketChat/Rocket.Chat/pull/7999) Sender's name in email notifications.
+- [#8459](https://github.com/RocketChat/Rocket.Chat/pull/8459) Setting to disable MarkDown and enable AutoLinker
+- [#8362](https://github.com/RocketChat/Rocket.Chat/pull/8362) Sidebar item width to 100%
+- [#8360](https://github.com/RocketChat/Rocket.Chat/pull/8360) Smaller accountBox
+- [#8060](https://github.com/RocketChat/Rocket.Chat/pull/8060) Token Controlled Access channels
+- [#8361](https://github.com/RocketChat/Rocket.Chat/pull/8361) Unify unread and mentions badge
+- [#8715](https://github.com/RocketChat/Rocket.Chat/pull/8715) Upgrade Meteor to 1.6
+- [#8073](https://github.com/RocketChat/Rocket.Chat/pull/8073) Upgrade to meteor 1.5.2
+- [#8433](https://github.com/RocketChat/Rocket.Chat/pull/8433) Use enter separator rather than comma in highlight preferences + Auto refresh after change highlighted words
+- [#9092](https://github.com/RocketChat/Rocket.Chat/pull/9092) Modal
+- [#9066](https://github.com/RocketChat/Rocket.Chat/pull/9066) Make Custom oauth accept nested usernameField
+
+
+### Bug Fixes
+
+- [#8147](https://github.com/RocketChat/Rocket.Chat/pull/8147) "*.members" rest api being useless and only returning usernames
+- [#8278](https://github.com/RocketChat/Rocket.Chat/pull/8278) "Cancel button" on modal in RTL in Firefox 55
+- [#8266](https://github.com/RocketChat/Rocket.Chat/pull/8266) "Channel Setting" buttons alignment in RTL
+- [#8270](https://github.com/RocketChat/Rocket.Chat/pull/8270) [i18n] My Profile & README.md links
+- [#8094](https://github.com/RocketChat/Rocket.Chat/pull/8094) Add admin audio preferences translations
+- [#8708](https://github.com/RocketChat/Rocket.Chat/pull/8708) Add historic chats icon in Livechat
+- [#8389](https://github.com/RocketChat/Rocket.Chat/pull/8389) Add needed dependency for snaps
+- [#7971](https://github.com/RocketChat/Rocket.Chat/pull/7971) Add padding on messages to allow space to the action buttons
+- [#9022](https://github.com/RocketChat/Rocket.Chat/pull/9022) Added afterUserCreated trigger after first CAS login
+- [#8314](https://github.com/RocketChat/Rocket.Chat/pull/8314) After deleting the room, cache is not synchronizing
+- [#8172](https://github.com/RocketChat/Rocket.Chat/pull/8172) Allow unknown file types if no allowed whitelist has been set ([#7074](https://github.com/RocketChat/Rocket.Chat/issues/7074))
+- [#8593](https://github.com/RocketChat/Rocket.Chat/pull/8593) AmazonS3: Quote file.name for ContentDisposition for files with commas
+- [#8635](https://github.com/RocketChat/Rocket.Chat/pull/8635) API channel/group.members not sorting
+- [#8241](https://github.com/RocketChat/Rocket.Chat/pull/8241) Api groups.files is always returning empty
+- [#8271](https://github.com/RocketChat/Rocket.Chat/pull/8271) Attachment icons alignment in LTR and RTL
+- [#8648](https://github.com/RocketChat/Rocket.Chat/pull/8648) Audio message icon
+- [#8107](https://github.com/RocketChat/Rocket.Chat/pull/8107) Autoupdate of CSS does not work when using a prefix
+- [#7944](https://github.com/RocketChat/Rocket.Chat/pull/7944) Broken embedded view layout
+- [#7943](https://github.com/RocketChat/Rocket.Chat/pull/7943) Broken emoji picker on firefox
+- [#8307](https://github.com/RocketChat/Rocket.Chat/pull/8307) Call buttons with wrong margin on RTL
+- [#8925](https://github.com/RocketChat/Rocket.Chat/pull/8925) Can't react on Read Only rooms even when enabled
+- [#9044](https://github.com/RocketChat/Rocket.Chat/pull/9044) Can't use OAuth login against a Rocket.Chat OAuth server
+- [#8889](https://github.com/RocketChat/Rocket.Chat/pull/8889) Cannot edit or delete custom sounds
+- [#8654](https://github.com/RocketChat/Rocket.Chat/pull/8654) CAS does not share secrets when operating multiple server instances
+- [#8216](https://github.com/RocketChat/Rocket.Chat/pull/8216) Case insensitive SAML email check
+- [#8928](https://github.com/RocketChat/Rocket.Chat/pull/8928) Change old 'rocketbot' username to 'InternalHubot_Username' setting
+- [#8883](https://github.com/RocketChat/Rocket.Chat/pull/8883) Change the unread messages style
+- [#9012](https://github.com/RocketChat/Rocket.Chat/pull/9012) Changed oembedUrlWidget to prefer og:image and twitter:image over msapplication-TileImage
+- [#7984](https://github.com/RocketChat/Rocket.Chat/pull/7984) Chat box no longer auto-focuses when typing
+- [#8295](https://github.com/RocketChat/Rocket.Chat/pull/8295) Check attachments is defined before accessing first element
+- [#8259](https://github.com/RocketChat/Rocket.Chat/pull/8259) clipboard and permalink on new popover
+- [#8543](https://github.com/RocketChat/Rocket.Chat/pull/8543) Color reset when default value editor is different
+- [#8656](https://github.com/RocketChat/Rocket.Chat/pull/8656) Contextual errors for this and RegExp declarations in IRC module
+- [#8039](https://github.com/RocketChat/Rocket.Chat/pull/8039) copy to clipboard and update clipboard.js library
+- [#7942](https://github.com/RocketChat/Rocket.Chat/pull/7942) Create channel button on Firefox
+- [#9034](https://github.com/RocketChat/Rocket.Chat/pull/9034) Custom OAuth: Not able to set different token place for routes
+- [#8386](https://github.com/RocketChat/Rocket.Chat/pull/8386) disabled katex tooltip on messageBox
+- [#8917](https://github.com/RocketChat/Rocket.Chat/pull/8917) DM email notifications always being sent regardless of account setting
+- [#8527](https://github.com/RocketChat/Rocket.Chat/pull/8527) Do not send joinCode field to clients
+- [#7948](https://github.com/RocketChat/Rocket.Chat/pull/7948) Document README.md. Drupal repo out of date
+- [#8812](https://github.com/RocketChat/Rocket.Chat/pull/8812) Don't strip trailing slash on autolinker urls
+- [#7927](https://github.com/RocketChat/Rocket.Chat/pull/7927) Double scroll on 'keyboard shortcuts' menu in sidepanel
+- [#8408](https://github.com/RocketChat/Rocket.Chat/pull/8408) Duplicate code in rest api letting in a few bugs with the rest api
+- [#8101](https://github.com/RocketChat/Rocket.Chat/pull/8101) Dynamic popover
+- [#8317](https://github.com/RocketChat/Rocket.Chat/pull/8317) Email Subjects not being sent
+- [#7923](https://github.com/RocketChat/Rocket.Chat/pull/7923) Email verification indicator added
+- [#8300](https://github.com/RocketChat/Rocket.Chat/pull/8300) Emoji Picker hidden for reactions in RTL
+- [#8671](https://github.com/RocketChat/Rocket.Chat/pull/8671) Enable CORS for Restivus
+- [#8551](https://github.com/RocketChat/Rocket.Chat/pull/8551) encode filename in url to prevent links breaking
+- [#9023](https://github.com/RocketChat/Rocket.Chat/pull/9023) Error when saving integration with symbol as only trigger
+- [#8001](https://github.com/RocketChat/Rocket.Chat/pull/8001) Error when translating message
+- [#8310](https://github.com/RocketChat/Rocket.Chat/pull/8310) Execute meteor reset on TRAVIS_TAG builds
+- [#8645](https://github.com/RocketChat/Rocket.Chat/pull/8645) Fix e-mail message forward
+- [#7754](https://github.com/RocketChat/Rocket.Chat/pull/7754) Fix email on mention
+- [#7912](https://github.com/RocketChat/Rocket.Chat/pull/7912) Fix google play logo on repo README
+- [#8577](https://github.com/RocketChat/Rocket.Chat/pull/8577) Fix guest pool inquiry taking
+- [#8146](https://github.com/RocketChat/Rocket.Chat/pull/8146) Fix iframe login API response (issue [#8145](https://github.com/RocketChat/Rocket.Chat/issues/8145))
+- [#7904](https://github.com/RocketChat/Rocket.Chat/pull/7904) Fix livechat toggle UI issue
+- [#8144](https://github.com/RocketChat/Rocket.Chat/pull/8144) Fix new room sound being played too much
+- [#7945](https://github.com/RocketChat/Rocket.Chat/pull/7945) Fix placeholders in account profile
+- [#8099](https://github.com/RocketChat/Rocket.Chat/pull/8099) Fix setting user avatar on LDAP login
+- [#7963](https://github.com/RocketChat/Rocket.Chat/pull/7963) Fix the status on the members list
+- [#8679](https://github.com/RocketChat/Rocket.Chat/pull/8679) Fix typos
+- [#8787](https://github.com/RocketChat/Rocket.Chat/pull/8787) Fixed some typos in DE translations
+- [#8014](https://github.com/RocketChat/Rocket.Chat/pull/8014) Hide scrollbar on login page if not necessary
+- [#8431](https://github.com/RocketChat/Rocket.Chat/pull/8431) Highlighted color height issue
+- [#8721](https://github.com/RocketChat/Rocket.Chat/pull/8721) i18n'd Resend_verification_mail, username_initials, upload avatar
+- [#9000](https://github.com/RocketChat/Rocket.Chat/pull/9000) if ogImage exists use it over image in oembedUrlWidget
+- [#8966](https://github.com/RocketChat/Rocket.Chat/pull/8966) Importers failing when usernames exists but cases don't match and improve the importer framework's performance
+- [#8795](https://github.com/RocketChat/Rocket.Chat/pull/8795) Improved grammar and made it clearer to the user
+- [#8211](https://github.com/RocketChat/Rocket.Chat/pull/8211) Incorrect URL for login terms when using prefix
+- [#8491](https://github.com/RocketChat/Rocket.Chat/pull/8491) Invalid Code message for password protected channel
+- [#8048](https://github.com/RocketChat/Rocket.Chat/pull/8048) Invisible leader bar on hover
+- [#8167](https://github.com/RocketChat/Rocket.Chat/pull/8167) Issue [#8166](https://github.com/RocketChat/Rocket.Chat/issues/8166) where empty analytics setting breaks to load Piwik script
+- [#8948](https://github.com/RocketChat/Rocket.Chat/pull/8948) Katex markdown link changed
+- [#8541](https://github.com/RocketChat/Rocket.Chat/pull/8541) LDAP login error regression at 0.59.0
+- [#8457](https://github.com/RocketChat/Rocket.Chat/pull/8457) LDAP memory issues when pagination is not available
+- [#8613](https://github.com/RocketChat/Rocket.Chat/pull/8613) LDAP not merging existent users && Wrong id link generation
+- [#8691](https://github.com/RocketChat/Rocket.Chat/pull/8691) LDAP not respecting UTF8 characters & Sync Interval not working
+- [#8213](https://github.com/RocketChat/Rocket.Chat/pull/8213) Leave and hide buttons was removed
+- [#8985](https://github.com/RocketChat/Rocket.Chat/pull/8985) Link for channels are not rendering correctly
+- [#8868](https://github.com/RocketChat/Rocket.Chat/pull/8868) long filename overlaps cancel button in progress bar
+- [#8907](https://github.com/RocketChat/Rocket.Chat/pull/8907) Long room announcement cut off
+- [#8262](https://github.com/RocketChat/Rocket.Chat/pull/8262) make sidebar item animation fast
+- [#7965](https://github.com/RocketChat/Rocket.Chat/pull/7965) Markdown being rendered in code tags
+- [#8316](https://github.com/RocketChat/Rocket.Chat/pull/8316) Mention unread indicator was removed
+- [#7885](https://github.com/RocketChat/Rocket.Chat/pull/7885) message actions over unread bar
+- [#8634](https://github.com/RocketChat/Rocket.Chat/pull/8634) Message popup menu on mobile/cordova
+- [#8019](https://github.com/RocketChat/Rocket.Chat/pull/8019) message-box autogrow
+- [#8932](https://github.com/RocketChat/Rocket.Chat/pull/8932) Message-box autogrow flick
+- [#8544](https://github.com/RocketChat/Rocket.Chat/pull/8544) Migration 103 wrong converting primrary colors
+- [#8357](https://github.com/RocketChat/Rocket.Chat/pull/8357) Missing i18n translations
+- [#8286](https://github.com/RocketChat/Rocket.Chat/pull/8286) Missing placeholder translations
+- [#8637](https://github.com/RocketChat/Rocket.Chat/pull/8637) Missing scroll at create channel page
+- [#8884](https://github.com/RocketChat/Rocket.Chat/pull/8884) Missing sidebar footer padding
+- [#8059](https://github.com/RocketChat/Rocket.Chat/pull/8059) Not sending email to mentioned users with unchanged preference
+- [#8828](https://github.com/RocketChat/Rocket.Chat/pull/8828) Notification is not sent when a video conference start
+- [#9042](https://github.com/RocketChat/Rocket.Chat/pull/9042) Notification sound is not disabling when busy
+- [#7954](https://github.com/RocketChat/Rocket.Chat/pull/7954) OTR buttons padding
+- [#7883](https://github.com/RocketChat/Rocket.Chat/pull/7883) popover position on mobile
+- [#8046](https://github.com/RocketChat/Rocket.Chat/pull/8046) Prevent autotranslate tokens race condition
+- [#8315](https://github.com/RocketChat/Rocket.Chat/pull/8315) Put delete action on another popover group
+- [#8441](https://github.com/RocketChat/Rocket.Chat/pull/8441) Range Slider Value label has bug in RTL
+- [#7998](https://github.com/RocketChat/Rocket.Chat/pull/7998) Recent emojis not updated when adding via text
+- [#8358](https://github.com/RocketChat/Rocket.Chat/pull/8358) remove accountBox from admin menu
+- [#7895](https://github.com/RocketChat/Rocket.Chat/pull/7895) Remove break change in Realtime API
+- [#8334](https://github.com/RocketChat/Rocket.Chat/pull/8334) Remove sidebar header on admin embedded version
+- [#8237](https://github.com/RocketChat/Rocket.Chat/pull/8237) Removing pipe and commas from custom emojis ([#8168](https://github.com/RocketChat/Rocket.Chat/issues/8168))
+- [#8017](https://github.com/RocketChat/Rocket.Chat/pull/8017) room icon on header
+- [#8112](https://github.com/RocketChat/Rocket.Chat/pull/8112) RTL
+- [#8261](https://github.com/RocketChat/Rocket.Chat/pull/8261) RTL on reply
+- [#8047](https://github.com/RocketChat/Rocket.Chat/pull/8047) Scroll on messagebox
+- [#8190](https://github.com/RocketChat/Rocket.Chat/pull/8190) Scrollbar not using new style
+- [#8018](https://github.com/RocketChat/Rocket.Chat/pull/8018) search results height
+- [#7881](https://github.com/RocketChat/Rocket.Chat/pull/7881) search results position on sidebar
+- [#8830](https://github.com/RocketChat/Rocket.Chat/pull/8830) Set correct Twitter link
+- [#8122](https://github.com/RocketChat/Rocket.Chat/pull/8122) Settings description not showing
+- [#7712](https://github.com/RocketChat/Rocket.Chat/pull/7712) Show leader on first load
+- [#8718](https://github.com/RocketChat/Rocket.Chat/pull/8718) Show real name of current user at top of side nav if setting enabled
+- [#8154](https://github.com/RocketChat/Rocket.Chat/pull/8154) Sidebar and RTL alignments
+- [#8397](https://github.com/RocketChat/Rocket.Chat/pull/8397) Sidebar item menu position in RTL
+- [#7880](https://github.com/RocketChat/Rocket.Chat/pull/7880) sidebar paddings
+- [#8257](https://github.com/RocketChat/Rocket.Chat/pull/8257) sidenav colors, hide and leave, create channel on safari
+- [#8252](https://github.com/RocketChat/Rocket.Chat/pull/8252) sidenav mentions on hover
+- [#8390](https://github.com/RocketChat/Rocket.Chat/pull/8390) Slack import failing and not being able to be restarted
+- [#7970](https://github.com/RocketChat/Rocket.Chat/pull/7970) Small alignment fixes
+- [#9029](https://github.com/RocketChat/Rocket.Chat/pull/9029) snap install by setting grpc package used by google/vision to 1.6.6
+- [#8937](https://github.com/RocketChat/Rocket.Chat/pull/8937) Snippetted messages not working
+- [#8269](https://github.com/RocketChat/Rocket.Chat/pull/8269) some placeholder and phrase traslation fix
+- [#8717](https://github.com/RocketChat/Rocket.Chat/pull/8717) Sort direct messages by full name if show real names setting enabled
+- [#7960](https://github.com/RocketChat/Rocket.Chat/pull/7960) status and active room colors on sidebar
+- [#8413](https://github.com/RocketChat/Rocket.Chat/pull/8413) Store Outgoing Integration Result as String in Mongo
+- [#8006](https://github.com/RocketChat/Rocket.Chat/pull/8006) Sync of non existent field throws exception
+- [#7985](https://github.com/RocketChat/Rocket.Chat/pull/7985) Text area buttons and layout on mobile
+- [#8159](https://github.com/RocketChat/Rocket.Chat/pull/8159) Text area lost text when page reloads
+- [#7986](https://github.com/RocketChat/Rocket.Chat/pull/7986) Textarea on firefox
+- [#8298](https://github.com/RocketChat/Rocket.Chat/pull/8298) TypeError: Cannot read property 't' of undefined
+- [#8938](https://github.com/RocketChat/Rocket.Chat/pull/8938) Typo Fix
+- [#8514](https://github.com/RocketChat/Rocket.Chat/pull/8514) Uncessary route reload break some routes
+- [#9046](https://github.com/RocketChat/Rocket.Chat/pull/9046) Update insecure moment.js dependency
+- [#8655](https://github.com/RocketChat/Rocket.Chat/pull/8655) Update pt-BR translation
+- [#9024](https://github.com/RocketChat/Rocket.Chat/pull/9024) Use encodeURI in AmazonS3 contentDisposition file.name to prevent fail
+- [#8210](https://github.com/RocketChat/Rocket.Chat/pull/8210) User avatar in DM list.
+- [#8810](https://github.com/RocketChat/Rocket.Chat/pull/8810) User email settings on DM
+- [#8716](https://github.com/RocketChat/Rocket.Chat/pull/8716) Username clipping on firefox
+- [#7953](https://github.com/RocketChat/Rocket.Chat/pull/7953) username ellipsis on firefox
+- [#8372](https://github.com/RocketChat/Rocket.Chat/pull/8372) Various LDAP issues & Missing pagination
+- [#7988](https://github.com/RocketChat/Rocket.Chat/pull/7988) Vertical menu on flex-tab
+- [#7893](https://github.com/RocketChat/Rocket.Chat/pull/7893) Window exception when parsing Markdown on server
+- [#8547](https://github.com/RocketChat/Rocket.Chat/pull/8547) Wrong colors after migration 103
+- [#8296](https://github.com/RocketChat/Rocket.Chat/pull/8296) Wrong file name when upload to AWS S3
+- [#8489](https://github.com/RocketChat/Rocket.Chat/pull/8489) Wrong message when reseting password and 2FA is enabled
+- [#9013](https://github.com/RocketChat/Rocket.Chat/pull/9013) Wrong room counter name
+- [#8968](https://github.com/RocketChat/Rocket.Chat/pull/8968) Xenforo [BD]API for 'user.user_id; instead of 'id'
+- [#9109](https://github.com/RocketChat/Rocket.Chat/pull/9109) Creating channels on Firefox
+- [#9108](https://github.com/RocketChat/Rocket.Chat/pull/9108) REST API file upload not respecting size limit
+- [#9095](https://github.com/RocketChat/Rocket.Chat/pull/9095) Some UI problems on 0.60
+- [#9094](https://github.com/RocketChat/Rocket.Chat/pull/9094) Update rocketchat:streamer to be compatible with previous version
+- [#9091](https://github.com/RocketChat/Rocket.Chat/pull/9091) Channel page error
+- [#9121](https://github.com/RocketChat/Rocket.Chat/pull/9121) Do not block room while loading history
+- [#9134](https://github.com/RocketChat/Rocket.Chat/pull/9134) Importers not recovering when an error occurs
+- [#9062](https://github.com/RocketChat/Rocket.Chat/pull/9062) Update Rocket.Chat for sandstorm
+- [#9169](https://github.com/RocketChat/Rocket.Chat/pull/9169) Last sent message reoccurs in textbox
+- [#9171](https://github.com/RocketChat/Rocket.Chat/pull/9171) modal data on enter and modal style for file preview
+- [#9170](https://github.com/RocketChat/Rocket.Chat/pull/9170) show oauth logins when adblock is used
+- [#9182](https://github.com/RocketChat/Rocket.Chat/pull/9182) "Use Emoji" preference not working
+- [#9168](https://github.com/RocketChat/Rocket.Chat/pull/9168) channel create scroll on small screens
+- [#9185](https://github.com/RocketChat/Rocket.Chat/pull/9185) Cursor position when reply on safari
+- [#9186](https://github.com/RocketChat/Rocket.Chat/pull/9186) Emoji size on last message preview
+- [#9040](https://github.com/RocketChat/Rocket.Chat/pull/9040) Error when user roles is missing or is invalid
+- [#9172](https://github.com/RocketChat/Rocket.Chat/pull/9172) go to replied message
+- [#9193](https://github.com/RocketChat/Rocket.Chat/pull/9193) Made welcome emails more readable
+- [#8922](https://github.com/RocketChat/Rocket.Chat/pull/8922) Make mentions and menu icons color darker
+- [#9176](https://github.com/RocketChat/Rocket.Chat/pull/9176) make the cross icon on user selection at channel creation page work
+- [#9188](https://github.com/RocketChat/Rocket.Chat/pull/9188) Unread bar position when room have announcement
+- [#9194](https://github.com/RocketChat/Rocket.Chat/pull/9194) "Enter usernames" placeholder is cutting in "create channel" view
+- [#9206](https://github.com/RocketChat/Rocket.Chat/pull/9206) File upload not working on IE and weird on Chrome
+- [#9241](https://github.com/RocketChat/Rocket.Chat/pull/9241) Show modal with announcement
+- [#9243](https://github.com/RocketChat/Rocket.Chat/pull/9243) Move emojipicker css to theme package
+
+
+<details>
+<summary>Others</summary>
+
+- [#8299](https://github.com/RocketChat/Rocket.Chat/pull/8299)  [FIX] Amin menu not showing all items & File list breaking line
+- [#8331](https://github.com/RocketChat/Rocket.Chat/pull/8331) [FIX-RC] Mobile file upload not working
+- [#8906](https://github.com/RocketChat/Rocket.Chat/pull/8906) Add a few dots in readme.md
+- [#8394](https://github.com/RocketChat/Rocket.Chat/pull/8394) Add i18n Title to snippet messages
+- [#6606](https://github.com/RocketChat/Rocket.Chat/pull/6606) Added RocketChatLauncher (SaaS)
+- [#8036](https://github.com/RocketChat/Rocket.Chat/pull/8036) Adding: How to Install in WeDeploy
+- [#8820](https://github.com/RocketChat/Rocket.Chat/pull/8820) Bump version to 0.60.0-develop
+- [#8515](https://github.com/RocketChat/Rocket.Chat/pull/8515) Change artifact path
+- [#8872](https://github.com/RocketChat/Rocket.Chat/pull/8872) Changed wording for "Maximum Allowed Message Size"
+- [#8463](https://github.com/RocketChat/Rocket.Chat/pull/8463) Color variables migration
+- [#8273](https://github.com/RocketChat/Rocket.Chat/pull/8273) Deps update
+- [#7866](https://github.com/RocketChat/Rocket.Chat/pull/7866) Develop sync
+- [#8244](https://github.com/RocketChat/Rocket.Chat/pull/8244) Disable perfect scrollbar
+- [#8490](https://github.com/RocketChat/Rocket.Chat/pull/8490) Enable AutoLinker back
+- [#8243](https://github.com/RocketChat/Rocket.Chat/pull/8243) Fix `leave and hide` click, color and position
+- [#9049](https://github.com/RocketChat/Rocket.Chat/pull/9049) Fix api regression (exception when deleting user)
+- [#8282](https://github.com/RocketChat/Rocket.Chat/pull/8282) fix color on unread messages
+- [#8862](https://github.com/RocketChat/Rocket.Chat/pull/8862) Fix Docker image build
+- [#8520](https://github.com/RocketChat/Rocket.Chat/pull/8520) Fix high CPU load when sending messages on large rooms (regression)
+- [#8829](https://github.com/RocketChat/Rocket.Chat/pull/8829) Fix link to .asc file on S3
+- [#8194](https://github.com/RocketChat/Rocket.Chat/pull/8194) Fix more rtl issues
+- [#9084](https://github.com/RocketChat/Rocket.Chat/pull/9084) Fix tag build
+- [#8750](https://github.com/RocketChat/Rocket.Chat/pull/8750) Fix Travis CI build
+- [#8705](https://github.com/RocketChat/Rocket.Chat/pull/8705) Fix typo
+- [#8416](https://github.com/RocketChat/Rocket.Chat/pull/8416) Fix: Account menu position on RTL
+- [#8516](https://github.com/RocketChat/Rocket.Chat/pull/8516) Fix: Change password not working in new UI
+- [#8417](https://github.com/RocketChat/Rocket.Chat/pull/8417) Fix: Missing LDAP option to show internal logs
+- [#8414](https://github.com/RocketChat/Rocket.Chat/pull/8414) Fix: Missing LDAP reconnect setting
+- [#8398](https://github.com/RocketChat/Rocket.Chat/pull/8398) Fix: Missing settings to configure LDAP size and page limits
+- [#1](https://github.com/RocketChat/Rocket.Chat/pull/1) h
+- [#7894](https://github.com/RocketChat/Rocket.Chat/pull/7894) Hide flex-tab close button
+- [#8451](https://github.com/RocketChat/Rocket.Chat/pull/8451) Improve markdown parser code
+- [#8529](https://github.com/RocketChat/Rocket.Chat/pull/8529) Improve room sync speed
+- [#8653](https://github.com/RocketChat/Rocket.Chat/pull/8653) install grpc package manually to fix snap armhf build
+- [#8831](https://github.com/RocketChat/Rocket.Chat/pull/8831) LingoHub based on develop
+- [#8375](https://github.com/RocketChat/Rocket.Chat/pull/8375) LingoHub based on develop
+- [#9085](https://github.com/RocketChat/Rocket.Chat/pull/9085) Meteor update to 1.6.0.1
+- [#7969](https://github.com/RocketChat/Rocket.Chat/pull/7969) npm deps update
+- [#8197](https://github.com/RocketChat/Rocket.Chat/pull/8197) npm deps update
+- [#8253](https://github.com/RocketChat/Rocket.Chat/pull/8253) readme-file: fix broken link
+- [#8742](https://github.com/RocketChat/Rocket.Chat/pull/8742) Remove chatops package
+- [#8345](https://github.com/RocketChat/Rocket.Chat/pull/8345) Remove field `lastActivity` from subscription data
+- [#8054](https://github.com/RocketChat/Rocket.Chat/pull/8054) Remove unnecessary returns in cors common
+- [#8743](https://github.com/RocketChat/Rocket.Chat/pull/8743) Removed tmeasday:crypto-md5
+- [#8434](https://github.com/RocketChat/Rocket.Chat/pull/8434) removing a duplicate line
+- [#7983](https://github.com/RocketChat/Rocket.Chat/pull/7983) Revert "npm deps update"
+- [#9088](https://github.com/RocketChat/Rocket.Chat/pull/9088) Sync develop with master
+- [#8363](https://github.com/RocketChat/Rocket.Chat/pull/8363) Sync translations from LingoHub
+- [#9068](https://github.com/RocketChat/Rocket.Chat/pull/9068) Turn off prettyJson if the node environment isn't development
+- [#8793](https://github.com/RocketChat/Rocket.Chat/pull/8793) Update DEMO to OPEN links
+- [#8802](https://github.com/RocketChat/Rocket.Chat/pull/8802) Update meteor package to 1.8.1
+- [#8364](https://github.com/RocketChat/Rocket.Chat/pull/8364) Update Meteor to 1.5.2.2
+- [#8355](https://github.com/RocketChat/Rocket.Chat/pull/8355) Update meteor to 1.5.2.2-rc.0
+- [#9018](https://github.com/RocketChat/Rocket.Chat/pull/9018) Update multiple-instance-status package
+- [#8719](https://github.com/RocketChat/Rocket.Chat/pull/8719) Updated comments.
+- [#7922](https://github.com/RocketChat/Rocket.Chat/pull/7922) Use real names for user and room in emails
+- [#9110](https://github.com/RocketChat/Rocket.Chat/pull/9110) Fix regression in api channels.members
+- [#9111](https://github.com/RocketChat/Rocket.Chat/pull/9111) Fix: users listed as online after API login
+- [#9137](https://github.com/RocketChat/Rocket.Chat/pull/9137) Fix: Clear all unreads modal not closing after confirming
+- [#9136](https://github.com/RocketChat/Rocket.Chat/pull/9136) Fix: Confirmation modals showing `Send` button
+- [#9138](https://github.com/RocketChat/Rocket.Chat/pull/9138) Fix: Message action quick buttons drops if "new message" divider is being shown
+- [#9120](https://github.com/RocketChat/Rocket.Chat/pull/9120) Fix: Multiple unread indicators
+- [#9144](https://github.com/RocketChat/Rocket.Chat/pull/9144) Fix: Messages being displayed in reverse order
+- [#9146](https://github.com/RocketChat/Rocket.Chat/pull/9146) Fix test without oplog by waiting a successful login on changing users
+- [#9162](https://github.com/RocketChat/Rocket.Chat/pull/9162) Fix: Can’t login using LDAP via REST
+- [#9165](https://github.com/RocketChat/Rocket.Chat/pull/9165) Fix: Click on channel name - hover area bigger than link area
+- [#9166](https://github.com/RocketChat/Rocket.Chat/pull/9166) Fix: UI: Descenders of glyphs are cut off
+- [#9149](https://github.com/RocketChat/Rocket.Chat/pull/9149) Fix: Unread line
+- [#9197](https://github.com/RocketChat/Rocket.Chat/pull/9197) Dependencies Update
+- [#9196](https://github.com/RocketChat/Rocket.Chat/pull/9196) Fix: Rooms and users are using different avatar style
+- [#9184](https://github.com/RocketChat/Rocket.Chat/pull/9184) Fix: Snippet name to not showing in snippet list
+- [#9181](https://github.com/RocketChat/Rocket.Chat/pull/9181) Fix: UI: Descenders of glyphs are cut off
+- [#9183](https://github.com/RocketChat/Rocket.Chat/pull/9183) Fix/api me only return verified
+- [#9200](https://github.com/RocketChat/Rocket.Chat/pull/9200) Replace postcss-nesting with postcss-nested
+- [#9190](https://github.com/RocketChat/Rocket.Chat/pull/9190) Typo: German language file
+- [#9229](https://github.com/RocketChat/Rocket.Chat/pull/9229) Fix: Missing option to set user's avatar from a url
+- [#9240](https://github.com/RocketChat/Rocket.Chat/pull/9240) Fix: Unneeded warning in payload of REST API calls
+- [#9227](https://github.com/RocketChat/Rocket.Chat/pull/9227) Fix: updating last message on message edit or delete
+- [#9215](https://github.com/RocketChat/Rocket.Chat/pull/9215) Fix: Upload access control too distributed
+- [#9217](https://github.com/RocketChat/Rocket.Chat/pull/9217) Fix: Username find is matching partially
+- [#9248](https://github.com/RocketChat/Rocket.Chat/pull/9248) Add curl, its missing on worker nodes so has to be explicitly added
+- [#9257](https://github.com/RocketChat/Rocket.Chat/pull/9257) Do not change room icon color when room is unread
+- [#9247](https://github.com/RocketChat/Rocket.Chat/pull/9247) Fix: Sidebar item on rtl and small devices
+- [#9256](https://github.com/RocketChat/Rocket.Chat/pull/9256) LingoHub based on develop
+</details>
+
+
+<details>
+<summary>Details</summary>
+## 0.60.0-rc.8 (2017-12-27)
+
+
+<details>
+<summary>Others</summary>
+
+- [#9248](https://github.com/RocketChat/Rocket.Chat/pull/9248) Add curl, its missing on worker nodes so has to be explicitly added
+- [#9257](https://github.com/RocketChat/Rocket.Chat/pull/9257) Do not change room icon color when room is unread
+- [#9247](https://github.com/RocketChat/Rocket.Chat/pull/9247) Fix: Sidebar item on rtl and small devices
+- [#9256](https://github.com/RocketChat/Rocket.Chat/pull/9256) LingoHub based on develop
+</details>
+
+
+
+## 0.60.0-rc.7 (2017-12-26)
+
+
+### Bug Fixes
+
+- [#9243](https://github.com/RocketChat/Rocket.Chat/pull/9243) Move emojipicker css to theme package
+
+
+
+## 0.60.0-rc.6 (2017-12-26)
+
+
+### Bug Fixes
+
+- [#9194](https://github.com/RocketChat/Rocket.Chat/pull/9194) "Enter usernames" placeholder is cutting in "create channel" view
+- [#9206](https://github.com/RocketChat/Rocket.Chat/pull/9206) File upload not working on IE and weird on Chrome
+- [#9241](https://github.com/RocketChat/Rocket.Chat/pull/9241) Show modal with announcement
+
+
+<details>
+<summary>Others</summary>
+
+- [#9229](https://github.com/RocketChat/Rocket.Chat/pull/9229) Fix: Missing option to set user's avatar from a url
+- [#9240](https://github.com/RocketChat/Rocket.Chat/pull/9240) Fix: Unneeded warning in payload of REST API calls
+- [#9227](https://github.com/RocketChat/Rocket.Chat/pull/9227) Fix: updating last message on message edit or delete
+- [#9215](https://github.com/RocketChat/Rocket.Chat/pull/9215) Fix: Upload access control too distributed
+- [#9217](https://github.com/RocketChat/Rocket.Chat/pull/9217) Fix: Username find is matching partially
+</details>
+
+
+
+## 0.60.0-rc.5 (2017-12-20)
+
+
+### New Features
+
+- [#9066](https://github.com/RocketChat/Rocket.Chat/pull/9066) Make Custom oauth accept nested usernameField
+
+
+### Bug Fixes
+
+- [#9182](https://github.com/RocketChat/Rocket.Chat/pull/9182) "Use Emoji" preference not working
+- [#9168](https://github.com/RocketChat/Rocket.Chat/pull/9168) channel create scroll on small screens
+- [#9185](https://github.com/RocketChat/Rocket.Chat/pull/9185) Cursor position when reply on safari
+- [#9186](https://github.com/RocketChat/Rocket.Chat/pull/9186) Emoji size on last message preview
+- [#9040](https://github.com/RocketChat/Rocket.Chat/pull/9040) Error when user roles is missing or is invalid
+- [#9172](https://github.com/RocketChat/Rocket.Chat/pull/9172) go to replied message
+- [#9193](https://github.com/RocketChat/Rocket.Chat/pull/9193) Made welcome emails more readable
+- [#8922](https://github.com/RocketChat/Rocket.Chat/pull/8922) Make mentions and menu icons color darker
+- [#9176](https://github.com/RocketChat/Rocket.Chat/pull/9176) make the cross icon on user selection at channel creation page work
+- [#9188](https://github.com/RocketChat/Rocket.Chat/pull/9188) Unread bar position when room have announcement
+
+
+<details>
+<summary>Others</summary>
+
+- [#9197](https://github.com/RocketChat/Rocket.Chat/pull/9197) Dependencies Update
+- [#9196](https://github.com/RocketChat/Rocket.Chat/pull/9196) Fix: Rooms and users are using different avatar style
+- [#9184](https://github.com/RocketChat/Rocket.Chat/pull/9184) Fix: Snippet name to not showing in snippet list
+- [#9181](https://github.com/RocketChat/Rocket.Chat/pull/9181) Fix: UI: Descenders of glyphs are cut off
+- [#9183](https://github.com/RocketChat/Rocket.Chat/pull/9183) Fix/api me only return verified
+- [#9200](https://github.com/RocketChat/Rocket.Chat/pull/9200) Replace postcss-nesting with postcss-nested
+- [#9190](https://github.com/RocketChat/Rocket.Chat/pull/9190) Typo: German language file
+</details>
+
+
+
+## 0.60.0-rc.4 (2017-12-18)
+
+
+### Bug Fixes
+
+- [#9169](https://github.com/RocketChat/Rocket.Chat/pull/9169) Last sent message reoccurs in textbox
+- [#9171](https://github.com/RocketChat/Rocket.Chat/pull/9171) modal data on enter and modal style for file preview
+- [#9170](https://github.com/RocketChat/Rocket.Chat/pull/9170) show oauth logins when adblock is used
+
+
+<details>
+<summary>Others</summary>
+
+- [#9146](https://github.com/RocketChat/Rocket.Chat/pull/9146) Fix test without oplog by waiting a successful login on changing users
+- [#9162](https://github.com/RocketChat/Rocket.Chat/pull/9162) Fix: Can’t login using LDAP via REST
+- [#9165](https://github.com/RocketChat/Rocket.Chat/pull/9165) Fix: Click on channel name - hover area bigger than link area
+- [#9166](https://github.com/RocketChat/Rocket.Chat/pull/9166) Fix: UI: Descenders of glyphs are cut off
+- [#9149](https://github.com/RocketChat/Rocket.Chat/pull/9149) Fix: Unread line
+</details>
+
+
+
+## 0.60.0-rc.3 (2017-12-15)
+
+
+### Bug Fixes
+
+- [#9062](https://github.com/RocketChat/Rocket.Chat/pull/9062) Update Rocket.Chat for sandstorm
+
+
+<details>
+<summary>Others</summary>
+
+- [#9144](https://github.com/RocketChat/Rocket.Chat/pull/9144) Fix: Messages being displayed in reverse order
+</details>
+
+
+
+## 0.60.0-rc.2 (2017-12-15)
+
+
+### Bug Fixes
+
+- [#9091](https://github.com/RocketChat/Rocket.Chat/pull/9091) Channel page error
+- [#9121](https://github.com/RocketChat/Rocket.Chat/pull/9121) Do not block room while loading history
+- [#9134](https://github.com/RocketChat/Rocket.Chat/pull/9134) Importers not recovering when an error occurs
+
+
+<details>
+<summary>Others</summary>
+
+- [#9137](https://github.com/RocketChat/Rocket.Chat/pull/9137) Fix: Clear all unreads modal not closing after confirming
+- [#9136](https://github.com/RocketChat/Rocket.Chat/pull/9136) Fix: Confirmation modals showing `Send` button
+- [#9138](https://github.com/RocketChat/Rocket.Chat/pull/9138) Fix: Message action quick buttons drops if "new message" divider is being shown
+- [#9120](https://github.com/RocketChat/Rocket.Chat/pull/9120) Fix: Multiple unread indicators
+</details>
+
+
+
+## 0.60.0-rc.1 (2017-12-13)
+
+
+### New Features
+
+- [#9092](https://github.com/RocketChat/Rocket.Chat/pull/9092) Modal
+
+
+### Bug Fixes
+
+- [#9109](https://github.com/RocketChat/Rocket.Chat/pull/9109) Creating channels on Firefox
+- [#9108](https://github.com/RocketChat/Rocket.Chat/pull/9108) REST API file upload not respecting size limit
+- [#9095](https://github.com/RocketChat/Rocket.Chat/pull/9095) Some UI problems on 0.60
+- [#9094](https://github.com/RocketChat/Rocket.Chat/pull/9094) Update rocketchat:streamer to be compatible with previous version
+
+
+<details>
+<summary>Others</summary>
+
+- [#9110](https://github.com/RocketChat/Rocket.Chat/pull/9110) Fix regression in api channels.members
+- [#9111](https://github.com/RocketChat/Rocket.Chat/pull/9111) Fix: users listed as online after API login
+</details>
+
+
+
+## 0.60.0-rc.0 (2017-12-12)
+
+
+### New Features
+
+- [#8915](https://github.com/RocketChat/Rocket.Chat/pull/8915)  Add "Favorites" and "Mark as read" options to the room list
+- [#8739](https://github.com/RocketChat/Rocket.Chat/pull/8739) Add "real name change" setting
+- [#8626](https://github.com/RocketChat/Rocket.Chat/pull/8626) Add icon art in Tokenpass channel title
+- [#8947](https://github.com/RocketChat/Rocket.Chat/pull/8947) Add new API endpoints
+- [#8304](https://github.com/RocketChat/Rocket.Chat/pull/8304) Add RD Station integration to livechat
+- [#8066](https://github.com/RocketChat/Rocket.Chat/pull/8066) Add settings for allow user direct messages to yourself
+- [#8108](https://github.com/RocketChat/Rocket.Chat/pull/8108) Add sweet alert to video call tab
+- [#8037](https://github.com/RocketChat/Rocket.Chat/pull/8037) Add yunohost.org installation method to Readme.md
+- [#8902](https://github.com/RocketChat/Rocket.Chat/pull/8902) Added support for Dataporten's userid-feide scope
+- [#7641](https://github.com/RocketChat/Rocket.Chat/pull/7641) Adds admin option to globally set mobile devices to always be notified regardless of presence status.
+- [#7285](https://github.com/RocketChat/Rocket.Chat/pull/7285) Allow user's default preferences configuration
+- [#8857](https://github.com/RocketChat/Rocket.Chat/pull/8857) code to get the updated messages
+- [#8924](https://github.com/RocketChat/Rocket.Chat/pull/8924) Describe file uploads when notifying by email
+- [#8143](https://github.com/RocketChat/Rocket.Chat/pull/8143) Displays QR code for manually entering when enabling 2fa
+- [#8260](https://github.com/RocketChat/Rocket.Chat/pull/8260) Enable read only channel creation
+- [#8807](https://github.com/RocketChat/Rocket.Chat/pull/8807) Facebook livechat integration
+- [#8149](https://github.com/RocketChat/Rocket.Chat/pull/8149) Feature/livechat hide email
+- [#9009](https://github.com/RocketChat/Rocket.Chat/pull/9009) Improve room types API and usages
+- [#8882](https://github.com/RocketChat/Rocket.Chat/pull/8882) New Modal component
+- [#8029](https://github.com/RocketChat/Rocket.Chat/pull/8029) Option to enable/disable auto away and configure timer
+- [#8866](https://github.com/RocketChat/Rocket.Chat/pull/8866) Room counter sidebar preference
+- [#8979](https://github.com/RocketChat/Rocket.Chat/pull/8979) Save room's last message
+- [#8905](https://github.com/RocketChat/Rocket.Chat/pull/8905) Send category and title fields to iOS push notification
+- [#7999](https://github.com/RocketChat/Rocket.Chat/pull/7999) Sender's name in email notifications.
+- [#8459](https://github.com/RocketChat/Rocket.Chat/pull/8459) Setting to disable MarkDown and enable AutoLinker
+- [#8362](https://github.com/RocketChat/Rocket.Chat/pull/8362) Sidebar item width to 100%
+- [#8360](https://github.com/RocketChat/Rocket.Chat/pull/8360) Smaller accountBox
+- [#8060](https://github.com/RocketChat/Rocket.Chat/pull/8060) Token Controlled Access channels
+- [#8361](https://github.com/RocketChat/Rocket.Chat/pull/8361) Unify unread and mentions badge
+- [#8715](https://github.com/RocketChat/Rocket.Chat/pull/8715) Upgrade Meteor to 1.6
+- [#8073](https://github.com/RocketChat/Rocket.Chat/pull/8073) Upgrade to meteor 1.5.2
+- [#8433](https://github.com/RocketChat/Rocket.Chat/pull/8433) Use enter separator rather than comma in highlight preferences + Auto refresh after change highlighted words
+
+
+### Bug Fixes
+
+- [#8147](https://github.com/RocketChat/Rocket.Chat/pull/8147) "*.members" rest api being useless and only returning usernames
+- [#8278](https://github.com/RocketChat/Rocket.Chat/pull/8278) "Cancel button" on modal in RTL in Firefox 55
+- [#8266](https://github.com/RocketChat/Rocket.Chat/pull/8266) "Channel Setting" buttons alignment in RTL
+- [#8270](https://github.com/RocketChat/Rocket.Chat/pull/8270) [i18n] My Profile & README.md links
+- [#8094](https://github.com/RocketChat/Rocket.Chat/pull/8094) Add admin audio preferences translations
+- [#8708](https://github.com/RocketChat/Rocket.Chat/pull/8708) Add historic chats icon in Livechat
+- [#8389](https://github.com/RocketChat/Rocket.Chat/pull/8389) Add needed dependency for snaps
+- [#7971](https://github.com/RocketChat/Rocket.Chat/pull/7971) Add padding on messages to allow space to the action buttons
+- [#9022](https://github.com/RocketChat/Rocket.Chat/pull/9022) Added afterUserCreated trigger after first CAS login
+- [#8314](https://github.com/RocketChat/Rocket.Chat/pull/8314) After deleting the room, cache is not synchronizing
+- [#8172](https://github.com/RocketChat/Rocket.Chat/pull/8172) Allow unknown file types if no allowed whitelist has been set ([#7074](https://github.com/RocketChat/Rocket.Chat/issues/7074))
+- [#8593](https://github.com/RocketChat/Rocket.Chat/pull/8593) AmazonS3: Quote file.name for ContentDisposition for files with commas
+- [#8635](https://github.com/RocketChat/Rocket.Chat/pull/8635) API channel/group.members not sorting
+- [#8241](https://github.com/RocketChat/Rocket.Chat/pull/8241) Api groups.files is always returning empty
+- [#8271](https://github.com/RocketChat/Rocket.Chat/pull/8271) Attachment icons alignment in LTR and RTL
+- [#8648](https://github.com/RocketChat/Rocket.Chat/pull/8648) Audio message icon
+- [#8107](https://github.com/RocketChat/Rocket.Chat/pull/8107) Autoupdate of CSS does not work when using a prefix
+- [#7944](https://github.com/RocketChat/Rocket.Chat/pull/7944) Broken embedded view layout
+- [#7943](https://github.com/RocketChat/Rocket.Chat/pull/7943) Broken emoji picker on firefox
+- [#8307](https://github.com/RocketChat/Rocket.Chat/pull/8307) Call buttons with wrong margin on RTL
+- [#8925](https://github.com/RocketChat/Rocket.Chat/pull/8925) Can't react on Read Only rooms even when enabled
+- [#9044](https://github.com/RocketChat/Rocket.Chat/pull/9044) Can't use OAuth login against a Rocket.Chat OAuth server
+- [#8889](https://github.com/RocketChat/Rocket.Chat/pull/8889) Cannot edit or delete custom sounds
+- [#8654](https://github.com/RocketChat/Rocket.Chat/pull/8654) CAS does not share secrets when operating multiple server instances
+- [#8216](https://github.com/RocketChat/Rocket.Chat/pull/8216) Case insensitive SAML email check
+- [#8928](https://github.com/RocketChat/Rocket.Chat/pull/8928) Change old 'rocketbot' username to 'InternalHubot_Username' setting
+- [#8883](https://github.com/RocketChat/Rocket.Chat/pull/8883) Change the unread messages style
+- [#9012](https://github.com/RocketChat/Rocket.Chat/pull/9012) Changed oembedUrlWidget to prefer og:image and twitter:image over msapplication-TileImage
+- [#7984](https://github.com/RocketChat/Rocket.Chat/pull/7984) Chat box no longer auto-focuses when typing
+- [#8295](https://github.com/RocketChat/Rocket.Chat/pull/8295) Check attachments is defined before accessing first element
+- [#8259](https://github.com/RocketChat/Rocket.Chat/pull/8259) clipboard and permalink on new popover
+- [#8543](https://github.com/RocketChat/Rocket.Chat/pull/8543) Color reset when default value editor is different
+- [#8656](https://github.com/RocketChat/Rocket.Chat/pull/8656) Contextual errors for this and RegExp declarations in IRC module
+- [#8039](https://github.com/RocketChat/Rocket.Chat/pull/8039) copy to clipboard and update clipboard.js library
+- [#7942](https://github.com/RocketChat/Rocket.Chat/pull/7942) Create channel button on Firefox
+- [#9034](https://github.com/RocketChat/Rocket.Chat/pull/9034) Custom OAuth: Not able to set different token place for routes
+- [#8386](https://github.com/RocketChat/Rocket.Chat/pull/8386) disabled katex tooltip on messageBox
+- [#8917](https://github.com/RocketChat/Rocket.Chat/pull/8917) DM email notifications always being sent regardless of account setting
+- [#8527](https://github.com/RocketChat/Rocket.Chat/pull/8527) Do not send joinCode field to clients
+- [#7948](https://github.com/RocketChat/Rocket.Chat/pull/7948) Document README.md. Drupal repo out of date
+- [#8812](https://github.com/RocketChat/Rocket.Chat/pull/8812) Don't strip trailing slash on autolinker urls
+- [#7927](https://github.com/RocketChat/Rocket.Chat/pull/7927) Double scroll on 'keyboard shortcuts' menu in sidepanel
+- [#8408](https://github.com/RocketChat/Rocket.Chat/pull/8408) Duplicate code in rest api letting in a few bugs with the rest api
+- [#8101](https://github.com/RocketChat/Rocket.Chat/pull/8101) Dynamic popover
+- [#8317](https://github.com/RocketChat/Rocket.Chat/pull/8317) Email Subjects not being sent
+- [#7923](https://github.com/RocketChat/Rocket.Chat/pull/7923) Email verification indicator added
+- [#8300](https://github.com/RocketChat/Rocket.Chat/pull/8300) Emoji Picker hidden for reactions in RTL
+- [#8671](https://github.com/RocketChat/Rocket.Chat/pull/8671) Enable CORS for Restivus
+- [#8551](https://github.com/RocketChat/Rocket.Chat/pull/8551) encode filename in url to prevent links breaking
+- [#9023](https://github.com/RocketChat/Rocket.Chat/pull/9023) Error when saving integration with symbol as only trigger
+- [#8001](https://github.com/RocketChat/Rocket.Chat/pull/8001) Error when translating message
+- [#8310](https://github.com/RocketChat/Rocket.Chat/pull/8310) Execute meteor reset on TRAVIS_TAG builds
+- [#8645](https://github.com/RocketChat/Rocket.Chat/pull/8645) Fix e-mail message forward
+- [#7754](https://github.com/RocketChat/Rocket.Chat/pull/7754) Fix email on mention
+- [#7912](https://github.com/RocketChat/Rocket.Chat/pull/7912) Fix google play logo on repo README
+- [#8577](https://github.com/RocketChat/Rocket.Chat/pull/8577) Fix guest pool inquiry taking
+- [#8146](https://github.com/RocketChat/Rocket.Chat/pull/8146) Fix iframe login API response (issue [#8145](https://github.com/RocketChat/Rocket.Chat/issues/8145))
+- [#7904](https://github.com/RocketChat/Rocket.Chat/pull/7904) Fix livechat toggle UI issue
+- [#8144](https://github.com/RocketChat/Rocket.Chat/pull/8144) Fix new room sound being played too much
+- [#7945](https://github.com/RocketChat/Rocket.Chat/pull/7945) Fix placeholders in account profile
+- [#8099](https://github.com/RocketChat/Rocket.Chat/pull/8099) Fix setting user avatar on LDAP login
+- [#7963](https://github.com/RocketChat/Rocket.Chat/pull/7963) Fix the status on the members list
+- [#8679](https://github.com/RocketChat/Rocket.Chat/pull/8679) Fix typos
+- [#8787](https://github.com/RocketChat/Rocket.Chat/pull/8787) Fixed some typos in DE translations
+- [#8014](https://github.com/RocketChat/Rocket.Chat/pull/8014) Hide scrollbar on login page if not necessary
+- [#8431](https://github.com/RocketChat/Rocket.Chat/pull/8431) Highlighted color height issue
+- [#8721](https://github.com/RocketChat/Rocket.Chat/pull/8721) i18n'd Resend_verification_mail, username_initials, upload avatar
+- [#9000](https://github.com/RocketChat/Rocket.Chat/pull/9000) if ogImage exists use it over image in oembedUrlWidget
+- [#8966](https://github.com/RocketChat/Rocket.Chat/pull/8966) Importers failing when usernames exists but cases don't match and improve the importer framework's performance
+- [#8795](https://github.com/RocketChat/Rocket.Chat/pull/8795) Improved grammar and made it clearer to the user
+- [#8211](https://github.com/RocketChat/Rocket.Chat/pull/8211) Incorrect URL for login terms when using prefix
+- [#8491](https://github.com/RocketChat/Rocket.Chat/pull/8491) Invalid Code message for password protected channel
+- [#8048](https://github.com/RocketChat/Rocket.Chat/pull/8048) Invisible leader bar on hover
+- [#8167](https://github.com/RocketChat/Rocket.Chat/pull/8167) Issue [#8166](https://github.com/RocketChat/Rocket.Chat/issues/8166) where empty analytics setting breaks to load Piwik script
+- [#8948](https://github.com/RocketChat/Rocket.Chat/pull/8948) Katex markdown link changed
+- [#8541](https://github.com/RocketChat/Rocket.Chat/pull/8541) LDAP login error regression at 0.59.0
+- [#8457](https://github.com/RocketChat/Rocket.Chat/pull/8457) LDAP memory issues when pagination is not available
+- [#8613](https://github.com/RocketChat/Rocket.Chat/pull/8613) LDAP not merging existent users && Wrong id link generation
+- [#8691](https://github.com/RocketChat/Rocket.Chat/pull/8691) LDAP not respecting UTF8 characters & Sync Interval not working
+- [#8213](https://github.com/RocketChat/Rocket.Chat/pull/8213) Leave and hide buttons was removed
+- [#8985](https://github.com/RocketChat/Rocket.Chat/pull/8985) Link for channels are not rendering correctly
+- [#8868](https://github.com/RocketChat/Rocket.Chat/pull/8868) long filename overlaps cancel button in progress bar
+- [#8907](https://github.com/RocketChat/Rocket.Chat/pull/8907) Long room announcement cut off
+- [#8262](https://github.com/RocketChat/Rocket.Chat/pull/8262) make sidebar item animation fast
+- [#7965](https://github.com/RocketChat/Rocket.Chat/pull/7965) Markdown being rendered in code tags
+- [#8316](https://github.com/RocketChat/Rocket.Chat/pull/8316) Mention unread indicator was removed
+- [#7885](https://github.com/RocketChat/Rocket.Chat/pull/7885) message actions over unread bar
+- [#8634](https://github.com/RocketChat/Rocket.Chat/pull/8634) Message popup menu on mobile/cordova
+- [#8019](https://github.com/RocketChat/Rocket.Chat/pull/8019) message-box autogrow
+- [#8932](https://github.com/RocketChat/Rocket.Chat/pull/8932) Message-box autogrow flick
+- [#8544](https://github.com/RocketChat/Rocket.Chat/pull/8544) Migration 103 wrong converting primrary colors
+- [#8357](https://github.com/RocketChat/Rocket.Chat/pull/8357) Missing i18n translations
+- [#8286](https://github.com/RocketChat/Rocket.Chat/pull/8286) Missing placeholder translations
+- [#8637](https://github.com/RocketChat/Rocket.Chat/pull/8637) Missing scroll at create channel page
+- [#8884](https://github.com/RocketChat/Rocket.Chat/pull/8884) Missing sidebar footer padding
+- [#8059](https://github.com/RocketChat/Rocket.Chat/pull/8059) Not sending email to mentioned users with unchanged preference
+- [#8828](https://github.com/RocketChat/Rocket.Chat/pull/8828) Notification is not sent when a video conference start
+- [#9042](https://github.com/RocketChat/Rocket.Chat/pull/9042) Notification sound is not disabling when busy
+- [#7954](https://github.com/RocketChat/Rocket.Chat/pull/7954) OTR buttons padding
+- [#7883](https://github.com/RocketChat/Rocket.Chat/pull/7883) popover position on mobile
+- [#8046](https://github.com/RocketChat/Rocket.Chat/pull/8046) Prevent autotranslate tokens race condition
+- [#8315](https://github.com/RocketChat/Rocket.Chat/pull/8315) Put delete action on another popover group
+- [#8441](https://github.com/RocketChat/Rocket.Chat/pull/8441) Range Slider Value label has bug in RTL
+- [#7998](https://github.com/RocketChat/Rocket.Chat/pull/7998) Recent emojis not updated when adding via text
+- [#8358](https://github.com/RocketChat/Rocket.Chat/pull/8358) remove accountBox from admin menu
+- [#7895](https://github.com/RocketChat/Rocket.Chat/pull/7895) Remove break change in Realtime API
+- [#8334](https://github.com/RocketChat/Rocket.Chat/pull/8334) Remove sidebar header on admin embedded version
+- [#8237](https://github.com/RocketChat/Rocket.Chat/pull/8237) Removing pipe and commas from custom emojis ([#8168](https://github.com/RocketChat/Rocket.Chat/issues/8168))
+- [#8017](https://github.com/RocketChat/Rocket.Chat/pull/8017) room icon on header
+- [#8112](https://github.com/RocketChat/Rocket.Chat/pull/8112) RTL
+- [#8261](https://github.com/RocketChat/Rocket.Chat/pull/8261) RTL on reply
+- [#8047](https://github.com/RocketChat/Rocket.Chat/pull/8047) Scroll on messagebox
+- [#8190](https://github.com/RocketChat/Rocket.Chat/pull/8190) Scrollbar not using new style
+- [#8018](https://github.com/RocketChat/Rocket.Chat/pull/8018) search results height
+- [#7881](https://github.com/RocketChat/Rocket.Chat/pull/7881) search results position on sidebar
+- [#8830](https://github.com/RocketChat/Rocket.Chat/pull/8830) Set correct Twitter link
+- [#8122](https://github.com/RocketChat/Rocket.Chat/pull/8122) Settings description not showing
+- [#7712](https://github.com/RocketChat/Rocket.Chat/pull/7712) Show leader on first load
+- [#8718](https://github.com/RocketChat/Rocket.Chat/pull/8718) Show real name of current user at top of side nav if setting enabled
+- [#8154](https://github.com/RocketChat/Rocket.Chat/pull/8154) Sidebar and RTL alignments
+- [#8397](https://github.com/RocketChat/Rocket.Chat/pull/8397) Sidebar item menu position in RTL
+- [#7880](https://github.com/RocketChat/Rocket.Chat/pull/7880) sidebar paddings
+- [#8257](https://github.com/RocketChat/Rocket.Chat/pull/8257) sidenav colors, hide and leave, create channel on safari
+- [#8252](https://github.com/RocketChat/Rocket.Chat/pull/8252) sidenav mentions on hover
+- [#8390](https://github.com/RocketChat/Rocket.Chat/pull/8390) Slack import failing and not being able to be restarted
+- [#7970](https://github.com/RocketChat/Rocket.Chat/pull/7970) Small alignment fixes
+- [#9029](https://github.com/RocketChat/Rocket.Chat/pull/9029) snap install by setting grpc package used by google/vision to 1.6.6
+- [#8937](https://github.com/RocketChat/Rocket.Chat/pull/8937) Snippetted messages not working
+- [#8269](https://github.com/RocketChat/Rocket.Chat/pull/8269) some placeholder and phrase traslation fix
+- [#8717](https://github.com/RocketChat/Rocket.Chat/pull/8717) Sort direct messages by full name if show real names setting enabled
+- [#7960](https://github.com/RocketChat/Rocket.Chat/pull/7960) status and active room colors on sidebar
+- [#8413](https://github.com/RocketChat/Rocket.Chat/pull/8413) Store Outgoing Integration Result as String in Mongo
+- [#8006](https://github.com/RocketChat/Rocket.Chat/pull/8006) Sync of non existent field throws exception
+- [#7985](https://github.com/RocketChat/Rocket.Chat/pull/7985) Text area buttons and layout on mobile
+- [#8159](https://github.com/RocketChat/Rocket.Chat/pull/8159) Text area lost text when page reloads
+- [#7986](https://github.com/RocketChat/Rocket.Chat/pull/7986) Textarea on firefox
+- [#8298](https://github.com/RocketChat/Rocket.Chat/pull/8298) TypeError: Cannot read property 't' of undefined
+- [#8938](https://github.com/RocketChat/Rocket.Chat/pull/8938) Typo Fix
+- [#8514](https://github.com/RocketChat/Rocket.Chat/pull/8514) Uncessary route reload break some routes
+- [#9046](https://github.com/RocketChat/Rocket.Chat/pull/9046) Update insecure moment.js dependency
+- [#8655](https://github.com/RocketChat/Rocket.Chat/pull/8655) Update pt-BR translation
+- [#9024](https://github.com/RocketChat/Rocket.Chat/pull/9024) Use encodeURI in AmazonS3 contentDisposition file.name to prevent fail
+- [#8210](https://github.com/RocketChat/Rocket.Chat/pull/8210) User avatar in DM list.
+- [#8810](https://github.com/RocketChat/Rocket.Chat/pull/8810) User email settings on DM
+- [#8716](https://github.com/RocketChat/Rocket.Chat/pull/8716) Username clipping on firefox
+- [#7953](https://github.com/RocketChat/Rocket.Chat/pull/7953) username ellipsis on firefox
+- [#8372](https://github.com/RocketChat/Rocket.Chat/pull/8372) Various LDAP issues & Missing pagination
+- [#7988](https://github.com/RocketChat/Rocket.Chat/pull/7988) Vertical menu on flex-tab
+- [#7893](https://github.com/RocketChat/Rocket.Chat/pull/7893) Window exception when parsing Markdown on server
+- [#8547](https://github.com/RocketChat/Rocket.Chat/pull/8547) Wrong colors after migration 103
+- [#8296](https://github.com/RocketChat/Rocket.Chat/pull/8296) Wrong file name when upload to AWS S3
+- [#8489](https://github.com/RocketChat/Rocket.Chat/pull/8489) Wrong message when reseting password and 2FA is enabled
+- [#9013](https://github.com/RocketChat/Rocket.Chat/pull/9013) Wrong room counter name
+- [#8968](https://github.com/RocketChat/Rocket.Chat/pull/8968) Xenforo [BD]API for 'user.user_id; instead of 'id'
+
+
+<details>
+<summary>Others</summary>
+
+- [#8299](https://github.com/RocketChat/Rocket.Chat/pull/8299)  [FIX] Amin menu not showing all items & File list breaking line
+- [#8331](https://github.com/RocketChat/Rocket.Chat/pull/8331) [FIX-RC] Mobile file upload not working
+- [#8906](https://github.com/RocketChat/Rocket.Chat/pull/8906) Add a few dots in readme.md
+- [#8394](https://github.com/RocketChat/Rocket.Chat/pull/8394) Add i18n Title to snippet messages
+- [#6606](https://github.com/RocketChat/Rocket.Chat/pull/6606) Added RocketChatLauncher (SaaS)
+- [#8036](https://github.com/RocketChat/Rocket.Chat/pull/8036) Adding: How to Install in WeDeploy
+- [#8820](https://github.com/RocketChat/Rocket.Chat/pull/8820) Bump version to 0.60.0-develop
+- [#8515](https://github.com/RocketChat/Rocket.Chat/pull/8515) Change artifact path
+- [#8872](https://github.com/RocketChat/Rocket.Chat/pull/8872) Changed wording for "Maximum Allowed Message Size"
+- [#8463](https://github.com/RocketChat/Rocket.Chat/pull/8463) Color variables migration
+- [#8273](https://github.com/RocketChat/Rocket.Chat/pull/8273) Deps update
+- [#7866](https://github.com/RocketChat/Rocket.Chat/pull/7866) Develop sync
+- [#8244](https://github.com/RocketChat/Rocket.Chat/pull/8244) Disable perfect scrollbar
+- [#8490](https://github.com/RocketChat/Rocket.Chat/pull/8490) Enable AutoLinker back
+- [#8243](https://github.com/RocketChat/Rocket.Chat/pull/8243) Fix `leave and hide` click, color and position
+- [#9049](https://github.com/RocketChat/Rocket.Chat/pull/9049) Fix api regression (exception when deleting user)
+- [#8282](https://github.com/RocketChat/Rocket.Chat/pull/8282) fix color on unread messages
+- [#8862](https://github.com/RocketChat/Rocket.Chat/pull/8862) Fix Docker image build
+- [#8520](https://github.com/RocketChat/Rocket.Chat/pull/8520) Fix high CPU load when sending messages on large rooms (regression)
+- [#8829](https://github.com/RocketChat/Rocket.Chat/pull/8829) Fix link to .asc file on S3
+- [#8194](https://github.com/RocketChat/Rocket.Chat/pull/8194) Fix more rtl issues
+- [#9084](https://github.com/RocketChat/Rocket.Chat/pull/9084) Fix tag build
+- [#8750](https://github.com/RocketChat/Rocket.Chat/pull/8750) Fix Travis CI build
+- [#8705](https://github.com/RocketChat/Rocket.Chat/pull/8705) Fix typo
+- [#8416](https://github.com/RocketChat/Rocket.Chat/pull/8416) Fix: Account menu position on RTL
+- [#8516](https://github.com/RocketChat/Rocket.Chat/pull/8516) Fix: Change password not working in new UI
+- [#8417](https://github.com/RocketChat/Rocket.Chat/pull/8417) Fix: Missing LDAP option to show internal logs
+- [#8414](https://github.com/RocketChat/Rocket.Chat/pull/8414) Fix: Missing LDAP reconnect setting
+- [#8398](https://github.com/RocketChat/Rocket.Chat/pull/8398) Fix: Missing settings to configure LDAP size and page limits
+- [#1](https://github.com/RocketChat/Rocket.Chat/pull/1) h
+- [#7894](https://github.com/RocketChat/Rocket.Chat/pull/7894) Hide flex-tab close button
+- [#8451](https://github.com/RocketChat/Rocket.Chat/pull/8451) Improve markdown parser code
+- [#8529](https://github.com/RocketChat/Rocket.Chat/pull/8529) Improve room sync speed
+- [#8653](https://github.com/RocketChat/Rocket.Chat/pull/8653) install grpc package manually to fix snap armhf build
+- [#8831](https://github.com/RocketChat/Rocket.Chat/pull/8831) LingoHub based on develop
+- [#8375](https://github.com/RocketChat/Rocket.Chat/pull/8375) LingoHub based on develop
+- [#9085](https://github.com/RocketChat/Rocket.Chat/pull/9085) Meteor update to 1.6.0.1
+- [#7969](https://github.com/RocketChat/Rocket.Chat/pull/7969) npm deps update
+- [#8197](https://github.com/RocketChat/Rocket.Chat/pull/8197) npm deps update
+- [#8253](https://github.com/RocketChat/Rocket.Chat/pull/8253) readme-file: fix broken link
+- [#8742](https://github.com/RocketChat/Rocket.Chat/pull/8742) Remove chatops package
+- [#8345](https://github.com/RocketChat/Rocket.Chat/pull/8345) Remove field `lastActivity` from subscription data
+- [#8054](https://github.com/RocketChat/Rocket.Chat/pull/8054) Remove unnecessary returns in cors common
+- [#8743](https://github.com/RocketChat/Rocket.Chat/pull/8743) Removed tmeasday:crypto-md5
+- [#8434](https://github.com/RocketChat/Rocket.Chat/pull/8434) removing a duplicate line
+- [#7983](https://github.com/RocketChat/Rocket.Chat/pull/7983) Revert "npm deps update"
+- [#9088](https://github.com/RocketChat/Rocket.Chat/pull/9088) Sync develop with master
+- [#8363](https://github.com/RocketChat/Rocket.Chat/pull/8363) Sync translations from LingoHub
+- [#9068](https://github.com/RocketChat/Rocket.Chat/pull/9068) Turn off prettyJson if the node environment isn't development
+- [#8793](https://github.com/RocketChat/Rocket.Chat/pull/8793) Update DEMO to OPEN links
+- [#8802](https://github.com/RocketChat/Rocket.Chat/pull/8802) Update meteor package to 1.8.1
+- [#8364](https://github.com/RocketChat/Rocket.Chat/pull/8364) Update Meteor to 1.5.2.2
+- [#8355](https://github.com/RocketChat/Rocket.Chat/pull/8355) Update meteor to 1.5.2.2-rc.0
+- [#9018](https://github.com/RocketChat/Rocket.Chat/pull/9018) Update multiple-instance-status package
+- [#8719](https://github.com/RocketChat/Rocket.Chat/pull/8719) Updated comments.
+- [#7922](https://github.com/RocketChat/Rocket.Chat/pull/7922) Use real names for user and room in emails
+</details>
+
+</details>
+
+
 <a name="0.59.4"></a>
 ## 0.59.4 (2017-11-28)
 
diff --git a/package-lock.json b/package-lock.json
index 240b39744b9d..9cd72042cbdc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -283,6 +283,12 @@
         "es-abstract": "1.9.0"
       }
     },
+    "array-iterate": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-iterate/-/array-iterate-1.1.1.tgz",
+      "integrity": "sha1-hlv3+K851rCYLGCQKRSsdrwBCPY=",
+      "dev": true
+    },
     "array-union": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
@@ -350,23 +356,58 @@
       "dev": true
     },
     "autoprefixer": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.6.tgz",
-      "integrity": "sha1-+5MwOfdK90qD5xIlznjZ/Vi6hNc=",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.3.tgz",
+      "integrity": "sha512-dqzVGiz3v934+s3YZA6nk7tAs9xuTz5wMJbX1M+L4cY/MTNkOUqP61c1GWkEVlUL/PEy1pKRSCFuoRZrXYx9qA==",
       "dev": true,
       "requires": {
-        "browserslist": "2.6.1",
-        "caniuse-lite": "1.0.30000756",
+        "browserslist": "2.10.0",
+        "caniuse-lite": "1.0.30000783",
         "normalize-range": "0.1.2",
         "num2fraction": "1.2.2",
-        "postcss": "6.0.13",
+        "postcss": "6.0.14",
         "postcss-value-parser": "3.3.0"
+      },
+      "dependencies": {
+        "browserslist": {
+          "version": "2.10.0",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.10.0.tgz",
+          "integrity": "sha512-WyvzSLsuAVPOjbljXnyeWl14Ae+ukAT8MUuagKVzIDvwBxl4UAwD1xqtyQs2eWYPGUKMeC3Ol62goqYuKqTTcw==",
+          "dev": true,
+          "requires": {
+            "caniuse-lite": "1.0.30000783",
+            "electron-to-chromium": "1.3.29"
+          }
+        },
+        "caniuse-lite": {
+          "version": "1.0.30000783",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000783.tgz",
+          "integrity": "sha1-m1SZ+xtQPSNF0SqmuGEoUvQnb/0=",
+          "dev": true
+        },
+        "electron-to-chromium": {
+          "version": "1.3.29",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.29.tgz",
+          "integrity": "sha1-elgja5VGjD52YAkTSFItZddzazY=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.14",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
+          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.0",
+            "source-map": "0.6.1",
+            "supports-color": "4.5.0"
+          }
+        }
       }
     },
     "aws-sdk": {
-      "version": "2.146.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.146.0.tgz",
-      "integrity": "sha1-4tdVhaAw2uEWrjLL9CxJZojQTvs=",
+      "version": "2.172.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.172.0.tgz",
+      "integrity": "sha1-R9+3mQeXbrvVOFYupaJYNbWz810=",
       "requires": {
         "buffer": "4.9.1",
         "crypto-browserify": "1.0.9",
@@ -1171,7 +1212,7 @@
       "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
-        "core-js": "2.5.1",
+        "core-js": "2.5.3",
         "regenerator-runtime": "0.10.5"
       },
       "dependencies": {
@@ -1280,7 +1321,7 @@
       "requires": {
         "babel-core": "6.26.0",
         "babel-runtime": "6.26.0",
-        "core-js": "2.5.1",
+        "core-js": "2.5.3",
         "home-or-tmp": "2.0.0",
         "lodash": "4.17.4",
         "mkdirp": "0.5.1",
@@ -1333,7 +1374,7 @@
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "requires": {
-        "core-js": "2.5.1",
+        "core-js": "2.5.3",
         "regenerator-runtime": "0.11.0"
       }
     },
@@ -1393,6 +1434,12 @@
         "precond": "0.2.3"
       }
     },
+    "bail": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.2.tgz",
+      "integrity": "sha1-99bBcxYwqfnw1NNe0fli4gdKF2Q=",
+      "dev": true
+    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -1516,16 +1563,6 @@
       "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
       "dev": true
     },
-    "browserslist": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.6.1.tgz",
-      "integrity": "sha512-HBZwVT7ciQB9KlXM3AUMQbnQXtHWPsEUKQTiS0BEFfY5bOrMl94ORaqQD1GyuTGh69ZmYeue9QBqiw219e09eQ==",
-      "dev": true,
-      "requires": {
-        "caniuse-lite": "1.0.30000756",
-        "electron-to-chromium": "1.3.27"
-      }
-    },
     "buffer": {
       "version": "4.9.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
@@ -1569,7 +1606,7 @@
       "integrity": "sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c=",
       "requires": {
         "dtrace-provider": "0.8.5",
-        "moment": "2.19.3",
+        "moment": "2.20.1",
         "mv": "2.1.1",
         "safe-json-stringify": "1.0.4"
       }
@@ -1624,12 +1661,6 @@
         "map-obj": "1.0.1"
       }
     },
-    "caniuse-lite": {
-      "version": "1.0.30000756",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000756.tgz",
-      "integrity": "sha1-PacBwVIbn6uHAExt58l/pH2+qtI=",
-      "dev": true
-    },
     "capture-stack-trace": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
@@ -1640,6 +1671,12 @@
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
+    "ccount": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.2.tgz",
+      "integrity": "sha1-U7ai+BW7d7nChx97mnLDol8djok=",
+      "dev": true
+    },
     "center-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
@@ -1682,6 +1719,30 @@
         "supports-color": "4.5.0"
       }
     },
+    "character-entities": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.1.tgz",
+      "integrity": "sha1-92hxvl72bdt/j440eOzDdMJ9bco=",
+      "dev": true
+    },
+    "character-entities-html4": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.1.tgz",
+      "integrity": "sha1-NZoqSg9+KdPcKsmb2+Ie45Q46lA=",
+      "dev": true
+    },
+    "character-entities-legacy": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.1.tgz",
+      "integrity": "sha1-9Ad53xoQGHK7UQo9KV4fzPFHIC8=",
+      "dev": true
+    },
+    "character-reference-invalid": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz",
+      "integrity": "sha1-lCg191Dk7GGjCOYMLvjMEBEgLvw=",
+      "dev": true
+    },
     "check-error": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
@@ -1780,6 +1841,7 @@
       "requires": {
         "anymatch": "1.3.2",
         "async-each": "1.0.1",
+        "fsevents": "1.1.3",
         "glob-parent": "2.0.0",
         "inherits": "2.0.3",
         "is-binary-path": "1.0.1",
@@ -1881,9 +1943,15 @@
       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
     },
     "codemirror": {
-      "version": "5.31.0",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.31.0.tgz",
-      "integrity": "sha512-LKbMZKoAz7pMmWuSEl253G6yyloSulj1kXfvYv+3n3I8wMiI7QwnCHwKM3Zw5S9ItNV28Layq0/ihQXWmn9T9w=="
+      "version": "5.32.0",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.32.0.tgz",
+      "integrity": "sha512-95OxAlYiigW0g4n4ixFdavG07clJGILp3MvHh2pKR3FvyrTuHHvqtKSVbrV3/Jz6o0YqGvyCDLDTbH4h6ciaSw=="
+    },
+    "collapse-white-space": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.3.tgz",
+      "integrity": "sha1-S5BvZw5aljqHt2sOFolkM0G2Ajw=",
+      "dev": true
     },
     "color-convert": {
       "version": "1.9.0",
@@ -1992,111 +2060,189 @@
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
     },
-    "conventional-changelog": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.6.tgz",
-      "integrity": "sha1-69mxq2N2bHFfkD9lRia2scDad2I=",
-      "dev": true,
-      "requires": {
-        "conventional-changelog-angular": "1.5.1",
-        "conventional-changelog-atom": "0.1.1",
-        "conventional-changelog-codemirror": "0.2.0",
-        "conventional-changelog-core": "1.9.2",
-        "conventional-changelog-ember": "0.2.8",
-        "conventional-changelog-eslint": "0.2.0",
-        "conventional-changelog-express": "0.2.0",
-        "conventional-changelog-jquery": "0.1.0",
-        "conventional-changelog-jscs": "0.1.0",
-        "conventional-changelog-jshint": "0.2.0"
-      }
-    },
-    "conventional-changelog-angular": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.5.1.tgz",
-      "integrity": "sha1-l05zqhw5w5LkNk8pUr2aYpBOnqM=",
-      "dev": true,
-      "requires": {
-        "compare-func": "1.3.2",
-        "q": "1.5.1"
-      }
-    },
-    "conventional-changelog-atom": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz",
-      "integrity": "sha1-1AqbKXlhtTx0Xl0XGP0aM3n2qS8=",
-      "dev": true,
-      "requires": {
-        "q": "1.5.1"
-      }
-    },
     "conventional-changelog-cli": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.4.tgz",
-      "integrity": "sha1-OPf/ese8qS6hEIl+oItHPyBVonw=",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.5.tgz",
+      "integrity": "sha1-RsUUliFrdAZYiIPe+m+sWJ6bsx4=",
       "dev": true,
       "requires": {
         "add-stream": "1.0.0",
-        "conventional-changelog": "1.1.6",
+        "conventional-changelog": "1.1.7",
         "lodash": "4.17.4",
         "meow": "3.7.0",
         "tempfile": "1.1.1"
-      }
-    },
-    "conventional-changelog-codemirror": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.0.tgz",
-      "integrity": "sha1-PMkllV87FEAoJ7FRaASYIZctlFk=",
-      "dev": true,
-      "requires": {
-        "q": "1.5.1"
-      }
-    },
-    "conventional-changelog-core": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.2.tgz",
-      "integrity": "sha1-oJtrlZFhZx/0W5PMnvsEROfIRcA=",
-      "dev": true,
-      "requires": {
-        "conventional-changelog-writer": "2.0.1",
-        "conventional-commits-parser": "2.0.0",
-        "dateformat": "1.0.12",
-        "get-pkg-repo": "1.4.0",
-        "git-raw-commits": "1.2.0",
-        "git-remote-origin-url": "2.0.0",
-        "git-semver-tags": "1.2.2",
-        "lodash": "4.17.4",
-        "normalize-package-data": "2.4.0",
-        "q": "1.5.1",
-        "read-pkg": "1.1.0",
-        "read-pkg-up": "1.0.1",
-        "through2": "2.0.3"
-      }
-    },
-    "conventional-changelog-ember": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.8.tgz",
-      "integrity": "sha1-ZeaG2oPSO2cTPR+FOQjIf5SANcA=",
-      "dev": true,
-      "requires": {
-        "q": "1.5.1"
-      }
-    },
-    "conventional-changelog-eslint": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.0.tgz",
-      "integrity": "sha1-tLm13AlBeETYfHvPsWvcxobEscE=",
-      "dev": true,
-      "requires": {
-        "q": "1.5.1"
-      }
-    },
-    "conventional-changelog-express": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.2.0.tgz",
-      "integrity": "sha1-jWZq1BsQ6/lkpGAgYt3S4A3rUY0=",
-      "dev": true,
-      "requires": {
-        "q": "1.5.1"
+      },
+      "dependencies": {
+        "conventional-changelog": {
+          "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.7.tgz",
+          "integrity": "sha1-kVGmKx2O2y2CcR2r9bfPcQQfgrE=",
+          "dev": true,
+          "requires": {
+            "conventional-changelog-angular": "1.6.0",
+            "conventional-changelog-atom": "0.1.2",
+            "conventional-changelog-codemirror": "0.2.1",
+            "conventional-changelog-core": "1.9.5",
+            "conventional-changelog-ember": "0.2.10",
+            "conventional-changelog-eslint": "0.2.1",
+            "conventional-changelog-express": "0.2.1",
+            "conventional-changelog-jquery": "0.1.0",
+            "conventional-changelog-jscs": "0.1.0",
+            "conventional-changelog-jshint": "0.2.1"
+          }
+        },
+        "conventional-changelog-angular": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-1.6.0.tgz",
+          "integrity": "sha1-CiagcfLJ/PzyuGugz79uYwG3W/o=",
+          "dev": true,
+          "requires": {
+            "compare-func": "1.3.2",
+            "q": "1.5.1"
+          }
+        },
+        "conventional-changelog-atom": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-0.1.2.tgz",
+          "integrity": "sha1-Ella1SZ6aTfDTPkAKBscZRmKTGM=",
+          "dev": true,
+          "requires": {
+            "q": "1.5.1"
+          }
+        },
+        "conventional-changelog-codemirror": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.1.tgz",
+          "integrity": "sha1-KZpPcUe681DmyBWPxUlUopHFzAk=",
+          "dev": true,
+          "requires": {
+            "q": "1.5.1"
+          }
+        },
+        "conventional-changelog-core": {
+          "version": "1.9.5",
+          "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-1.9.5.tgz",
+          "integrity": "sha1-XbdWba18DLddr0f7spdve/mSjB0=",
+          "dev": true,
+          "requires": {
+            "conventional-changelog-writer": "2.0.3",
+            "conventional-commits-parser": "2.1.0",
+            "dateformat": "1.0.12",
+            "get-pkg-repo": "1.4.0",
+            "git-raw-commits": "1.3.0",
+            "git-remote-origin-url": "2.0.0",
+            "git-semver-tags": "1.2.3",
+            "lodash": "4.17.4",
+            "normalize-package-data": "2.4.0",
+            "q": "1.5.1",
+            "read-pkg": "1.1.0",
+            "read-pkg-up": "1.0.1",
+            "through2": "2.0.3"
+          }
+        },
+        "conventional-changelog-ember": {
+          "version": "0.2.10",
+          "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.2.10.tgz",
+          "integrity": "sha512-LBBBZO6Q7ib4HhSdyCNVR25OtaXl710UJg1aSHCLmR8AjuXKs3BO8tnbY1MH+D1C+z5IFoEDkpjOddefNTyhCQ==",
+          "dev": true,
+          "requires": {
+            "q": "1.5.1"
+          }
+        },
+        "conventional-changelog-eslint": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.1.tgz",
+          "integrity": "sha1-LCoRvrIW+AZJunKDQYApO2h8BmI=",
+          "dev": true,
+          "requires": {
+            "q": "1.5.1"
+          }
+        },
+        "conventional-changelog-express": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-0.2.1.tgz",
+          "integrity": "sha1-g42eHmyQmXA7FQucGaoteBdCvWw=",
+          "dev": true,
+          "requires": {
+            "q": "1.5.1"
+          }
+        },
+        "conventional-changelog-jshint": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.1.tgz",
+          "integrity": "sha1-hhObs6yZiZ8rF36WF+CbN9mbzzo=",
+          "dev": true,
+          "requires": {
+            "compare-func": "1.3.2",
+            "q": "1.5.1"
+          }
+        },
+        "conventional-changelog-writer": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.3.tgz",
+          "integrity": "sha512-2E1h7UXL0fhRO5h0CxDZ5EBc5sfBZEQePvuZ+gPvApiRrICUyNDy/NQIP+2TBd4wKZQf2Zm7TxbzXHG5HkPIbA==",
+          "dev": true,
+          "requires": {
+            "compare-func": "1.3.2",
+            "conventional-commits-filter": "1.1.1",
+            "dateformat": "1.0.12",
+            "handlebars": "4.0.11",
+            "json-stringify-safe": "5.0.1",
+            "lodash": "4.17.4",
+            "meow": "3.7.0",
+            "semver": "5.4.1",
+            "split": "1.0.1",
+            "through2": "2.0.3"
+          }
+        },
+        "conventional-commits-filter": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.1.tgz",
+          "integrity": "sha512-bQyatySNKHhcaeKVr9vFxYWA1W1Tdz6ybVMYDmv4/FhOXY1+fchiW07TzRbIQZhVa4cvBwrEaEUQBbCncFSdJQ==",
+          "dev": true,
+          "requires": {
+            "is-subset": "0.1.1",
+            "modify-values": "1.0.0"
+          }
+        },
+        "conventional-commits-parser": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.1.0.tgz",
+          "integrity": "sha512-8MD05yN0Zb6aRsZnFX1ET+8rHWfWJk+my7ANCJZBU2mhz7TSB1fk2vZhkrwVy/PCllcTYAP/1T1NiWQ7Z01mKw==",
+          "dev": true,
+          "requires": {
+            "JSONStream": "1.3.1",
+            "is-text-path": "1.0.1",
+            "lodash": "4.17.4",
+            "meow": "3.7.0",
+            "split2": "2.2.0",
+            "through2": "2.0.3",
+            "trim-off-newlines": "1.0.1"
+          }
+        },
+        "git-raw-commits": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.3.0.tgz",
+          "integrity": "sha1-C8hZbpDV/+c29/VUa9LRL3OrqsY=",
+          "dev": true,
+          "requires": {
+            "dargs": "4.1.0",
+            "lodash.template": "4.4.0",
+            "meow": "3.7.0",
+            "split2": "2.2.0",
+            "through2": "2.0.3"
+          }
+        },
+        "git-semver-tags": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.3.tgz",
+          "integrity": "sha1-GItFOIK/nXojr9Mbq6U32rc4jV0=",
+          "dev": true,
+          "requires": {
+            "meow": "3.7.0",
+            "semver": "5.4.1"
+          }
+        }
       }
     },
     "conventional-changelog-jquery": {
@@ -2117,59 +2263,6 @@
         "q": "1.5.1"
       }
     },
-    "conventional-changelog-jshint": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.0.tgz",
-      "integrity": "sha1-Y6167GbNGuVZuv6ANIxGV6brGHI=",
-      "dev": true,
-      "requires": {
-        "compare-func": "1.3.2",
-        "q": "1.5.1"
-      }
-    },
-    "conventional-changelog-writer": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-2.0.1.tgz",
-      "integrity": "sha1-R8END6ulJreNGUOJ0ekx0J7mI3I=",
-      "dev": true,
-      "requires": {
-        "compare-func": "1.3.2",
-        "conventional-commits-filter": "1.0.0",
-        "dateformat": "1.0.12",
-        "handlebars": "4.0.11",
-        "json-stringify-safe": "5.0.1",
-        "lodash": "4.17.4",
-        "meow": "3.7.0",
-        "semver": "5.4.1",
-        "split": "1.0.1",
-        "through2": "2.0.3"
-      }
-    },
-    "conventional-commits-filter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.0.0.tgz",
-      "integrity": "sha1-b8KmWTcrw/IznPn//34bA0S5MDk=",
-      "dev": true,
-      "requires": {
-        "is-subset": "0.1.1",
-        "modify-values": "1.0.0"
-      }
-    },
-    "conventional-commits-parser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz",
-      "integrity": "sha1-cdAZEMsKma6yDBROUPgfTfMXhEc=",
-      "dev": true,
-      "requires": {
-        "JSONStream": "1.3.1",
-        "is-text-path": "1.0.1",
-        "lodash": "4.17.4",
-        "meow": "3.7.0",
-        "split2": "2.2.0",
-        "through2": "2.0.3",
-        "trim-off-newlines": "1.0.1"
-      }
-    },
     "convert-source-map": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
@@ -2183,9 +2276,9 @@
       "dev": true
     },
     "core-js": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
-      "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs="
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz",
+      "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4="
     },
     "core-util-is": {
       "version": "1.0.2",
@@ -2417,6 +2510,16 @@
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
       "dev": true
     },
+    "decamelize-keys": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
+      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
+      "dev": true,
+      "requires": {
+        "decamelize": "1.2.0",
+        "map-obj": "1.0.1"
+      }
+    },
     "deep-eql": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
@@ -2499,14 +2602,25 @@
       "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=",
       "dev": true
     },
-    "doctrine": {
+    "dir-glob": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz",
-      "integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
+      "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
       "dev": true,
       "requires": {
-        "esutils": "2.0.2",
-        "isarray": "1.0.0"
+        "arrify": "1.0.1",
+        "path-type": "3.0.0"
+      },
+      "dependencies": {
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "dev": true,
+          "requires": {
+            "pify": "3.0.0"
+          }
+        }
       }
     },
     "dom-serializer": {
@@ -2609,12 +2723,6 @@
       "integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo=",
       "dev": true
     },
-    "electron-to-chromium": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz",
-      "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0=",
-      "dev": true
-    },
     "emailreplyparser": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/emailreplyparser/-/emailreplyparser-0.0.5.tgz",
@@ -2743,9 +2851,9 @@
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "eslint": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.10.0.tgz",
-      "integrity": "sha1-8l0NeVXIGWjCMJqlyaIp4EUXa7c=",
+      "version": "4.13.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.13.1.tgz",
+      "integrity": "sha512-UCJVV50RtLHYzBp1DZ8CMPtRSg4iVZvjgO9IJHIKyWU/AnJVjtdRikoUPLB29n5pzMB7TnsLQWf0V6VUJfoPfw==",
       "dev": true,
       "requires": {
         "ajv": "5.3.0",
@@ -2754,22 +2862,22 @@
         "concat-stream": "1.6.0",
         "cross-spawn": "5.1.0",
         "debug": "3.1.0",
-        "doctrine": "2.0.0",
+        "doctrine": "2.0.2",
         "eslint-scope": "3.7.1",
-        "espree": "3.5.1",
+        "espree": "3.5.2",
         "esquery": "1.0.0",
         "estraverse": "4.2.0",
         "esutils": "2.0.2",
         "file-entry-cache": "2.0.0",
         "functional-red-black-tree": "1.0.1",
         "glob": "7.1.2",
-        "globals": "9.18.0",
+        "globals": "11.1.0",
         "ignore": "3.3.7",
         "imurmurhash": "0.1.4",
         "inquirer": "3.0.6",
         "is-resolvable": "1.0.0",
         "js-yaml": "3.10.0",
-        "json-stable-stringify": "1.0.1",
+        "json-stable-stringify-without-jsonify": "1.0.1",
         "levn": "0.3.0",
         "lodash": "4.17.4",
         "minimatch": "3.0.4",
@@ -2796,12 +2904,37 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
         },
+        "doctrine": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.2.tgz",
+          "integrity": "sha512-y0tm5Pq6ywp3qSTZ1vPgVdAnbDEoeoc5wlOHXoY1c4Wug/a7JvqHIl7BTvwodaHmejWkK/9dSb3sCYfyo/om8A==",
+          "dev": true,
+          "requires": {
+            "esutils": "2.0.2"
+          }
+        },
+        "espree": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.2.tgz",
+          "integrity": "sha512-sadKeYwaR/aJ3stC2CdvgXu1T16TdYN+qwCpcWbMnGJ8s0zNWemzrvb2GbD4OhmJ/fwpJjudThAlLobGbWZbCQ==",
+          "dev": true,
+          "requires": {
+            "acorn": "5.2.1",
+            "acorn-jsx": "3.0.1"
+          }
+        },
+        "globals": {
+          "version": "11.1.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.1.0.tgz",
+          "integrity": "sha512-uEuWt9mqTlPDwSqi+sHjD4nWU/1N+q0fiWI9T1mZpD2UENqX20CFD5T/ziLZvztPaBKl7ZylUi1q6Qfm7E2CiQ==",
+          "dev": true
+        },
         "progress": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
@@ -2829,16 +2962,6 @@
         "estraverse": "4.2.0"
       }
     },
-    "espree": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.1.tgz",
-      "integrity": "sha1-DJiLirRttTEAoZVK5LqZXd0n2H4=",
-      "dev": true,
-      "requires": {
-        "acorn": "5.2.1",
-        "acorn-jsx": "3.0.1"
-      }
-    },
     "esprima": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
@@ -3060,9 +3183,9 @@
       }
     },
     "file-type": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-7.2.0.tgz",
-      "integrity": "sha1-ETz+1S4daVmrgCSJBuLyWozcy3Q="
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-7.4.0.tgz",
+      "integrity": "sha1-KnyU9ioAMBULt9m2xwz6HT51nIY="
     },
     "filename-regex": {
       "version": "2.0.1",
@@ -3163,12 +3286,6 @@
         }
       }
     },
-    "flatten": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
-      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
-      "dev": true
-    },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -3232,25 +3349,929 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
-    "fstream": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "inherits": "2.0.3",
-        "mkdirp": "0.5.1",
-        "rimraf": "2.6.2"
-      }
-    },
-    "fstream-ignore": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-      "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
+    "fsevents": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
+      "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
+      "dev": true,
+      "optional": true,
       "requires": {
-        "fstream": "1.0.11",
-        "inherits": "2.0.3",
-        "minimatch": "3.0.4"
+        "nan": "2.6.2",
+        "node-pre-gyp": "0.6.39"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ajv": {
+          "version": "4.11.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "aproba": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "1.0.0",
+            "readable-stream": "2.2.9"
+          }
+        },
+        "asn1": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws4": {
+          "version": "1.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "balanced-match": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true
+        },
+        "bcrypt-pbkdf": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "tweetnacl": "0.14.5"
+          }
+        },
+        "block-stream": {
+          "version": "0.0.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3"
+          }
+        },
+        "boom": {
+          "version": "2.10.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "brace-expansion": {
+          "version": "1.1.7",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "balanced-match": "0.4.2",
+            "concat-map": "0.0.1"
+          }
+        },
+        "buffer-shims": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "caseless": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "co": {
+          "version": "4.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "combined-stream": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "delayed-stream": "1.0.0"
+          }
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "boom": "2.10.1"
+          }
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "debug": {
+          "version": "2.6.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ecc-jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "extend": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "extsprintf": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.15"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "fstream": {
+          "version": "1.0.11",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "inherits": "2.0.3",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.1"
+          }
+        },
+        "fstream-ignore": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fstream": "1.0.11",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4"
+          }
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "1.1.1",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.2"
+          }
+        },
+        "getpass": {
+          "version": "0.1.7",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.11",
+          "bundled": true,
+          "dev": true
+        },
+        "har-schema": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "har-validator": {
+          "version": "4.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "bundled": true,
+          "dev": true
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.0",
+            "sshpk": "1.13.0"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "ini": {
+          "version": "1.3.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jodid25519": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-schema": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-stable-stringify": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsonify": "0.0.0"
+          }
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsonify": {
+          "version": "0.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsprim": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.0.2",
+            "json-schema": "0.2.3",
+            "verror": "1.3.6"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "mime-db": {
+          "version": "1.27.0",
+          "bundled": true,
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.15",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "mime-db": "1.27.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "node-pre-gyp": {
+          "version": "0.6.39",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "1.0.2",
+            "hawk": "3.1.3",
+            "mkdirp": "0.5.1",
+            "nopt": "4.0.1",
+            "npmlog": "4.1.0",
+            "rc": "1.2.1",
+            "request": "2.81.0",
+            "rimraf": "2.6.1",
+            "semver": "5.3.0",
+            "tar": "2.2.1",
+            "tar-pack": "3.4.0"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1.1.0",
+            "osenv": "0.1.4"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "performance-now": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "bundled": true,
+          "dev": true
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "qs": {
+          "version": "6.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "0.4.2",
+            "ini": "1.3.4",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.2.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "buffer-shims": "1.0.0",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "1.0.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "request": {
+          "version": "2.81.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aws-sign2": "0.6.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.1.4",
+            "har-validator": "4.2.1",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.15",
+            "oauth-sign": "0.8.2",
+            "performance-now": "0.2.0",
+            "qs": "6.4.0",
+            "safe-buffer": "5.0.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.2",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "glob": "7.1.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "semver": {
+          "version": "5.3.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "sshpk": {
+          "version": "1.13.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asn1": "0.2.3",
+            "assert-plus": "1.0.0",
+            "bcrypt-pbkdf": "1.0.1",
+            "dashdash": "1.14.1",
+            "ecc-jsbn": "0.1.1",
+            "getpass": "0.1.7",
+            "jodid25519": "1.0.2",
+            "jsbn": "0.1.1",
+            "tweetnacl": "0.14.5"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "2.2.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "block-stream": "0.0.9",
+            "fstream": "1.0.11",
+            "inherits": "2.0.3"
+          }
+        },
+        "tar-pack": {
+          "version": "3.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "2.6.8",
+            "fstream": "1.0.11",
+            "fstream-ignore": "1.0.5",
+            "once": "1.4.0",
+            "readable-stream": "2.2.9",
+            "rimraf": "2.6.1",
+            "tar": "2.2.1",
+            "uid-number": "0.0.6"
+          }
+        },
+        "tough-cookie": {
+          "version": "2.3.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "uuid": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "verror": {
+          "version": "1.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "extsprintf": "1.0.2"
+          }
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        }
+      }
+    },
+    "fstream": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "inherits": "2.0.3",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2"
+      }
+    },
+    "fstream-ignore": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+      "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
+      "requires": {
+        "fstream": "1.0.11",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4"
       }
     },
     "function-bind": {
@@ -3359,19 +4380,6 @@
       "integrity": "sha1-edzgTRIj6kO0hip2vlzo+JwSwyw=",
       "dev": true
     },
-    "git-raw-commits": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-1.2.0.tgz",
-      "integrity": "sha1-DzqL/ZmuDy2LkiTViJKXXppS0Dw=",
-      "dev": true,
-      "requires": {
-        "dargs": "4.1.0",
-        "lodash.template": "4.4.0",
-        "meow": "3.7.0",
-        "split2": "2.2.0",
-        "through2": "2.0.3"
-      }
-    },
     "git-remote-origin-url": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz",
@@ -3390,16 +4398,6 @@
         }
       }
     },
-    "git-semver-tags": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.2.2.tgz",
-      "integrity": "sha1-ohOb4b9uM34SXz64u4/G9dTWRF8=",
-      "dev": true,
-      "requires": {
-        "meow": "3.7.0",
-        "semver": "5.4.1"
-      }
-    },
     "gitconfiglocal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz",
@@ -3485,6 +4483,23 @@
         "minimatch": "3.0.4"
       }
     },
+    "gonzales-pe": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.2.3.tgz",
+      "integrity": "sha512-Kjhohco0esHQnOiqqdJeNz/5fyPkOMD/d6XVjwTAoPGUFh0mCollPUTUTa2OZy4dYNAqlPIQdTiNzJTWdd9Htw==",
+      "dev": true,
+      "requires": {
+        "minimist": "1.1.3"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
+          "integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
+          "dev": true
+        }
+      }
+    },
     "google-auth-library": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.10.0.tgz",
@@ -4290,6 +5305,28 @@
       "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
       "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU="
     },
+    "is-alphabetical": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.1.tgz",
+      "integrity": "sha1-x3B5zJHU76x3W+EDS/LSQ/lebwg=",
+      "dev": true
+    },
+    "is-alphanumeric": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz",
+      "integrity": "sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ=",
+      "dev": true
+    },
+    "is-alphanumerical": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.1.tgz",
+      "integrity": "sha1-37SqTRCF4zvbYcLe6cgOnGwZ9Ts=",
+      "dev": true,
+      "requires": {
+        "is-alphabetical": "1.0.1",
+        "is-decimal": "1.0.1"
+      }
+    },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -4330,6 +5367,12 @@
       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
       "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
     },
+    "is-decimal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.1.tgz",
+      "integrity": "sha1-9ftqlJlq2ejjdh+/vQkfH8qMToI=",
+      "dev": true
+    },
     "is-directory": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
@@ -4395,6 +5438,12 @@
         "is-extglob": "1.0.0"
       }
     },
+    "is-hexadecimal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz",
+      "integrity": "sha1-bghLvJIGH7sJcexYts5tQE4k2mk=",
+      "dev": true
+    },
     "is-my-json-valid": {
       "version": "2.16.1",
       "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
@@ -4451,6 +5500,12 @@
         "path-is-inside": "1.0.2"
       }
     },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true
+    },
     "is-posix-bracket": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
@@ -4546,6 +5601,18 @@
       "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
       "dev": true
     },
+    "is-whitespace-character": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.1.tgz",
+      "integrity": "sha1-muAXbzKCtlRXoZks2whPil+DPjs=",
+      "dev": true
+    },
+    "is-word-character": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.1.tgz",
+      "integrity": "sha1-WgP6HqkazopusMfNdw64bWXIvvs=",
+      "dev": true
+    },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -4638,6 +5705,12 @@
       "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
       "dev": true
     },
+    "json-parse-better-errors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz",
+      "integrity": "sha512-xyQpxeWWMKyJps9CuGJYeng6ssI5bpqS9ltQpdVQ90t4ql6NdnxFKh95JcRt2cun/DjMVNrdjniLPuMA69xmCw==",
+      "dev": true
+    },
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -4657,6 +5730,12 @@
         "jsonify": "0.0.0"
       }
     },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
@@ -4757,12 +5836,6 @@
         "graceful-fs": "4.1.11"
       }
     },
-    "known-css-properties": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.4.1.tgz",
-      "integrity": "sha512-n+ThoCKhyMFKkMfksdLMP5ndp+VzwDRzQdH6JlmZ2GTpUenYB2EeEKjOue2SErAAG/MmBSUISpwvawDhydWQdQ==",
-      "dev": true
-    },
     "lazy-cache": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
@@ -4873,6 +5946,24 @@
         }
       }
     },
+    "locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "requires": {
+        "p-locate": "2.0.0",
+        "path-exists": "3.0.0"
+      },
+      "dependencies": {
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
+        }
+      }
+    },
     "lodash": {
       "version": "4.17.4",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
@@ -5002,6 +6093,12 @@
       "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
       "dev": true
     },
+    "longest-streak": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.2.tgz",
+      "integrity": "sha512-TmYTeEYxiAmSVdpbnQDXGtvYOIRsCMg89CVZzwzc2o7GFL1CjoiRPjH5ec0NFAVlAx3fVof9dX/t6KKRAo2OWA==",
+      "dev": true
+    },
     "loose-envify": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
@@ -5078,6 +6175,18 @@
       "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
       "dev": true
     },
+    "markdown-escapes": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.1.tgz",
+      "integrity": "sha1-GZTfLTr0gR3lmmcUk0wrIpJzRRg=",
+      "dev": true
+    },
+    "markdown-table": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.1.tgz",
+      "integrity": "sha1-Sz3ToTPRUYuO8NvHCb8qG0gkvIw=",
+      "dev": true
+    },
     "marked": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz",
@@ -5089,6 +6198,16 @@
       "integrity": "sha1-jUEmgWi/htEQK5gQnijlMeejRXg=",
       "dev": true
     },
+    "mdast-util-compact": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.1.tgz",
+      "integrity": "sha1-zbX4TitqLTEU3zO9BdnLMuPECDo=",
+      "dev": true,
+      "requires": {
+        "unist-util-modify-children": "1.1.1",
+        "unist-util-visit": "1.3.0"
+      }
+    },
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -5170,9 +6289,9 @@
       "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
     },
     "mime-db": {
-      "version": "1.31.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.31.0.tgz",
-      "integrity": "sha512-oB3w9lx50CMd6nfonoV5rBRUbJtjMifUHaFb5MfzjC8ksAIfVjT0BsX46SjjqBz7n9JGTrTX3paIeLSK+rS5fQ=="
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.32.0.tgz",
+      "integrity": "sha512-+ZWo/xZN40Tt6S+HyakUxnSOgff+JEdaneLWIm0Z6LmpCn5DMcZntLyUY5c/rTDog28LhXLKOUZKoTxTCAdBVw=="
     },
     "mime-type": {
       "version": "3.0.5",
@@ -5219,6 +6338,16 @@
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
       "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
     },
+    "minimist-options": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
+      "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
+      "dev": true,
+      "requires": {
+        "arrify": "1.0.1",
+        "is-plain-obj": "1.1.0"
+      }
+    },
     "mkdirp": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
@@ -5323,16 +6452,16 @@
       "dev": true
     },
     "moment": {
-      "version": "2.19.3",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.3.tgz",
-      "integrity": "sha1-vbmdJw1tf9p4zA+6zoVeJ/59pp8="
+      "version": "2.20.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz",
+      "integrity": "sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg=="
     },
     "moment-timezone": {
       "version": "0.5.14",
       "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.14.tgz",
       "integrity": "sha1-TrOP+VOLgBCLpGekWPPtQmjM/LE=",
       "requires": {
-        "moment": "2.19.3"
+        "moment": "2.20.1"
       }
     },
     "ms": {
@@ -5601,12 +6730,41 @@
         "os-tmpdir": "1.0.2"
       }
     },
+    "p-limit": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz",
+      "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=",
+      "dev": true
+    },
+    "p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "requires": {
+        "p-limit": "1.1.0"
+      }
+    },
     "p-map": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
       "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
       "dev": true
     },
+    "parse-entities": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.1.tgz",
+      "integrity": "sha1-gRLYhHExnyerrk1klksSL+ThuJA=",
+      "dev": true,
+      "requires": {
+        "character-entities": "1.2.1",
+        "character-entities-legacy": "1.1.1",
+        "character-reference-invalid": "1.1.1",
+        "is-alphanumerical": "1.0.1",
+        "is-decimal": "1.0.1",
+        "is-hexadecimal": "1.0.1"
+      }
+    },
     "parse-github-repo-url": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz",
@@ -6016,6 +7174,17 @@
         "postcss": "6.0.13"
       }
     },
+    "postcss-html": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-0.12.0.tgz",
+      "integrity": "sha512-KxKUpj7AY7nlCbLcTOYxdfJnGE7QFAfU2n95ADj1Q90RM/pOLdz8k3n4avOyRFs7MDQHcRzJQWM1dehCwJxisQ==",
+      "dev": true,
+      "requires": {
+        "htmlparser2": "3.9.2",
+        "remark": "8.0.0",
+        "unist-util-find-all-after": "1.0.1"
+      }
+    },
     "postcss-import": {
       "version": "11.0.0",
       "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-11.0.0.tgz",
@@ -6114,13 +7283,27 @@
       "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
       "dev": true
     },
-    "postcss-nesting": {
+    "postcss-nested": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-3.0.0.tgz",
-      "integrity": "sha1-sKdJ1+/xHSVQoE3qZCtpXXWC+x0=",
+      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-3.0.0.tgz",
+      "integrity": "sha512-1xxmLHSfubuUi6xZZ0zLsNoiKfk3BWQj6fkNMaBJC529wKKLcdeCxXt6KJmDLva+trNyQNwEaE/ZWMA7cve1fA==",
       "dev": true,
       "requires": {
-        "postcss": "6.0.13"
+        "postcss": "6.0.14",
+        "postcss-selector-parser": "3.1.1"
+      },
+      "dependencies": {
+        "postcss": {
+          "version": "6.0.14",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
+          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.0",
+            "source-map": "0.6.1",
+            "supports-color": "4.5.0"
+          }
+        }
       }
     },
     "postcss-reporter": {
@@ -6150,6 +7333,16 @@
         "postcss": "6.0.13"
       }
     },
+    "postcss-sass": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.2.0.tgz",
+      "integrity": "sha512-cUmYzkP747fPCQE6d+CH2l1L4VSyIlAzZsok3HPjb5Gzsq3jE+VjpAdGlPsnQ310WKWI42sw+ar0UNN59/f3hg==",
+      "dev": true,
+      "requires": {
+        "gonzales-pe": "4.2.3",
+        "postcss": "6.0.13"
+      }
+    },
     "postcss-scss": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-1.0.2.tgz",
@@ -6178,12 +7371,12 @@
       }
     },
     "postcss-selector-parser": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
-      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz",
+      "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=",
       "dev": true,
       "requires": {
-        "flatten": "1.0.2",
+        "dot-prop": "4.2.0",
         "indexes-of": "1.0.1",
         "uniq": "1.0.1"
       }
@@ -6311,6 +7504,12 @@
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
       "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
     },
+    "quick-lru": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
+      "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=",
+      "dev": true
+    },
     "randomatic": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
@@ -6509,6 +7708,62 @@
         }
       }
     },
+    "remark": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/remark/-/remark-8.0.0.tgz",
+      "integrity": "sha512-K0PTsaZvJlXTl9DN6qYlvjTkqSZBFELhROZMrblm2rB+085flN84nz4g/BscKRMqDvhzlK1oQ/xnWQumdeNZYw==",
+      "dev": true,
+      "requires": {
+        "remark-parse": "4.0.0",
+        "remark-stringify": "4.0.0",
+        "unified": "6.1.6"
+      }
+    },
+    "remark-parse": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-4.0.0.tgz",
+      "integrity": "sha512-XZgICP2gJ1MHU7+vQaRM+VA9HEL3X253uwUM/BGgx3iv6TH2B3bF3B8q00DKcyP9YrJV+/7WOWEWBFF/u8cIsw==",
+      "dev": true,
+      "requires": {
+        "collapse-white-space": "1.0.3",
+        "is-alphabetical": "1.0.1",
+        "is-decimal": "1.0.1",
+        "is-whitespace-character": "1.0.1",
+        "is-word-character": "1.0.1",
+        "markdown-escapes": "1.0.1",
+        "parse-entities": "1.1.1",
+        "repeat-string": "1.6.1",
+        "state-toggle": "1.0.0",
+        "trim": "0.0.1",
+        "trim-trailing-lines": "1.1.0",
+        "unherit": "1.1.0",
+        "unist-util-remove-position": "1.1.1",
+        "vfile-location": "2.0.2",
+        "xtend": "4.0.1"
+      }
+    },
+    "remark-stringify": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-4.0.0.tgz",
+      "integrity": "sha512-xLuyKTnuQer3ke9hkU38SUYLiTmS078QOnoFavztmbt/pAJtNSkNtFgR0U//uCcmG0qnyxao+PDuatQav46F1w==",
+      "dev": true,
+      "requires": {
+        "ccount": "1.0.2",
+        "is-alphanumeric": "1.0.0",
+        "is-decimal": "1.0.1",
+        "is-whitespace-character": "1.0.1",
+        "longest-streak": "2.0.2",
+        "markdown-escapes": "1.0.1",
+        "markdown-table": "1.1.1",
+        "mdast-util-compact": "1.0.1",
+        "parse-entities": "1.1.1",
+        "repeat-string": "1.6.1",
+        "state-toggle": "1.0.0",
+        "stringify-entities": "1.3.1",
+        "unherit": "1.1.0",
+        "xtend": "4.0.1"
+      }
+    },
     "remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
@@ -6536,6 +7791,12 @@
         "is-finite": "1.0.2"
       }
     },
+    "replace-ext": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+      "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
+      "dev": true
+    },
     "request": {
       "version": "2.83.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
@@ -6942,12 +8203,23 @@
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
     "simple-git": {
-      "version": "1.80.1",
-      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.80.1.tgz",
-      "integrity": "sha1-SBBMtKxyV2k3hT4a/R7v/cl6yyk=",
+      "version": "1.85.0",
+      "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.85.0.tgz",
+      "integrity": "sha1-VjrSke/IoSdzXo+815aWc3dhTNQ=",
       "dev": true,
       "requires": {
-        "debug": "2.6.9"
+        "debug": "3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
       }
     },
     "slash": {
@@ -7165,6 +8437,12 @@
         "stacktrace-gps": "2.4.4"
       }
     },
+    "state-toggle": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.0.tgz",
+      "integrity": "sha1-0g+aYWu08MO5i5GSLSW2QKorxCU=",
+      "dev": true
+    },
     "stream-events": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz",
@@ -7201,6 +8479,18 @@
         "safe-buffer": "5.1.1"
       }
     },
+    "stringify-entities": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.1.tgz",
+      "integrity": "sha1-sVDsLXKsTBtfMktR+2soyc3/BYw=",
+      "dev": true,
+      "requires": {
+        "character-entities-html4": "1.1.1",
+        "character-entities-legacy": "1.1.1",
+        "is-alphanumerical": "1.0.1",
+        "is-hexadecimal": "1.0.1"
+      }
+    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -7249,12 +8539,12 @@
       "dev": true
     },
     "stylelint": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-8.2.0.tgz",
-      "integrity": "sha512-57JWIz/1Uh9ehZMZyAqlFC0EDfQrMXCH8yqt8ZuJQQvV3LBKgAM/JYd+CWi1hC4eJtRODSPbIIBYKdGjkPZdMg==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-8.4.0.tgz",
+      "integrity": "sha512-56hPH5mTFnk8LzlEuTWq0epa34fHuS54UFYQidBOFt563RJBNi1nz1F2HK2MoT1X1waq47milvRsRahFCCJs/Q==",
       "dev": true,
       "requires": {
-        "autoprefixer": "7.1.6",
+        "autoprefixer": "7.2.3",
         "balanced-match": "1.0.0",
         "chalk": "2.3.0",
         "cosmiconfig": "3.1.0",
@@ -7262,27 +8552,29 @@
         "execall": "1.0.0",
         "file-entry-cache": "2.0.0",
         "get-stdin": "5.0.1",
-        "globby": "6.1.0",
+        "globby": "7.1.1",
         "globjoin": "0.1.4",
         "html-tags": "2.0.0",
         "ignore": "3.3.7",
         "imurmurhash": "0.1.4",
-        "known-css-properties": "0.4.1",
+        "known-css-properties": "0.5.0",
         "lodash": "4.17.4",
         "log-symbols": "2.1.0",
         "mathml-tag-names": "2.0.1",
-        "meow": "3.7.0",
+        "meow": "4.0.0",
         "micromatch": "2.3.11",
         "normalize-selector": "0.2.0",
         "pify": "3.0.0",
         "postcss": "6.0.13",
+        "postcss-html": "0.12.0",
         "postcss-less": "1.1.1",
         "postcss-media-query-parser": "0.2.3",
         "postcss-reporter": "5.0.0",
         "postcss-resolve-nested-selector": "0.1.1",
         "postcss-safe-parser": "3.0.1",
+        "postcss-sass": "0.2.0",
         "postcss-scss": "1.0.2",
-        "postcss-selector-parser": "2.2.3",
+        "postcss-selector-parser": "3.1.1",
         "postcss-value-parser": "3.3.0",
         "resolve-from": "4.0.0",
         "specificity": "0.3.2",
@@ -7299,6 +8591,23 @@
           "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "dev": true
         },
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "camelcase-keys": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
+          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
+          "dev": true,
+          "requires": {
+            "camelcase": "4.1.0",
+            "map-obj": "2.0.0",
+            "quick-lru": "1.1.0"
+          }
+        },
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
@@ -7308,18 +8617,155 @@
             "ms": "2.0.0"
           }
         },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "2.0.0"
+          }
+        },
         "get-stdin": {
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz",
           "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=",
           "dev": true
         },
+        "globby": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
+          "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
+          "dev": true,
+          "requires": {
+            "array-union": "1.0.2",
+            "dir-glob": "2.0.0",
+            "glob": "7.1.2",
+            "ignore": "3.3.7",
+            "pify": "3.0.0",
+            "slash": "1.0.0"
+          }
+        },
+        "indent-string": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+          "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
+          "dev": true
+        },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
+        "known-css-properties": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.5.0.tgz",
+          "integrity": "sha512-LOS0CoS8zcZnB1EjLw4LLqDXw8nvt3AGH5dXLQP3D9O1nLLA+9GC5GnPl5mmF+JiQAtSX4VyZC7KvEtcA4kUtA==",
+          "dev": true
+        },
+        "load-json-file": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "parse-json": "4.0.0",
+            "pify": "3.0.0",
+            "strip-bom": "3.0.0"
+          }
+        },
+        "map-obj": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
+          "dev": true
+        },
+        "meow": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.0.tgz",
+          "integrity": "sha512-Me/kel335m6vMKmEmA6c87Z6DUFW3JqkINRnxkbC+A/PUm0D5Fl2dEBQrPKnqCL9Te/CIa1MUt/0InMJhuC/sw==",
+          "dev": true,
+          "requires": {
+            "camelcase-keys": "4.2.0",
+            "decamelize-keys": "1.1.0",
+            "loud-rejection": "1.6.0",
+            "minimist": "1.2.0",
+            "minimist-options": "3.0.2",
+            "normalize-package-data": "2.4.0",
+            "read-pkg-up": "3.0.0",
+            "redent": "2.0.0",
+            "trim-newlines": "2.0.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "parse-json": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+          "dev": true,
+          "requires": {
+            "error-ex": "1.3.1",
+            "json-parse-better-errors": "1.0.1"
+          }
+        },
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "dev": true,
+          "requires": {
+            "pify": "3.0.0"
+          }
+        },
+        "postcss-selector-parser": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz",
+          "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=",
+          "dev": true,
+          "requires": {
+            "dot-prop": "4.2.0",
+            "indexes-of": "1.0.1",
+            "uniq": "1.0.1"
+          }
+        },
+        "read-pkg": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "4.0.0",
+            "normalize-package-data": "2.4.0",
+            "path-type": "3.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+          "dev": true,
+          "requires": {
+            "find-up": "2.1.0",
+            "read-pkg": "3.0.0"
+          }
+        },
+        "redent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
+          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
+          "dev": true,
+          "requires": {
+            "indent-string": "3.2.0",
+            "strip-indent": "2.0.0"
+          }
+        },
         "resolve-from": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -7344,18 +8790,49 @@
           "requires": {
             "ansi-regex": "3.0.0"
           }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        },
+        "strip-indent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+          "dev": true
+        },
+        "trim-newlines": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
+          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
+          "dev": true
         }
       }
     },
     "stylelint-order": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-0.7.0.tgz",
-      "integrity": "sha1-zqtcviSqM/pjWQAkmVOV9u38mrc=",
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-0.8.0.tgz",
+      "integrity": "sha512-XwJO7rIAt/hnBJjOsDgEwNSeqw+5jE22da4pVKaePbojM9bGwhOoAWV7Q2BL8caOg81IlTesmYCEf8s0+2Cc5g==",
       "dev": true,
       "requires": {
         "lodash": "4.17.4",
-        "postcss": "6.0.13",
+        "postcss": "6.0.14",
         "postcss-sorting": "3.1.0"
+      },
+      "dependencies": {
+        "postcss": {
+          "version": "6.0.14",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
+          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.0",
+            "source-map": "0.6.1",
+            "supports-color": "4.5.0"
+          }
+        }
       }
     },
     "sugarss": {
@@ -7580,9 +9057,12 @@
       "dev": true
     },
     "toastr": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/toastr/-/toastr-2.1.2.tgz",
-      "integrity": "sha1-/WkGaudXilszV3JfycfDNem2gd8="
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/toastr/-/toastr-2.1.4.tgz",
+      "integrity": "sha1-i0O+ZPudDEFIcURvLbjoyk6V8YE=",
+      "requires": {
+        "jquery": "3.2.1"
+      }
     },
     "tough-cookie": {
       "version": "2.3.3",
@@ -7592,6 +9072,12 @@
         "punycode": "1.4.1"
       }
     },
+    "trim": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
+      "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=",
+      "dev": true
+    },
     "trim-newlines": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
@@ -7610,6 +9096,18 @@
       "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
       "dev": true
     },
+    "trim-trailing-lines": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz",
+      "integrity": "sha1-eu+7eAjfnWafbaLkOMrIxGradoQ=",
+      "dev": true
+    },
+    "trough": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.1.tgz",
+      "integrity": "sha1-qf2LA5Swro//guBjOgo2zK1bX4Y=",
+      "dev": true
+    },
     "tryit": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
@@ -7697,6 +9195,31 @@
         "util-deprecate": "1.0.2"
       }
     },
+    "unherit": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.0.tgz",
+      "integrity": "sha1-a5qu379z3xdWrZ4xbdmBiFhAzX0=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "xtend": "4.0.1"
+      }
+    },
+    "unified": {
+      "version": "6.1.6",
+      "resolved": "https://registry.npmjs.org/unified/-/unified-6.1.6.tgz",
+      "integrity": "sha512-pW2f82bCIo2ifuIGYcV12fL96kMMYgw7JKVEgh7ODlrM9rj6vXSY3BV+H6lCcv1ksxynFf582hwWLnA1qRFy4w==",
+      "dev": true,
+      "requires": {
+        "bail": "1.0.2",
+        "extend": "3.0.1",
+        "is-plain-obj": "1.1.0",
+        "trough": "1.0.1",
+        "vfile": "2.3.0",
+        "x-is-function": "1.0.4",
+        "x-is-string": "0.1.0"
+      }
+    },
     "uniq": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
@@ -7711,6 +9234,54 @@
         "crypto-random-string": "1.0.0"
       }
     },
+    "unist-util-find-all-after": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-1.0.1.tgz",
+      "integrity": "sha1-TlUSq/734GFnga7Pex7XUcAK+Qg=",
+      "dev": true,
+      "requires": {
+        "unist-util-is": "2.1.1"
+      }
+    },
+    "unist-util-is": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.1.tgz",
+      "integrity": "sha1-DDEmKeP5YMZukx6BLT2A53AQlHs=",
+      "dev": true
+    },
+    "unist-util-modify-children": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.1.tgz",
+      "integrity": "sha1-ZtfmpEnm9nIguXarPLi166w55R0=",
+      "dev": true,
+      "requires": {
+        "array-iterate": "1.1.1"
+      }
+    },
+    "unist-util-remove-position": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.1.tgz",
+      "integrity": "sha1-WoXBVV/BugwQG4ZwfRXlD6TIcbs=",
+      "dev": true,
+      "requires": {
+        "unist-util-visit": "1.3.0"
+      }
+    },
+    "unist-util-stringify-position": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.1.tgz",
+      "integrity": "sha1-PMvcU2ee7W7PN3fdf14yKcG2qjw=",
+      "dev": true
+    },
+    "unist-util-visit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.3.0.tgz",
+      "integrity": "sha512-9ntYcxPFtl44gnwXrQKZ5bMqXMY0ZHzUpqMFiU4zcc8mmf/jzYm8GhYgezuUlX4cJIM1zIDYaO6fG/fI+L6iiQ==",
+      "dev": true,
+      "requires": {
+        "unist-util-is": "2.1.1"
+      }
+    },
     "upper-case": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
@@ -7828,6 +9399,33 @@
         "extsprintf": "1.3.0"
       }
     },
+    "vfile": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-2.3.0.tgz",
+      "integrity": "sha512-ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w==",
+      "dev": true,
+      "requires": {
+        "is-buffer": "1.1.6",
+        "replace-ext": "1.0.0",
+        "unist-util-stringify-position": "1.1.1",
+        "vfile-message": "1.0.0"
+      }
+    },
+    "vfile-location": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.2.tgz",
+      "integrity": "sha1-02dcWch3SY5JK0dW/2Xkrxp1IlU=",
+      "dev": true
+    },
+    "vfile-message": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.0.0.tgz",
+      "integrity": "sha512-HPREhzTOB/sNDc9/Mxf8w0FmHnThg5CRSJdR9VRFkD2riqYWs+fuXlj5z8mIpv2LrD7uU41+oPWFOL4Mjlf+dw==",
+      "dev": true,
+      "requires": {
+        "unist-util-stringify-position": "1.1.1"
+      }
+    },
     "walkdir": {
       "version": "0.0.11",
       "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz",
@@ -7857,7 +9455,7 @@
           "integrity": "sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs=",
           "dev": true,
           "requires": {
-            "core-js": "2.5.1",
+            "core-js": "2.5.3",
             "regenerator-runtime": "0.10.5"
           }
         },
@@ -7927,7 +9525,7 @@
           "integrity": "sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs=",
           "dev": true,
           "requires": {
-            "core-js": "2.5.1",
+            "core-js": "2.5.3",
             "regenerator-runtime": "0.10.5"
           }
         },
@@ -8148,9 +9746,9 @@
       "optional": true
     },
     "wolfy87-eventemitter": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.3.tgz",
-      "integrity": "sha1-4Jl5tOfY1SVuOiXoEVKboUMRVWg="
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.4.tgz",
+      "integrity": "sha512-yUOUSIzZxqBeu6VdnigqYHwwjy5N3CRX5XSHh/YcVpy+Qsx+HkHaEWdmdyAr3NvyBYDraOa5EfNIbu47T5QzIA=="
     },
     "wordwrap": {
       "version": "0.0.3",
@@ -8181,6 +9779,18 @@
         "signal-exit": "3.0.2"
       }
     },
+    "x-is-function": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/x-is-function/-/x-is-function-1.0.4.tgz",
+      "integrity": "sha1-XSlNw9Joy90GJYDgxd93o5HR+h4=",
+      "dev": true
+    },
+    "x-is-string": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz",
+      "integrity": "sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=",
+      "dev": true
+    },
     "xdg-basedir": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
diff --git a/package.json b/package.json
index eaabe38705d8..209537f97100 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.60.0-develop",
+	"version": "0.61.0-develop",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"
@@ -86,50 +86,50 @@
 		"email": "support@rocket.chat"
 	},
 	"devDependencies": {
-		"autoprefixer": "^7.1.6",
+		"autoprefixer": "^7.2.3",
 		"babel-mocha-es6-compiler": "^0.1.0",
 		"babel-plugin-array-includes": "^2.0.3",
 		"chimp": "^0.50.2",
-		"conventional-changelog-cli": "^1.3.4",
-		"eslint": "^4.10.0",
+		"conventional-changelog-cli": "^1.3.5",
+		"eslint": "^4.13.1",
 		"mock-require": "^2.0.2",
 		"postcss-custom-properties": "^6.2.0",
 		"postcss-import": "^11.0.0",
 		"postcss-media-minmax": "^3.0.0",
-		"postcss-nesting": "^3.0.0",
+		"postcss-nested": "^3.0.0",
 		"postcss-selector-not": "^3.0.1",
 		"proxyquire": "^1.8.0",
-		"simple-git": "^1.80.1",
-		"stylelint": "^8.2.0",
-		"stylelint-order": "^0.7.0",
+		"simple-git": "^1.85.0",
+		"stylelint": "^8.4.0",
+		"stylelint-order": "^0.8.0",
 		"supertest": "^3.0.0"
 	},
 	"dependencies": {
-		"@google-cloud/storage": "^1.4.0",
-		"aws-sdk": "^2.146.0",
+		"@google-cloud/storage": "1.4.0",
+		"aws-sdk": "^2.172.0",
 		"babel-runtime": "^6.26.0",
 		"bcrypt": "^1.0.3",
 		"bunyan": "^1.8.12",
-		"codemirror": "^5.31.0",
-		"core-js": "2.5.1",
+		"codemirror": "^5.32.0",
+		"core-js": "2.5.3",
 		"emailreplyparser": "0.0.5",
-		"file-type": "^7.2.0",
+		"file-type": "^7.4.0",
 		"highlight.js": "^9.12.0",
 		"imap": "^0.8.19",
 		"jquery": "^3.2.1",
 		"ldapjs": "^1.0.1",
 		"mailparser-node4": "^2.0.2-2",
-		"mime-db": "^1.31.0",
+		"mime-db": "^1.32.0",
 		"mime-type": "^3.0.5",
-		"moment": "^2.19.3",
+		"moment": "^2.20.1",
 		"moment-timezone": "^0.5.14",
 		"photoswipe": "^4.1.2",
 		"poplib": "^0.1.7",
 		"prom-client": "^10.2.2",
 		"semver": "^5.4.1",
-		"toastr": "^2.1.2",
+		"toastr": "^2.1.4",
 		"underscore": "^1.8.3",
 		"underscore.string": "^3.3.4",
-		"wolfy87-eventemitter": "^5.2.3"
+		"wolfy87-eventemitter": "^5.2.4"
 	}
 }
diff --git a/packages/rocketchat-api/server/api.js b/packages/rocketchat-api/server/api.js
index 834f66db8331..df2e1a9dd72a 100644
--- a/packages/rocketchat-api/server/api.js
+++ b/packages/rocketchat-api/server/api.js
@@ -58,8 +58,6 @@ class API extends Restivus {
 	success(result = {}) {
 		if (_.isObject(result)) {
 			result.success = true;
-			// TODO: Remove this after three versions have been released. That means at 0.64 this should be gone. ;)
-			result.developerWarning = '[WARNING]: The "usernames" field has been removed for performance reasons. Please use the "*.members" endpoint to get a list of members/users in a room.';
 		}
 
 		return {
@@ -141,7 +139,20 @@ class API extends Restivus {
 							return RocketChat.API.v1.failure(e.message, e.error);
 						}
 
-						return result ? result : RocketChat.API.v1.success();
+						result = result ? result : RocketChat.API.v1.success();
+
+						if (
+							/(channels|groups)\./.test(route)
+							&& result
+							&& result.body
+							&& result.body.success === true
+							&& (result.body.channel || result.body.channels || result.body.group || result.body.groups)
+						) {
+							// TODO: Remove this after three versions have been released. That means at 0.64 this should be gone. ;)
+							result.body.developerWarning = '[WARNING]: The "usernames" field has been removed for performance reasons. Please use the "*.members" endpoint to get a list of members/users in a room.';
+						}
+
+						return result;
 					};
 
 					for (const [name, helperMethod] of this.helperMethods) {
@@ -161,6 +172,15 @@ class API extends Restivus {
 		const loginCompatibility = (bodyParams) => {
 			// Grab the username or email that the user is logging in with
 			const {user, username, email, password, code} = bodyParams;
+
+			if (password == null) {
+				return bodyParams;
+			}
+
+			if (_.without(Object.keys(bodyParams), 'user', 'username', 'email', 'password', 'code').length > 0) {
+				return bodyParams;
+			}
+
 			const auth = {
 				password
 			};
@@ -177,7 +197,7 @@ class API extends Restivus {
 				return bodyParams;
 			}
 
-			if (auth.password && auth.password.hashed) {
+			if (auth.password.hashed) {
 				auth.password = {
 					digest: auth.password,
 					algorithm: 'sha-256'
diff --git a/packages/rocketchat-api/server/v1/misc.js b/packages/rocketchat-api/server/v1/misc.js
index a9152d874330..3960511cef5d 100644
--- a/packages/rocketchat-api/server/v1/misc.js
+++ b/packages/rocketchat-api/server/v1/misc.js
@@ -20,7 +20,7 @@ RocketChat.API.v1.addRoute('info', { authRequired: false }, {
 
 RocketChat.API.v1.addRoute('me', { authRequired: true }, {
 	get() {
-		return RocketChat.API.v1.success(_.pick(this.user, [
+		const me = _.pick(this.user, [
 			'_id',
 			'name',
 			'emails',
@@ -30,7 +30,13 @@ RocketChat.API.v1.addRoute('me', { authRequired: true }, {
 			'utcOffset',
 			'active',
 			'language'
-		]));
+		]);
+
+		const verifiedEmail = me.emails.find((email) => email.verified);
+
+		me.email = verifiedEmail ? verifiedEmail.address : undefined;
+
+		return RocketChat.API.v1.success(me);
 	}
 });
 
diff --git a/packages/rocketchat-autolinker/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-autolinker/.npm/package/npm-shrinkwrap.json
index a4807702dee4..2722bd948d82 100644
--- a/packages/rocketchat-autolinker/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-autolinker/.npm/package/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 1,
   "dependencies": {
     "autolinker": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-1.4.0.tgz",
-      "integrity": "sha1-oVjpDIL8V/gSMv0ZwSsQ61ON6IE="
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-1.6.0.tgz",
+      "integrity": "sha1-utN2t62OQV8i8QL8Dzf2QOZPHL8="
     }
   }
 }
diff --git a/packages/rocketchat-autolinker/package.js b/packages/rocketchat-autolinker/package.js
index 4b8c67381d82..7e6d72a259e2 100644
--- a/packages/rocketchat-autolinker/package.js
+++ b/packages/rocketchat-autolinker/package.js
@@ -6,7 +6,7 @@ Package.describe({
 });
 
 Npm.depends({
-	autolinker: '1.4.0'
+	autolinker: '1.6.0'
 });
 
 Package.onUse(function(api) {
diff --git a/packages/rocketchat-custom-oauth/server/custom_oauth_server.js b/packages/rocketchat-custom-oauth/server/custom_oauth_server.js
index 0477ff932f25..f78b9e57edb8 100644
--- a/packages/rocketchat-custom-oauth/server/custom_oauth_server.js
+++ b/packages/rocketchat-custom-oauth/server/custom_oauth_server.js
@@ -260,20 +260,12 @@ export class CustomOAuth {
 	getUsername(data) {
 		let username = '';
 
-		if (this.usernameField.indexOf('#{') > -1) {
-			username = this.usernameField.replace(/#{(.+?)}/g, function(match, field) {
-				if (!data[field]) {
-					throw new Meteor.Error('field_not_found', `Username template item "${ field }" not found in data`, data);
-				}
-				return data[field];
-			});
-		} else {
-			username = data[this.usernameField];
-			if (!username) {
-				throw new Meteor.Error('field_not_found', `Username field "${ this.usernameField }" not found in data`, data);
-			}
+		username = this.usernameField.split('.').reduce(function(prev, curr) {
+			return prev ? prev[curr] : undefined;
+		}, data);
+		if (!username) {
+			throw new Meteor.Error('field_not_found', `Username field "${ this.usernameField }" not found in data`, data);
 		}
-
 		return username;
 	}
 
diff --git a/packages/rocketchat-emoji-emojione/client/sprites.css b/packages/rocketchat-emoji-emojione/client/sprites.css
index e3c89a0eb179..476c0ee6e484 100644
--- a/packages/rocketchat-emoji-emojione/client/sprites.css
+++ b/packages/rocketchat-emoji-emojione/client/sprites.css
@@ -23,8 +23,8 @@
 }
 
 .emojione.big {
-	width: 44px !important;
-	height: 44px !important;
+	width: 44px;
+	height: 44px;
 }
 
 .emojione-0023-20e3 {
diff --git a/packages/rocketchat-emoji/client/emoji.css b/packages/rocketchat-emoji/client/emoji.css
deleted file mode 100644
index 2effbd52e5ab..000000000000
--- a/packages/rocketchat-emoji/client/emoji.css
+++ /dev/null
@@ -1,27 +0,0 @@
-.emoji {
-	position: relative;
-
-	display: inline-block;
-	overflow: hidden;
-
-	width: 22px;
-	height: 22px;
-	margin: 0 0.15em;
-
-	vertical-align: middle;
-	white-space: nowrap;
-	text-indent: 100%;
-
-	background-repeat: no-repeat;
-	background-position: center;
-	background-size: cover;
-
-	font-size: inherit;
-	line-height: normal;
-	image-rendering: auto;
-}
-
-.emoji.big {
-	width: 44px !important;
-	height: 44px !important;
-}
diff --git a/packages/rocketchat-emoji/client/emojiButton.js b/packages/rocketchat-emoji/client/emojiButton.js
index 6162ee9ca5cd..997dc4966763 100644
--- a/packages/rocketchat-emoji/client/emojiButton.js
+++ b/packages/rocketchat-emoji/client/emojiButton.js
@@ -3,6 +3,11 @@ Template.messageBox.events({
 	'click .emoji-picker-icon'(event) {
 		event.stopPropagation();
 		event.preventDefault();
+
+		if (!RocketChat.getUserPreference(Meteor.user(), 'useEmojis')) {
+			return false;
+		}
+
 		if (RocketChat.EmojiPicker.isOpened()) {
 			RocketChat.EmojiPicker.close();
 		} else {
diff --git a/packages/rocketchat-emoji/package.js b/packages/rocketchat-emoji/package.js
index 9d7dbdd0c6d2..7b3e3f3d1a61 100644
--- a/packages/rocketchat-emoji/package.js
+++ b/packages/rocketchat-emoji/package.js
@@ -10,6 +10,7 @@ Package.onUse(function(api) {
 		'ecmascript',
 		'templating',
 		'rocketchat:lib',
+		'rocketchat:theme',
 		'rocketchat:ui-message'
 	]);
 
@@ -20,9 +21,6 @@ Package.onUse(function(api) {
 
 	api.addFiles('client/emojiPicker.html', 'client');
 	api.addFiles('client/emojiPicker.js', 'client');
-	api.addFiles('client/emojiPicker.css', 'client');
-
-	api.addFiles('client/emoji.css', 'client');
 
 	api.addFiles('client/lib/emojiRenderer.js', 'client');
 	api.addFiles('client/lib/EmojiPicker.js', 'client');
diff --git a/packages/rocketchat-file-upload/server/config/GridFS.js b/packages/rocketchat-file-upload/server/config/GridFS.js
index 99496bdae3f8..1dc16f697909 100644
--- a/packages/rocketchat-file-upload/server/config/GridFS.js
+++ b/packages/rocketchat-file-upload/server/config/GridFS.js
@@ -4,9 +4,6 @@ import zlib from 'zlib';
 import util from 'util';
 
 import { FileUploadClass } from '../lib/FileUpload';
-import { Cookies } from 'meteor/ostrio:cookies';
-
-const cookie = new Cookies();
 
 const logger = new Logger('FileUpload');
 
@@ -126,46 +123,15 @@ const readFromGridFS = function(storeName, fileId, file, headers, req, res) {
 	}
 };
 
-const onRead = function(fileId, file, req, res) {
-	if (RocketChat.settings.get('FileUpload_ProtectFiles')) {
-		let uid;
-		let token;
-
-		if (req && req.headers && req.headers.cookie) {
-			const rawCookies = req.headers.cookie;
-
-			if (rawCookies) {
-				uid = cookie.get('rc_uid', rawCookies) ;
-				token = cookie.get('rc_token', rawCookies);
-			}
-		}
-
-		if (!uid) {
-			uid = req.query.rc_uid;
-			token = req.query.rc_token;
-		}
-
-		if (!uid || !token || !RocketChat.models.Users.findOneByIdAndLoginToken(uid, token)) {
-			res.writeHead(403);
-			return false;
-		}
-	}
-
-	res.setHeader('content-disposition', `attachment; filename="${ encodeURIComponent(file.name) }"`);
-	return true;
-};
-
 FileUpload.configureUploadsStore('GridFS', 'GridFS:Uploads', {
-	collectionName: 'rocketchat_uploads',
-	onRead
+	collectionName: 'rocketchat_uploads'
 });
 
 // DEPRECATED: backwards compatibility (remove)
 UploadFS.getStores()['rocketchat_uploads'] = UploadFS.getStores()['GridFS:Uploads'];
 
 FileUpload.configureUploadsStore('GridFS', 'GridFS:Avatars', {
-	collectionName: 'rocketchat_avatars',
-	onRead
+	collectionName: 'rocketchat_avatars'
 });
 
 
diff --git a/packages/rocketchat-file-upload/server/lib/FileUpload.js b/packages/rocketchat-file-upload/server/lib/FileUpload.js
index 933fad438551..3874f829c546 100644
--- a/packages/rocketchat-file-upload/server/lib/FileUpload.js
+++ b/packages/rocketchat-file-upload/server/lib/FileUpload.js
@@ -4,6 +4,9 @@ import fs from 'fs';
 import stream from 'stream';
 import mime from 'mime-type/with-db';
 import Future from 'fibers/future';
+import { Cookies } from 'meteor/ostrio:cookies';
+
+const cookie = new Cookies();
 
 Object.assign(FileUpload, {
 	handlers: {},
@@ -28,7 +31,16 @@ Object.assign(FileUpload, {
 				return `${ RocketChat.settings.get('uniqueID') }/uploads/${ file.rid }/${ file.userId }/${ file._id }`;
 			},
 			// transformWrite: FileUpload.uploadsTransformWrite
-			onValidate: FileUpload.uploadsOnValidate
+			onValidate: FileUpload.uploadsOnValidate,
+			onRead(fileId, file, req, res) {
+				if (!FileUpload.requestCanAccessFiles(req)) {
+					res.writeHead(403);
+					return false;
+				}
+
+				res.setHeader('content-disposition', `attachment; filename="${ encodeURIComponent(file.name) }"`);
+				return true;
+			}
 		};
 	},
 
@@ -156,6 +168,25 @@ Object.assign(FileUpload, {
 		// console.log('upload finished ->', file);
 	},
 
+	requestCanAccessFiles({ headers = {}, query = {} }) {
+		if (!RocketChat.settings.get('FileUpload_ProtectFiles')) {
+			return true;
+		}
+
+		let { uid, token } = query;
+
+		if (!uid && headers.cookie) {
+			uid = cookie.get('rc_uid', headers.cookie) ;
+			token = cookie.get('rc_token', headers.cookie);
+		}
+
+		if (!uid || !token || !RocketChat.models.Users.findOneByIdAndLoginToken(uid, token)) {
+			return false;
+		}
+
+		return true;
+	},
+
 	addExtensionTo(file) {
 		if (mime.lookup(file.name) === file.type) {
 			return file;
diff --git a/packages/rocketchat-file-upload/server/lib/requests.js b/packages/rocketchat-file-upload/server/lib/requests.js
index 175397de6fdb..7a47c0496e81 100644
--- a/packages/rocketchat-file-upload/server/lib/requests.js
+++ b/packages/rocketchat-file-upload/server/lib/requests.js
@@ -1,11 +1,4 @@
 /* globals FileUpload, WebApp */
-import { Cookies } from 'meteor/ostrio:cookies';
-
-let protectedFiles;
-
-RocketChat.settings.get('FileUpload_ProtectFiles', function(key, value) {
-	protectedFiles = value;
-});
 
 WebApp.connectHandlers.use(`${ __meteor_runtime_config__.ROOT_URL_PATH_PREFIX }/file-upload/`,	function(req, res, next) {
 
@@ -15,43 +8,16 @@ WebApp.connectHandlers.use(`${ __meteor_runtime_config__.ROOT_URL_PATH_PREFIX }/
 		const file = RocketChat.models.Uploads.findOneById(match[1]);
 
 		if (file) {
-			if (!Meteor.settings.public.sandstorm && protectedFiles) {
-				let rawCookies;
-				let token;
-				let uid;
-				const cookie = new Cookies();
-
-				if (req.headers && req.headers.cookie != null) {
-					rawCookies = req.headers.cookie;
-				}
-
-				if (rawCookies != null) {
-					uid = cookie.get('rc_uid', rawCookies);
-				}
-
-				if (rawCookies != null) {
-					token = cookie.get('rc_token', rawCookies);
-				}
-
-				if (uid == null) {
-					uid = req.query.rc_uid;
-					token = req.query.rc_token;
-				}
-
-				if (!(uid && token && RocketChat.models.Users.findOneByIdAndLoginToken(uid, token))) {
-					res.writeHead(403);
-					res.end();
-					return false;
-				}
+			if (!Meteor.settings.public.sandstorm && !FileUpload.requestCanAccessFiles(req)) {
+				res.writeHead(403);
+				return res.end();
 			}
 
 			res.setHeader('Content-Security-Policy', 'default-src \'none\'');
-
 			return FileUpload.get(file, req, res, next);
 		}
 	}
 
 	res.writeHead(404);
 	res.end();
-	return;
 });
diff --git a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
index de48c301bb9f..2cd5d961f1fc 100644
--- a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
@@ -1,10 +1,97 @@
 {
   "lockfileVersion": 1,
   "dependencies": {
+    "@google-cloud/common": {
+      "version": "0.13.6",
+      "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.6.tgz",
+      "integrity": "sha1-qdjhN7xCmkSrqWif5qDkMxeE+FM="
+    },
+    "@google-cloud/common-grpc": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@google-cloud/common-grpc/-/common-grpc-0.4.3.tgz",
+      "integrity": "sha512-A3nErp1qV8iCWPYQniBhot7Gx+kZHTAuRzOQyoPpfbv9pLmsvZgTWzVUg1/R1ncrirQElHUDhIFXPV+kr+UJAA==",
+      "dependencies": {
+        "dot-prop": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-2.4.0.tgz",
+          "integrity": "sha1-hI4o9/HVB0DGdHqzywdnBGK2+Jw="
+        }
+      }
+    },
+    "@google-cloud/storage": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-1.2.1.tgz",
+      "integrity": "sha1-oPLiCHG4YvDqZKkKxI/AiEXPlQU="
+    },
+    "@google-cloud/vision": {
+      "version": "0.11.5",
+      "resolved": "https://registry.npmjs.org/@google-cloud/vision/-/vision-0.11.5.tgz",
+      "integrity": "sha1-W9sS0ptVQsX7fbtelDLDmsrR9v4="
+    },
+    "@protobufjs/aspromise": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+      "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78="
+    },
+    "@protobufjs/base64": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
+    },
+    "@protobufjs/codegen": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
+    },
+    "@protobufjs/eventemitter": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+      "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A="
+    },
+    "@protobufjs/fetch": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+      "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU="
+    },
+    "@protobufjs/float": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+      "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E="
+    },
+    "@protobufjs/inquire": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+      "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik="
+    },
+    "@protobufjs/path": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+      "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0="
+    },
+    "@protobufjs/pool": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+      "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q="
+    },
+    "@protobufjs/utf8": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+      "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="
+    },
+    "@types/long": {
+      "version": "3.0.32",
+      "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz",
+      "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA=="
+    },
+    "@types/node": {
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.5.1.tgz",
+      "integrity": "sha512-SrmAO+NhnsuG/6TychSl2VdxBZiw/d6V+8j+DFo8O3PwFi+QeYXWHhAw+b170aSc6zYab6/PjEWRZHIDN9mNUw=="
+    },
     "ajv": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.1.tgz",
-      "integrity": "sha1-s4u4h22ehr7plJVqBOch6IskjrI="
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU="
     },
     "ansi-regex": {
       "version": "2.1.1",
@@ -353,14 +440,14 @@
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
     },
     "grpc": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.7.2.tgz",
-      "integrity": "sha512-GH6xziNGjW8LAtqQ3HmYI7Tx8BIlr46iaMRXHfh46kkaOP6PNWUx47ULNTUlXSYR3P00d0Pl8uzodTLwPk805w==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.8.0.tgz",
+      "integrity": "sha512-AwVQiyMdNv09O4kwec3z52HwkPuo1i61Uk1oENWM9CDeLAUiixQLMpXDIJL31MmZdAuKnAYds/naFEXzprbgHg==",
       "dependencies": {
         "abbrev": {
-          "version": "1.0.9",
-          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-          "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU="
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+          "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
         },
         "ajv": {
           "version": "4.11.8",
@@ -485,9 +572,9 @@
           }
         },
         "debug": {
-          "version": "2.6.8",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw="
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
         },
         "deep-extend": {
           "version": "0.4.2",
@@ -505,9 +592,9 @@
           "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
         },
         "detect-libc": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.2.tgz",
-          "integrity": "sha1-ca1dIEvxempsqPRQxhRUBm70YeE="
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+          "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
         },
         "ecc-jsbn": {
           "version": "0.1.1",
@@ -567,9 +654,9 @@
           }
         },
         "glob": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
-          "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg="
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="
         },
         "graceful-fs": {
           "version": "4.1.11",
@@ -617,9 +704,9 @@
           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
         },
         "ini": {
-          "version": "1.3.4",
-          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-          "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+          "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
@@ -711,14 +798,12 @@
         "node-pre-gyp": {
           "version": "0.6.39",
           "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz",
-          "integrity": "sha512-OsJV74qxnvz/AMGgcfZoDaeDXKD3oY3QVIbBmwszTFkRisTSXbMQyn4UWzUMOtA5SVhrBZOTp0wcoSBgfMfMmQ==",
-          "dependencies": {
-            "nopt": {
-              "version": "4.0.1",
-              "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-              "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00="
-            }
-          }
+          "integrity": "sha512-OsJV74qxnvz/AMGgcfZoDaeDXKD3oY3QVIbBmwszTFkRisTSXbMQyn4UWzUMOtA5SVhrBZOTp0wcoSBgfMfMmQ=="
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00="
         },
         "npmlog": {
           "version": "4.1.2",
@@ -1239,9 +1324,9 @@
       "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw=="
     },
     "retry-request": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.3.0.tgz",
-      "integrity": "sha512-bCbvtnZkfgB2TnbKMUUxzSR5W4AJQyMD6D6UcCsE/wBTVmlsS59OrDQr4RKV/Kq1hiIBmUYlbxd9MZ0cfpjrAQ=="
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.3.1.tgz",
+      "integrity": "sha512-PjAmtWIxjNj4Co/6FRtBl8afRP3CxrrIAnUzb1dzydfROd+6xt7xAebFeskgQgkfFf8NmzrXIoaB3HxmswXyxw=="
     },
     "rgb-hex": {
       "version": "1.0.0",
diff --git a/packages/rocketchat-i18n/i18n/ca.i18n.json b/packages/rocketchat-i18n/i18n/ca.i18n.json
index 31af00dcee70..7a1afcb9737b 100644
--- a/packages/rocketchat-i18n/i18n/ca.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ca.i18n.json
@@ -40,8 +40,6 @@
   "Accounts_CustomFields_Description": "Ha de ser un objecte JSON vàlid on les claus són els noms dels camps i contenen un diccionari amb les opcions del camp. Exemple:<br/><code>{\n \"role\": {\n  \"type\": \"select\",\n  \"defaultValue\": \"student\",\n  \"options\": [\"teacher\", \"student\"],\n  \"required\": true,\n  \"modifyRecordField\": {\n   \"array\": true,\n   \"field\": \"roles\"\n  }\n },\n \"twitter\": {\n  \"type\": \"text\",\n  \"required\": true,\n  \"minLength\": 2,\n  \"maxLength\": 10\n }\n}</code> ",
   "Accounts_CustomFieldsToShowInUserInfo": "Camps personalitzats a mostrar a l'informació d'usuari",
   "Accounts_DefaultUsernamePrefixSuggestion": "Prefix suggerit per al nom d'usuari per defecte",
-  "Accounts_Default_User_Preferences_desktopNotifications": "Alerta per defecte per a les notificacions d'escriptori",
-  "Accounts_Default_User_Preferences_mobileNotifications": "Alerta per defecte notificacions mòbil",
   "Accounts_denyUnverifiedEmail": "Denegar correu electrònic sense verificar",
   "Accounts_EmailVerification": "Verificació de correu electrònic",
   "Accounts_EmailVerification_Description": "Assegura't que la configuració SMTP és correcta per fer servir aquesta funcionalitat",
@@ -480,6 +478,7 @@
   "Desktop": "Escriptori",
   "Desktop_Notification_Test": "Prova de notificació d'escriptori",
   "Desktop_Notifications": "Notificacions d'escriptori",
+  "Desktop_Notifications_Default_Alert": "Alerta per defecte per a les notificacions d'escriptori",
   "Desktop_Notifications_Disabled": "Les notificacions d'escriptori han estat desactivades. Canvia les preferències del navegador si vols tornar a activar-les.",
   "Desktop_Notifications_Duration": "Durada de les notificacions d'escriptori",
   "Desktop_Notifications_Duration_Description": "Segons de mostra de les notificacions d'escriptori. Això pot afectar al centre de notificacions del macOS. Introduïu 0 per utilitzar la configuració del navegador per defecte i no afectar al centre de notificacions.",
@@ -1184,6 +1183,7 @@
   "Min_length_is": "La llargada mínima és %s",
   "minutes": "minuts",
   "Mobile": "Mòbil",
+  "Mobile_Notifications_Default_Alert": "Alerta per defecte notificacions mòbil",
   "Monday": "dilluns",
   "Monitor_history_for_changes_on": "Monitoritza l'historial per canvis a ",
   "More_channels": "Més canals",
@@ -2006,4 +2006,4 @@
   "your_message_optional": "el teu missatge (opcional)",
   "Your_password_is_wrong": "La contrasenya és incorrecta!",
   "Your_push_was_sent_to_s_devices": "La notificació push s'ha enviat a %s dispositius"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/cs.i18n.json b/packages/rocketchat-i18n/i18n/cs.i18n.json
index 72d997305d79..8d0d96bda69c 100644
--- a/packages/rocketchat-i18n/i18n/cs.i18n.json
+++ b/packages/rocketchat-i18n/i18n/cs.i18n.json
@@ -40,9 +40,6 @@
   "Accounts_CustomFields_Description": "Validní JSON obsahující klíče polí s nastavením. Například:<br/><code>{\n \"role\": {\n  \"type\": \"select\",\n  \"defaultValue\": \"student\",\n  \"options\": [\"teacher\", \"student\"],\n  \"required\": true,\n  \"modifyRecordField\": {\n   \"array\": true,\n   \"field\": \"roles\"\n  }\n },\n \"twitter\": {\n  \"type\": \"text\",\n  \"required\": true,\n  \"minLength\": 2,\n  \"maxLength\": 10\n }\n}</code>",
   "Accounts_CustomFieldsToShowInUserInfo": "Vlastní pole zobrazená v uživatelském profilu",
   "Accounts_DefaultUsernamePrefixSuggestion": "Výchozí návrh prefixu uživatelského jména",
-  "Accounts_Default_User_Preferences_audioNotifications": "Výchozí zvuk upozornění audia",
-  "Accounts_Default_User_Preferences_desktopNotifications": "Výchozí upozornění oznámení na ploše",
-  "Accounts_Default_User_Preferences_mobileNotifications": "Výchozí upozornění mobilní notifikace",
   "Accounts_denyUnverifiedEmail": "Zakázat neověřené e-mailové adresy",
   "Accounts_EmailVerification": "Ověření e-mailu",
   "Accounts_EmailVerification_Description": "Pro použití této funkce se ujistěte, že máte správné nastavení SMTP",
@@ -223,7 +220,7 @@
   "API_Token": "API Token",
   "API_Upper_Count_Limit": "Maximální počet",
   "API_Upper_Count_Limit_Description": "Kolik nejvíce záznamů smí REST API vrátit (pokud není limitovaná)",
-  "API_User_Limit": "Maximální počet uživatelů přidaných do místnosti",
+  "API_User_Limit": "Uživatelský limit pro přidání všech uživatelů do Channel",
   "API_Wordpress_URL": "WordPress URL",
   "Apiai_Key": "Api.ai Klíč",
   "Apiai_Language": "Api.ai Jazyk",
@@ -248,6 +245,8 @@
   "Attribute_handling": "Operace s atributy",
   "Audio_message": "Audio zpráva",
   "Audio_Notification_Value_Description": "Jakýkoliv z výchozích zvuků: beep, chelle, ding, droplet, highbell, seasons",
+  "Audio_Notifications_Default_Alert": "Výchozí zvuk upozornění audia",
+  "Audio_Notifications_Value": "Výchozí zvuk upozornění zprávy",
   "Auth_Token": "Auth Token",
   "Author": "Autor",
   "Authorization_URL": "URL autorizace",
@@ -322,7 +321,7 @@
   "CAS_base_url": "SSO URL",
   "CAS_base_url_Description": "Adresa vaší externí SSO služby např: https://sso.priklad.cz/sso/",
   "CAS_button_color": "Barva pozadí tlačítka přihlásit",
-  "CAS_button_label_color": "Barva textu login přihlásit",
+  "CAS_button_label_color": "Barva textu tlačítka přihlásit",
   "CAS_button_label_text": "Text tlačítka přihlásit",
   "CAS_enabled": "Povoleno",
   "CAS_Login_Layout": "Rozložení CAS přihlášení",
@@ -371,7 +370,7 @@
   "clean-channel-history_description": "Právo pročistit historii místnosti",
   "clear": "Vyčistit",
   "Clear_all_unreads_question": "Označit vše jako přečtené?",
-  "clear_cache_now": "Vyčistit cache",
+  "clear_cache_now": "Vyčistit cache nyní",
   "clear_history": "Smazat historii",
   "Click_here": "Klikněte zde",
   "Click_here_for_more_info": "Klikněte pro více infomací",
@@ -483,6 +482,7 @@
   "Desktop": "Plocha",
   "Desktop_Notification_Test": "Test oznámení na ploše",
   "Desktop_Notifications": "Oznámení na ploše",
+  "Desktop_Notifications_Default_Alert": "Výchozí upozornění oznámení na ploše",
   "Desktop_Notifications_Disabled": "Oznámení na ploše jsou vypnuta. Změňte nastavení svého prohlížeče, pokud chcete oznámení povolit.",
   "Desktop_Notifications_Duration": "Délka zobrazení notifikace",
   "Desktop_Notifications_Duration_Description": "Délka zobrazení oznámení (v sekundách). Toto může ovlivnit nastevení OS X Oznamovacího centra. Zadejte 0 pro použítí výchozí nastavení prohlížeče/notifikačního centra OS X",
@@ -664,7 +664,7 @@
   "every_six_hours": "Jednou za 6 hodin",
   "Everyone_can_access_this_channel": "Tato místnost je přístupná všem",
   "Example_s": "Příklad: <code class=\"inline\">%s</code>",
-  "Exclude_Botnames": "Vyjmout boty",
+  "Exclude_Botnames": "Vyloučit boty",
   "Exclude_Botnames_Description": "Nepřevádět v potaz zprávy botu, jejichž jména odpovídají výše uvedenému regulárnímu výrazu. Pokud je pole prázdné, budou převedeny zprávy všech botů",
   "False": "Ne",
   "Favorite_Rooms": "Aktivovat oblíbené místnosti",
@@ -700,7 +700,7 @@
   "FileUpload_S3_AWSSecretAccessKey": "Tajný klíč",
   "FileUpload_S3_Bucket": "Název bucketu",
   "FileUpload_S3_BucketURL": "URL Bucketu",
-  "FileUpload_S3_CDN": "CDN doména",
+  "FileUpload_S3_CDN": "CDN doména pro stahování",
   "FileUpload_S3_ForcePathStyle": "Vynutit Path Style",
   "FileUpload_S3_Region": "Region",
   "FileUpload_S3_SignatureVersion": "Verze Signature",
@@ -832,7 +832,7 @@
   "Importer_Source_File": "Výběr zdrojového souboru",
   "Incoming_Livechats": "Příchozí požadavky na LiveChat",
   "Incoming_WebHook": "Příchozí webhook",
-  "initials_avatar": "Iniciály avatara",
+  "initials_avatar": "Avatar z iniciál jména uživatele",
   "inline_code": "vlozeny_kod",
   "Install_Extension": "Nainstalovat rozšíření",
   "Install_FxOs": "Nainstalovat Rocket.Chat do Vašeho Firefoxu",
@@ -884,7 +884,7 @@
   "InternalHubot": "Interní Hubot",
   "InternalHubot_PathToLoadCustomScripts": "Složka odkud načíst skripty",
   "InternalHubot_reload": "Znovu načíst skripty",
-  "InternalHubot_ScriptsToLoad": "Načíst skripty",
+  "InternalHubot_ScriptsToLoad": "Skripty k načtení",
   "InternalHubot_ScriptsToLoad_Description": "Prosím, zadejte čárkami oddělený seznam skriptů k načtení z https://github.com/github/hubot-scripts/tree/master/src/scripts umístěných ve vaší složce",
   "InternalHubot_Username_Description": "Musí být platné uživatelské jméno jednoho z botů registrovaných na tomto serveru.",
   "Invalid_confirm_pass": "Hesla nesouhlasí",
@@ -1072,7 +1072,7 @@
   "List_of_Channels": "Seznam místností",
   "List_of_Direct_Messages": "Seznam přímých zpráv",
   "Livechat_agents": "LiveChat operátoři",
-  "Livechat_AllowedDomainsList": "Povolené domény pro Livechat",
+  "Livechat_AllowedDomainsList": "Domény na kterých povolit Livechat",
   "Livechat_Dashboard": "LiveChat Přehled",
   "Livechat_enabled": "LiveChat povolen",
   "Livechat_forward_open_chats": "Předat otevřené chaty",
@@ -1084,7 +1084,7 @@
   "Livechat_online": "Livechat online",
   "Livechat_open_inquiery_show_connecting": "Zobrazit informaci o čekajícím připojení místo pole zprávy pokud uživatel ještě nebyl propojen s operátorem",
   "Livechat_Queue": "LiveChat fronta",
-  "Livechat_room_count": "LiveChat počet místností",
+  "Livechat_room_count": "Počet Livechat místností",
   "Livechat_Routing_Method": "Metoda rozřazení LiveChat",
   "Livechat_Take_Confirm": "Chcete převzít tohoto klienta",
   "Livechat_title": "LiveChat název",
@@ -1192,9 +1192,9 @@
   "Message_HideType_ru": "Schovat zprávu o \"odebrání uživatele\"",
   "Message_HideType_uj": "Schovat zprávu o \"připojení uživatele\"",
   "Message_HideType_ul": "Schovat zprávu o \"odchodu uživatele\"",
-  "Message_KeepHistory": "Udržovat historie zpráv",
+  "Message_KeepHistory": "Udržovat historii editace zprávy",
   "Message_MaxAll": "Maximální velikost místnosti pro všechny zprávy",
-  "Message_MaxAllowedSize": "Maximální povolená velikost zprávy",
+  "Message_MaxAllowedSize": "Maximální povolená velikost zprávy (počet znaků)",
   "Message_pinning": "Připnutí zprávy",
   "Message_QuoteChainLimit": "Maximální počet navazujících citací",
   "Message_removed": "Zpráva odstraněna",
@@ -1224,6 +1224,7 @@
   "Min_length_is": "Minimální délka je %s",
   "minutes": "minuty",
   "Mobile": "Mobilní",
+  "Mobile_Notifications_Default_Alert": "Výchozí upozornění mobilní notifikace",
   "Monday": "Pondělí",
   "Monitor_history_for_changes_on": "Sledovat historii na změny:",
   "More_channels": "Více místností",
@@ -1272,7 +1273,7 @@
   "No_group_with_name_%s_was_found": "Nebyla nalezena žádná soukromá skupina s názvem <strong>\"%s\"</strong>!",
   "No_groups_yet": "Zatím nemáte žádné soukromé skupiny.",
   "No_integration_found": "Pod zvoleným id nenalezena žádná integrace.",
-  "No_livechats": "Nemáte žádné livechaty.",
+  "No_livechats": "Nemáte žádné LiveChaty.",
   "No_mentions_found": "Nenalezeny žádné zmínky",
   "No_pinned_messages": "Žádné zprávy nejsou připnuté",
   "No_results_found": "Nebyly nalezeny žádné výsledky",
@@ -1615,7 +1616,7 @@
   "Show_more": "Zobrazit více",
   "show_offline_users": "zobrazit offline uživatele",
   "Show_on_registration_page": "Zobrazit na registrační stránce",
-  "Show_only_online": "Pouze on-line",
+  "Show_only_online": "Ukázat pouze on-line",
   "Show_preregistration_form": "Ukázat před-registrační formulář",
   "Show_queue_list_to_all_agents": "Zobrazit frontu všech operátorů",
   "Show_the_keyboard_shortcut_list": "Zobrazit klávesové zkratky",
@@ -1984,7 +1985,7 @@
   "view-statistics_description": "Právo zobrazit statistiky jako počet přihlášených uživatelů, počet místností, informace o operačním systému",
   "view-user-administration": "Zobrazit administraci uživatelů",
   "view-user-administration_description": "Zobrazit částečný seznam (pouze ke čtení) uživatelů přihlášených do systému. Přes toto právo nelze přistupovat k informacím ostatních uživatelů",
-  "View_All": "Zobrazit vše",
+  "View_All": "Zobrazit všechny členy",
   "View_Logs": "Zobrazit logy",
   "View_mode": "Režim zobrazení",
   "View_mode_info": "Tím se změní místo, které zprávy zabírají na obrazovce.",
@@ -2057,4 +2058,4 @@
   "your_message_optional": "vaše zpráva (nepovinná)",
   "Your_password_is_wrong": "Vaše heslo je špatně!",
   "Your_push_was_sent_to_s_devices": "Vaše notifikace byla odeslána do %s zařízení"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/de-AT.i18n.json b/packages/rocketchat-i18n/i18n/de-AT.i18n.json
index 23311fdba94c..3d3bbd45fdc1 100644
--- a/packages/rocketchat-i18n/i18n/de-AT.i18n.json
+++ b/packages/rocketchat-i18n/i18n/de-AT.i18n.json
@@ -1113,7 +1113,7 @@
   "Type_your_name": "Geben Sie Ihren Namen ein",
   "Type_your_new_password": "Geben Sie Ihr neues Passwort ein",
   "UI_DisplayRoles": "Rollen anzeigen",
-  "UI_Merge_Channels_Groups": "Private Gruppen mit Kanälen gemeinsam anzeigen",
+  "UI_Merge_Channels_Groups": "Private Gruppen mit öffentlichen Kanälen gemeinsam anzeigen",
   "Unarchive": "Wiederherstellen",
   "Unmute_someone_in_room": "Jemanden das Chatten in einem Raum wieder erlauben",
   "Unmute_user": "Benutzern das Chatten erlauben ",
diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json
index 4f3457a0c4a0..6a8b0199fce2 100644
--- a/packages/rocketchat-i18n/i18n/de.i18n.json
+++ b/packages/rocketchat-i18n/i18n/de.i18n.json
@@ -29,7 +29,6 @@
   "Accounts_AllowEmailChange": "Ändern der E-Mail-Adresse erlauben",
   "Accounts_AllowPasswordChange": "Ändern des Passworts erlauben",
   "Accounts_AllowUserAvatarChange": "Benutzern das Ändern des Profilbilds erlauben",
-  "Accounts_AllowRealNameChange": "Ändern des Namens erlauben",
   "Accounts_AllowUsernameChange": "Ändern des Benutzernamens erlauben",
   "Accounts_AllowUserProfileChange": "Benutzern das Ändern des Profils erlauben",
   "Accounts_AvatarResize": "Größe des Profilbilds anpassen",
@@ -41,14 +40,11 @@
   "Accounts_CustomFields_Description": "Ein gültiges JSON, in dem die Schlüssel Sprachkürzel sind, die wiederum Tupel von Schlüssel und Übersetzungen enthalten. Beispiel: <br/>\n<code>{\n \"role\": {\n  \"type\": \"select\",\n  \"defaultValue\": \"student\",\n  \"options\": [\"teacher\", \"student\"],\n  \"required\": true,\n  \"modifyRecordField\": {\n   \"array\": true,\n   \"field\": \"roles\"\n  }\n },\n \"twitter\": {\n  \"type\": \"text\",\n  \"required\": true,\n  \"minLength\": 2,\n  \"maxLength\": 10\n }\n}</code>",
   "Accounts_CustomFieldsToShowInUserInfo": "Eigene Felder, die in der Benutzer-Information angezeigt werden sollen",
   "Accounts_DefaultUsernamePrefixSuggestion": "Vorschlag für Präfix des Standard-Benutzernamens ",
-  "Accounts_Default_User_Preferences_audioNotifications": "Akustische Benachrichtigung bei",
-  "Accounts_Default_User_Preferences_desktopNotifications": "Desktop-Benachrichtigungen bei",
-  "Accounts_Default_User_Preferences_mobileNotifications": "Mobile Benachrichtigungen bei",
   "Accounts_denyUnverifiedEmail": "Nicht verifizierte E-Mail-Adressen ablehnen",
   "Accounts_EmailVerification": "E-Mail-Verifizierung",
-  "Accounts_EmailVerification_Description": "Um diese Funktion nutzen zu können, stellen Sie bitte sicher, dass ihre SMTP-Einstellungen korrekt sind.",
+  "Accounts_EmailVerification_Description": "Um diese Funktion nutzen zu können, stell bitte sicher, dass Deine SMTP-Einstellungen korrekt sind.",
   "Accounts_Enrollment_Email": "Registrierungsmail",
-  "Accounts_Enrollment_Email_Default": "<h2> Willkommen zu <h1>[Site_Name]</h1></h2><p>Besuchen Sie [Site_URL] und probieren Sie noch heute die beste Open-Source-Chat-Lösung aus.</p>",
+  "Accounts_Enrollment_Email_Default": "<h2> Willkommen zu <h1>[Site_Name]</h1></h2><p>Besuche [Site_URL] und probiere noch heute die beste Open-Source-Chat-Lösung aus.</p>",
   "Accounts_Enrollment_Email_Description": "Sie können die folgenden Platzhalter verwenden: <br/><ul><li> [name], [fname], [lname] für den vollständigen Namen, Vornamen oder Nachnamen des Benutzers. </li><li> [email] für die E-Mail-Adresse des Benutzers. </li><li> [Site_Name] und [Site_URL] für den Anwendungsnamen und die URL. </li></ul>",
   "Accounts_Enrollment_Email_Subject_Default": "Willkommen zu [Site_Name]",
   "Accounts_ForgetUserSessionOnWindowClose": "Benutzer Session beenden, wenn das Fenster geschlossen wird",
@@ -124,7 +120,7 @@
   "Accounts_RegistrationForm_Public": "Öffentlich",
   "Accounts_RegistrationForm_Secret_URL": "Geheime URL",
   "Accounts_RegistrationForm_SecretURL": "Geheime URL für die Registrierungsseite",
-  "Accounts_RegistrationForm_SecretURL_Description": "Sie müssen eine zufällige Zeichenfolge, die der Registrierungs-URL hinzugefügt wird, angeben. Beispiel: https://open.rocket.chat/register/[secret_hash]",
+  "Accounts_RegistrationForm_SecretURL_Description": "Gib eine zufällige Zeichenfolge, die der Registrierungs-URL hinzugefügt wird, an. Zum Beispiel: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Namen für die Anmeldung verlangen",
   "Accounts_RequirePasswordConfirmation": "Passwortbestätigung erforderlich",
   "Accounts_SearchFields": "Felder, die in der Suche berücksichtigt werden sollen",
@@ -133,9 +129,9 @@
   "Accounts_ShowFormLogin": "Anmeldeformular zeigen",
   "Accounts_UseDefaultBlockedDomainsList": "Standardliste für blockierte Domains verwenden",
   "Accounts_UseDNSDomainCheck": "DNS-Domain-Check verwenden",
-  "Accounts_UserAddedEmail_Default": "<h2> Willkommen zu <h1>[Site_Name]</h1></h2><p>Besuchen Sie [Site_URL] und probieren Sie noch heute die beste Open-Source-Chat-Lösung aus.</p><p>Sie können sich mit den folgenden Daten einloggen.<br><br>E-Mail-Adresse: [email]<br>Passwort: [password]<br><br>Sie müssen Ihr Passwort möglicherweise nach dem ersten Login ändern.</p>",
+  "Accounts_UserAddedEmail_Default": "<h2> Willkommen zu <h1>[Site_Name]</h1></h2><p>Besuche [Site_URL] und probiere noch heute die beste Open-Source-Chat-Lösung aus.</p><p>Du kannst Dich mit den folgenden Daten anmelden:<br><br>E-Mail-Adresse: [email]<br>Passwort: [password]<br><br>Es kann sein, dass Du Dein Passwort nach der ersten Anmeldung ändern musst</p>",
   "Accounts_UserAddedEmail_Description": "Sie können die folgenden Platzhalter verwenden: <br/><ul><li> [name], [fname], [lname] für den vollständigen Namen des Benutzers, Vornamen oder Nachnamen. </li><li> [email] für die E-Mail-Adresse des Benutzers. </li><li> [password] für das Kennwort des Benutzers. </li><li> [Site_Name] und [Site_URL] für den Anwendungsname und die URL. </li></ul>",
-  "Accounts_UserAddedEmailSubject_Default": "Sie wurden auf [Site_Name] hinzugefügt",
+  "Accounts_UserAddedEmailSubject_Default": "Du wurdest auf [Site_Name] hinzugefügt",
   "Activate": "Aktivieren",
   "Activity": "Aktivität",
   "Add": "Hinzufügen",
@@ -177,14 +173,14 @@
   "All_channels": "Alle Kanäle",
   "All_logs": "Alle Protokolle",
   "All_messages": "Alle Nachrichten",
-  "All_users_in_the_channel_can_write_new_messages": "Alle Benutzer in diesem Kanal können neue Nachrichten verfassen",
+  "All_users_in_the_channel_can_write_new_messages": "Alle Benutzer in diesem Kanal dürfen Nachrichten schreiben",
   "Allow_Invalid_SelfSigned_Certs": "Ungültige und selbstsignierte SSL-Zertifikate erlauben",
   "Allow_Invalid_SelfSigned_Certs_Description": "Ungültige und selbstsignierte SSL-Zertifikate für die Link-Validierung und die Vorschau zulassen.",
   "Allow_switching_departments": "Erlaube Besuchern, Abteilungen zu wechseln",
   "Always_open_in_new_window": "Immer in neuem Fenster öffnen",
   "Analytics_features_enabled": "Aktivierte Funktionen",
   "Analytics_features_messages_Description": "Zeichnet benutzerdefinierte Ereignisse im Zusammenhang mit Aktionen eines Nutzers in Nachrichten auf.",
-  "Analytics_features_rooms_Description": "Zeichnet benutzerdefinierte Ereignisse im Zusammenhang mit Aktionen in einem Kanal oder einer Gruppe (erstellen, verlassen, löschen) auf.",
+  "Analytics_features_rooms_Description": "Zeichnet benutzerdefinierte Ereignisse im Zusammenhang mit Aktionen in einem Kanal (erstellen, verlassen, löschen) auf.",
   "Analytics_features_users_Description": "Zeichnet benutzerdefinierte Ereignisse (Passwort-Reset-Zeiten, Profilbild ändern, etc) auf.",
   "Analytics_Google": "Google Analytics",
   "Analytics_Google_id": "Tracking ID",
@@ -238,8 +234,8 @@
   "archive-room_description": "Berechtigung, einen Kanal zu archivieren",
   "are_also_typing": "schreiben auch",
   "are_typing": "schreiben",
-  "Are_you_sure": "Sind Sie sicher?",
-  "Are_you_sure_you_want_to_delete_your_account": "Sind Sie sicher, dass Sie Ihr Konto löschen möchten?",
+  "Are_you_sure": "Bist Du sicher?",
+  "Are_you_sure_you_want_to_delete_your_account": "Bist Du sicher, dass Du Dein Konto löschen möchtest?",
   "assign-admin-role": "Administratorrolle zuordnen",
   "assign-admin-role_description": "Berechtigung, Administratorrolle zuzuordnen",
   "Assign_admin": "Admin zuweisen",
@@ -249,6 +245,8 @@
   "Attribute_handling": "Behandlung von Eigenschaften",
   "Audio_message": "Audio-Nachricht",
   "Audio_Notification_Value_Description": "Dies kann einer der Standard-Töne (beep, chelle, ding, droplet, highbell, seasons) oder jeder eigene Ton sein",
+  "Audio_Notifications_Default_Alert": "Akustische Benachrichtigung bei",
+  "Audio_Notifications_Value": "Akustische Benachrichtigung: Ton",
   "Auth_Token": "Auth-Token",
   "Author": "Autor",
   "Authorization_URL": "Autorisierungs-URL",
@@ -276,7 +274,7 @@
   "Avatar": "Profilbild",
   "Avatar_changed_successfully": "Das Profilbild wurde erfolgreich geändert.",
   "Avatar_URL": "URL des Profilbilds",
-  "Avatar_url_invalid_or_error": "Die angegebene Internetadresse ist ungültig oder nicht verfügbar. Bitte versuchen Sie es mit einer anderen Internetadresse erneut.",
+  "Avatar_url_invalid_or_error": "Die angegebene Internetadresse ist ungültig oder nicht verfügbar. Bitte versuche es mit einer anderen Internetadresse erneut.",
   "away": "abwesend",
   "Away": "Abwesend",
   "away_female": "abwesend",
@@ -371,7 +369,7 @@
   "clean-channel-history": "Kanalhistorie löschen",
   "clean-channel-history_description": "Berechtigung, die Historie aus Kanälen zu löschen",
   "clear": "Löschen",
-  "Clear_all_unreads_question": "Möchten Sie alle ungelesenen Nachrichten löschen?",
+  "Clear_all_unreads_question": "Möchtest Du alle ungelesenen Nachrichten löschen?",
   "clear_cache_now": "Zwischenspeicher jetzt leeren",
   "clear_history": "Verlauf löschen",
   "Click_here": "Hier klicken",
@@ -394,7 +392,7 @@
   "Commands": "Befehle",
   "Comment_to_leave_on_closing_session": "Kommentar, der beim Schließen einer Konversation hinterlassen wird",
   "Compact": "Kompakt",
-  "Confirm_password": "Bestätigen Sie Ihr Passwort.",
+  "Confirm_password": "Bestätige Dein Passwort",
   "Content": "Inhalt",
   "Conversation": "Gespräch",
   "Conversation_closed": "Gespräch geschlossen: __comment__.",
@@ -414,7 +412,7 @@
   "create-p_description": "Berechtigung, private Kanäle anzulegen",
   "create-user": "Benutzer anlegen",
   "create-user_description": "Berechtigung, Benutzer anzulegen",
-  "Create_A_New_Channel": "Erstellen Sie einen neuen Kanal",
+  "Create_A_New_Channel": "Kanal anlegen",
   "Create_new": "Neu erstellen",
   "Created_at": "Erstellt am",
   "Created_at_s_by_s": "Erstellt am <strong>%s</strong> von <strong>%s</strong>",
@@ -484,9 +482,10 @@
   "Desktop": "Desktop",
   "Desktop_Notification_Test": "Desktop-Benachrichtigungstest",
   "Desktop_Notifications": "Desktop-Benachrichtigungen",
-  "Desktop_Notifications_Disabled": "Desktop-Benachrichtigungen sind deaktiviert. Ändern Sie Ihre Browsereinstellungen, wenn Sie Benachrichtigungen erhalten wollen.",
+  "Desktop_Notifications_Default_Alert": "Desktop-Benachrichtigungen bei",
+  "Desktop_Notifications_Disabled": "Desktop-Benachrichtigungen sind deaktiviert. Ändere Deine Browsereinstellungen, wenn Du Benachrichtigungen erhalten möchtest.",
   "Desktop_Notifications_Duration": "Desktop-Benachrichtigungsdauer",
-  "Desktop_Notifications_Duration_Description": "Zeit in Sekunden für die Desktop-Benachrichtigungen angezeigt werden sollen. Dies kann OS X Notification Center beeinflussen. Geben Sie 0 ein, um die Standard-Browser-Einstellungen zu verwenden und OS X Notification Center nicht zu beeinflussen.",
+  "Desktop_Notifications_Duration_Description": "Die Anzeigedauer die Desktop-Benachrichtigungen  in Sekunden. Dies kann das OS X Notification Center beeinflussen. Gibe 0 ein, um die Standard-Browser-Einstellungen zu verwenden und auch das OS X Notification Center nicht zu beeinflussen.",
   "Desktop_Notifications_Enabled": "Desktop-Benachrichtigungen sind aktiviert.",
   "Different_Style_For_User_Mentions": "Anderer Stil für Benutzer-Erwähnungen",
   "Direct_message_someone": "Jemandem eine private Nachricht schicken",
@@ -511,7 +510,7 @@
   "Disable_two-factor_authentication": "Zwei-Faktor-Authentifizierung deaktivieren",
   "Display_offline_form": "Formular für Offline-Kontakt anzeigen",
   "Displays_action_text": "Zeigt den Aktionstext",
-  "Do_you_want_to_change_to_s_question": "Möchten Sie dies zu <strong>%s</strong> ändern?",
+  "Do_you_want_to_change_to_s_question": "Möchtest Du dies zu <strong>%s</strong> ändern?",
   "Domain": "Domain",
   "Domain_added": "Domäne hinzugefügt",
   "Domain_removed": "Domäne entfernt",
@@ -522,9 +521,9 @@
   "Dry_run": "Probelauf",
   "Dry_run_description": "Es wird nur eine E-Mail an die Adresse aus dem Feld \"Absender\" geschickt. Die E-Mail-Adresse muss zu einem gültigen Benutzer gehören.",
   "Duplicate_archived_channel_name": "Ein archivierter Kanal mit dem Namen '%s' existiert bereits.",
-  "Duplicate_archived_private_group_name": "Eine archivierte private Gruppe mit dem Namen '%s' existiert bereits.",
+  "Duplicate_archived_private_group_name": "Ein archivierter privater Kanal mit dem Namen '%s' existiert bereits.",
   "Duplicate_channel_name": "Ein Kanal mit dem Namen '%s' existiert bereits",
-  "Duplicate_private_group_name": "Eine private Gruppe mit dem Namen '%s' existiert bereits.",
+  "Duplicate_private_group_name": "Ein privater Kanal mit dem Namen '%s' existiert bereits.",
   "Duration": "Dauer",
   "Edit": "Bearbeiten",
   "edit-message": "Nachricht bearbeiten",
@@ -605,7 +604,7 @@
   "error-invalid-arguments": "Ungültige Argumente",
   "error-invalid-asset": "Ungültiges Asset",
   "error-invalid-channel": "Ungültiger Kanal.",
-  "error-invalid-channel-start-with-chars": "Ungültiger Kanal. Beginnen Sie mit @ oder #",
+  "error-invalid-channel-start-with-chars": "Ungültiger Kanal. Beginne mit @ oder #",
   "error-invalid-custom-field": "Ungültiges benutzerdefiniertes Feld",
   "error-invalid-custom-field-name": "Unzulässiger Name für ein benutzerdefiniertes Feld. Benutzen Sie nur Buchstaben, Nummern, Binde- und Unterstriche.",
   "error-invalid-date": "Das eingegebene Datum ist ungültig.",
@@ -616,7 +615,7 @@
   "error-invalid-file-height": "Ungültige Bildhöhe der Datei",
   "error-invalid-file-type": "Ungültiges Dateiformat",
   "error-invalid-file-width": "Ungültige Bildhöhe der Datei",
-  "error-invalid-from-address": "Sie haben eine ungültige E-Mail-Adresse als Empfänger angegeben.",
+  "error-invalid-from-address": "Du hast eine ungültige E-Mail-Adresse als Empfänger angegeben.",
   "error-invalid-integration": "Ungültige Integration",
   "error-invalid-message": "Ungültige Nachricht",
   "error-invalid-method": "Ungültige Methode",
@@ -638,7 +637,7 @@
   "error-message-deleting-blocked": "Nachrichten löschen ist gesperrt",
   "error-message-editing-blocked": "Nachrichten bearbeiten ist gesperrt",
   "error-message-size-exceeded": "Nachrichtengröße überschreitet Message_MaxAllowedSize",
-  "error-missing-unsubscribe-link": "Sie müssen einen Link zum Abmelden vom Verteiler angeben.",
+  "error-missing-unsubscribe-link": "Du musst einen Link zum Abmelden vom Verteiler angeben.",
   "error-no-tokens-for-this-user": "Es liegen keine Tokens für diesen Benutzer vor",
   "error-not-allowed": "Nicht erlaubt",
   "error-not-authorized": "Nicht berechtigt",
@@ -653,7 +652,7 @@
   "error-user-not-in-room": "Der Benutzer ist nicht in diesem Raum.",
   "error-user-registration-disabled": "Benutzerregistrierung ist deaktiviert",
   "error-user-registration-secret": "Benutzerregistrierung ist nur über geheime URL erlaubt",
-  "error-you-are-last-owner": "Sie sind der letzte Besitzer. Bitte bestimmen Sie einen neuen Besitzer, bevor Sie den Raum verlassen.",
+  "error-you-are-last-owner": "Du bist der letzte Besitzer. Bitte bestimme einen neuen Besitzer, bevor Du den Raum verlässt.",
   "Error_changing_password": "Fehler beim Ändern des Passwortes",
   "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances": "Fehler: Rocket.Chat erfordert Oplog-Tailing, wenn es auf mehreren Instanzen läuft",
   "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances_details": "Bitte stellen Sie sicher, dass die MongoDB als Replicaset konfiguriert ist und die Umgebungsvariable  MONGO_OPLOG_URL korrekt auf Ihren Anwendungsservern gesetzt wurde.",
@@ -737,8 +736,8 @@
   "From_Email": "E-Mail-Absender",
   "From_email_warning": "<b>Warnung</b>: Der <b>Absender</b> ist wird aus den Mail-Server-Einstellungen übernommen.",
   "General": "Allgemeines",
-  "github_no_public_email": "Sie haben keine öffentliche E-Mail-Adresse in Ihrem GitHub-Account.",
-  "Give_a_unique_name_for_the_custom_oauth": "Geben Sie dem benutzerdefinierten OAuth-Konto einen eindeutigen Namen.",
+  "github_no_public_email": "Du hast keine öffentliche E-Mail-Adresse in Deinem GitHub-Account.",
+  "Give_a_unique_name_for_the_custom_oauth": "Gib dem benutzerdefinierten OAuth-Konto einen eindeutigen Namen.",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Geben Sie der Anwendung einen Namen. Alle Nutzer können diesen Namen sehen.",
   "Global": "Global",
   "Google_Vision_usage_limit_exceeded": "Nutzungsbeschränkung für Google Vision erreicht",
@@ -790,11 +789,11 @@
   "How_knowledgeable_was_the_chat_agent": "Wie sachkundig war der Chat-Agent?",
   "How_long_to_wait_after_agent_goes_offline": "Wartedauer, bevor ein Agent in den Offline-Modus übergeht",
   "How_responsive_was_the_chat_agent": "Wie reaktionsschnell war der Chat-Agent?",
-  "How_satisfied_were_you_with_this_chat": "Wie zufrieden waren Sie mit diesem Chat?",
+  "How_satisfied_were_you_with_this_chat": "Wie zufrieden warst Du mit diesem Chat?",
   "How_to_handle_open_sessions_when_agent_goes_offline": "Behandlung von offenen Konversationen, wenn ein Agent Offline geht",
   "If_this_email_is_registered": "Wenn es sich um eine registrierte E-Mail-Adresse handelt, werden wir an diese eine Anleitung zum Zurücksetzen des Passworts senden. Sollten Sie in Kürzen keine E-Mail erhalten, kommen Sie wieder und versuchen Sie es noch einmal.",
   "If_you_are_sure_type_in_your_password": "Wenn Sie sich sicher sind, geben Sie ihr Passwort ein:",
-  "If_you_are_sure_type_in_your_username": "Wenn Sie sich sicher sind, geben Sie Ihren Benutzernamen ein:",
+  "If_you_are_sure_type_in_your_username": "Wenn Du Dir sicher bist, gib Deinen Benutzernamen ein:",
   "Iframe_Integration": "Iframe-Integration",
   "Iframe_Integration_receive_enable": "Empfang zulassen",
   "Iframe_Integration_receive_enable_Description": "Erlaube dem übergeordneten Fenster (parent window) Befehle an Rocket.Chat zu senden.",
@@ -808,6 +807,7 @@
   "IMAP_intercepter_Not_running": "IMAP intercepter läuft nicht",
   "Impersonate_user": "Benutzeridentität übernehmen",
   "Impersonate_user_description": "Wenn aktiviert, erstellt die Integration Nachrichten mit der Identität des Benutzers der die Integration ausgelöst hat",
+  "Import": "Import",
   "Importer_Archived": "Archiviert",
   "Importer_CSV_Information": "Der CSV-Importer erfordert ein spezielles Format. Bitte lesen Sie die Dokumentation, wie die ZIP-Datei strukturiert sein muss:",
   "Importer_done": "Die Daten wurden erfolgreich importiert!",
@@ -832,6 +832,7 @@
   "Importer_Source_File": "Auswahl der Quelldatei",
   "Incoming_Livechats": "Eingehende Livechats",
   "Incoming_WebHook": "Eingehender Webhook",
+  "initials_avatar": "Avatar aus Initialien",
   "inline_code": "Code",
   "Install_Extension": "Erweiterung installieren",
   "Install_FxOs": "Rocket.Chat in deinem Firefox-Browser aktivieren",
@@ -841,7 +842,7 @@
   "Installation": "Installation",
   "Installed_at": "Installationsdatum",
   "Instance_Record": "Datensatz",
-  "Instructions_to_your_visitor_fill_the_form_to_send_a_message": "Anweisungen an Ihre Besucher: Füllen Sie das Formular aus, um eine Nachricht zu senden.",
+  "Instructions_to_your_visitor_fill_the_form_to_send_a_message": "Offline-Information für Ihre Benutzer, dass diese eine Nachricht hinterlassen können",
   "Integration_added": "Die Integration wurde hinzugefügt.",
   "Integration_Advanced_Settings": "Erweiterte Einstellungen",
   "Integration_History_Cleared": "Integrationshistorie erfolgreich gelöscht",
@@ -901,10 +902,10 @@
   "Invisible": "Unsichtbar",
   "Invitation": "Einladung",
   "Invitation_HTML": "Einladungstext (HTML)",
-  "Invitation_HTML_Default": "<h2> Sie wurden eingeladen zu <h1> [Site_Name] </h1></h2><p> Besuchen Sie zu [Site_URL] und probieren Sie heute die beste verfügbare Open-Source-Chat-Lösung aus! </p>",
+  "Invitation_HTML_Default": "<h2> Du wurdest zu <h1> [Site_Name] </h1></h2><p> eingeladen. Besuche [Site_URL] und probiere noch heute die beste Open-Source-Chat-Lösung aus! </p>",
   "Invitation_HTML_Description": "Sie können die folgenden Platzhalter verwenden: <br/><ul><li> [email] für den Empfänger der E-Mail. </li><li> [Site_Name] und [Site_URL] jeweils für den Anwendungsnamen und die URL. </li></ul>",
   "Invitation_Subject": "Betreff der Einladung",
-  "Invitation_Subject_Default": "Sie wurden zu [Site_Name] eingeladen",
+  "Invitation_Subject_Default": "Du wurdest zu [Site_Name] eingeladen",
   "Invite_user_to_join_channel": "Benutzer in diesen Kanal einladen",
   "Invite_user_to_join_channel_all_from": "Alle Benutzer des Kanals  [#channel] einladen, diesem Kanal zu folgen",
   "Invite_user_to_join_channel_all_to": "Alle Benutzer dieses Kanals einladen, dem Kanal [#channel] zu folgen",
@@ -989,16 +990,24 @@
   "LDAP_CA_Cert": "CA-Cert",
   "LDAP_Connect_Timeout": "Verbindungs-Timeout (ms)",
   "LDAP_Default_Domain": "Standard-Domain",
+  "LDAP_Default_Domain_Description": "Wenn eine Standard-Domäne angegeben wurde, wird diese zur Erzeugung von E-Mail-Adressen verwendet, sofern keine E-Mail-Adresse aus dem LDAP importiert wurde. Die E-Mail wird konstruiert als `benutzername@standard-domäne` oder `unique_id@standard-domäne`<br/>Beispiel: `rocket.chat`",
   "LDAP_Description": "LDAP ist eine hierarchische Datenbank, die viele Unternehmen nutzen, um eine eine Einmalanmeldung (SSO) zu ermöglichen. Über SSO kann \"ein Benutzer nach einer einmaligen Authentifizierung an einem Arbeitsplatz auf alle Rechner und Dienste, für die er lokal berechtigt ist, am selben Arbeitsplatz zugreifen kann, ohne sich jedes Mal neu anmelden zu müssen\". Genauere Informationen zur Konfiguration von LDAP mit Konfigurationsbeispielen erhalten Sie unter folgendem Link: https://rocket.chat/docs/administrator-guides/authentication/ldap/",
   "LDAP_BaseDN": "Base DN",
   "LDAP_BaseDN_Description": "Der volle Distinguished Name (DN) von einem LDAP-Unterverzeichnis, den Sie nach Benutzern und Gruppen durchsuchen möchten. Sie können so viele hinzufügen wie sie möchten. Jede Gruppe muss aber der selben Domainbasis angehören, in der sich die Benutzer befindet. Wenn Sie beschränkte Nutzergruppen angeben, werden nur Benutzer, die diesen Gruppen angehören, berücksichtig. Wir empfehlen, die oberste Ebene des LDAP-Verzeichnisbaums als Domainbasis anzugeben und Suchfilter zu verwenden, um Einschränkungen vorzunehmen.",
+  "LDAP_User_Search_Field": "Suchfeld",
   "LDAP_User_Search_Field_Description": "Das LDAP-Attribut, welches den LDAP-Benutzer identifiziert, der sich zu authentifizieren versucht. Das Feld ist für die meisten Active-Directory-Installationen `sAMAccountName`, für andere LDAP-Lösungen wie OpenLDAP kann dieses jedoch auch `uid` sein. Sie können aber auch `mail` verwenden, um Benutzer mit Ihrer E-Mail-Adresse zu identifizieren - oder jedes Attribut, das Sie möchten. <br/>Sie können mehrere Werte, getrennt mit Kommata, verwenden, um es Benutzern zu erlauben, sich mit mehreren Kennungen anzumelden, wie zum Beispiel einem Benutzernamen und der E-Mail-Adresse.",
+  "LDAP_User_Search_Filter": "Filter",
   "LDAP_User_Search_Filter_Description": "Wenn angegeben, wird nur Benutzern, die dem Filter entsprechen, erlaubt, sich anzumelden. Wenn kein Filter angegeben ist, werden sich alle Benutzer in dem Bereich der angegebenen Domainbasis anmelden können.<br/>Ein Beispiel für Active-Directory: `memberOf=cn=ROCKET_CHAT,ou=General Groups`<br/>Ein Beispiel für OpenLDAP (erweiterbare Übereinstimmungssuche): `ou:dn:=ROCKET_CHAT`",
-  "LDAP_Authentication_UserDN_Description": "Der LDAP-Benutzer, der eine Benutzersuche durchführt, um andere Nutzer bei der Anmeldung zu authentifizieren. <br/>Dies ist in der Regel ein Servicekonto, welches für Drittintegrationen erstellt worden ist. Verwenden Sie einen vollen Namen, wie zum Beispiel `cn=Administrator,cn=Users,dc=Example,dc=com`.",
+  "LDAP_User_Search_Scope": "Scope",
+  "LDAP_Authentication": "Aktivieren",
+  "LDAP_Authentication_Password": "Passwort",
+  "LDAP_Authentication_UserDN": "User DN",
+  "LDAP_Authentication_UserDN_Description": "Der LDAP-Benutzer, der eine Benutzersuche durchführt, um andere Nutzer bei der Anmeldung zu authentifizieren. <br/>Dies ist in der Regel ein Servicekonto, welches für Drittintegrationen erstellt worden ist. Verwende einen vollen Namen, wie zum Beispiel `cn=Administrator,cn=Users,dc=Example,dc=com`.",
   "LDAP_Enable": "LDAP",
   "LDAP_Enable_Description": "LDAP zur Authentifizierung verwenden",
   "LDAP_Encryption": "Verschlüsselung",
   "LDAP_Encryption_Description": "Die Verschlüsselungsmethode für sichere Kommunikation mit dem LDAP-Server. Bspw. `plain` (keine Verschlüsselung), `SSL/LDAPS` (von Anfang an verschlüsselt) und `StartTLS` (zur verschlüsselten Kommunikation wechseln, sobald verbunden wurde)",
+  "LDAP_Internal_Log_Level": "Internes Log-Level",
   "LDAP_Group_Filter_Enable": "LDAP Benutzergruppen-Filter",
   "LDAP_Group_Filter_Enable_Description": "Zugriff auf LDAP-Benutzergruppe beschränken.<br/>Diese Option ist hilfreich bei OpenLDAP-Servern, die den *memberOf*-Filter nicht unterstützen.",
   "LDAP_Group_Filter_Group_Id_Attribute": "Group-ID-Attibut",
@@ -1014,6 +1023,7 @@
   "LDAP_Host": "LDAP-Host",
   "LDAP_Host_Description": "Der LDAP-Host, bspw. `ldap.example.com` oder `10.0.0.30`.",
   "LDAP_Idle_Timeout": "Idle Timeout (ms)",
+  "LDAP_Idle_Timeout_Description": "Die Wartezeit in Millisekunden, die nach der letzten LDAP-Operation gewartet werden soll, bevor die Verbindung beendet wird. Anmerkung: Jede Operation öffnet eine neue Verbindung",
   "LDAP_Import_Users_Description": "Importiert alle gefundenen LDAP-Benutzer.<br/>*Achtung!* Filteroption angeben , um nicht zu viele Benutzer zu importieren",
   "LDAP_Login_Fallback": "Login Fallback",
   "LDAP_Login_Fallback_Description": "Wenn der Login mit Hilfe von LDAP nicht erfolgreich war versuchen, mit dem lokalen Konto anzumelden. Das kann hilfreich sein, falls LDAP nicht verfügbar war.",
@@ -1021,17 +1031,36 @@
   "LDAP_Merge_Existing_Users_Description": "*Achtung!* Wenn beim Import aus LDAP ein lokaler Benutzer mit gleichem Namen bereits existiert, wird der lokale Benutzer mit den Einstellungen aus LDAP aktualisiert.",
   "LDAP_Port": "LDAP-Port",
   "LDAP_Port_Description": "Port für den LDAP-Zugriff, bspw.Port 389 oder 636 für LDAPS",
+  "LDAP_Reconnect": "Erneut verbinden",
+  "LDAP_Reconnect_Description": "Versuche, erneut zu verbinden, wenn die Verbindung aus unbekanntem Grund unterbrochen wurde",
   "LDAP_Reject_Unauthorized": "Unberechtigte ablehnen",
+  "LDAP_Reject_Unauthorized_Description": "Deaktiviere diese Option, um nicht-verifizierte Zertifikate zu akzeptieren. Ein Deaktivieren wird üblicherweise bei der Nutzung von selbst-signierten Zertifikaten benötigt.",
   "LDAP_Sync_User_Avatar": "Profilbilder synchronisieren",
+  "LDAP_Sync_Now": "Jetzt im Hintergrund synchronisieren",
+  "LDAP_Sync_Now_Description": "Führt jetzt eine **Synchronisierung im Hintergrund**  aus, anstatt auf die nächste planmäßige Synchronisierung zu warten.\nDas funktioniert auch, wenn die Synchronisierung im Hintergrund deaktiviert ist. <br/>Die Aktion läuft asynchron ab, der Fortschritt kann im Log verfolgt werden.",
+  "LDAP_Background_Sync": "Synchronisierung im Hintergrund",
+  "LDAP_Background_Sync_Interval": "Interval für die Synchronisierung im Hintergrund",
+  "LDAP_Background_Sync_Interval_Description": "Das Intervall zwischen Synchronisierungen. Z. B. `every 24 hours` oder `on the first day of the week`. Weitere Beispiele unter [Cron Text Parser](http://bunkat.github.io/later/parsers.html#text)",
+  "LDAP_Background_Sync_Import_New_Users": "Synchronisierung neuer Benutzer im Hintergrund",
+  "LDAP_Background_Sync_Import_New_Users_Description": "Dies wird alle Benutzer entsprechend Deiner Filterkriterien importieren, die im LDAP aber noch nicht in Rocket.Chat vorhanden sind",
+  "LDAP_Background_Sync_Keep_Existant_Users_Updated": "Im Hintergrund eine Aktualisierung der bestehenden Benutzer ausführen",
+  "LDAP_Background_Sync_Keep_Existant_Users_Updated_Description": "Dies wird den Benutzernamen, den Avatar und alle weiteren Felder basierend auf Deiner Konfiguration aus dem LDAP bei jeder Synchronisierung aktualisieren",
   "LDAP_Sync_User_Data": "Benutzerdaten synchronisieren",
   "LDAP_Sync_User_Data_Description": "Bei der Anmeldung die Benutzerdaten mit dem Server synchronisieren (Bspw. Name, E-Mail-Adresse).",
   "LDAP_Sync_User_Data_FieldMap": "Zuordnung der Benutzer-Attribute",
   "LDAP_Sync_User_Data_FieldMap_Description": "Konfigurieren Sie, wie Benutzer-Account-Eigenschaften (wie die E-Mail-Adresse) aus einem LDAP-Datensatz (falls gefunden) geladen werden.<br/>Beispiel: {\"cn\":\"name\", \"mail\":\"email\"} nimmt einen von Menschen lesbaren Namen aus dem cn-Attribut und die E-Mail-Adresse aus dem Mail-Attribut. Zusätzlich ist die Verwendung von Variablen möglich, wie z.B.: `{ \"#{givenName} #{sn}\": \"name\", \"mail\": \"email\" }`. Hierbei wird eine Kombination des Vor- und Nachnamens verwendet.<br/>Verfügbare Felder in Rocket.Chat sind `name` und `email`.",
+  "LDAP_Search_Page_Size": "Seitengröße für die Suche",
+  "LDAP_Search_Page_Size_Description": "Die maximale Anzahl von Einträgen, die auf einmal verarbeitet werden",
+  "LDAP_Search_Size_Limit": "Maximale Treffer-Anzahl",
+  "LDAP_Search_Size_Limit_Description": "Die maximale Anzahl von Einträgen, die prozessiert werden. **Achtung**: Diese Zahle sollte größer als die **Seitengröße für die Suche** sein",
   "LDAP_Test_Connection": "Verbindung prüfen",
+  "LDAP_Timeout": "Timeout (ms)",
+  "LDAP_Timeout_Description": "Wie lange auf ein Suchergebnis gewartet werden soll, bevor ein Fehler ausgegeben wird",
   "LDAP_Unique_Identifier_Field": "Feld für eindeutige Identifizierung",
-  "LDAP_Unique_Identifier_Field_Description": "Dieses Feld wird verwendet, um LDAP-Nutzer und Rocket.Chat-Nutzer zu verbinden. Sie können mehrere Kommata-getrennte Werte angeben, um die Werte vom LDAP-Eintrag zu erhalten.<br/>Der Standardwert ist `objectGUID,ibm-entryUUID,GUID,dominoUNID,nsuniqueId,uidNumber`.",
+  "LDAP_Unique_Identifier_Field_Description": "Dieses Feld wird verwendet, um LDAP-Nutzer und Rocket.Chat-Nutzer zu verbinden. Kommata-getrennte Werte können verwendet werden, um die Werte vom LDAP-Eintrag zu erhalten.<br/>Der Standardwert ist `objectGUID,ibm-entryUUID,GUID,dominoUNID,nsuniqueId,uidNumber`.",
   "LDAP_Username_Field": "Feld für den Benutzernamen",
   "LDAP_Username_Field_Description": "Geben Sie an, welches Feld als *Benutzername* für neue Benutzer verwendet werden soll. Lassen Sie das Feld leer, um den Nutzernamen zu verwenden, der auf der Anmeldeseite verwendet wird.<br/>Es können auch Template-Tags wie `#{givenNamen}.#{sn}` verwendet werden.<br/>Der Standardwert ist `sAMAccountName`.",
+  "Execute_Synchronization_Now": "Jetzt eine Synchronisierung ausführen",
   "Least_Amount": "Geringste Anzahl",
   "Leave_Group_Warning": "Sind sie sicher, dass Sie die Gruppe \"%s\" verlassen wollen?",
   "Leave_Livechat_Warning": "Sind Sie sich sicher, dass Sie den Livechat mit \"%s\" verlassen wollen?",
@@ -1079,11 +1108,11 @@
   "Logout_Others": "Von anderen Geräten abmelden",
   "mail-messages": "Nachrichten per E-Mail versenden",
   "mail-messages_description": "Berechtigung, Nachrichten per E-Mail zu versenden",
-  "Mail_Message_Invalid_emails": "Sie haben eine oder mehrere ungültige E-Mail-Adressen angegeben: %s",
+  "Mail_Message_Invalid_emails": "Du hast eine oder mehrere ungültige E-Mail-Adressen angegeben: %s",
   "Mail_Message_Missing_to": "Sie müssen einen/mehrere Benutzer auswählen oder eine/mehrere E-Mail-Adressen durch Kommata getrennt angeben.",
   "Mail_Message_No_messages_selected_select_all": "Sie haben keine Nachrichten ausgewählt. Möchten Sie <a href=\"#\" class=\"select-all\">alle</a> sichtbaren Nachrichten auswählen?",
   "Mail_Messages": "Nachrichten per E-Mail senden",
-  "Mail_Messages_Instructions": "Wählen Sie aus, welche Nachrichten Sie per E-Mail senden möchten, indem Sie die Nachrichten anklicken. ",
+  "Mail_Messages_Instructions": "Wähle die per E-Mail zu versendenden Nachrichten aus, indem Du die Nachrichten anklickst. ",
   "Mail_Messages_Subject": "Hier ist ein ausgewählter Teil aus %s Nachrichten",
   "Mailer": "Mailer",
   "Mailer_body_tags": "Sie <b>müssen</b> [unsubscribe] verwenden, um einen Link zum Abmelden aus dem Verteiler zur Verfügung zu stellen. <br/> Sie können [name] für den vollständigen Namen, [fname] für den Vornamen oder [lname] für den Nachnamen des Benutzers verwenden. <br/>Ebenfalls können Sie [email] verwenden, um die E-Mail-Adresse des Benutzers anzugeben.",
@@ -1134,9 +1163,10 @@
   "Message_AllowDeleting": "Löschen von Nachrichten erlauben",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Löschen von Nachrichten nach (n) Minuten sperren",
   "Message_AllowDeleting_BlockDeleteInMinutes_Description": "Geben Sie 0 ein, um keine Sperre zu setzen",
+  "Message_AllowDirectMessagesToYourself": "Selbstgespräche erlauben",
   "Message_AllowEditing": "Die Bearbeitung von Nachrichten erlauben",
   "Message_AllowEditing_BlockEditInMinutes": "Bearbeiten von Nachrichten nach (n) Minuten sperren",
-  "Message_AllowEditing_BlockEditInMinutesDescription": "Geben Sie eine 0 ein, um das Bearbeiten von Nachrichten jederzeit zu erlauben.",
+  "Message_AllowEditing_BlockEditInMinutesDescription": "Gib 0 ein, um das Bearbeiten von Nachrichten unbegrenzt zu erlauben.",
   "Message_AllowPinning": "Das Anheften von Nachrichten erlauben",
   "Message_AllowPinning_Description": "Benutzern das Anheften von Nachrichten in Kanälen erlauben",
   "Message_AllowSnippeting": "Erlauben, Snippets aus Nachrichten zu erstellen",
@@ -1194,11 +1224,12 @@
   "Min_length_is": "Die minimale Länge beträgt %s",
   "minutes": "Minuten",
   "Mobile": "Mobil",
+  "Mobile_Notifications_Default_Alert": "Mobile Benachrichtigungen bei",
   "Monday": "Montag",
   "Monitor_history_for_changes_on": "Was soll für die Historie überwacht werden?",
   "More_channels": "Weitere Kanäle",
   "More_direct_messages": "Weitere Direktnachrichten",
-  "More_groups": "Weitere private Gruppen",
+  "More_groups": "Weitere private Kanäle",
   "More_unreads": "Weitere ungelesene Nachrichten",
   "Move_beginning_message": "`%s` - Zum Anfang der Nachricht springen",
   "Move_end_message": "`%s` - Zum Ende der Nachricht springen",
@@ -1281,7 +1312,7 @@
   "Office_hours_enabled": "Bürozeiten aktiviert",
   "Office_hours_updated": "Bürozeiten aktualisiert",
   "Offline": "Offline",
-  "Offline_DM_Email": "Sie haben eine private Nachricht von __user__ erhalten.",
+  "Offline_DM_Email": "Du hast eine private Nachricht von __user__ erhalten.",
   "Offline_Email_Subject_Description": "Sie können die folgenden Platzhalter verwenden:<br/><ul><li>[Site_Name], [Site_URL], [User] & [Room] für den Anwendungsnamen, URL, Benutzernamen und Raumnamen.<li/></ul>",
   "Offline_form": "Offline-Formular",
   "Offline_form_unavailable_message": "Nachricht, dass das Offline-Kontaktformular nicht verfügbar ist",
@@ -1341,7 +1372,7 @@
   "Pinned_a_message": "Eine Nachricht wurde angeheftet:",
   "Pinned_Messages": "Gepinnte Nachrichten",
   "PiwikAdditionalTrackers": "Zusätzliche Piwik Websites",
-  "PiwikAdditionalTrackers_Description": "Geben Sie hier weitere Piwik Website URLs und SiteIDs in folgendem Format an, wenn Sie dieselben Daten in verschiedene Piwik Instanzen tracken möchten: [ { \"trackerURL\" : \"https://my.piwik.domain2/\", \"siteId\" : 42 }, { \"trackerURL\" : \"https://my.piwik.domain3/\", \"siteId\" : 15 } ]",
+  "PiwikAdditionalTrackers_Description": "Gib hier weitere Piwik Website URLs und SiteIDs in folgendem Format an, wenn Du dieselben Daten in verschiedenen Piwik Instanzen tracken möchten: [ { \"trackerURL\" : \"https://my.piwik.domain2/\", \"siteId\" : 42 }, { \"trackerURL\" : \"https://my.piwik.domain3/\", \"siteId\" : 15 } ]",
   "PiwikAnalytics_cookieDomain": "Alle Subdomains",
   "PiwikAnalytics_cookieDomain_Description": "Besucher auf allen Subdomains aufzeichnen",
   "PiwikAnalytics_domains": "Verberge ausgehende Links",
@@ -1352,12 +1383,12 @@
   "PiwikAnalytics_url_Description": "Die Piwik URL benötigt einen abschließenden Slash. Beispiel: //piwik.rocket.chat/",
   "Placeholder_for_email_or_username_login_field": "Platzhalter für E-Mail-Adresse und den Benutzernamen",
   "Placeholder_for_password_login_field": "Platzhalter für das Anmeldepassworts",
-  "Please_add_a_comment": "Bitte fügen Sie einen Kommentar hinzu",
+  "Please_add_a_comment": "Bitte füge einen Kommentar hinzu",
   "Please_add_a_comment_to_close_the_room": "Bitte fügen Sie einen Kommentar hinzu, um den Raum zu schließen",
   "Please_answer_survey": "Bitte nehmen Sie sich einen Moment Zeit, um kurz einige Fragen zu dem Chat zu beantworten",
   "please_enter_valid_domain": "Bitte eine gültige Domain eingeben",
   "Please_enter_value_for_url": "Bitte geben Sie eine URL für Ihr Profilbild ein",
-  "Please_enter_your_new_password_below": "Bitte geben Sie Ihr neues Passwort ein:",
+  "Please_enter_your_new_password_below": "Bitte gib neues Passwort ein:",
   "Please_enter_your_password": "Bitte Passwort eingeben",
   "Please_fill_a_label": "Bitte Bezeichner ausfüllen",
   "Please_fill_a_name": "Bitte geben Sie einen Namen ein",
@@ -1384,9 +1415,9 @@
   "Privacy": "Datenschutz",
   "Private": "Privat",
   "Private_Channel": "Privater Kanal",
-  "Private_Group": "Private Gruppe",
-  "Private_Groups": "Private Gruppen",
-  "Private_Groups_list": "Liste aller privaten Gruppen",
+  "Private_Group": "Privater Kanal",
+  "Private_Groups": "Private Kanäle",
+  "Private_Groups_list": "Liste aller privaten Kanäle",
   "Profile": "Profil",
   "Profile_details": "Profildetails",
   "Profile_picture": "Profilbild",
@@ -1425,7 +1456,6 @@
   "Read_only_changed_successfully": "Erfolgreich schreibgeschützt",
   "Read_only_channel": "Kanal schreibgeschützt",
   "Read_only_group": "Schreibgeschützte Gruppe",
-  "RealName_Change_Disabled": "Der Administrator hat das Ändern von Namen deaktiviert",
   "Record": "Aufnehmen",
   "Redirect_URI": "Weiterleitungs-URL",
   "Refresh_keys": "Schlüssel aktualisieren",
@@ -1525,18 +1555,19 @@
   "Saved": "Gespeichert",
   "Saving": "Speichern",
   "Scan_QR_code": "Scanne den QR-Code mit einer Authenticator-App (wie Google Authenticator, Authy oder Duo). Danach wird ein sechsstelliger Code angezeigt, den Sie unten eingeben müssen.",
+  "Scan_QR_code_alternative_s": "Wenn Du den QR-code nicht einscannen kannst, kannst Du ihn alternativ manuell eingeben: __code__",
   "Scope": "Umfang",
   "Screen_Share": "Bildschirmübertragung",
   "Script_Enabled": "Das Script wurde aktiviert",
   "Search": "Suche",
   "Search_by_username": "Anhand des Nutzernamens suchen",
   "Search_Messages": "Nachrichten durchsuchen",
-  "Search_Private_Groups": "Durchsuche private Gruppen",
+  "Search_Private_Groups": "Durchsuche private Kanäle",
   "seconds": "Sekunden",
   "Secret_token": "Geheimes Token",
   "Security": "Sicherheit",
-  "Select_a_department": "Wählen Sie eine Abteilung",
-  "Select_a_user": "Wählen Sie einen Benutzer",
+  "Select_a_department": "Wähle eine Abteilung",
+  "Select_a_user": "Wähle einen Benutzer",
   "Select_an_avatar": "Profilbild auswählen",
   "Select_file": "Datei auswählen",
   "Select_role": "Eine Rolle auswählen",
@@ -1552,7 +1583,7 @@
   "Send_data_into_RocketChat_in_realtime": "Daten an Rocket.Chat in Echtzeit senden",
   "Send_email": "E-Mail senden",
   "Send_invitation_email": "Einladung per E-Mail senden",
-  "Send_invitation_email_error": "Sie haben keine gültige E-Mail-Adresse angegeben.",
+  "Send_invitation_email_error": "Du hast keine gültige E-Mail-Adresse angegeben.",
   "Send_invitation_email_info": "Sie können mehrere Einladungen per E-Mail gleichzeitig absenden",
   "Send_invitation_email_success": "Sie haben eine Einladung an folgende E-Mail-Adressen versendet:",
   "Send_request_on_chat_close": "Nach dem Schließen des Chatraums einen Webhook anstoßen",
@@ -1643,12 +1674,14 @@
   "SSL": "SSL",
   "Star_Message": "Nachricht favorisieren",
   "Starred_Messages": "Favorisierte Nachrichten",
+  "Start": "Starten",
   "Start_audio_call": "Anruf starten",
   "Start_Chat": "Chat beginnen",
   "Start_of_conversation": "Beginn des Gesprächs",
   "Start_OTR": "OTR starten",
   "Start_video_call": "Videoanruf starten",
-  "Start_with_s_for_user_or_s_for_channel_Eg_s_or_s": "Starten Sie mit <code class=\"inline\">%s</code> für Nutzer oder <code class=\"inline\">%s</code> für Kanäle. Beispiel: <code class=\"inline\">%s</code> oder <code class=\"inline\">%s</code>",
+  "Start_video_conference": "Eine Video-Konferenz starten?",
+  "Start_with_s_for_user_or_s_for_channel_Eg_s_or_s": "Starte mit <code class=\"inline\">%s</code> für Nutzer oder <code class=\"inline\">%s</code> für Kanäle. Beispiel: <code class=\"inline\">%s</code> oder <code class=\"inline\">%s</code>",
   "Started_At": "Gestartet um",
   "Started_a_video_call": "Ein Video-Anruf wurde gestartet",
   "Statistics": "Statistiken",
@@ -1656,7 +1689,7 @@
   "Statistics_reporting_Description": "Mit dem Senden Ihrer Statistiken helfen Sie uns herauszufinden, wie viele Instanzen von Rocket.Chat eingesetzt werden und wie gut sich das System verhält. So können wir es weiter verbessern. Es werden keine Benutzerinformationen übertragen und die erhaltenen Daten werden vertraulich behandelt.",
   "Stats_Active_Users": "Aktive Benutzer",
   "Stats_Avg_Channel_Users": "Durchschnittliche Benutzeranzahl pro Kanal",
-  "Stats_Avg_Private_Group_Users": "Durchschnittliche Benutzeranzahl in privaten Gruppen",
+  "Stats_Avg_Private_Group_Users": "Durchschnittliche Benutzeranzahl in privaten Kanälen",
   "Stats_Away_Users": "Abwesende Benutzer",
   "Stats_Max_Room_Users": "Maximale Benutzeranzahl eines Raums",
   "Stats_Non_Active_Users": "Nicht aktive Benutzer",
@@ -1670,7 +1703,7 @@
   "Stats_Total_Messages_Direct": "Gesamtanzahl der Nachrichten in Direktnachrichten",
   "Stats_Total_Messages_Livechat": "Gesamtanzahl der Nachrichten in Livechats",
   "Stats_Total_Messages_PrivateGroup": "Gesamtanzahl der Nachrichten in privaten Gruppen",
-  "Stats_Total_Private_Groups": "Anzahl der privaten Gruppen",
+  "Stats_Total_Private_Groups": "Anzahl der privaten Kanäle",
   "Stats_Total_Rooms": "Anzahl der Räume",
   "Stats_Total_Users": "Anzahl der Benutzer",
   "Status": "Status",
@@ -1688,6 +1721,7 @@
   "Survey_instructions": "Bewerten Sie jede Frage nach Ihrer Zufriedenheit. 1 bedeutet, dass Sie völlig frustriert sind. 5 bedeutet, dass Sie vollständig zufrieden sind.",
   "Symbols": "Symbole",
   "Sync_success": "Die Synchronisierung war erfolgreich",
+  "Sync_in_progress": "Eine Synchronisierung wird durchgeführt",
   "Sync_Users": "Benutzer synchronisieren",
   "System_messages": "Systemnachrichten",
   "Tag": "Tag",
@@ -1737,6 +1771,21 @@
   "theme-color-transparent-lighter": "Transparent hell",
   "theme-color-transparent-lightest": "Transparent am hellsten",
   "theme-color-unread-notification-color": "Farbe von ungelesenen Benachrichtigungen",
+  "theme-color-rc-color-error": "Fehler",
+  "theme-color-rc-color-error-light": "Fehler (hell)",
+  "theme-color-rc-color-alert": "Hinweis",
+  "theme-color-rc-color-alert-light": "Hinweis (hell)",
+  "theme-color-rc-color-success": "Erfolg",
+  "theme-color-rc-color-success-light": "Erfolg (hell)",
+  "theme-color-rc-color-button-primary": "Button Primär",
+  "theme-color-rc-color-button-primary-light": "Button Primär (hell)",
+  "theme-color-rc-color-primary": "Primär",
+  "theme-color-rc-color-primary-darkest": "Primär (am dunkelsten)",
+  "theme-color-rc-color-primary-dark": "Primär (dunkel)",
+  "theme-color-rc-color-primary-light": "Primär (hell)",
+  "theme-color-rc-color-primary-light-medium": "Primär (mittelhell)",
+  "theme-color-rc-color-primary-lightest": "Primär (am hellsten)",
+  "theme-color-rc-color-content": "Inhalt",
   "theme-custom-css": "Benutzerdefiniertes CSS",
   "theme-font-body-font-family": "Schrift-Familie für den Textkörper",
   "There_are_no_agents_added_to_this_department_yet": "Es wurden bisher keine Agenten zu dieser Abteilung hinzugefügt",
@@ -1776,15 +1825,15 @@
   "Two-factor_authentication_is_currently_disabled": "Zwei-Faktor-Authentifizierung ist momentan deaktiviert",
   "Two-factor_authentication_native_mobile_app_warning": "WARNUNG: Nach der Aktivierung kannst du dich nicht mehr auf den mobilen Apps (Rocket.Chat+) einloggen, da dieses Feature dort noch nicht implementiert wurde.",
   "Type": "Typ",
-  "Type_your_email": "Geben Sie Ihre E-Mail-Adresse ein",
-  "Type_your_message": "Geben Sie Ihre Nachricht ein",
-  "Type_your_name": "Geben Sie Ihren Namen ein",
-  "Type_your_new_password": "Geben Sie Ihr neues Passwort ein",
+  "Type_your_email": "Gib Deine E-Mail-Adresse ein",
+  "Type_your_message": "Gib Deine Nachricht ein",
+  "Type_your_name": "Gib Deinen Namen ein",
+  "Type_your_new_password": "Gib ein neues Passwort ein",
   "UI_Allow_room_names_with_special_chars": "Sonderzeichen im Raumnamen erlauben",
   "UI_Click_Direct_Message": "Anklicken, um eine Direktnachricht zu erstellen",
   "UI_Click_Direct_Message_Description": "Den Profil-Tab überspringen und direkt zur Konversation gehen",
   "UI_DisplayRoles": "Rollen anzeigen",
-  "UI_Merge_Channels_Groups": "Führe private Gruppen und Kanäle zusammen",
+  "UI_Merge_Channels_Groups": "Führe private und öffentliche Kanäle zusammen",
   "UI_Unread_Counter_Style": "Stil für den \"Ungelesen\"-Zähler",
   "UI_Use_Name_Avatar": "Die Initialen des vollständigen Namens verwenden, um einen Standard-Avatar zu generieren",
   "UI_Use_Real_Name": "Den echten Namen verwenden",
@@ -1793,9 +1842,9 @@
   "unarchive-room_description": "Berechtigung, einen Raum aus dem Archiv holen",
   "Unblock_User": "Benutzer entsperren",
   "Unmute_someone_in_room": "Jemandem das Chatten in einem Raum wieder erlauben",
-  "Unmute_user": "Benutzern das Chatten erlauben ",
+  "Unmute_user": "Benutzern das Chatten erlauben",
   "Unnamed": "Unbenannt",
-  "Unpin_Message": "Nachicht nicht mehr anheften",
+  "Unpin_Message": "Nachricht nicht mehr anheften",
   "Unread_Count": "Zählen ungelesener Nachrichten",
   "Unread_Count_DM": "Zählen ungelesener Direktnachrichten",
   "Unread_Messages": "Ungelesene Nachrichten",
@@ -1804,9 +1853,10 @@
   "Unread_Tray_Icon_Alert": "Ungelesen-Markierung in Statusleiste anzeigen",
   "Unstar_Message": "Aus den Favoriten entfernen",
   "Updated_at": "Aktualisiert am",
+  "Upload_user_avatar": "Avatar hochladen",
   "Upload_file_description": "Dateibeschreibung",
   "Upload_file_name": "Dateiname",
-  "Upload_file_question": "Möchten Sie eine Datei hochladen?",
+  "Upload_file_question": "Möchtest Du eine Datei hochladen?",
   "Uploading_file": "Datei wird hochgeladen...",
   "Uptime": "Laufzeit",
   "URL": "URL",
@@ -1876,10 +1926,10 @@
   "Username_description": "Der Benutzername wird dazu benutzt, um Sie in Nachrichten zu erwähnen",
   "Username_doesnt_exist": "Benutzer \"%s\" existiert nicht",
   "Username_ended_the_OTR_session": "__username__ hat die OTR-Session beendet",
-  "Username_invalid": "<strong>%s</strong> ist kein zulässiger Benutzername.<br/> Verwenden Sie nur Buchstaben, Zahlen, Punkte oder Binde- und Unterstriche.",
+  "Username_invalid": "<strong>%s</strong> ist kein gültiger Benutzername.<br/> Verwende nur Buchstaben, Zahlen, Punkte oder Binde- und Unterstriche.",
   "Username_is_already_in_here": "`@%s` wurde bereits hinzugefügt",
   "Username_is_not_in_this_room": "Benutzer `#%s` ist nicht in diesem Raum",
-  "Username_Placeholder": "Bitte geben Sie Benutzernamen ein",
+  "Username_Placeholder": "Bitte gib Benutzernamen ein...",
   "Username_title": "Benutzernamen festlegen",
   "Username_wants_to_start_otr_Do_you_want_to_accept": "__username__ möchte ein OTR-Gespräch starten. Möchten Sie es annehmen?",
   "Users": "Benutzer",
@@ -1950,8 +2000,8 @@
   "Wait_activation_warning": "Bevor Sie sich anmelden können, muss das Konto von einem Administrator manuell aktiviert werden",
   "Warnings": "Warnungen",
   "We_are_offline_Sorry_for_the_inconvenience": "Wir sind offline. Bitte entschuldigen Sie die Unannehmlichkeiten.",
-  "We_have_sent_password_email": "Wir haben Ihnen eine Anleitung zum Zurücksetzen des Passworts an Ihre E-Mail-Adresse gesendet. Wenn Sie keine E-Mail erhalten haben, versuchen Sie es bitte noch einmal.",
-  "We_have_sent_registration_email": "Wir haben Ihnen eine Bestätigungsmail gesendet. Wenn Sie keine E-Mail erhalten haben, versuchen Sie es bitte noch einmal.",
+  "We_have_sent_password_email": "Wir haben Dir eine Anleitung zum Zurücksetzen des Passworts an Deine E-Mail-Adresse gesendet. Wenn Du keine E-Mail erhalten hast, versuch es bitte noch einmal.",
+  "We_have_sent_registration_email": "Wir haben Dir eine Bestätigungsmail gesendet. Wenn Du keine E-Mail erhalten hast, versuch es bitte noch einmal.",
   "Webhook_URL": "Webhook-URL",
   "Webhooks": "Webhooks",
   "WebRTC_Enable_Channel": "Für öffentliche Kanäle aktivieren",
@@ -1962,7 +2012,7 @@
   "Wednesday": "Mittwoch",
   "Welcome": "Willkommen, <em>%s</em>.",
   "Welcome_to_the": "Willkommen bei",
-  "Why_do_you_want_to_report_question_mark": "Warum möchten Sie das melden?",
+  "Why_do_you_want_to_report_question_mark": "Warum möchtest Du das melden?",
   "will_be_able_to": "wird in der Lage sein,",
   "Would_you_like_to_return_the_inquiry": "Anfrage zurückgeben?",
   "Yes": "Ja",
@@ -1974,9 +2024,9 @@
   "Yes_mute_user": "Ja, Benutzer stumm schalten!\n",
   "Yes_remove_user": "Ja, Benutzer entfernen!",
   "Yes_unarchive_it": "Ja, aus dem Archiv holen!",
-  "You": "Sie",
+  "You": "Du",
   "you_are_in_preview_mode_of": "Sie befinden sich im Vorschaumodus des Kanals #<strong>__room_name__</strong>",
-  "You_are_logged_in_as": "Sie sind angemeldet als",
+  "You_are_logged_in_as": "Du bist angemeldet als",
   "You_are_not_authorized_to_view_this_page": "Sie sind nicht berechtigt, diese Seite zu sehen",
   "You_can_change_a_different_avatar_too": "Sie können für Post dieser Integration ein anderes Profilbild verwenden",
   "You_can_search_using_RegExp_eg": "Sie können einen regulären Ausdruck zum Suchen verwenden. z.B.",
@@ -1994,7 +2044,7 @@
   "You_need_to_type_in_your_password_in_order_to_do_this": "Um diese Aktion auszuführen, müssen sie Ihr Passwort eingeben",
   "You_need_to_type_in_your_username_in_order_to_do_this": "Sie müssen Ihren Benutzernamen angeben, um diese Aktion auszuführen",
   "You_need_to_verifiy_your_email_address_to_get_notications": "Sie müssen Ihre E-Mail-Adresse bestätigen, um Benachrichtigungen erhalten zu können",
-  "You_need_to_write_something": "Sie müssen etwas dazu schreiben!",
+  "You_need_to_write_something": "Du solltest etwas schreiben!",
   "You_should_inform_one_url_at_least": "Sie müssen mindestens eine URL angeben",
   "You_should_name_it_to_easily_manage_your_integrations": "Zur einfacheren Verwaltung der Integrationen empfehlen wir, der Integration einen Namen zu geben.",
   "You_will_not_be_able_to_recover": "Die Nachricht kann anschließend nicht wiederhergestellt werden",
@@ -2008,4 +2058,4 @@
   "your_message_optional": "ihre optionale Nachricht",
   "Your_password_is_wrong": "Falsches Passwort",
   "Your_push_was_sent_to_s_devices": "Eine Push-Nachricht wurde an %s Geräte gesendet."
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 9471113b77ad..75188fe03472 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -29,7 +29,6 @@
   "Accounts_AllowEmailChange": "Allow Email Change",
   "Accounts_AllowPasswordChange": "Allow Password Change",
   "Accounts_AllowUserAvatarChange": "Allow User Avatar Change",
-  "Accounts_AllowRealNameChange": "Allow Name Change",
   "Accounts_AllowUsernameChange": "Allow Username Change",
   "Accounts_AllowUserProfileChange": "Allow User Profile Change",
   "Accounts_AvatarResize": "Resize Avatars",
@@ -41,10 +40,6 @@
   "Accounts_CustomFields_Description": "Should be a valid JSON where keys are the field names containing a dictionary of field settings. Example:<br/><code>{\n \"role\": {\n  \"type\": \"select\",\n  \"defaultValue\": \"student\",\n  \"options\": [\"teacher\", \"student\"],\n  \"required\": true,\n  \"modifyRecordField\": {\n   \"array\": true,\n   \"field\": \"roles\"\n  }\n },\n \"twitter\": {\n  \"type\": \"text\",\n  \"required\": true,\n  \"minLength\": 2,\n  \"maxLength\": 10\n }\n}</code> ",
   "Accounts_CustomFieldsToShowInUserInfo": "Custom Fields to Show in User Info",
   "Accounts_DefaultUsernamePrefixSuggestion": "Default Username Prefix Suggestion",
-  "Accounts_Default_User_Preferences": "Default User Preferences",
-  "Accounts_Default_User_Preferences_audioNotifications": "Audio Notifications Default Alert",
-  "Accounts_Default_User_Preferences_desktopNotifications": "Desktop Notifications Default Alert",
-  "Accounts_Default_User_Preferences_mobileNotifications": "Mobile Notifications Default Alert",
   "Accounts_denyUnverifiedEmail": "Deny unverified email",
   "Accounts_EmailVerification": "Email Verification",
   "Accounts_EmailVerification_Description": "Make sure you have correct SMTP settings to use this feature",
@@ -72,7 +67,6 @@
   "Accounts_OAuth_Custom_Secret": "Secret",
   "Accounts_OAuth_Custom_Token_Path": "Token Path",
   "Accounts_OAuth_Custom_Token_Sent_Via": "Token Sent Via",
-  "Accounts_OAuth_Custom_Identity_Token_Sent_Via": "Identity Token Sent Via",
   "Accounts_OAuth_Custom_Username_Field": "Username field",
   "Accounts_OAuth_Drupal": "Drupal Login Enabled",
   "Accounts_OAuth_Drupal_callback_url": "Drupal oAuth2 Redirect URI",
@@ -106,10 +100,6 @@
   "Accounts_OAuth_Meteor_callback_url": "Meteor Callback URL",
   "Accounts_OAuth_Meteor_id": "Meteor Id",
   "Accounts_OAuth_Meteor_secret": "Meteor Secret",
-  "Accounts_OAuth_Tokenpass": "Tokenpass Login",
-  "Accounts_OAuth_Tokenpass_callback_url": "Tokenpass Callback URL",
-  "Accounts_OAuth_Tokenpass_id": "Tokenpass Id",
-  "Accounts_OAuth_Tokenpass_secret": "Tokenpass Secret",
   "Accounts_OAuth_Proxy_host": "Proxy Host",
   "Accounts_OAuth_Proxy_services": "Proxy Services",
   "Accounts_OAuth_Twitter": "Twitter Login",
@@ -125,6 +115,7 @@
   "Accounts_Registration_AuthenticationServices_Default_Roles_Description": "Default roles (comma-separated) users will be given when registering through authentication services",
   "Accounts_Registration_AuthenticationServices_Enabled": "Registration with Authentication Services",
   "Accounts_RegistrationForm": "Registration Form",
+  "Accounts_RegistrationForm_Disabled": "Disabled",
   "Accounts_RegistrationForm_LinkReplacementText": "Registration Form Link Replacement Text",
   "Accounts_RegistrationForm_Public": "Public",
   "Accounts_RegistrationForm_Secret_URL": "Secret URL",
@@ -182,7 +173,6 @@
   "All_channels": "All channels",
   "All_logs": "All logs",
   "All_messages": "All messages",
-  "All_added_tokens_will_be_required_by_the_user": "All added tokens will be required by the user",
   "All_users_in_the_channel_can_write_new_messages": "All users in the channel can write new messages",
   "Allow_Invalid_SelfSigned_Certs": "Allow Invalid Self-Signed Certs",
   "Allow_Invalid_SelfSigned_Certs_Description": "Allow invalid and self-signed SSL certificate's for link validation and previews.",
@@ -228,8 +218,6 @@
   "API_Shield_Types": "Shield Types",
   "API_Shield_Types_Description": "Types of shields to enable as a comma separated list, choose from `online`, `channel` or `*` for all",
   "API_Token": "API Token",
-  "API_Tokenpass_URL": "Tokenpass Server URL",
-  "API_Tokenpass_URL_Description": "Example: https://domain.com (excluding trailing slash)",
   "API_Upper_Count_Limit": "Max Record Amount",
   "API_Upper_Count_Limit_Description": "What is the maximum number of records the REST API should return (when not unlimited)?",
   "API_User_Limit": "User Limit for Adding All Users to Channel",
@@ -248,17 +236,17 @@
   "are_typing": "are typing",
   "Are_you_sure": "Are you sure?",
   "Are_you_sure_you_want_to_delete_your_account": "Are you sure you want to delete your account?",
-  "Are_you_sure_you_want_to_disable_Facebook_integration": "Are you sure you want to disable Facebook integration?",
   "assign-admin-role": "Assign Admin Role",
   "assign-admin-role_description": "Permission to assign the admin role to other users",
   "Assign_admin": "Assigning admin",
   "at": "at",
-  "At_least_one_added_token_is_required_by_the_user": "At least one added token is required by the user",
   "AtlassianCrowd": "Atlassian Crowd",
   "Attachment_File_Uploaded": "File Uploaded",
   "Attribute_handling": "Attribute handling",
   "Audio_message": "Audio message",
   "Audio_Notification_Value_Description": "Can be any custom sound or the default ones: beep, chelle, ding, droplet, highbell, seasons",
+  "Audio_Notifications_Default_Alert": "Audio Notifications Default Alert",
+  "Audio_Notifications_Value": "Default Message Notification Audio",
   "Auth_Token": "Auth Token",
   "Author": "Author",
   "Authorization_URL": "Authorization URL",
@@ -360,7 +348,6 @@
   "Channel_created": "Channel `#%s` created.",
   "Channel_doesnt_exist": "The channel `#%s` does not exist.",
   "Channel_name": "Channel Name",
-  "Channel_Name_Placeholder": "Type channel name",
   "Channel_Name_Placeholder": "Please enter channel name...",
   "Channel_to_listen_on": "Channel to listen on",
   "Channel_Unarchived": "Channel with name `#%s` has been Unarchived successfully",
@@ -404,7 +391,6 @@
   "Color": "Color",
   "Commands": "Commands",
   "Comment_to_leave_on_closing_session": "Comment to Leave on Closing Session",
-  "Common_Access": "Common Access",
   "Compact": "Compact",
   "Confirm_password": "Confirm your password",
   "Content": "Content",
@@ -496,6 +482,7 @@
   "Desktop": "Desktop",
   "Desktop_Notification_Test": "Desktop Notification Test",
   "Desktop_Notifications": "Desktop Notifications",
+  "Desktop_Notifications_Default_Alert": "Desktop Notifications Default Alert",
   "Desktop_Notifications_Disabled": "Desktop Notifications are Disabled. Change your browser preferences if you need Notifications enabled.",
   "Desktop_Notifications_Duration": "Desktop Notifications Duration",
   "Desktop_Notifications_Duration_Description": "Seconds to display desktop notification. This may affect OS X Notification Center. Enter 0 to use default browser settings and not affect OS X Notification Center.",
@@ -519,11 +506,9 @@
   "Direct_Reply_Separator_Description": "[Alter only if you know exactly what you are doing, refer docs]<br/>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",
-  "Disable_Facebook_integration": "Disable Facebook integration",
   "Disable_Notifications": "Disable Notifications",
   "Disable_two-factor_authentication": "Disable two-factor authentication",
-  "Disabled": "Disabled",
-  "Display_offline_form": "Display offline form",
+  "Display_offline_form": "Display Offline Form",
   "Displays_action_text": "Displays action text",
   "Do_you_want_to_change_to_s_question": "Do you want to change to <strong>%s</strong>?",
   "Domain": "Domain",
@@ -570,6 +555,7 @@
   "Email_Header_Description": "You may use the following placeholders: <br /><ul><li>[Site_Name] and [Site_URL] for the Application Name and URL respectively.</li></ul>",
   "Email_Notification_Mode": "Offline Email Notifications",
   "Email_Notification_Mode_All": "Every Mention/DM",
+  "Email_Notification_Mode_Disabled": "Disabled",
   "Email_or_username": "Email or username",
   "Email_Placeholder": "Please enter your email address...",
   "Email_subject": "Subject",
@@ -579,10 +565,9 @@
   "Empty_title": "Empty title",
   "Enable": "Enable",
   "Enable_Desktop_Notifications": "Enable Desktop Notifications",
+  "Enable_Svg_Favicon": "Enable SVG favicon",
   "Enable_two-factor_authentication": "Enable two-factor authentication",
   "Enabled": "Enabled",
-  "Enable_Auto_Away": "Enable Auto Away",
-  "Enable_Svg_Favicon": "Enable SVG favicon",
   "Encrypted_message": "Encrypted message",
   "End_OTR": "End OTR",
   "Enter_a_regex": "Enter a regex",
@@ -669,7 +654,6 @@
   "error-user-registration-secret": "User registration is only allowed via Secret URL",
   "error-you-are-last-owner": "You are the last owner. Please set new owner before leaving the room.",
   "Error_changing_password": "Error changing password",
-  "Error_loading_pages": "Error loading pages",
   "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances": "Error: Rocket.Chat requires oplog tailing when running in multiple instances",
   "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances_details": "Please make sure your MongoDB is on ReplicaSet mode and MONGO_OPLOG_URL environment variable is defined correctly on the application server",
   "Esc_to": "Esc to",
@@ -682,7 +666,6 @@
   "Example_s": "Example: <code class=\"inline\">%s</code>",
   "Exclude_Botnames": "Exclude Bots",
   "Exclude_Botnames_Description": "Do not propagate messages from bots whose name matches the regular expression above. If left empty, all messages from bots will be propagated.",
-  "Facebook_Page": "Facebook Page",
   "False": "False",
   "Favorite_Rooms": "Enable Favorite Rooms",
   "Favorites": "Favorites",
@@ -796,7 +779,7 @@
   "Hide_Unread_Room_Status": "Hide Unread Room Status",
   "Hide_usernames": "Hide Usernames",
   "Highlights": "Highlights",
-  "Highlights_How_To": "To be notified when someone mentions a word or phrase, add it here. You can separate words or phrases with <Enter>. Highlight Words are not case sensitive.",
+  "Highlights_How_To": "To be notified when someone mentions a word or phrase, add it here. You can separate words or phrases with commas. Highlight Words are not case sensitive.",
   "Highlights_List": "Highlight words",
   "History": "History",
   "Host": "Host",
@@ -811,7 +794,6 @@
   "If_this_email_is_registered": "If this email is registered, we'll send instructions on how to reset your password. If you do not receive an email shortly, please come back and try again.",
   "If_you_are_sure_type_in_your_password": "If you are sure type in your password:",
   "If_you_are_sure_type_in_your_username": "If you are sure type in your username:",
-  "If_you_dont_have_one_send_an_email_to_omni_rocketchat_to_get_yours": "If you don't have one send an email to [omni@rocket.chat](mailto:omni@rocket.chat) to get yours.",
   "Iframe_Integration": "Iframe Integration",
   "Iframe_Integration_receive_enable": "Enable Receive",
   "Iframe_Integration_receive_enable_Description": "Allow parent window to send commands to Rocket.Chat.",
@@ -833,7 +815,6 @@
   "Importer_From_Description": "Imports __from__ data into Rocket.Chat.",
   "Importer_HipChatEnterprise_BetaWarning": "Please be aware that this import is still a work in progress, please report any errors which occur in GitHub:",
   "Importer_HipChatEnterprise_Information": "The file uploaded must be a decrypted tar.gz, please read the documentation for further information:",
-  "Importer_Slack_Users_CSV_Information": "The file uploaded must be Slack's Users export file, which is a CSV file. See here for more information:",
   "Importer_import_cancelled": "Import cancelled.",
   "Importer_import_failed": "An error occurred while running the import.",
   "Importer_importing_channels": "Importing the channels.",
@@ -864,7 +845,6 @@
   "Instructions_to_your_visitor_fill_the_form_to_send_a_message": "Instructions to your visitor fill the form to send a message",
   "Integration_added": "Integration has been added",
   "Integration_Advanced_Settings": "Advanced Settings",
-  "Integration_disabled": "Integration disabled",
   "Integration_History_Cleared": "Integration History Successfully Cleared",
   "Integration_Incoming_WebHook": "Incoming WebHook Integration",
   "Integration_New": "New Integration",
@@ -954,7 +934,6 @@
   "IssueLinks_LinkTemplate": "Template for issue links",
   "IssueLinks_LinkTemplate_Description": "Template for issue links; %s will be replaced by the issue number.",
   "It_works": "It works",
-  "Idle_Time_Limit": "Idle Time Limit",
   "italics": "italics",
   "Jitsi_Chrome_Extension": "Chrome Extension Id",
   "Jitsi_Enable_Channels": "Enable in Channels",
@@ -1098,9 +1077,6 @@
   "Livechat_AllowedDomainsList": "Livechat Allowed Domains",
   "Livechat_Dashboard": "Livechat Dashboard",
   "Livechat_enabled": "Livechat enabled",
-  "Livechat_Facebook_Enabled": "Facebook integration enabled",
-  "Livechat_Facebook_API_Key": "Facebook API Key",
-  "Livechat_Facebook_API_Secret": "Facebook API Secret",
   "Livechat_forward_open_chats": "Forward open chats",
   "Livechat_forward_open_chats_timeout": "Timeout (in seconds) to forward chats",
   "Livechat_guest_count": "Guest Counter",
@@ -1248,9 +1224,9 @@
   "Meta_msvalidate01": "MSValidate.01",
   "Meta_robots": "Robots",
   "Min_length_is": "Min length is %s",
-  "Minimum_balance": "Minimum balance",
   "minutes": "minutes",
   "Mobile": "Mobile",
+  "Mobile_Notifications_Default_Alert": "Mobile Notifications Default Alert",
   "Monday": "Monday",
   "Monitor_history_for_changes_on": "Monitor History for Changes on",
   "More_channels": "More channels",
@@ -1301,8 +1277,6 @@
   "No_integration_found": "No integration found by the provided id.",
   "No_livechats": "You have no livechats",
   "No_mentions_found": "No mentions found",
-  "No_pages_yet_Try_hitting_Reload_Pages_button": "No pages yet. Try hitting \"Reload Pages\" button.",
-  "No_messages_yet": "No messages yet",
   "No_pinned_messages": "No pinned messages",
   "No_results_found": "No results found",
   "No_snippet_messages": "No snippet",
@@ -1322,8 +1296,6 @@
   "Notification_Duration": "Notification Duration",
   "Notification_Mobile_Default_For": "Push Mobile Notifications For",
   "Notifications": "Notifications",
-  "Notifications_Always_Notify_Mobile" : "Always notify mobile",
-  "Notifications_Always_Notify_Mobile_Description" : "Choose to always notify mobile device regardless of presence status.",
   "Notifications_Max_Room_Members": "Max Room Members Before Disabling All Message Notifications",
   "Notifications_Max_Room_Members_Description": "Max number of members in room when notifications for all messages gets disabled. Users can still change per room setting to receive all notifications on an individual basis. (0 to disable)",
   "Notifications_Muted_Description": "If you choose to mute everything, you won't see the room highlight in the list when there are new messages, except for mentions. Muting notifications will override notifications settings.",
@@ -1425,7 +1397,6 @@
   "Please_fill_a_username": "Please fill a username",
   "Please_fill_all_the_information": "Please fill all the information",
   "Please_fill_name_and_email": "Please fill name and email",
-  "Please_go_to_the_Administration_page_then_Livechat_Facebook": "Please go to the Administration page then Livechat > Facebook",
   "Please_select_an_user": "Please select an user",
   "Please_select_enabled_yes_or_no": "Please select an option for Enabled",
   "Please_wait": "Please wait",
@@ -1487,7 +1458,6 @@
   "Read_only_changed_successfully": "Read only changed successfully",
   "Read_only_channel": "Read Only Channel",
   "Read_only_group": "Read Only Group",
-  "RealName_Change_Disabled": "Your Rocket.Chat administrator has disabled the changing of names",
   "Record": "Record",
   "Redirect_URI": "Redirect URI",
   "Refresh_keys": "Refresh keys",
@@ -1501,7 +1471,6 @@
   "Regular_Expressions": "Regular Expressions",
   "Release": "Release",
   "Reload": "Reload",
-  "Reload_Pages": "Reload Pages",
   "Remove": "Remove",
   "remove-user": "Remove User",
   "remove-user_description": "Permission to remove a user from a room",
@@ -1519,8 +1488,6 @@
   "Report_exclamation_mark": "Report!",
   "Report_sent": "Report sent",
   "Report_this_message_question_mark": "Report this message?",
-  "Require_all_tokens": "Require all tokens",
-  "Require_any_token": "Require any token",
   "Reporting": "Reporting",
   "Require_password_change": "Require password change",
   "Resend_verification_email": "Resend verification email",
@@ -1548,9 +1515,6 @@
   "Room_has_been_archived": "Room has been archived",
   "Room_has_been_deleted": "Room has been deleted",
   "Room_has_been_unarchived": "Room has been unarchived",
-  "Room_tokenpass_config_changed_successfully": "Room tokenpass configuration changed successfully",
-  "Room_type_of_default_rooms_cant_be_changed": "This is a default room and the type can not be changed, please consult with your administrator.",
-  "Room_default_change_to_private_will_be_default_no_more": "This is a default channel and changing it to a private group will cause it to no longer be a default channel. Do you want to proceed?",
   "Room_Info": "Room Info",
   "room_is_blocked": "This room is blocked",
   "room_is_read_only": "This room is read only",
@@ -1572,7 +1536,6 @@
   "run-migration_description": "Permission to run the migrations",
   "Running_Instances": "Running Instances",
   "S_new_messages_since_s": "%s new messages since %s",
-  "Same_As_Token_Sent_Via" : "Same as \"Token Sent Via\"",
   "Same_Style_For_Mentions": "Same style for mentions",
   "SAML": "SAML",
   "SAML_Custom_Cert": "Custom Certificate",
@@ -1632,7 +1595,6 @@
   "Send_welcome_email": "Send welcome email",
   "Send_your_JSON_payloads_to_this_URL": "Send your JSON payloads to this URL.",
   "Sending": "Sending...",
-  "Sent_an_attachment": "Sent an attachment",
   "Served_By": "Served By",
   "Service": "Service",
   "Service_account_key": "Service account key",
@@ -1653,9 +1615,7 @@
   "Shared_Location": "Shared Location",
   "Should_be_a_URL_of_an_image": "Should be a URL of an image.",
   "Should_exists_a_user_with_this_username": "The user must already exist.",
-  "Show_agent_email": "Show agent email",
   "Show_all": "Show All",
-  "Show_room_counter_on_sidebar": "Show room counter on sidebar",
   "Show_more": "Show more",
   "show_offline_users": "show offline users",
   "Show_on_registration_page": "Show on registration page",
@@ -1666,7 +1626,6 @@
   "Showing_archived_results": "<p>Showing <b>%s</b> archived results</p>",
   "Showing_online_users": "Showing: <b>__total_showing__</b>, Online: __online__, Total: __total__ users",
   "Showing_results": "<p>Showing <b>%s</b> results</p>",
-  "Sidebar": "Sidebar",
   "Sidebar_list_mode": "Sidebar Channel List Mode",
   "Sign_in_to_start_talking": "Sign in to start talking",
   "since_creation": "since %s",
@@ -1683,7 +1642,6 @@
   "SlackBridge_Out_Enabled": "SlackBridge Out Enabled",
   "SlackBridge_Out_Enabled_Description": "Choose whether SlackBridge should also send your messages back to Slack",
   "SlackBridge_start": "@%s has started a SlackBridge import at `#%s`. We'll let you know when it's finished.",
-  "Slack_Users": "Slack's Users CSV",
   "Slash_Gimme_Description": "Displays ༼ つ ◕_◕ ༽つ before your message",
   "Slash_LennyFace_Description": "Displays ( ͡° ͜ʖ ͡°) after your message",
   "Slash_Shrug_Description": "Displays ¯\\_(ツ)_/¯ after your message",
@@ -1753,8 +1711,6 @@
   "Stats_Total_Users": "Total Users",
   "Status": "Status",
   "Stop_Recording": "Stop Recording",
-  "Store_Last_Message": "Store Last Message",
-  "Store_Last_Message_Sent_per_Room": "Store last message sent on each room.",
   "Stream_Cast": "Stream Cast",
   "Stream_Cast_Address": "Stream Cast Address",
   "Stream_Cast_Address_Description": "IP or Host of your Rocket.Chat central Stream Cast. E.g. `192.168.1.1:3000` or `localhost:4000`",
@@ -1854,18 +1810,6 @@
   "to_see_more_details_on_how_to_integrate": "to see more details on how to integrate.",
   "To_users": "To Users",
   "Toggle_original_translated": "Toggle original/translated",
-  "Token_Access": "Token Access",
-  "Token_Controlled_Access": "Token Controlled Access",
-  "Token_required": "Token required",
-  "Tokenpass_Channel_Label": "Tokenpass Channel",
-  "Tokenpass_Channels": "Tokenpass Channels",
-  "Tokens_Minimum_Needed_Balance": "Minimum needed token balance",
-  "Tokens_Minimum_Needed_Balance_Description": "Set minimum needed balance on each token. Blank or \"0\" for not limit.",
-  "Tokens_Minimum_Needed_Balance_Placeholder": "Balance value",
-  "Tokens_Required": "Tokens required",
-  "Tokens_Required_Input_Description": "Type one or more tokens asset names separated by comma.",
-  "Tokens_Required_Input_Error": "Invalid typed tokens.",
-  "Tokens_Required_Input_Placeholder": "Tokens asset names",
   "Topic": "Topic",
   "Transcript_Enabled": "Ask Visitor if They Would Like a Transcript After Chat Closed",
   "Transcript_message": "Message to Show When Asking About Transcript",
@@ -1972,13 +1916,11 @@
   "User_removed": "User removed",
   "User_removed_by": "User <em>__user_removed__</em> removed by <em>__user_by__</em>.",
   "User_Settings": "User Settings",
-  "user_sent_an_attachment": "__user__ sent an attachment",
   "User_unmuted_by": "User <em>__user_unmuted__</em> unmuted by <em>__user_by__</em>.",
   "User_unmuted_in_room": "User unmuted in room",
   "User_updated_successfully": "User updated successfully",
   "User_uploaded_file": "Uploaded a file",
   "User_uploaded_image": "Uploaded an image",
-  "User_Presence": "User Presence",
   "Username": "Username",
   "Username_and_message_must_not_be_empty": "Username and message must not be empty.",
   "Username_cant_be_empty": "The username cannot be empty",
@@ -1991,10 +1933,6 @@
   "Username_is_already_in_here": "`@%s` is already in here.",
   "Username_is_not_in_this_room": "The user `#%s` is not in this room.",
   "Username_Placeholder": "Please enter usernames...",
-  "User_sent_a_message_on_channel": "<strong>__username__</strong> sent a message on <strong>__channel__</strong>:",
-  "User_uploaded_a_file_on_channel": "<strong>__username__</strong> uploaded a file on <strong>__channel__</strong>:",
-  "User_sent_a_message_to_you": "<strong>__username__</strong> sent you a message:",
-  "User_uploaded_a_file_to_you": "<strong>__username__</strong> sent you a file:",
   "Username_title": "Register username",
   "Username_wants_to_start_otr_Do_you_want_to_accept": "__username__ wants to start OTR. Do you want to accept?",
   "Users": "Users",
@@ -2089,7 +2027,6 @@
   "Yes_mute_user": "Yes, mute user!",
   "Yes_remove_user": "Yes, remove user!",
   "Yes_unarchive_it": "Yes, unarchive it!",
-  "yesterday": "yesterday",
   "You": "You",
   "you_are_in_preview_mode_of": "You are in preview mode of channel #<strong>__room_name__</strong>",
   "You_are_logged_in_as": "You are logged in as",
@@ -2103,7 +2040,6 @@
   "You_have_n_codes_remaining": "You have __number__ codes remaining.",
   "You_have_not_verified_your_email": "You have not verified your email.",
   "You_have_successfully_unsubscribed": "You have successfully unsubscribed from our Mailling List.",
-  "You_have_to_set_an_API_token_first_in_order_to_use_the_integration": "You have to set an API token first in order to use the integration.",
   "You_must_join_to_view_messages_in_this_channel": "You must join to view messages in this channel",
   "You_need_confirm_email": "You need to confirm your email to login!",
   "You_need_install_an_extension_to_allow_screen_sharing": "You need install an extension to allow screen sharing",
diff --git a/packages/rocketchat-i18n/i18n/es.i18n.json b/packages/rocketchat-i18n/i18n/es.i18n.json
index a27b588677fa..ad3f4d799fe1 100644
--- a/packages/rocketchat-i18n/i18n/es.i18n.json
+++ b/packages/rocketchat-i18n/i18n/es.i18n.json
@@ -14,6 +14,7 @@
   "Accept_with_no_online_agents": "Aceptar sin agentes en línea",
   "access-mailer": "Acceso a la Pantalla de Correo",
   "access-mailer_description": "Permiso para enviar correo electrónico masivo a todos los usuarios.",
+  "access-permissions": "Acceso a la Pantalla de Permisos",
   "access-permissions_description": "Modificar permisos para varios roles.",
   "Access_not_authorized": "Acceso no autorizado",
   "Access_Token_URL": "URL de Token de Acceso",
@@ -37,6 +38,7 @@
   "Accounts_BlockedUsernameList": "Lista de nombres de usuario bloqueados",
   "Accounts_BlockedUsernameList_Description": "Lista de nombres de usuarios bloqueados separada por comas (no distingue mayúsculas y minúsculas)",
   "Accounts_CustomFieldsToShowInUserInfo": "Campos Personalizados para Mostrar en la Información del Usuario",
+  "Accounts_DefaultUsernamePrefixSuggestion": "Sugerencia de Prefijo de Nombre de Usuario Predeterminado",
   "Accounts_denyUnverifiedEmail": "Denegar correo electrónico sin verificar",
   "Accounts_EmailVerification": "Verificación de correo electrónico",
   "Accounts_EmailVerification_Description": "Asegúrese de que tiene la configuración SMTP correcta para usar esta característica",
@@ -137,6 +139,8 @@
   "add-user-to-any-p-room": "Añadir Usuario a Cualquier Canal Privado",
   "add-user-to-any-p-room_description": "Permiso para añadir un usuario a cualquier canal privado",
   "add-user-to-joined-room": "Añadir Usuario a Cualquier Canal Unido",
+  "add-user-to-joined-room_description": "Permiso para agregar un usuario a un canal actualmente unido",
+  "add-user_description": "Permiso para agregar nuevos usuarios al servidor a través de la pantalla de usuarios",
   "Add_agent": "Agregar agente",
   "Add_custom_oauth": "Agregar oauth personalizado",
   "Add_Domain": "Agregar Dominio",
@@ -190,6 +194,7 @@
   "API_Drupal_URL": "URL del Servidor Drupal",
   "API_Drupal_URL_Description": "Ejemplo: https://domain.com (sin incluir la barra diagonal)",
   "API_Embed": "Incrustar (embed)",
+  "API_EmbedCacheExpirationDays": "Días de Vencimiento de Caché Embebido",
   "API_EmbedDisabledFor": "Deshabilitar el insertar vinculos para los Usuarios",
   "API_EmbedDisabledFor_Description": "Lista separada por comas de nombres de usuarios ",
   "API_EmbedIgnoredHosts": "Incrusta hosts ignorados",
@@ -216,6 +221,8 @@
   "Application_updated": "Aplicación actualizada",
   "Apply_and_refresh_all_clients": "Aplicar y refrescar todos los clientes",
   "Archive": "Archivo",
+  "archive-room": "Archivar Room",
+  "archive-room_description": "Permiso para archivar un canal",
   "are_also_typing": "también están escribiendo",
   "are_typing": "están escribiendo",
   "Are_you_sure": "Estás seguro?",
@@ -228,6 +235,8 @@
   "Attachment_File_Uploaded": "Archivo subido",
   "Attribute_handling": "Manejo de atributos",
   "Audio_message": "Mensaje de audio",
+  "Audio_Notification_Value_Description": "Puede ser cualquier sonido personalizado o por defecto: beep, chelle, ding, droplet, highbell, seasons",
+  "Audio_Notifications_Default_Alert": "Alerta Predeterminada para Notificaciones de Audio",
   "Audio_Notifications_Value": "Audio de notificación de mensaje predeterminado",
   "Auth_Token": "Auth Token",
   "Author": "Autor",
@@ -266,7 +275,7 @@
   "Back_to_applications": "Volver a las aplicaciones",
   "Back_to_chat": "Volver al chat",
   "Back_to_integration_detail": "Volver al detalle de la integración",
-  "Back_to_integrations": "De regreso a integraciones",
+  "Back_to_integrations": "Volver a integraciones",
   "Back_to_login": "Volver a identificarse",
   "Back_to_permissions": "Regresar a permisos",
   "Backup_codes": "Respaldar códigos",
@@ -289,7 +298,13 @@
   "Cancel": "Cancelar",
   "Cancel_message_input": "Cancelar",
   "Cannot_invite_users_to_direct_rooms": "No se puede invitar a los usuarios a las salas directas",
+  "CAS_autoclose": "Cierre Automático de la ventana emergente de Inicio de Sesión",
   "CAS_button_color": "Color de fondo para el botón de inicio de sesión",
+  "CAS_button_label_color": "Color del texto del botón de inicio de sesión",
+  "CAS_button_label_text": "Etiqueta del botón de inicio de sesión",
+  "CAS_enabled": "Habilitado",
+  "CAS_popup_height": "Alto de de Ventana Emergente de Inicio de Sesión",
+  "CAS_popup_width": "Ancho de Ventana Emergente de Inicio de Sesión",
   "CAS_Sync_User_Data_Enabled": "Siempre sincronizar los Datos de Usuario",
   "CDN_PREFIX": "Prefijo de CDN",
   "Certificates_and_Keys": "Certificados y Llaves",
@@ -298,15 +313,17 @@
   "channel": "canal",
   "Channel": "Canal",
   "Channel_already_exist": "El canal '#% s' ya existe.",
-  "Channel_already_Unarchived": "El canal con nombre `#% s` ya está en estado Desarchivado.",
-  "Channel_Archived": "El canal con nombre `#% s` se ha archivado correctamente.",
+  "Channel_already_Unarchived": "El canal con nombre `#%s` ya está en estado Desarchivado",
+  "Channel_Archived": "El canal con nombre `#%s` ha sido archivado con éxito",
   "Channel_doesnt_exist": "El canal `#%s` no existe",
+  "Channel_name": "Nombre del Canal",
+  "Channel_Name_Placeholder": "Por favor ingrese el nombre del canal...",
   "Channel_Unarchived": "El canal con nombre `#% s` se ha desarchivado correctamente.",
   "Channels": "Canales",
   "Channels_list": "Lista de canales públicos",
   "Chat_button": "Botón de chat",
   "Chat_closed": "Chat cerrado",
-  "Chat_closed_successfully": "Chat cerrado correctamente",
+  "Chat_closed_successfully": "Chat cerrado con éxito",
   "Chat_window": "Ventana de chat",
   "Chatops_Enabled": "Habilitar Chatops",
   "Chatops_Title": "Panel de Chatops",
@@ -345,22 +362,29 @@
   "Count": "Contar",
   "Cozy": "Acogedor",
   "Create": "Crear",
+  "create-d": "Crear Mensajes Directos",
+  "create-user": "Crear usuario",
+  "create-user_description": "Permiso para crear usuarios",
   "Create_A_New_Channel": "Crear un nuevo canal",
   "Create_new": "Crear nuevo",
   "Created_at": "Creado en",
   "Created_at_s_by_s": "Creado a las <strong>%s</strong> por <strong>%s</strong>",
   "Current_Chats": "Chats actuales",
+  "Current_Status": "Estado actual",
   "Custom": "Personalizado",
   "Custom_Fields": "Campos Personalizados",
   "Custom_oauth_helper": "Mientras configura el Proveedor de OAuth, tendra que establecer un URL de Devolucion. Use <pre>%s</pre>.",
   "Custom_oauth_unique_name": "Nombre único de oauth personalizado",
   "Custom_Script_Logged_In": "Script personalizado para los usuarios que han iniciado sesión",
   "Custom_Script_Logged_Out": "Script personalizado para los usuarios que han cerrado sesión",
+  "Custom_Scripts": "Scripts Personalizados",
+  "Custom_Sound_Add": "Agregar Sonido Personalizado",
   "Custom_Sound_Error_Invalid_Sound": "Sonido no válido",
   "Custom_Sound_Error_Name_Already_In_Use": "El nombre de sonido personalizado ya está siendo utilizado.",
   "Custom_Sound_Has_Been_Deleted": "El sonido personalizado ha sido borrado.",
   "Custom_Sound_Info": "Información de Sonido Personalizado",
   "Custom_Sound_Saved_Successfully": "Sonido personalizado guardado con éxito",
+  "Custom_Sounds": "Sonidos Personalizados",
   "Custom_Translations": "Traducciones Personalizadas",
   "Dashboard": "Tablero",
   "Date": "Fecha",
@@ -372,6 +396,8 @@
   "Deactivate": "Desactivar",
   "Default": "Por defecto",
   "Delete": "Eliminar",
+  "delete-message": "Eliminar mensaje",
+  "delete-user": "Eliminar usuario",
   "Delete_message": "Borrar mensaje",
   "Delete_my_account": "Borrar mi cuenta",
   "Delete_Room_Warning": "Eliminar un sala de chat eliminara todos los mensajes de la sala. Esto no se puede deshacer",
@@ -391,6 +417,10 @@
   "Desktop_Notifications_Enabled": "Las Notificaciones de Escritorio están Habilitadas",
   "Direct_message_someone": "Mensaje directo a alguien",
   "Direct_Messages": "Mensajes Directos",
+  "Direct_Reply_Password": "Contraseña",
+  "Direct_Reply_Separator": "Separador",
+  "Direct_Reply_Username": "Nombre de usuario",
+  "Disable_Notifications": "Deshabilitar notificaciones",
   "Display_offline_form": "Mostrar formulario  fuera línea",
   "Displays_action_text": "Mostrar texto de la acción",
   "Do_you_want_to_change_to_s_question": "Desea cambiar a <strong>%s</strong>",
@@ -427,39 +457,41 @@
   "Email_subject": "Asunto",
   "Email_verified": "Correo electrónico verificado",
   "Emoji": "Emoji",
-  "Empty_title": "Titulo Vacio",
+  "EmojiCustomFilesystem": "Sistema de Archivos Emoji Personalizado",
+  "Empty_title": "Titulo Vacío",
   "Enable": "Habilitar",
   "Enable_Desktop_Notifications": "Habilitar Notificaciones de Escritorio",
+  "Enable_Svg_Favicon": "Habilitar favicon SVG",
   "Enabled": "Habilitado",
   "Encrypted_message": "Mensaje cifrado",
   "End_OTR": "Finalizar OTR",
   "Enter_a_regex": "Introduzca un regex",
   "Enter_a_room_name": "Introduzca un nombre de sala",
-  "Enter_a_username": "Ingrese un nombre de usuario",
-  "Enter_name_here": "Introduce el nombre aquí",
+  "Enter_a_username": "Introduzca un nombre de usuario",
+  "Enter_name_here": "Introduzca nombre aquí",
   "Enter_Normal": "Modo normal(enviar con Enter)",
   "Enter_to": "Entrar a",
   "Error": "Error",
   "error-action-not-allowed": "__action__ no está permitido",
   "error-application-not-found": "Aplicación no encontrada",
-  "error-archived-duplicate-name": "Hay un canal de archivado con el nombre '__room_name__'",
-  "error-avatar-invalid-url": "URL del avatar no válido: __url__",
+  "error-archived-duplicate-name": "Hay un canal archivado con el nombre '__room_name__'",
+  "error-avatar-invalid-url": "URL de avatar inválida: __url__",
   "error-avatar-url-handling": "Error durante la manipulación de ajuste de imagen de usuario desde una dirección URL (__url__) para __username__",
   "error-cant-invite-for-direct-room": "No se puede invitar al usuario salas directos",
   "error-could-not-change-email": "No se pudo cambiar de correo electrónico",
   "error-could-not-change-name": "No se pudo cambiar el nombre",
   "error-could-not-change-username": "No se pudo cambiar nombre de usuario",
-  "error-delete-protected-role": "No puede eliminar un rol protegido",
+  "error-delete-protected-role": "No se puede eliminar un rol protegido",
   "error-department-not-found": "Departamento no encontrado",
   "error-direct-message-file-upload-not-allowed": "No se permite compartir archivos en mensajes directos",
   "error-duplicate-channel-name": "Un canal con el nombre '__channel_name__' ya existe",
-  "error-email-domain-blacklisted": "El dominio de correo electrónico en una lista negra",
+  "error-email-domain-blacklisted": "El dominio de correo electrónico está en una lista negra",
   "error-field-unavailable": "<strong>__field__</strong> ya está en uso :(",
   "error-file-too-large": "El archivo es demasiado grande",
-  "error-importer-not-defined": "El importador no se definió correctamente, no se encuentra la clase de importación.",
-  "error-input-is-not-a-valid-field": "__input__ no es un __field__ válida",
-  "error-invalid-actionlink": "enlace de acción no válida",
-  "error-invalid-arguments": "Los argumentos inválidos",
+  "error-importer-not-defined": "El importador no se definió correctamente, no se encuentra la Clase de Importación.",
+  "error-input-is-not-a-valid-field": "__input__ no es un __field__ válido",
+  "error-invalid-actionlink": "Enlace de acción inválido",
+  "error-invalid-arguments": "Argumentos inválidos",
   "error-invalid-asset": "Activo invalido",
   "error-invalid-channel": "Canal no válido.",
   "error-invalid-channel-start-with-chars": "Canal no válido. Comience con @ o #",
@@ -474,13 +506,13 @@
   "error-invalid-file-type": "Tipo Invalido de Archivo",
   "error-invalid-file-width": "Anchura Invalida de Archivo",
   "error-invalid-from-address": "Ha ingresado una dirección invalida en el campo De",
-  "error-invalid-integration": "la integración no válido",
-  "error-invalid-message": "mensaje no válido",
-  "error-invalid-method": "método no válido",
+  "error-invalid-integration": "Integración inválida",
+  "error-invalid-message": "Mensaje inválido",
+  "error-invalid-method": "Método inválido",
   "error-invalid-name": "Nombre inválido",
-  "error-invalid-password": "Contraseña invalida",
+  "error-invalid-password": "Contraseña inválida",
   "error-invalid-redirectUri": "inválida redirectUri",
-  "error-invalid-role": "función no válida",
+  "error-invalid-role": "Role inválido",
   "error-invalid-room": "Sala no válida",
   "error-invalid-room-name": "<strong> %s</strong> no es un nombre válido de Sala, <br/> utilice sólo letras, números, guiones y guiones bajos",
   "error-invalid-room-type": "<strong>__type__</strong> no es un tipo valido de Sala.",
@@ -516,7 +548,7 @@
   "every_hour": "Una vez por hora",
   "every_six_hours": "Una vez cada seis horas",
   "Example_s": "Ejemplo: <code class=\"inline\">%s</code>",
-  "Exclude_Botnames": "Excluir bots",
+  "Exclude_Botnames": "Excluir Bots",
   "Exclude_Botnames_Description": "No propagar los mensajes de bots cuyos nombres coincidan con la expresión regular. Se se deja en blanco, todos los mensajes de los bots se propagarán.",
   "False": "Falso",
   "Favorite_Rooms": "Habilitar salas favoritas",
@@ -537,13 +569,13 @@
   "FileUpload_ProtectFiles": "Proteger archivos cargados",
   "FileUpload_ProtectFilesDescription": "Únicamente usuarios autenticados tendrán acceso ",
   "FileUpload_S3_Acl": "Amazon S3 acl",
-  "FileUpload_S3_AWSAccessKeyId": "Amazon S3 AWSAccessKeyID",
-  "FileUpload_S3_AWSSecretAccessKey": "Amazon S3 AWSSecretAccessKey",
-  "FileUpload_S3_Bucket": "Amazon S3 bucket name",
+  "FileUpload_S3_AWSAccessKeyId": "Access Key",
+  "FileUpload_S3_AWSSecretAccessKey": "Secret Key",
+  "FileUpload_S3_Bucket": "Nombre de Bucket",
   "FileUpload_S3_BucketURL": "Bucket URL",
-  "FileUpload_S3_CDN": "Dominio CDN para descargas",
+  "FileUpload_S3_CDN": "Dominio CDN para Descargas",
   "FileUpload_S3_Region": "Región",
-  "FileUpload_S3_URLExpiryTimeSpan": "Caducidad de las URLs",
+  "FileUpload_S3_URLExpiryTimeSpan": "Tiempo de caducidad de las URLs",
   "FileUpload_S3_URLExpiryTimeSpan_Description": "Tiempo después el cual las direcciones de Amazon S3 generadas dejarán de ser válidas (en segundos). Si se establece a menos de 5 segundos, este campo será ignorado.",
   "FileUpload_Storage_Type": "Tipo de Almacenamiento",
   "Flags": "Indicadores",
@@ -555,10 +587,10 @@
   "Force_SSL": "Forzar SSL",
   "Force_SSL_Description": "* Precaución! * _Force SSL_ nunca debe ser usado con proxy inverso. Si usted tiene un proxy inverso, debería hacer la redirección AHÍ. Esta opción existe para los despliegues como Heroku, que no permite la configuración de redirección en el proxy inverso.",
   "Forgot_password": "Olvidaste tu contraseña",
-  "Forward": "Remitir",
-  "Forward_chat": "Remitir chat",
-  "Forward_to_department": "Remitir al departamento",
-  "Forward_to_user": "Remitir al usuario",
+  "Forward": "Reenviar",
+  "Forward_chat": "Reenviar chat",
+  "Forward_to_department": "Reenviar a departamento",
+  "Forward_to_user": "Reenviar a usuario",
   "Frequently_Used": "Usado frecuentemente",
   "Friday": "Viernes",
   "From": "De",
@@ -576,7 +608,7 @@
   "Header_and_Footer": "Encabezado y Pie de página",
   "Hidden": "Oculto",
   "Hide_Avatars": "Ocultar avatares",
-  "Hide_flextab": "Esconder barra lateral derecha al hacer clic",
+  "Hide_flextab": "Ocultar Barra Lateral Derecha con un Click",
   "Hide_Group_Warning": "¿Seguro que desea ocultar el grupo \" %s\"?",
   "Hide_Private_Warning": "¿Está seguro de que desea ocultar la discusión con \" %s\"?",
   "Hide_room": "Ocultar sala",
@@ -596,29 +628,31 @@
   "If_you_are_sure_type_in_your_password": "Si está seguro escriba su contraseña:",
   "If_you_are_sure_type_in_your_username": "Si está seguro ingrese su nombre de usuario:",
   "Importer_Archived": "Archivado",
-  "Importer_done": "Importación completa!",
-  "Importer_finishing": "Finalizar la importación.",
+  "Importer_CSV_Information": "El importador de CSV requiere un formato específico; lea la documentación sobre cómo estructurar su archivo zip:",
+  "Importer_done": "¡Importación terminada!",
+  "Importer_finishing": "Finalizando la importación.",
   "Importer_From_Description": "Las importaciones __from datos __ 's en Rocket.Chat.",
   "Importer_import_cancelled": "Importación cancelada.",
   "Importer_import_failed": "Se produjo un error durante la ejecución de la importación.",
-  "Importer_importing_channels": "La importación de los canales.",
-  "Importer_importing_messages": "La importación de los mensajes.",
-  "Importer_importing_started": "A partir de la importación.",
-  "Importer_importing_users": "La importación de los usuarios.",
+  "Importer_importing_channels": "Importando los canales.",
+  "Importer_importing_messages": "Importando los mensajes.",
+  "Importer_importing_started": "Iniciando la importación.",
+  "Importer_importing_users": "Importando los usuarios.",
   "Importer_not_in_progress": "El importador actualmente no se está ejecutando.",
-  "Importer_Prepare_Restart_Import": "reinicio de importación",
-  "Importer_Prepare_Start_Import": "comenzar a importar",
-  "Importer_Prepare_Uncheck_Archived_Channels": "Canales archivados desactive los campos",
-  "Importer_Prepare_Uncheck_Deleted_Users": "Los usuarios desmarque eliminados",
+  "Importer_not_setup": "El importador no está configurado correctamente, ya que no devolvió ningún dato.",
+  "Importer_Prepare_Restart_Import": "Reiniciar importación",
+  "Importer_Prepare_Start_Import": "Iniciar importación",
+  "Importer_Prepare_Uncheck_Archived_Channels": "Descarmar Channel archivados",
+  "Importer_Prepare_Uncheck_Deleted_Users": "Desmarcar usuarios eliminados",
   "Importer_progress_error": "No se pudo obtener el progreso de la importación.",
   "Importer_setup_error": "Se produjo un error al configurar el importador.",
   "Importer_Source_File": "Selección del archivo de origen",
   "Incoming_Livechats": "LiveChats entrantes",
   "inline_code": "inline_code",
-  "Install_Extension": "Instalar extension",
-  "Install_FxOs": "Instalar Rocket.Chat en Firefox",
-  "Install_FxOs_done": "Grandioso! Ya puedes comenzar a utilizar Rocket.Chat mediante el icono de tu Escritorio. Diviértete usando Rocket.Chat!",
-  "Install_FxOs_error": "Sentimos que no funcionara como es debido! Apareció el siguiente error:",
+  "Install_Extension": "Instalar Extensión",
+  "Install_FxOs": "Instalar Rocket.Chat en su Firefox",
+  "Install_FxOs_done": "Genial! Ya puede comenzar a usarRocket.Chat mediante el ícono en su Escritorio. ¡Diviértase usando Rocket.Chat!",
+  "Install_FxOs_error": "Lo sentimos, ¡eso no funcionó como se esperaba! El siguiente error apareció:",
   "Install_FxOs_follow_instructions": "Por favor confirma la instalación de la aplicación en tu dispositivo (presione \"Instalar\" cuando se le solicite).",
   "Installation": "Instalación ",
   "Installed_at": "instalado en",
@@ -635,8 +669,8 @@
   "Integrations_Outgoing_Type_RoomCreated": "chat creado(público y privado)",
   "Integrations_Outgoing_Type_RoomJoined": "Usuario se ha unido al chat",
   "InternalHubot": "hubot interna",
-  "InternalHubot_ScriptsToLoad": "Secuencias de comandos para cargar",
-  "InternalHubot_ScriptsToLoad_Description": "Por favor, introduzca una lista separada por comas de secuencias de comandos para cargar desde https://github.com/github/hubot-scripts/tree/master/src/scripts",
+  "InternalHubot_ScriptsToLoad": "Scripts a Cargar",
+  "InternalHubot_ScriptsToLoad_Description": "Por favor introduzca una lista separada por comas de scripts a cargar desde su carpeta personalizada ",
   "InternalHubot_Username_Description": "Este debe ser un nombre de usuario válido de un bot registrado en su servidor.",
   "Invalid_confirm_pass": "La confirmación de la contraseña no coincide con la contraseña",
   "Invalid_email": "El e-mail ingresado es invalido",
@@ -713,30 +747,30 @@
   "LDAP_User_Search_Field_Description": "El atributo LDAP que identifica al usuario que intente LDAP autenticación. Este campo debe ser `sAMAccountName` para la mayoría de las instalaciones de Active Directory, pero puede ser` uid` para otras soluciones LDAP, como OpenLDAP. Puede utilizar `mail` para identificar a los usuarios por correo electrónico o cualquier atributo que desee. <br> Se pueden utilizar varios valores separados por comas para permitir a los usuarios acceder usando múltiples identificadores como nombre de usuario o correo electrónico.",
   "LDAP_User_Search_Filter_Description": "Si se les permitirá especificados, sólo los usuarios que coincidan con este filtro para iniciar sesión. Si no se especifica ningún filtro, todos los usuarios dentro del alcance de la base de dominio especificado serán capaces de iniciar sesión. <br/> Por ejemplo, para Active Directory `memberOf = cn = ROCKET_CHAT, ou = Groups` general. <br/> Por ejemplo, para OpenLDAP (búsqueda de coincidencia de extensible) `ou: dn: = ROCKET_CHAT`.",
   "LDAP_Authentication_UserDN_Description": "El usuario LDAP que realiza búsquedas de usuario para autenticar a otros usuarios cuando inician sesión en. <br/> Esta es normalmente una cuenta de servicio creado específicamente para integraciones de terceros. Utilizar un nombre completo, como `cn = Administrador, cn = Users, dc = ejemplo, dc = com`.",
-  "LDAP_Enable": "Habilitado",
+  "LDAP_Enable": "Habilitar",
   "LDAP_Enable_Description": "Intentar utilizar LDAP como método de autenticación ",
   "LDAP_Encryption": "Cifrado",
   "LDAP_Encryption_Description": "Metodo de cifrado usado para la comunicación segura hacia el servidor LDAP. Algunos ejemplos 'sin cifrado', 'SSL/LDAPS (cifrado desde el inicio), y 'StartTLS' ( actualizar a comunicaciónes cifradas una ves conectado).",
   "LDAP_Host": "Servidor",
-  "LDAP_Host_Description": "Servidor LDAP, ejem. `ldap.example.com` o`10.0.0.30`.",
+  "LDAP_Host_Description": "Servidor LDAP, ej. `ldap.example.com` o`10.0.0.30`.",
   "LDAP_Port": "Puerto",
   "LDAP_Port_Description": "Puerto para acceder a LDAP. ej. `389` o `636` para LDAPS",
   "LDAP_Reject_Unauthorized": "rechazar no autorizada",
-  "LDAP_Sync_User_Avatar": "Sincronizar Avatar del usuario",
-  "LDAP_Sync_User_Data": "Sincronizar Datos",
+  "LDAP_Sync_User_Avatar": "Sincronizar Avatar del Usuario",
+  "LDAP_Sync_User_Data": "Sincronizar Datos de Usuario",
   "LDAP_Sync_User_Data_Description": "Mantener los datos del usuario en sincronía con el servidor al iniciar sesión (ej: nombre, correo electrónico). ",
-  "LDAP_Sync_User_Data_FieldMap": "Mapa de campos de datos de usuario",
+  "LDAP_Sync_User_Data_FieldMap": "Mapa de Campos de Datos de Usuario",
   "LDAP_Sync_User_Data_FieldMap_Description": "Configurar como los campos de cuenta de usuario ( como el correo electrónico) son llenados desde un registro en LDAP (una vez encontrados). <br/>A modo de ejemplo, `{\"cn\":\"name\", \"mail\":\"email\"}` elegira el nombre legible de una persona desde el atributo cn, y su correo electrónico desde el atributo de correo electrónico.</br/> Campos disponibles `nombre` y `correo electrónico`.",
   "LDAP_Test_Connection": "Probar Conexión ",
-  "LDAP_Unique_Identifier_Field": "Campo de Identificador Único ",
+  "LDAP_Unique_Identifier_Field": "Campo Identificador Único ",
   "LDAP_Unique_Identifier_Field_Description": "Qué campo se utilizará para vincular al usuario LDAP y el usuario Rocket.Chat. Puede informar a varios valores separados por una coma para tratar de obtener el valor del registro de LDAP. <br/> El valor por defecto es `objectGUID, IBM-entryUUID, GUID, dominoUNID, nsuniqueid, uidNumber`",
   "LDAP_Username_Field": "Campo de Nombre de Usuario",
   "LDAP_Username_Field_Description": "Qué campo se utilizará como nombre de usuario * * para los nuevos usuarios. Dejar en blanco para usar el nombre de usuario informado en la página de inicio de sesión. <br/> Puede utilizar etiquetas de plantilla también, como `#{givenName}.#{sn}`. <br/> El valor por defecto es `sAMAccountName`.",
-  "Least_Amount": "Menor cantidad",
-  "Leave_Group_Warning": "¿Seguro que quieres dejar el grupo \" %s\"?",
-  "Leave_Private_Warning": "¿Seguro que quieres salir de la discusión con \" %s\"?",
+  "Least_Amount": "Menor Cantidad",
+  "Leave_Group_Warning": "¿Seguro que quieres dejar el grupo \"%s\"?",
+  "Leave_Private_Warning": "¿Seguro que quieres salir de la discusión con \"%s\"?",
   "Leave_room": "Salir de la sala",
-  "Leave_Room_Warning": "¿Seguro que quieres salir de la Sala \" %s\"?",
+  "Leave_Room_Warning": "¿Seguro que quieres salir de la sala \"%s\"?",
   "line": "línea",
   "List_of_Channels": "Lista de Canales",
   "List_of_Direct_Messages": "Lista de mensajes directos",
@@ -780,14 +814,14 @@
   "Mailer": "Remitente",
   "Mailer_body_tags": "<b>Debe</b> utilizar [unsubscribe] para el enlace de anulación de la suscripción. <br /> Es posible utilizar [name], [fname], [lname] para el nombre completo del usuario, nombre o apellido, respectivamente. <br /> Es posible utilizar [email] para el correo electrónico del usuario.",
   "Mailing": "Envío",
-  "Make_Admin": "Crear admin",
+  "Make_Admin": "Hacer Administrador",
   "Manager_added": "Supervisor agregado",
   "Manager_removed": "Supervisor eliminado",
   "Managing_assets": "La gestión de activos",
   "Managing_integrations": "La gestión de integraciones",
-  "Mark_as_read": "Marcar como leído",
-  "Mark_as_unread": "Marcar como no leído",
-  "Markdown_Headers": "Encabezados Markdown",
+  "Mark_as_read": "Marcar Como Leído",
+  "Mark_as_unread": "Marcar Como No Leído",
+  "Markdown_Headers": "Permitir Encabezados Markdown en mensajes",
   "Markdown_SupportSchemesForLink": "Planes de apoyo de rebajas de Enlace",
   "Markdown_SupportSchemesForLink_Description": "Lista separada por comas de los esquemas permitidos",
   "Members_List": "Lista de Miembros",
@@ -805,11 +839,12 @@
   "Message_AllowPinning": "Permitir que se fijen/anclen los mensajes",
   "Message_AllowPinning_Description": "Permitir que los mensajes se puedan anclar a cualquier canal.",
   "Message_AllowStarring": "Permitir Destacar  un Mensaje",
+  "Message_AllowUnrecognizedSlashCommand": "Permitir Comandos Slash no Reconocidos",
   "Message_AlwaysSearchRegExp": "Siempre buscar utilizando RegExp",
   "Message_AlwaysSearchRegExp_Description": "Recomendamos establecer `TRUE si el idioma no es compatible con <a target=\"_blank\" href=\"https://docs.mongodb.org/manual/reference/text-search-languages/#text-search-languages\">la búsqueda de texto MongoDB</a> .",
   "Message_AudioRecorderEnabled": "Grabadora de audio habilitada",
   "Message_AudioRecorderEnabledDescription": "Requiere que los archivos del tipo 'audio/wav' sean un tipo de archivo valido dentro de las opciones de 'Carga de Archivos'.",
-  "Message_BadWordsFilterList": "Añadir malas palabras a la lista negra",
+  "Message_BadWordsFilterList": "Añadir Malas Palabras a la Lista Negra",
   "Message_BadWordsFilterListDescription": "Añadir Lista de lista separada por comas de malas palabras para filtrar",
   "Message_DateFormat": "Formato de fecha",
   "Message_DateFormat_Description": "Ver también: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
@@ -828,6 +863,7 @@
   "Message_ShowEditedStatus": "Mostrar el estado de edición",
   "Message_ShowFormattingTips": "Mostrar Sugerencias de Formato",
   "Message_starring": "Mensaje Destacado",
+  "Message_TimeAndDateFormat": "Formato de Fecha y Hora",
   "Message_TimeFormat": "Formato de tiempo",
   "Message_TimeFormat_Description": "Ver también: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_too_long": "Mensaje demasiado largo",
@@ -838,26 +874,26 @@
   "Meta": "Meta",
   "Meta_fb_app_id": "App Id de Facebook",
   "Meta_google-site-verification": "Verificación del sitio de Google (Google Site Verification)",
-  "Meta_language": "Lenguaje",
+  "Meta_language": "Idioma",
   "Meta_msvalidate01": "MSValidate.01",
   "Meta_robots": "Robots",
   "minutes": "minutos",
   "Monitor_history_for_changes_on": "Monitoriza el historial de cambios en",
   "More_channels": "Más canales",
   "More_direct_messages": "Más mensajes directos",
-  "More_groups": "Mas grupos privados",
-  "More_unreads": "Mas sin leer",
+  "More_groups": "Más grupos privados",
+  "More_unreads": "Más no leídos",
   "Msgs": "Mensajes",
   "multi": "multi",
   "Mute_someone_in_room": "Silenciar a alguien en la sala",
-  "Mute_user": "Silenciar Usuario",
+  "Mute_user": "Silenciar usuario",
   "Muted": "Silenciado",
-  "My_Account": "Mi cuenta",
+  "My_Account": "Mi Cuenta",
   "n_messages": "%s mensajes",
   "N_new_messages": " %s nuevos mensajes",
   "Name": "Nombre",
-  "Name_cant_be_empty": "El Nombre no puede estar vacio",
-  "Name_of_agent": "Nombre del Agente",
+  "Name_cant_be_empty": "El nombre no puede estar vacío",
+  "Name_of_agent": "Nombre del agente",
   "Name_optional": "Nombre (opcional)",
   "Navigation_History": "Historial de navegación",
   "New_Application": "Nueva aplicación",
@@ -874,7 +910,7 @@
   "No_channel_with_name_%s_was_found": "Ningún canal con el nombre <strong>\"%s\"</strong> ha sido encontrado!",
   "No_channels_yet": "Todavía no eres parte de un canal.",
   "No_direct_messages_yet": "No has comenzado ninguna conversación aún\n",
-  "No_Encryption": "sin cifrado",
+  "No_Encryption": "Sin Cifrado",
   "No_group_with_name_%s_was_found": "Ningún grupo privado con el nombre <strong>\"%s\"</strong> ha sido encontrado!",
   "No_groups_yet": "Aún no tienes grupos privados.",
   "No_livechats": "No tienes ningun chat en tiempo real (Livechat).",
@@ -912,7 +948,7 @@
   "Offline_Mention_Email": "Usted ha sido mencionado por __user__ en #__room__",
   "Offline_message": "Mensaje fuera de línea",
   "Offline_success_message": "Mensaje fuera de línea correcto",
-  "Offline_unavailable": "disponible sin conexión",
+  "Offline_unavailable": "No disponible sin conexión",
   "On": "Activar",
   "Online": "Conectado",
   "Only_you_can_see_this_message": "Solo tú puedes ver este mensaje",
@@ -941,9 +977,9 @@
   "Page_URL": "URL de la página",
   "Password": "Contraseña",
   "Password_Change_Disabled": "Tu administrador de Rocket.Chat ha deshabilitado la opción para cambiar contraseñas.",
-  "Password_changed_successfully": "La contraseña fue cambiada con éxito",
+  "Password_changed_successfully": "Contraseña cambiada con éxito",
   "Past_Chats": "Los chats últimos",
-  "Payload": "Carga útil",
+  "Payload": "Payload",
   "People": "Gente",
   "Permalink": "Permalink",
   "Permissions": "Permisos",
@@ -952,21 +988,21 @@
   "Pinned_Messages": "Mensajes Fijados",
   "PiwikAnalytics_siteId_Description": "La Identificación del sitio a utilizar para la identificación de este sitio. Ejemplo: 17",
   "PiwikAnalytics_url_Description": "La url donde reside el Piwik, asegúrese de incluir la barra probando. Ejemplo: //piwik.rocket.chat/",
-  "Placeholder_for_email_or_username_login_field": "Marcador de posición para el campo de correo electrónico o nombre de usuario de inicio de sesión",
-  "Placeholder_for_password_login_field": "Marcador de posición para el campo de la contraseña de inicio de sesión",
-  "Please_add_a_comment": "Por favor, añadir un comentario",
-  "Please_add_a_comment_to_close_the_room": "Por favor, agrega un comentario para cerrar la Sala",
-  "Please_answer_survey": "Por favor, tómese un momento para responder una encuesta rápida sobre este chat",
-  "Please_enter_value_for_url": "Por favor, introduzca un valor para la url de su avatar.",
-  "Please_enter_your_new_password_below": "Por favor, introduzca a continuación su nueva contraseña:",
+  "Placeholder_for_email_or_username_login_field": "Placeholder para el campo Email o Nombre de Usuario de Inicio de Sesión",
+  "Placeholder_for_password_login_field": "Placeholder para el Campo Contraseña de Inicio de Sesión",
+  "Please_add_a_comment": "Por favor, agregue un comentario",
+  "Please_add_a_comment_to_close_the_room": "Por favor, agregue un comentario para cerrar la sala",
+  "Please_answer_survey": "Por favor tómese un momento para responder una breve encuesta sobre este chat",
+  "Please_enter_value_for_url": "Por favor introduzca un valor para la url de su avatar.",
+  "Please_enter_your_new_password_below": "Por favor introduzca a continuación su nueva contraseña:",
   "Please_enter_your_password": "Por favor ingrese su contraseña",
-  "Please_fill_a_label": "Por favor llene una etiqueta",
-  "Please_fill_a_name": "Por favor introduzca su nombre",
-  "Please_fill_a_username": "Por favor ingrese un nombre de usuario",
-  "Please_fill_name_and_email": "Por favor introduzca su usuario y correo electrónico. ",
+  "Please_fill_a_label": "Por favor introduzca una etiqueta",
+  "Please_fill_a_name": "Por favor introduzca un nombre",
+  "Please_fill_a_username": "Por favor introduzca un nombre de usuario",
+  "Please_fill_name_and_email": "Por favor introduzca nombre y correo electrónico",
   "Please_select_enabled_yes_or_no": "Por favor elija una opción para Habilitar",
   "Please_wait": "Por favor espere",
-  "Please_wait_activation": "Por favor espere, esto puede tomar algún tiempo.",
+  "Please_wait_activation": "Por favor espere, ésto puede tomar algún tiempo.",
   "Please_wait_while_OTR_is_being_established": "Por favor espere mientras se está estableciendo OTR",
   "Please_wait_while_your_account_is_being_deleted": "Por favor, espere mientras se elimina su cuenta ...",
   "Please_wait_while_your_profile_is_being_saved": "Por favor, espere mientras que su perfil se guarda ...",
@@ -1030,8 +1066,9 @@
   "Report_this_message_question_mark": "Reportar este mensaje?",
   "Require_password_change": "Requerir el cambio de contraseña",
   "Resend_verification_email": "Reenviar correo electrónico de verificación",
-  "Reset": "Reiniciar",
-  "Reset_password": "Reiniciar password",
+  "Reset": "Restablecer",
+  "Reset_password": "Restablecer contraseña",
+  "Reset_section_settings": "Restablecer la Configuración de la Sección",
   "Restart": "Reiniciar",
   "Restart_the_server": "Reiniciar el servidor",
   "Role": "Rol",
@@ -1047,13 +1084,13 @@
   "room_changed_topic": "Tema del la sala cambiado a:  <em>__room_topic__</em> por <em>__user_by__</em>",
   "Room_description_changed_successfully": "Descripción de la sala cambiada correctamente",
   "Room_has_been_deleted": "La Sala ha sido eliminada",
-  "Room_Info": "Info de la Sala",
+  "Room_Info": "Información de la Sala",
   "Room_name_changed": "El nombre de la sala ha sido cambiado a: <em>__room_name__</em> por <em>__user_by__</em>",
-  "Room_name_changed_successfully": "El nombre de la Sala fue cambiado con éxito",
+  "Room_name_changed_successfully": "Nombre de sala cambiado con éxito",
   "Room_not_found": "Sala no encontrada",
   "Room_topic_changed_successfully": "tema de Sala cambiado con éxito",
   "Room_type_changed_successfully": "Tipo de Sala cambiado correctamente",
-  "Room_unarchived": "sala no archivada",
+  "Room_unarchived": "Sala no archivada",
   "Room_uploaded_file_list": "Lista de Archivos",
   "Room_uploaded_file_list_empty": "Ningún archivo disponible.",
   "Rooms": "Salas",
@@ -1067,17 +1104,17 @@
   "SAML_Custom_Provider": "Proveedor Personalizado",
   "Save": "Guardar",
   "Save_changes": "Guardar cambios",
-  "Save_Mobile_Bandwidth": "Ahorrar ancho de banda Movil",
-  "Save_to_enable_this_action": "Guardar para permitir esta acción",
+  "Save_Mobile_Bandwidth": "Ahorrar Ancho de Banda Móvil",
+  "Save_to_enable_this_action": "Guarde para habilitar esta acción",
   "Saved": "Guardado",
   "Saving": "Guardando",
   "Scope": "Alcance",
   "Screen_Share": "Compartir Pantalla",
-  "Script_Enabled": "Guión Habilitado",
+  "Script_Enabled": "Script Habilitado",
   "Search": "Buscar",
   "Search_by_username": "Búsqueda por nombre de usuario",
   "Search_Messages": "Buscar Mensajes",
-  "Search_Private_Groups": "Grupos privados",
+  "Search_Private_Groups": "Buscar Grupos privados",
   "seconds": "segundos",
   "Secret_token": "Token secreto",
   "Select_a_department": "Seleccionar un departamento",
@@ -1112,12 +1149,12 @@
   "Settings_updated": "Se han actualización las opciones ",
   "Should_be_a_URL_of_an_image": "Debe de ser un URL de una imagen. ",
   "Should_exists_a_user_with_this_username": "Ya debe existir el usuario.",
-  "Show_all": "Mostrar todo",
+  "Show_all": "Mostrar todos",
   "Show_more": "Mostrar más",
   "show_offline_users": "Mostrar usuarios desconectados",
   "Show_only_online": "Mostrar sólo en linea",
-  "Show_preregistration_form": "Mostrar formulario de inscripción previa",
-  "Show_queue_list_to_all_agents": "Mostrar la cola de todos los agentes",
+  "Show_preregistration_form": "Mostrar formulario de Preinscripción",
+  "Show_queue_list_to_all_agents": "Mostrar Lista de Cola a Todos los Agentes",
   "Showing_archived_results": "<p> Mostrando resultados <b>archivados %s</b> </p>",
   "Showing_online_users": "Mostrando: <b>__total_showing__</b>En linea: __online__ Total:__total__ ",
   "Showing_results": "<p>Mostrando <b>%s</b> resultados</p>",
@@ -1132,11 +1169,11 @@
   "Slash_Tableflip_Description": "Muestra ° (╯ ° □ °) ╯( ┻━┻",
   "Slash_TableUnflip_Description": "Muestra ┬─┬ ノ (゜ - ゜ ノ)",
   "Slash_Topic_Description": "Establecer tema",
-  "Slash_Topic_Params": "mensaje del tema",
-  "Smileys_and_People": "Smileys e personas",
-  "SMS_Enabled": "Activar SMS",
+  "Slash_Topic_Params": "Mensaje del tema",
+  "Smileys_and_People": "Sonrisas y Personas",
+  "SMS_Enabled": "SMS Habilitado",
   "SMTP": "SMTP",
-  "SMTP_Host": "Anfitrión SMTP",
+  "SMTP_Host": "Servidor SMTP",
   "SMTP_Password": "Contraseña SMTP",
   "SMTP_Port": "Puerto SMTP",
   "SMTP_Test_Button": "Prueba de valores de SMTP",
@@ -1145,15 +1182,15 @@
   "SSL": "SSL",
   "Star_Message": "Destacar un Mensaje",
   "Starred_Messages": "Mensajes Destacados",
-  "Start_audio_call": "Iniciar llamada",
-  "Start_Chat": "Iniciar chat",
+  "Start_audio_call": "Iniciar llamada de audio",
+  "Start_Chat": "Iniciar Chat",
   "Start_of_conversation": "Inicio de la conversación",
-  "Start_OTR": "Inicio OTR",
+  "Start_OTR": "Iniciar OTR",
   "Start_video_call": "Iniciar video llamada",
   "Start_with_s_for_user_or_s_for_channel_Eg_s_or_s": "Inicia con <code class=\"inline\">%s</code> para un usuario o <code class=\"inline\">%s</code> para un canal. Ej: <code class=\"inline\">%s</code> o <code class=\"inline\">%s</code>",
   "Started_At": "Empezó a las",
   "Statistics": "Estadisticas",
-  "Statistics_reporting": "Enviar estadísticas de Rocket.Chat",
+  "Statistics_reporting": "Enviar Estadísticas a Rocket.Chat",
   "Statistics_reporting_Description": "Mediante el envío de sus estadísticas, usted ayudará a identificar cómo se implementan muchos casos de Rocket.Chat, así como lo bien que el sistema se está comportando, por lo que puede mejorar aún más. No se preocupe, ya que no envíe información de usuario y toda la información que recibimos se mantiene confidencial.",
   "Stats_Active_Users": "Usuarios Activos",
   "Stats_Avg_Channel_Users": "Promedio de usuarios por canal",
@@ -1171,7 +1208,7 @@
   "Stats_Total_Users": "Total de Usuarios",
   "Stop_Recording": "Detener Grabacion",
   "strike": "strike",
-  "Subject": "Tema",
+  "Subject": "Asunto",
   "Submit": "Enviar",
   "Success": "Exito",
   "Success_message": "Mensaje correcto",
@@ -1179,46 +1216,46 @@
   "Survey_instructions": "Califique cada pregunta de acuerdo a su nivel de satisfacción, 1 para completamente insatisfecho y 5 para completamente satisfecho.",
   "Symbols": "símbolos",
   "Sync_success": "el éxito de sincronización",
-  "Sync_Users": "Los usuarios de sincronización",
+  "Sync_Users": "Sincronizar Usuarios",
   "Tag": "Etiqueta",
   "Take_it": "¡Tómalo!",
   "Test_Connection": "Conexión de prueba",
   "Test_Desktop_Notifications": "Prueba las notificaciones de escritorio",
   "Thank_you_exclamation_mark": "¡Gracias!",
-  "Thank_you_for_your_feedback": "Gracias por su comentario.",
-  "The_application_name_is_required": "Se requiere que el nombre de la aplicación",
+  "Thank_you_for_your_feedback": "Gracias por su comentario",
+  "The_application_name_is_required": "El nombre de la aplicación es requerido",
   "The_channel_name_is_required": "El nombre del canal es requerido",
-  "The_emails_are_being_sent": "Los correos electrónicos están siendo enviados",
-  "The_field_is_required": "El campo %s es obligatorio",
+  "The_emails_are_being_sent": "Los correos electrónicos están siendo enviados.",
+  "The_field_is_required": "El campo %s es requerido.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "El ajuste de tamaño de las imágenes no funcionara porque no detectamos ImageMagick o GraphicsMagick instalados en su servidor.",
   "The_redirectUri_is_required": "El Uri de redireccionamiento es requerido",
-  "The_server_will_restart_in_s_seconds": "El servidor se reiniciara en %s segundos",
+  "The_server_will_restart_in_s_seconds": "El servidor se reiniciará en %s segundos",
   "The_setting_s_is_configured_to_s_and_you_are_accessing_from_s": "La <strong>configuración %s</strong> está configurado <strong>para %s</strong> y está accediendo <strong>desde %s!</strong>",
   "The_user_will_be_removed_from_s": "El usuario sera eliminado de %s",
   "The_user_wont_be_able_to_type_in_s": "El usuario no podra introducir datos en %s",
   "Theme": "Tema",
   "theme-color-content-background-color": "Color de fondo del contenido",
   "theme-color-custom-scrollbar-color": "Barra de desplazamiento de color personalizado",
-  "theme-color-info-font-color": "Color del texto de Información",
-  "theme-color-link-font-color": "Color del texto de los Hipervinculos",
-  "theme-color-primary-background-color": "Color primario del fondo ",
-  "theme-color-primary-font-color": "Color primario del texto",
-  "theme-color-secondary-background-color": "Color secundario del fondo",
-  "theme-color-secondary-font-color": "Color secundario del texto",
-  "theme-color-status-away": "Color del estado Ausente",
+  "theme-color-info-font-color": "Color del Texto de Información",
+  "theme-color-link-font-color": "Color del Texto de los Enlaces",
+  "theme-color-primary-background-color": "Color de Fondo Primario",
+  "theme-color-primary-font-color": "Color de Texto Primario",
+  "theme-color-secondary-background-color": "Color de Fondo Secundario",
+  "theme-color-secondary-font-color": "Color de Texto Secundario",
+  "theme-color-status-away": "Color de Estado Ausente",
   "theme-color-status-busy": "Color de Estado Ocupado",
-  "theme-color-status-offline": "Color del estado Desconectado",
-  "theme-color-status-online": "Color del estado Conectado",
-  "theme-color-tertiary-background-color": "Color de fondo terciario",
-  "theme-color-tertiary-font-color": "Color de fuente terciaria",
-  "theme-color-unread-notification-color": "Sin leer Notificaciones color",
+  "theme-color-status-offline": "Color de Estado Desconectado",
+  "theme-color-status-online": "Color de Estado Conectado",
+  "theme-color-tertiary-background-color": "Color de Fondo Terciario",
+  "theme-color-tertiary-font-color": "Color de fuente Terciario",
+  "theme-color-unread-notification-color": "Color de Notificaciones No Leídas",
   "theme-custom-css": "CSS personalizado",
-  "There_are_no_agents_added_to_this_department_yet": "Todavia no hay ningún agente agregado a este departamento.",
+  "There_are_no_agents_added_to_this_department_yet": "Todavía no hay agentes agregados a este departamento.",
   "There_are_no_integrations": "No hay integraciones",
-  "There_are_no_users_in_this_role": "No hay ningún usuario en este rol",
+  "There_are_no_users_in_this_role": "No hay ningún usuario en este rol.",
   "This_conversation_is_already_closed": "La conversación ya está cerrada.",
   "This_email_has_already_been_used_and_has_not_been_verified__Please_change_your_password": "Este correo electrónico ya se ha utilizado y no se ha verificado. Por favor, cambie su contraseña.",
-  "This_is_a_desktop_notification": "Se trata de una notificación de escritorio",
+  "This_is_a_desktop_notification": "Ésto es una notificación de escritorio",
   "This_is_a_push_test_messsage": "Este es un mensaje de prueba push",
   "This_room_has_been_archived_by__username_": "Esta sala ha sido archivada por __username__",
   "This_room_has_been_unarchived_by__username_": "Esta Sala ha sido UNARCHIVED por __username__",
@@ -1229,7 +1266,7 @@
   "Title_offline": "título desconectado",
   "To_install_RocketChat_Livechat_in_your_website_copy_paste_this_code_above_the_last_body_tag_on_your_site": "Para instalar Rocket.Chat Livechat en su sitio web, copia y pega este código por encima de la última etiqueta <strong></ body></strong> en su sitio.",
   "to_see_more_details_on_how_to_integrate": "ver más detalles sobre cómo integrar.",
-  "To_users": "para los usuarios",
+  "To_users": "Para los Usuarios",
   "Topic": "Tema",
   "Travel_and_Places": "Viajes y Lugares",
   "Trigger_removed": "gatillo eliminado",
@@ -1241,8 +1278,8 @@
   "Type_your_message": "Escribe tu mensaje",
   "Type_your_name": "Escriba su nombre",
   "Type_your_new_password": "Escriba la nueva contraseña",
-  "UI_DisplayRoles": "Funciones de visualización",
-  "UI_Merge_Channels_Groups": "Unir grupos privados con canales",
+  "UI_DisplayRoles": "Mostrar Roles",
+  "UI_Merge_Channels_Groups": "Unir grupos privados con Canales",
   "Unarchive": "Desarchivar",
   "Unmute_someone_in_room": "De-silenciar a alguien en la sala",
   "Unmute_user": "Des-silenciar usuario",
@@ -1252,12 +1289,12 @@
   "Unread_Rooms_Mode": "Modo Salas sin leer",
   "Unstar_Message": "Eliminar Destacado",
   "Upload_file_question": "Subir archivo?",
-  "Uploading_file": "Subiendo Archivo...",
+  "Uploading_file": "Subiendo archivo...",
   "Uptime": "el tiempo de actividad",
   "URL": "URL",
-  "Use_account_preference": "Use cuenta la preferencia",
+  "Use_account_preference": "Usar la preferencia de cuenta",
   "Use_Emojis": "Usar Emojis",
-  "Use_Global_Settings": "Usar configuración global",
+  "Use_Global_Settings": "Usar la Configuración Global",
   "Use_initials_avatar": "Usar las iniciales de tu nombre de usuario",
   "Use_service_avatar": "Usar %s avatar",
   "Use_this_username": "Usar este nombre de usuario",
@@ -1276,16 +1313,16 @@
   "User_has_been_deactivated": "El usuario ha sido desactivado",
   "User_has_been_deleted": "El usuario ha sido eliminado",
   "User_has_been_muted_in_s": "El usuario ha sido silenciado en %s",
-  "User_has_been_removed_from_s": "El usuario ha sido eliminado en %s",
-  "User_Info": "Info de Usuario",
+  "User_has_been_removed_from_s": "El usuario ha sido eliminado de %s",
+  "User_Info": "Información del Usuario",
   "User_is_no_longer_an_admin": "El usuario ya no es un administrador",
-  "User_is_now_an_admin": "El usuario ahora es un administrador",
+  "User_is_now_an_admin": "El usuario es ahora un administrador",
   "User_joined_channel": "Se ha unido al canal.",
   "User_joined_channel_female": "Se ha unido al canal",
-  "User_joined_channel_male": "Se ha unido al canal",
+  "User_joined_channel_male": "Se ha unido al canal.",
   "User_left": "<em>__user_left__</em> ha salido del canal.",
-  "User_left_female": "Ha salido del canal",
-  "User_left_male": "Ha salido del canal",
+  "User_left_female": "Ha salido del canal.",
+  "User_left_male": "Ha salido del canal.",
   "User_logged_out": "El usuario está desconectado",
   "User_management": "Administracion de Usuarios",
   "User_muted_by": "<em>__user_muted__</em> Usuario ha silenciado por <em>__user_by__.</em>",
@@ -1294,17 +1331,17 @@
   "User_or_channel_name": "Nombre de usuario o canal",
   "User_removed": "Usuario eliminado",
   "User_removed_by": "El usuario <em>__user_removed__</em> ha sido eliminado por <em>__user_by__</em>.",
-  "User_Settings": "Opciones de usuario",
+  "User_Settings": "Opciones de Usuario",
   "User_unmuted_by": "<em>__user_unmuted__</em> Usuario desactivar el silencio <em>__user_by__.</em>",
-  "User_unmuted_in_room": "Activado sonido del usuario en la sala",
-  "User_updated_successfully": "Usuario actualizado exitosamente",
-  "Username": "Nombre de usuario",
+  "User_unmuted_in_room": "Usuario silenciado en la sala",
+  "User_updated_successfully": "Usuario actualizado con éxito",
+  "Username": "Nombre de Usuario",
   "Username_and_message_must_not_be_empty": "Nombre de usuario y el mensaje no debe estar vacío.",
   "Username_cant_be_empty": "El nombre de usuario no puede estar vacío",
   "Username_Change_Disabled": "Su administrador de Rocket.Chat ha des habilitado el cambio de nombres de usuario",
   "Username_denied_the_OTR_session": "__username__ negó la sesión OTR",
   "Username_description": "El nombre de usuario se utiliza para permitir que otros te mencionen en los mensajes.",
-  "Username_doesnt_exist": "El usuario `%s` no existe.",
+  "Username_doesnt_exist": "El monbre de usuario `%s` no existe.",
   "Username_ended_the_OTR_session": "__username__ terminó la sesión OTR",
   "Username_invalid": "<strong>%s</strong> no es un nombre de usuario válido,<br/> usa solo letras, números, puntos y guiones",
   "Username_is_already_in_here": "`@%s` ya esta aqui.",
@@ -1317,10 +1354,10 @@
   "UTF8_Names_Validation": "Validación de Nombres UTF8",
   "UTF8_Names_Validation_Description": "No se permiten caracteres especiales ni espacios. Puede user - _ y . pero no al final de un nombre.",
   "Verification_email_sent": "Verificación de correo electrónico enviado",
-  "Verified": "verificado",
+  "Verified": "Verificado",
   "Version": "Versión",
   "Video_Chat_Window": "Video chat",
-  "View_All": "Ver todo",
+  "View_All": "Ver Todos los Miembros",
   "View_Logs": "Ver Registros",
   "View_mode": "Modo de vista",
   "View_mode_info": "Esto cambia la cantidad de mensajes espacio ocupan en la pantalla.",
@@ -1345,19 +1382,19 @@
   "WebRTC_Servers_Description": "Una lista de servidores STUN y TURN separadas por comas. <br/> Nombre de usuario, contraseña y el puerto están permitidos en el formato 'nombre de usuario: contraseña @ paralizante: host: port` o `nombre de usuario: contraseña @ a su vez: host: port`.",
   "Welcome": "Bienvenido <em>%s</em>.",
   "Welcome_to_the": "Bienvenido a la",
-  "Why_do_you_want_to_report_question_mark": "¿Por qué quieres reportar?",
+  "Why_do_you_want_to_report_question_mark": "¿Por qué quiere reportar?",
   "will_be_able_to": "será capaz de",
   "Would_you_like_to_return_the_inquiry": "Quieres retornar la solicitud?",
   "Yes": "Sí",
-  "Yes_clear_all": "Si, borrar todos!",
-  "Yes_delete_it": "¡Sí, eliminalo!",
-  "Yes_hide_it": "Sí, ocultarlo!",
-  "Yes_leave_it": "Sí, lo dejas!",
-  "Yes_mute_user": "Si, silenciar usuario!",
-  "Yes_remove_user": "Si, eliminar usuario!",
+  "Yes_clear_all": "Si, ¡borrar todo!",
+  "Yes_delete_it": "Sí, ¡eliminarlo!",
+  "Yes_hide_it": "Sí, ¡ocultarlo!",
+  "Yes_leave_it": "Sí, ¡déjarlo!",
+  "Yes_mute_user": "Sí, ¡silenciar usuario!",
+  "Yes_remove_user": "Si, ¡eliminar usuario!",
   "You": "Tú",
   "you_are_in_preview_mode_of": "Estás en modo vista previa del canal #<strong>__room_name__</strong>",
-  "You_are_logged_in_as": "Has iniciado sesión como",
+  "You_are_logged_in_as": "Ha iniciado sesión como",
   "You_are_not_authorized_to_view_this_page": "No está autorizado para ver esta página.",
   "You_can_change_a_different_avatar_too": "Puedes anular el avatar usado para publicar desde esta integración.",
   "You_can_search_using_RegExp_eg": "Puede buscar utilizando RegExp. por ejemplo",
@@ -1377,12 +1414,12 @@
   "You_should_inform_one_url_at_least": "Debe definir al menos una URL.",
   "You_should_name_it_to_easily_manage_your_integrations": "Nombralo para poder administrar fácilmente sus integraciones",
   "You_will_not_be_able_to_recover": "No podrás recuperar este mensaje!",
-  "You_will_not_be_able_to_recover_file": "Usted no será capaz de recuperar este archivo!",
+  "You_will_not_be_able_to_recover_file": "No será capaz de recuperar este archivo!",
   "You_wont_receive_email_notifications_because_you_have_not_verified_your_email": "No recibirá notificaciones por correo electrónico, ya que no ha comprobado su correo electrónico.",
-  "Your_email_has_been_queued_for_sending": "Su correo electrónico ha puesto en cola para enviar",
+  "Your_email_has_been_queued_for_sending": "Su correo electrónico se ha puesto en cola para envío",
   "Your_entry_has_been_deleted": "Tu entrada ha sido eliminada",
-  "Your_file_has_been_deleted": "Tu archivo ha sido eliminado.",
+  "Your_file_has_been_deleted": "Su archivo ha sido eliminado.",
   "Your_mail_was_sent_to_s": "Su correo electrónico fue enviado a %s",
-  "Your_password_is_wrong": "Su contraseña es incorrecta!",
+  "Your_password_is_wrong": "¡Su contraseña es incorrecta!",
   "Your_push_was_sent_to_s_devices": "Su push fue enviado a los dispositivos %s"
 }
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/fa.i18n.json b/packages/rocketchat-i18n/i18n/fa.i18n.json
index a99240e40b1a..798467212464 100644
--- a/packages/rocketchat-i18n/i18n/fa.i18n.json
+++ b/packages/rocketchat-i18n/i18n/fa.i18n.json
@@ -1,5 +1,5 @@
 {
-  "#channel": "#channel",
+  "#channel": "#کانال",
   "0_Errors_Only": "0 - فقط خطاها ",
   "1_Errors_and_Information": "1 - خطاها و اطلاعات",
   "2_Erros_Information_and_Debug": "2 - خطاها، اطلاعات و اشکال زدایی",
@@ -36,7 +36,7 @@
   "Accounts_denyUnverifiedEmail": "رد ایمیل تأیید نشده",
   "Accounts_EmailVerification": "تأیید پست الکترونیکی",
   "Accounts_EmailVerification_Description": "برای استفاده از این ویژگی SMTP باید تنظیم شده باشد",
-  "Accounts_Enrollment_Email": "ثبت نام پست الکترونیک",
+  "Accounts_Enrollment_Email": "ثبت نام با ایمیل",
   "Accounts_Enrollment_Email_Default": "<h2 style=\";text-align:right;direction:rtl\"> خوش آمدید به <h1 style=\";text-align:right;direction:rtl\"> [Site_Name] </h1></h2><p style=\";text-align:right;direction:rtl\"> به [Site_URL] بروید و بهترین راه حل چت منبع باز را که امروزه در دسترس است امتحان کنید! </p>",
   "Accounts_Enrollment_Email_Description": "می توانید از این مکان نماها استفاده کنید: <br/><ul><li> [name], [fname], [lname] به ترتیب برای نام کامل، نام کوچک و نام بزرگ کاربر. </li><li>[email] برای ایمیل کاربر. </li><li>[Site_Name] و [Site_URL] به ترتیب برای نام و آدرس برنامه.",
   "Accounts_Enrollment_Email_Subject_Default": "به [Site_Name] خوش آمدید",
@@ -114,6 +114,7 @@
   "Add": "اضافه کردن",
   "Add_agent": "اضافه کردن عامل",
   "Add_custom_oauth": "اضافه کردن oauth سفارشی",
+  "Add_files_from": "بارگذاری فایل از",
   "Add_manager": "اضافه کردن مدیر",
   "Add_user": "اضافه کردن کاربر",
   "Add_User": "اضافه کردن کاربر",
@@ -132,6 +133,7 @@
   "All_channels": "همه کانال ها",
   "All_logs": "همه لاگ ها",
   "All_messages": "همه پیام ها",
+  "All_users_in_the_channel_can_write_new_messages": "همه اعضا می توانند پیام جدید بنویسند",
   "Allow_Invalid_SelfSigned_Certs": "گواهینامه های غیر معتبر مجازند",
   "Allow_Invalid_SelfSigned_Certs_Description": "گواهینامه های غیر معتبر برای پیش نمایش ها و تأیید لینک ها مجازند.",
   "Analytics_features_enabled": "ویژگی های فعال",
@@ -169,6 +171,9 @@
   "Are_you_sure": "آیا مطمئن هستید؟",
   "Are_you_sure_you_want_to_delete_your_account": "آیا شما مطمئن هستید که می خواهید حساب کاربری خود را حذف کنید؟",
   "at": "در",
+  "Audio_message": "پیام صوتی",
+  "Audio_Notifications_Default_Alert": "هشدار پیشفرض اعلان های صوتی",
+  "Audio_Notifications_Value": "پیام پیشفرض اعلان صوتی",
   "Auth_Token": "Auth Token",
   "Author": "نویسنده",
   "Authorization_URL": "آدرس احراز هویت",
@@ -200,6 +205,7 @@
   "Back_to_integrations": "بازگشت به یکپارچگی ها",
   "Back_to_login": "بازگشت به صفحه ورود",
   "Back_to_permissions": "بازگشت به مجوزها",
+  "Block_User": "مسدود کردن کاربر",
   "Body": "محتوا",
   "bold": "برجسته",
   "Branch": "شاخه",
@@ -210,8 +216,8 @@
   "busy_male": "مشغول",
   "Busy_male": "مشغول",
   "by": "توسط",
-  "Cancel": "لغو کردن",
-  "Cancel_message_input": "لغو کردن",
+  "Cancel": "لغو",
+  "Cancel_message_input": "لغو",
   "Cannot_invite_users_to_direct_rooms": "امکان دعوت کاربران به تماس های مستقیم وجود ندارد",
   "CDN_PREFIX": "پیشوند CDN",
   "Certificates_and_Keys": "گواهینامه ها و کلیدها",
@@ -221,8 +227,11 @@
   "Channel_already_Unarchived": "کانال `#%s` در حال حاضر آرشیو نشده است",
   "Channel_Archived": "کانال `#%s` با موفقیت آرشیو شد",
   "Channel_doesnt_exist": "کانال `# %s` وجود ندارد.",
+  "Channel_name": "نام کانال",
+  "Channel_Name_Placeholder": "لطفا نام کانال را وارد کنید...",
   "Channel_Unarchived": "کانال `#%s` با موفقیت از آرشیو خارج شد",
   "Channels": "کانال ها",
+  "Channels_are_where_your_team_communicate": "کانال جایی است که افراد با یکدیگر تعامل می کنند",
   "Channels_list": "لیست کانال های عمومی",
   "Chat_button": "دکمه چت",
   "Chat_closed": "چت بسته است",
@@ -237,6 +246,7 @@
   "Choose_the_username_that_this_integration_will_post_as": "نام کاربری را که این یکپارچه سازی به عنوان آن ارسال خواهد شد انتخاب کنید.",
   "Clear_all_unreads_question": "پاک کردن همه ناخوانده ها؟",
   "Click_here": "اینجا کلیک کنید",
+  "Click_to_join": "برای پیوستن کلیک کنید!",
   "Client_ID": "شناسه مشتری",
   "Client_Secret": "رمز مشتری",
   "Clients_will_refresh_in_a_few_seconds": "مشتریان طی چند ثانیه رفرش خواهند شد",
@@ -253,13 +263,13 @@
   "Convert_Ascii_Emojis": "تبدیل ASCII به Emoji",
   "Copied": "کپی شد",
   "Copy": "کپی",
-  "Copy_to_clipboard": "کپی به کلیپ بورد",
-  "COPY_TO_CLIPBOARD": "کپی به کلیپ بورد",
+  "Copy_to_clipboard": "کپی در کلیپبورد",
+  "COPY_TO_CLIPBOARD": "کپی در کلیپبورد",
   "Count": "شمردن",
   "Cozy": "Cozy",
-  "Create": "ايجاد كردن",
+  "Create": "ايجاد",
   "Create_A_New_Channel": "ایجاد یک کانال جدید",
-  "Create_new": "ایجاد جدید",
+  "Create_new": "ایجاد (جدید)",
   "Created_at": "ایجاد شده در",
   "Created_at_s_by_s": "ایجاد <strong>در %s</strong> <strong>توسط %s</strong>",
   "Current_Chats": "چت های کنونی",
@@ -289,12 +299,15 @@
   "Desktop": "دسکتاپ",
   "Desktop_Notification_Test": "تست هشدار دسکتاپ",
   "Desktop_Notifications": "هشدارهای دسکتاپ",
+  "Desktop_Notifications_Default_Alert": "هشدار پیشفرض اعلان های دسکتاپ",
   "Desktop_Notifications_Disabled": "هشدارهای دسکتاپ غیر فعال هستند. در صورت تمایل به فعال سازی تنظیمات مرورگر خود را تغییر دهید.",
   "Desktop_Notifications_Duration": "مدت زمان هشدارهای دسکتاپ",
   "Desktop_Notifications_Duration_Description": "ثانیه برای نمایش هشدارهای دسکتاپ. ممکن است روی تنظیمات OS X تأثیر بگذارد. برای اعمال تنظیمات پیشفرض مرورگر، صفر (۰) وارد کنید.",
   "Desktop_Notifications_Enabled": "هشدارهای دسکتاپ فعال شده است",
   "Direct_message_someone": "پیام مستقیم به دیگران",
-  "Direct_Messages": "پیام مستقیم",
+  "Direct_Messages": "پیام های مستقیم",
+  "Disable_Notifications": "غیر فعال کردن اعلانات",
+  "Disable_two-factor_authentication": "غیر فعال کردن تایید هویت دومرحله ای",
   "Display_offline_form": "نمایش فرم آفلاین",
   "Displays_action_text": "نمایش متن عمل",
   "Do_you_want_to_change_to_s_question": "آیا می‌خواهید به <strong>%s</strong> تغییر دهید؟",
@@ -307,13 +320,14 @@
   "Duplicate_archived_private_group_name": "یک گروه خصوصی آرشیو شده با نام '%s' وجود دارد",
   "Duplicate_channel_name": "یک کانال با نام '%s' وجود دارد",
   "Duplicate_private_group_name": "گروهی خصوصی با نام '%s' وجود دارد",
+  "Duration": "مدت زمان",
   "Edit": "ویرایش",
   "Edit_Custom_Field": "ویرایش فیلد سفارشی",
   "Edit_Department": "ویرایش بخش",
   "edited": "ویرایش شده",
   "Editing_room": "ویرایش اتاق",
   "Editing_user": "ویرایش کاربر",
-  "Email": "پست الکترونیک",
+  "Email": "ایمیل",
   "Email_address_to_send_offline_messages": "آدرس ایمیل جهت ارسال پیام های آفلاین",
   "Email_already_exists": "ایمیل از قبل وجود دارد",
   "Email_body": "بدنه ایمیل",
@@ -331,13 +345,17 @@
   "Empty_title": "عنوان خالی",
   "Enable": "فعال",
   "Enable_Desktop_Notifications": "هشدارهای دسکتاپ را فعال کن",
+  "Enable_two-factor_authentication": "فعال کردن تایید هویت دومرحله ای",
   "Enabled": "فعال شد",
   "Encrypted_message": "پیام رمز شده",
-  "End_OTR": "پایان OTR",
+  "End_OTR": "پایان مکالمه محرمانه",
   "Enter_a_regex": "یک regex وارد کنید",
   "Enter_a_room_name": "نام یک اتاق را وارد کنید",
   "Enter_a_username": "یک نام کاربری وارد کنید",
+  "Enter_Alternative": "حالت جایگزین (ارسال با Enter + Ctrl/Alt/Shift/CMD)",
+  "Enter_Behaviour": "عملکرد کلید Enter",
   "Enter_name_here": "نام را اینجا وارد کنید",
+  "Enter_Normal": "حالت عادی (ارسال با Enter)",
   "Enter_to": "ورود به ",
   "Error": "خطا",
   "error-action-not-allowed": "__action__ مجاز نیست",
@@ -383,7 +401,7 @@
   "error-invalid-room-type": "<strong>__type__</strong> نوع معتبری برای اتاق نیست",
   "error-invalid-settings": "تنظیمات نامعتبر است",
   "error-invalid-subscription": "اشتراک نامعتبر",
-  "error-invalid-token": "کد نامعتبر",
+  "error-invalid-token": "توکن نامعتبر",
   "error-invalid-triggerWords": "triggerWordهای غیر معتبر",
   "error-invalid-urls": "آدرس های نا معتبر",
   "error-invalid-user": "کاربر نامعتبر",
@@ -409,8 +427,9 @@
   "error-you-are-last-owner": "شما آخرین مالک هستید. لطفا مالک جدیدی قبل از خروج از اتاق مشخص کنید.",
   "Error_changing_password": "خطا هنگام تغییر رمز عبور",
   "Esc_to": "Esc برای",
+  "Everyone_can_access_this_channel": "همه به این کانال دسترسی دارند",
   "Example_s": "به عنوان مثال: <code class=\"inline\">%s</code>",
-  "False": "غلط",
+  "False": "خیر",
   "Favorite_Rooms": "فعال کردن اتاق های مورد علاقه",
   "Favorites": "موارد مورد علاقه",
   "Features_Enabled": "ویژگی ها فعال شد",
@@ -427,56 +446,59 @@
   "FileUpload_MediaTypeWhiteListDescription": "لیست کاما جدا از فرمت های فایل. برای پذیرفتن همه فرمت ها آن را خالی بگذارید.",
   "FileUpload_ProtectFiles": "از فایل های بارگذاری شده حفاظت شود",
   "FileUpload_ProtectFilesDescription": "تنها کاربران تعیین هویت شده دسترسی خواهند داشت",
-  "FileUpload_S3_Acl": "لیگ قهرمانان آسیا آمازون S3",
-  "FileUpload_S3_AWSAccessKeyId": "آمازون S3 AWSAccessKeyId",
-  "FileUpload_S3_AWSSecretAccessKey": "آمازون S3 AWSSecretAccessKey",
-  "FileUpload_S3_Bucket": "آمازون S3 نام سطل",
-  "FileUpload_S3_BucketURL": "URL سطل",
-  "FileUpload_S3_CDN": "دامنه CDN برای دریافت",
+  "FileUpload_S3_Acl": "Acl",
+  "FileUpload_S3_AWSAccessKeyId": "کلید دستیابی",
+  "FileUpload_S3_AWSSecretAccessKey": "کلید رمز",
+  "FileUpload_S3_Bucket": "نام Bucket",
+  "FileUpload_S3_BucketURL": "آدرس Bucket",
+  "FileUpload_S3_CDN": "دامنه CDN برای دانلودها",
   "FileUpload_S3_Region": "منطقه",
   "FileUpload_Storage_Type": "نوع ذخیره سازی",
-  "Flags": "پرچم",
-  "Follow_social_profiles": "دنبال پروفایل های اجتماعی ما، چنگال ما در github و به اشتراک گذاری افکار خود را در مورد برنامه rocket.chat در هیئت مدیره trello ما است.",
-  "Food_and_Drink": "غذا نوشیدنی",
-  "Footer": "بالا و پایین صفحه",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "برای امنیت شما، شما باید رمز عبور خود را دوباره وارد کنید به ادامه",
-  "Force_SSL": "استفاده از SSL",
-  "Force_SSL_Description": "* توجه * _Force SSL_ هرگز نباید با پروکسی معکوس استفاده می شود. اگر شما از یک پروکسی معکوس، شما باید تغییر مسیر وجود دارد انجام. این گزینه برای استقرار مانند Heroku، که پیکربندی تغییر مسیر در پروکسی معکوس اجازه نمی دهد وجود دارد.",
-  "Forgot_password": "رمز عبور خود را فراموش کرده",
+  "Flags": "پرچم ها",
+  "Follow_social_profiles": "ما را در شبکه های اجتماعی دنبال و در گیت هاب فورک کنید و نظرات خود را در مورد Rocket.chat  با ما در میان بگذارید.",
+  "Food_and_Drink": "غذا و نوشیدنی",
+  "Footer": "پاورقی",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "برای حفظ امنیت، باید گذرواژه فعلیتان را برای ادامه وارد کنید",
+  "Force_SSL": "اجباری کردن SSL",
+  "Force_SSL_Description": "*توجه!* _Force SSL_ هرگز نباید با پراکسی معکوس استفاده شود. اگر پراکسی معکسو دارید باید تغییر مسیر را آنجا پیکربندی کنید. این گزینه صرفا برای استفاده مثلا Heroku وجود دارد که اجازه تغییر مسیر را در پراکسی معکوس نمی دهد.",
+  "Forgot_password": "فراموشی رمز عبور",
   "Frequently_Used": "اغلب استفاده می شود",
-  "From": "از جانب",
+  "From": "از",
   "From_Email": "از ایمیل",
-  "From_email_warning": "<b>هشدار:</b> این زمینه <b>از</b> موضوع را به تنظیمات سرور پست الکترونیکی خود را است.",
+  "From_email_warning": "<b0>هشدار</b0>: فیلد <b1>از</b1> به تنظیمات سرور میل شما بستگی دارد.",
   "General": "عمومی",
-  "github_no_public_email": "شما به هیچ عنوان ایمیل ایمیل عمومی در حساب github خود را نمی",
-  "Give_a_unique_name_for_the_custom_oauth": "یک نام منحصر به فرد برای OAuth حفظ سفارشی",
-  "Give_the_application_a_name_This_will_be_seen_by_your_users": "به نرم افزار یک نام. این خواهد بود که توسط کاربران شما دیده می شود.",
-  "Global": "جهانی",
-  "GoogleTagManager_id": "گوگل ID مدیر برچسب",
-  "Hash": "مخلوط",
+  "github_no_public_email": "شما هیچ ایمیلی به عنوان ایمیل عمومی در اکانت گیت هابتان ندارید",
+  "Give_a_unique_name_for_the_custom_oauth": "یک نام یکتا به oauth سفارشی بدهید",
+  "Give_the_application_a_name_This_will_be_seen_by_your_users": "یک نام به برنامه بدهید. کاربران آن را مشاهده خواهند کرد.",
+  "Global": "سراسری",
+  "GoogleTagManager_id": "شناسه Tag Manager گوگل",
+  "Hash": "هش",
   "Header": "سربرگ",
   "Hidden": "پنهان",
-  "Hide_Group_Warning": "آیا مطمئن هستید که می خواهید برای مخفی گروه \" %s\" را؟",
-  "Hide_Private_Warning": "آیا شما مطمئن هستید که میخواهید برای مخفی کردن بحث با \" %s\" را؟",
-  "Hide_room": "مخفی کردن اتاق",
-  "Hide_Room_Warning": "آیا مطمئن هستید که می خواهید برای مخفی در اتاق \" %s\" را؟",
-  "Hide_usernames": "مخفی کردن نامهای کاربری",
-  "Highlights": "های لایت",
-  "Highlights_How_To": "مطلع می شود وقتی کسی اشاره یک کلمه یا عبارت، آن را در اینجا اضافه کنید. شما می توانید کلمات یا عبارات با کاما از هم جدا کنید. واژه های برجسته حروف حساس نیست.",
-  "Highlights_List": "کلمات برجسته",
+  "Hide_Avatars": "پنهان کردن آواتارها",
+  "Hide_Group_Warning": "آیا بابت پنهان کردن گروه  \"%s\" مطمئن هستید؟",
+  "Hide_Private_Warning": "آیا بابت پنهان کردن مکالمه با \"%s\" مطمئن هستید؟",
+  "Hide_roles": "پنهان کردن نقش ها",
+  "Hide_room": "پنهان کردن اتاق",
+  "Hide_Room_Warning": "آیا بابت پنهان کردن اتاق \"%s\" مطمئنید؟",
+  "Hide_Unread_Room_Status": "عدم نمایش وضعیت خوانده نشده برای این اتاق",
+  "Hide_usernames": "مخفی کردن نام های کاربری",
+  "Highlights": "نشان شده ها",
+  "Highlights_How_To": "برای مطلع شدن از زمانی که کسی به کلمه یا عبارتی اشاره می کند آن را اینجا وارد کنید. می توانید کلمات یا عبارات را با کاما جدا کنید. کلمات نشان شده به بزرگی و کوچکی حروف حساس نیستند.",
+  "Highlights_List": "کلمات نشان شده",
   "History": "تاریخ",
   "Host": "میزبان",
   "hours": "ساعت ها",
-  "How_friendly_was_the_chat_agent": "عامل چت چگونه دوستانه بود؟",
-  "How_knowledgeable_was_the_chat_agent": "عامل چت چگونه آگاه بود؟",
-  "How_responsive_was_the_chat_agent": "عامل چت چگونه پاسخگو بود؟",
-  "How_satisfied_were_you_with_this_chat": "چگونه رضایت شما را با این چت بود؟",
-  "If_you_are_sure_type_in_your_password": "اگر شما مطمئن نوع رمز عبور خود را عبارتند از:",
-  "If_you_are_sure_type_in_your_username": "اگر شما مطمئن نوع کاربری خود را عبارتند از:",
-  "Importer_Archived": "آرشیو",
+  "How_friendly_was_the_chat_agent": "عامل چت چقدر دوستانه بود؟",
+  "How_knowledgeable_was_the_chat_agent": "عامل چت چقدر آگاه بود؟",
+  "How_responsive_was_the_chat_agent": "عامل چت چقدر پاسخگو بود؟",
+  "How_satisfied_were_you_with_this_chat": "چه میزان از این چت راضی بودید؟",
+  "If_you_are_sure_type_in_your_password": "اگر مطمئن هستید رمز خود را وارد کنید:",
+  "If_you_are_sure_type_in_your_username": "اگر مطمئنید نام کاربری خود را وارد کنید:",
+  "Importer_Archived": "بایگانی شد",
   "Importer_done": "وارد کردن تمام شد!",
   "Importer_finishing": "پایان دادن به وارد کردن.",
-  "Importer_From_Description": "واردات __from داده __ را به Rocket.Chat.",
+  "Importer_From_Description": "داده های __from__ را وارد Rocket.chat می کند.",
   "Importer_import_cancelled": "وارد کردن لغو شد.",
   "Importer_import_failed": "هنگام وارد کردن خطایی رخ داد.",
   "Importer_importing_channels": "وارد کردن کانال ها.",
@@ -505,6 +527,7 @@
   "Integration_Outgoing_WebHook": "ادغام WebHook خروجی",
   "Integration_updated": "ادغام به روز شده است.",
   "Integrations": "ادغام ها",
+  "Integrations_Outgoing_Type_RoomLeft": "کاربر اتاق را ترک کرد",
   "InternalHubot": "Hubot داخلی",
   "InternalHubot_ScriptsToLoad": "اسکریپت ها برای بارگذاری",
   "InternalHubot_ScriptsToLoad_Description": "لطفا یک لیست کاما جدا از اسکریپت ها برای بارگذاری از پوشه سفارشی خود وارد کنید",
@@ -521,63 +544,64 @@
   "invisible": "پنهان",
   "Invisible": "پنهان",
   "Invitation_HTML": "HTML دعوتنامه",
-  "Invitation_HTML_Default": "<h2 style=\";text-align:right;direction:rtl\"> شما باید به دعوت شده است <h1 style=\";text-align:right;direction:rtl\"> [Site_Name] </h1></h2><p style=\";text-align:right;direction:rtl\"> برو به [Site_URL] و سعی کنید بهترین راه حل چت منبع باز امروز در دسترس است! </p>",
-  "Invitation_HTML_Description": "شما ممکن است متغیرهایی زیر استفاده کنید: <br /><ul style=\";text-align:right;direction:rtl\"><li style=\";text-align:right;direction:rtl\"> [email] برای ایمیل گیرنده. </li><li style=\";text-align:right;direction:rtl\"> [Site_Name] و [Site_URL] برای نام نرم افزار و URL است. </li></ul>",
+  "Invitation_HTML_Default": "<h2>شما به <h1>[Site_Name]</h1> دعوت شده اید.</h2><p>به [Site_URL] رفته و بهترین برنامه چت متن باز را امتحان کنید!</p>",
+  "Invitation_HTML_Description": "می توانید از مکان نماهای زیر استفاده کنید: <br/><ul><li>[email] برای گیرنده ایمیل.</li><li>[Site_Name] و [Site_URL] به ترتیب برای نام و آدرس برنامه.</li></ul>",
   "Invitation_Subject": "عنوان دعوت نامه",
-  "Invitation_Subject_Default": "شما باید به دعوت شده است [Site_Name]",
+  "Invitation_Subject_Default": "شما به [Site_Name] دعوت شده اید",
   "Invite_user_to_join_channel": "دعوت از یک کاربر برای پیوستن به این کانال",
   "Invite_Users": "دعوت از کاربران",
-  "is_also_typing": "همچنین تایپ",
-  "is_also_typing_female": "همچنین تایپ",
-  "is_also_typing_male": "همچنین تایپ",
-  "is_typing": "در حال تایپ کردن",
-  "is_typing_female": "در حال تایپ کردن",
-  "is_typing_male": "در حال تایپ کردن",
+  "is_also_typing": "هم می نویسد",
+  "is_also_typing_female": "هم می نویسد",
+  "is_also_typing_male": "هم می نویسد",
+  "is_typing": "می نویسد",
+  "is_typing_female": "می نویسد",
+  "is_typing_male": "می نویسد",
   "It_works": "کار می کند",
   "italics": "کج (ایتالیک)",
-  "Jitsi_Chrome_Extension": "کد برنامه افزودنی Chrome",
-  "Jitsi_Enable_Channels": "فعال کردن در کانال",
+  "Jitsi_Chrome_Extension": "کد افزونه کروم",
+  "Jitsi_Enable_Channels": "فعال کردن در Channelها",
   "join": "پیوستن",
-  "Join_audio_call": "اضافه کردن تماس های صوتی",
-  "Join_default_channels": "اضافه کردن کانال های پیش فرض",
-  "Join_the_Community": "تاریخ جامعه",
-  "Join_the_given_channel": "اضافه کردن کانال داده",
+  "Join_audio_call": "پیوستن به تماس صوتی",
+  "Join_default_channels": "پیوستن به کانال های پیشفرض",
+  "Join_the_Community": "پیوستن به جامعه",
+  "Join_the_given_channel": "پیوستن به این کانال",
   "Join_video_call": "پیوستن به تماس ویدیویی",
   "Joined": "پیوسته",
   "Jump": "پرش",
-  "Jump_to_first_unread": "پرش به خوانده نشده اولین",
+  "Jump_to_first_unread": "پرش به اولین خوانده نشده",
   "Jump_to_message": "پرش به پیام",
   "Jump_to_recent_messages": "پرش به پیام های اخیر",
-  "Katex_Dollar_Syntax": "اجازه دلار نحو",
-  "Katex_Dollar_Syntax_Description": "اجازه می دهد با استفاده از $ $ $ $ بلوک KAtex دارای و $ $ گرامرهای KAtex دارای درون خطی",
-  "Katex_Enabled": "KAtex دارای فعال",
-  "Katex_Enabled_Description": "اجازه می دهد با استفاده از <a target=\"_blank\" href=\"http://khan.github.io/KaTeX/\">KAtex دارای</a> برای نوشتن فرمولها در پیام",
-  "Katex_Parenthesis_Syntax": "اجازه می دهد پرانتز نحو",
-  "Katex_Parenthesis_Syntax_Description": "اجازه می دهد با استفاده از \\ [بلوک KAtex دارای \\] و \\ (خطی KAtex دارای \\) سینتکس",
+  "Just_invited_people_can_access_this_channel": "تنها افراد دعوت شده به این کانال دسترسی دارند.",
+  "Katex_Dollar_Syntax": "اجازه Dollar Syntax",
+  "Katex_Dollar_Syntax_Description": "اجازه استفاده از $$katex block$$ و $inline katex$",
+  "Katex_Enabled": "Katex فعال است",
+  "Katex_Enabled_Description": "اجازه استفاده از <a target=\"_blank\" href=\"http://khan.github.io/KaTeX/\">katex</a> برای ریاضیات در پیام ها",
+  "Katex_Parenthesis_Syntax": "اجازه استفاده از پرانتز",
+  "Katex_Parenthesis_Syntax_Description": "اجازه استفاده از \\[katex block\\] و \\(inline katex\\)",
   "Knowledge_Base": "دانش محور",
   "Label": "برچسب",
   "Language": "زبان",
   "Language_Version": "نسخه انگلیسی",
   "Last_login": "آخرین ورود به سیستم",
-  "Last_Message_At": "تاریخ و زمان آخرین در",
-  "Last_seen": "آخرین فعالیت",
+  "Last_Message_At": "آخرین پیام در",
+  "Last_seen": "آخرین مشاهده",
   "Layout": "طرح",
-  "Layout_Home_Body": "صفحه اصلی بدن",
-  "Layout_Home_Title": "صفحه اصلی عنوان",
-  "Layout_Login_Terms": "ورود به شرایط",
+  "Layout_Home_Body": "بدنه صفحه اول",
+  "Layout_Home_Title": "عنوان صفحه اول",
+  "Layout_Login_Terms": "ضوابط ورود",
   "Layout_Privacy_Policy": "سیاست حفظ حریم خصوصی",
-  "Layout_Sidenav_Footer": "سمت ناوبری پاورقی",
-  "Layout_Sidenav_Footer_description": "اندازه بالا و پایین صفحه 260 X 70px",
+  "Layout_Sidenav_Footer": "Side Navigation Footer",
+  "Layout_Sidenav_Footer_description": "اندازه پاورقی ۲۶۰ در ۷۰ پیکسل است",
   "Layout_Terms_of_Service": "شرایط استفاده از خدمات",
   "LDAP": "LDAP",
-  "LDAP_CA_Cert": "CA بزنید",
-  "LDAP_Default_Domain": "به طور پیش فرض دامنه",
+  "LDAP_CA_Cert": "گواهینامه CA",
+  "LDAP_Default_Domain": "دامنه پیشفرض",
   "LDAP_Description": "یک مرکز برای به اشتراک گذاری یک رمز عبور بین سایت و خدمات مختلف - LDAP یک پایگاه داده سلسله مراتبی است که بسیاری از شرکت ها برای ارائه یکبار ورود به سیستم است. https://rocket.chat/docs/administrator-guides/authentication/ldap/: برای کسب اطلاعات پیکربندی پیشرفته و نمونه، لطفا ویکی ما مشورت کنید.",
   "LDAP_BaseDN_Description": "نام کامل برجسته (DN) از یک زیر درخت LDAP شما می خواهید به جستجو برای کاربران و گروه. شما می توانید به عنوان بسیاری از شما می خواهم اضافه کنید. با این حال، هر گروه باید در پایه دامنه به عنوان کاربران که متعلق به آن تعریف شود. اگر شما گروه های کاربری محدود مشخص، تنها کاربران که متعلق به آن گروه در دامنه باشد. ما توصیه می کنیم که شما در سطح بالا از LDAP درخت دایرکتوری خود را مشخص کنید به عنوان پایه دامنه خود و استفاده از فیلتر جستجو برای کنترل دسترسی.",
   "LDAP_User_Search_Field_Description": "ویژگی LDAP LDAP که شناسایی کاربران که تلاش احراز هویت. در این زمینه باید `شود sAMAccountName` برای نصب فعال ترین دایرکتوری، اما ممکن است` uid` برای راه حل های دیگر LDAP، مانند OpenLDAP. شما می توانید `mail` برای شناسایی کاربران از طریق ایمیل و یا هر ویژگی شما می خواهید استفاده کنید. <br> شما می توانید چندین مقدار را جدا شده توسط کاما به کاربران اجازه ورود با استفاده از شناسههای متعدد مانند نام کاربری یا ایمیل استفاده کنید.",
   "LDAP_User_Search_Filter_Description": "اگر مشخص، تنها کاربران که مطابقت دارند این فیلتر اجازه خواهد داشت به سیستم وارد شوید. اگر هیچ فیلتر مشخص است، تمام کاربران در محدوده پایه دامنه مشخص قادر خواهد بود به سیستم وارد شوید. <br/> به عنوان مثال برای اکتیو دایرکتوری `memberOf = CN = ROCKET_CHAT، OU = عمومی Groups`. <br/> به عنوان مثال برای اوپنالدپ (جستجو بازی های درب) `OU: DN: = ROCKET_CHAT`.",
   "LDAP_Authentication_UserDN_Description": "کاربر LDAP که انجام جستجوها کاربران برای تأیید هویت کاربران دیگر زمانی که آنها وارد شوید. <br/> این یک حساب خدمات به طور خاص برای یکپارچگی شخص ثالث ایجاد شده است به طور معمول. استفاده از یک نام کاملا مناسب، مانند `CN = مدیر، CN = کاربران، DC = به عنوان مثال، DC = com`.",
-  "LDAP_Enable": "قادر ساختن",
+  "LDAP_Enable": "فعال کردن",
   "LDAP_Enable_Description": "تلاش برای استفاده از LDAP برای احراز هویت.",
   "LDAP_Encryption": "رمزگذاری",
   "LDAP_Encryption_Description": "روش رمزگذاری مورد استفاده برای تامین امنیت ارتباطات به سرور LDAP. مثالها عبارتند از `plain` (بدون رمزنگاری)،` SSL / LDAPS` (رمزگذاری از شروع)، و `StartTLS` (ارتقا به ارتباط رمزگذاری شده یک بار متصل).",
@@ -596,14 +620,14 @@
   "LDAP_Unique_Identifier_Field_Description": "که درست استفاده خواهد شد به لینک کاربران LDAP و کاربر Rocket.Chat است. شما می توانید چندین مقدار را جدا شده توسط کاما اطلاع به تلاش برای بدست آوردن مقدار از رکورد LDAP. <br/> مقدار پیش فرض است `objectGUID، آی بی ام-entryUUID، GUID، dominoUNID، nsuniqueId، uidNumber`",
   "LDAP_Username_Field": "نام کاربری درست",
   "LDAP_Username_Field_Description": "که درست خواهد شد به عنوان * نام کاربری * برای کاربران جدید استفاده می شود. خالی بگذارید به استفاده از نام کاربری آگاهانه در صفحه ورود. <br/> شما می توانید تگ های قالب بیش از حد استفاده کنید، مانند `#{givenName}.#{sn}`. <br/> مقدار پیش فرض است `sAMAccountName`.",
-  "Leave_Group_Warning": "آیا مطمئن هستید که می خواهید گروه \" %s\" را ترک کنند؟",
-  "Leave_Private_Warning": "مطمئنید که می خواهید بحث با \" %s\" را ترک کنند؟",
-  "Leave_room": "خروج از اتاق",
-  "Leave_Room_Warning": "آیا مطمئن هستید که می خواهید به ترک اتاق \" %s\" را؟",
+  "Leave_Group_Warning": "آیا واقعا می خواهید گروه \"%s\" را ترک کنید؟",
+  "Leave_Private_Warning": "آیا واقعا می خواهید مکالمه با \"%s\" را ترک کنید؟",
+  "Leave_room": "ترک اتاق",
+  "Leave_Room_Warning": "آیا واقعا می خواهید اتاق \"%s\" را ترک کنید؟",
   "line": "خط",
-  "List_of_Channels": "لیست کانال",
+  "List_of_Channels": "لیست Channelها",
   "List_of_Direct_Messages": "فهرست پیام های مستقیم",
-  "Livechat_agents": "عوامل livechat در",
+  "Livechat_agents": "عامل های Livechat",
   "Livechat_Dashboard": "داشبورد livechat در",
   "Livechat_enabled": "livechat در فعال",
   "Livechat_forward_open_chats": "چت رو به جلو باز",
@@ -617,40 +641,41 @@
   "Livechat_title_color": "عنوان livechat در رنگ پس زمینه",
   "Livechat_Users": "کاربران livechat در",
   "Load_more": "بارگیری بیشتر",
-  "Loading...": "در حال بارگذاری ...",
-  "Loading_more_from_history": "بارگیری بیش از تاریخ",
-  "Loading_suggestion": "بارگذاری پیشنهادات ...",
+  "Loading...": "در حال بارگیری...",
+  "Loading_more_from_history": "بارگیری بیشتر از تاریخچه",
+  "Loading_suggestion": "بارگیری پیشنهادها",
   "Localization": "بومی سازی",
   "Log_File": "نمایش فایل ها و خط",
   "Log_Level": "سطح ورود",
   "Log_Package": "نمایش بسته بندی",
   "Log_View_Limit": "ورود مشخصات محدود",
-  "Logged_out_of_other_clients_successfully": "از سیستم خارج از مشتریان دیگر موفقیت",
+  "Logged_out_of_other_clients_successfully": "از نشست های دیگر با موفقیت خارج شد",
   "Login": "ورود",
   "Login_with": "ورود با %s",
-  "Logout": "خروج از سیستم",
-  "Logout_Others": "خروج از دیگر وارد شده در مکان های",
-  "Mail_Message_Invalid_emails": "شما ایمیل یک یا نامعتبر ارائه کرده اند: %s را",
-  "Mail_Message_Missing_to": "شما باید یک یا چند کاربر را انتخاب کنید و یا ارائه یک یا چند آدرس ایمیل، با کاما جدا شده.",
-  "Mail_Message_No_messages_selected_select_all": "هیچ پیامی برای شما انتخاب نشده. دوست دارید <a href='#' class='select-all'>را انتخاب کنید همه</a> پیام قابل مشاهده است؟",
+  "Logout": "خروج",
+  "Logout_Others": "خروج از نشست های دیگر",
+  "Mail_Message_Invalid_emails": "یک یا چند ایمیل نامعتبر ارائه کرده اید: %s",
+  "Mail_Message_Missing_to": "باید یک یا چند کاربر را انتخاب و یا یک یا چند ایمیل وارد کنید (جدا شده با کاما).",
+  "Mail_Message_No_messages_selected_select_all": "هیچ پیامی را انتخاب نکرده اید. می خواهید همه پیام های قابل مشاهده را انتخاب کنید)<a href=\"#\" class=\"select-all\">select all</a>(؟",
   "Mail_Messages": "پیام های پست الکترونیکی",
-  "Mail_Messages_Instructions": "را انتخاب کنید که پیام های شما می خواهید برای ارسال از طریق ایمیل را با کلیک کردن پیام",
-  "Mail_Messages_Subject": "در اینجا یک بخش انتخاب شده از %s پیام است",
-  "Mailer": "نامه رسان",
+  "Mail_Messages_Instructions": "روی پیامی که می خواهید با ایمیل بفرستید کلیک کنید",
+  "Mail_Messages_Subject": "اینجا قسمتی از پیام های %s است",
+  "Mailer": "ایمیل کننده",
   "Mailer_body_tags": "شما <b>باید</b> [unsubscribe] برای لینک لغو عضویت استفاده کنید. <br /> شما ممکن است [name]، [fname] برای نام کامل کاربر، نام اول یا نام خانوادگی، به ترتیب استفاده کنید، [lname]. <br /> ممکن است [email] برای ایمیل کاربر استفاده کنید.",
-  "Mailing": "پستی",
-  "Make_Admin": "ساختن مدیر",
-  "Manager_added": "مدیر اضافه",
-  "Manager_removed": "مدیر حذف",
-  "Managing_assets": "مدیریت دارایی های",
-  "Managing_integrations": "مدیریت یکپارچگی",
-  "Mark_as_read": "به عنوان خوانده شده علامت بزن",
+  "Mailing": "ایمیل کردن",
+  "Make_Admin": "مدیر کردن",
+  "Manager_added": "مدیر اضافه شد",
+  "Manager_removed": "مدیر حذف شد",
+  "Managing_assets": "مدیریت دارایی ها",
+  "Managing_integrations": "مدیریت یکپارچگی ها",
+  "Mark_as_read": "تبدیل به خوانده شده",
+  "Mark_as_unread": "تبدیل به خوانده نشده",
   "Markdown_Headers": "مدل های نشانه گذاری سرصفحه",
   "Markdown_SupportSchemesForLink": "طرح های پشتیبانی مدل های نشانه گذاری برای لینک",
   "Markdown_SupportSchemesForLink_Description": "جدا شده با کاما از طرح اجازه",
   "Members_List": "فهرست کاربران",
-  "Mentions": "اشاره",
-  "Mentions_default": "اشاره (پیش فرض)",
+  "Mentions": "اشاره ها",
+  "Mentions_default": "اشاره ها (پیش فرض)",
   "Message": "پیام",
   "Message_AllowBadWordsFilter": "اجازه می دهد پیام کلمات بد فیلتر",
   "Message_AllowDeleting": "اجازه می دهد پیام حذف",
@@ -659,12 +684,12 @@
   "Message_AllowEditing": "اجازه می دهد پیام ویرایش",
   "Message_AllowEditing_BlockEditInMinutes": "بلوک پیام ویرایش پس از (N) دقیقه",
   "Message_AllowEditing_BlockEditInMinutesDescription": "را وارد کنید 0 برای غیر فعال کردن مسدود کردن.",
-  "Message_AllowPinning": "اجازه می دهد پیام سنجاق",
+  "Message_AllowPinning": "اجازه دادن سنجاق کردن پیام",
   "Message_AllowPinning_Description": "اجازه می دهد پیام به به هر یک از کانال های دوخته شود.",
   "Message_AllowStarring": "اجازه می دهد پیام بازیگران",
   "Message_AlwaysSearchRegExp": "همیشه با استفاده از استقبال میکنم جستجو",
   "Message_AlwaysSearchRegExp_Description": "ما توصیه می کنیم به مجموعه ای `True` اگر زبان شما در پشتیبانی نمی <a target=\"_blank\" href=\"https://docs.mongodb.org/manual/reference/text-search-languages/#text-search-languages\">جستجو در متن مانگودیبی</a> .",
-  "Message_AudioRecorderEnabled": "ضبط صوتی را فعال کنید",
+  "Message_AudioRecorderEnabled": "ضبط صوتی فعال شد",
   "Message_AudioRecorderEnabledDescription": "نیاز به 'صوتی / WAV، فایل ها را به یک نوع رسانه مورد قبول در تنظیمات، آپلود فایل.",
   "Message_BadWordsFilterList": "اضافه کردن کلمات بد را به لیست سیاه",
   "Message_BadWordsFilterListDescription": "اضافه کردن فهرست جدا شده با کاما از کلمات بد برای فیلتر",
@@ -677,7 +702,7 @@
   "Message_KeepHistory": "حفظ تاریخچه پیام",
   "Message_MaxAll": "حداکثر اندازه کانال برای تمام پیام",
   "Message_MaxAllowedSize": "حداکثر اندازه مجاز پیام",
-  "Message_pinning": "پیام سنجاق",
+  "Message_pinning": "سنجاق پیام",
   "Message_removed": "پیام حذف",
   "Message_ShowDeletedStatus": "نمایش وضعیت حذف",
   "Message_ShowEditedStatus": "نمایش وضعیت ویرایش",
@@ -695,14 +720,18 @@
   "Meta_msvalidate01": "MSValidate.01",
   "Meta_robots": "روبات",
   "minutes": "دقایق",
+  "Mobile": "تلفن همراه",
+  "Mobile_Notifications_Default_Alert": "هشدار پیشفرض اعلان های تلفن همراه",
   "More_channels": "کانال های بیشتر",
   "More_direct_messages": "پیام های مستقیم بیشتر",
   "More_groups": "گروه بیشتر خصوصی",
   "More_unreads": "unreads بیشتر",
   "Msgs": "پیام های",
   "multi": "چند",
-  "Mute_someone_in_room": "کسی بیصدا کردن در اتاق",
-  "Mute_user": "کاربران بیصدا",
+  "mute-user": "صامت کردن کاربر",
+  "mute-user_description": "مجوز صامت کردن کاربران دیگر در یک کانال",
+  "Mute_someone_in_room": "صامت کردن کسی در اتاق",
+  "Mute_user": "صامت کردن کاربر",
   "Muted": "خاموش",
   "My_Account": "حساب من",
   "n_messages": " %s پیام",
@@ -717,37 +746,44 @@
   "New_Department": "وزارت جدید",
   "New_integration": "یکپارچه سازی جدید",
   "New_logs": "سیاهههای مربوط جدید",
-  "New_Message_Notification": "پیام جدید هشدار از طریق",
+  "New_Message_Notification": "اعلان پیام جدید",
   "New_messages": "پیام های جدید",
-  "New_password": "رمز عبور جدید",
+  "New_password": "کلمه عبور جدید",
   "New_role": "نقش جدید",
-  "New_Room_Notification": "هشدار از طریق اتاق جدید",
+  "New_Room_Notification": "اعلان اتاق جدید",
   "No_channel_with_name_%s_was_found": "کانالی با نام <strong>\" %s\" را</strong> پیدا نشد!",
-  "No_channels_yet": "شما بخشی از هر کانال نکرده است.",
-  "No_direct_messages_yet": "شما هر گونه مکالمات آغاز نکرده است.",
+  "No_channels_yet": "شما در حال عضو هیچ کانالی نیستید.",
+  "No_direct_messages_yet": "بدون تماس مستقیم",
   "No_Encryption": "بدون رمزگذاری",
   "No_group_with_name_%s_was_found": "هیچ گروهی خصوصی با نام <strong>\" %s\" را</strong> پیدا نشد!",
   "No_groups_yet": "شما هیچ گروه های خصوصی است.",
   "No_livechats": "شما هیچ livechats.",
-  "No_mentions_found": "بدون اشاره یافت",
-  "No_pinned_messages": "هیچ پیام دوخته",
+  "No_mentions_found": "هیچ اشاره ای یافت نشد",
+  "No_pinned_messages": "پیام سنجاق شده ای نیست",
   "No_results_found": "نتیجه ای پیدا نشد",
-  "No_starred_messages": "بدون پیام های ستاره دار",
+  "No_starred_messages": "پیام ستاره داری نیست",
   "No_user_with_username_%s_was_found": "هیچ کاربر با نام کاربری <strong>\" %s\" را</strong> پیدا نشد!",
   "Node_version": "نسخه گره",
+  "None": "هیچکدام",
+  "Normal": "عادی",
   "Not_authorized": "غیر مجاز",
   "Not_Available": "در دسترس نیست",
   "Not_found_or_not_allowed": "یافت نشد و یا مجاز نیست",
-  "Nothing": "هیچ چی",
+  "Nothing": "هیچ چیز",
   "Nothing_found": "چیزی پیدا نشد",
-  "Notifications": "اطلاعیه",
+  "Notification_Desktop_Default_For": "نمایش اعلان های دسکتاپ برای",
+  "Notification_Duration": "مدت زمان اعلان",
+  "Notification_Mobile_Default_For": "Push Notificationهای تلفن همراه",
+  "Notifications": "اعلانات",
+  "Notifications_Sound_Volume": "میزان صدای اعلان ها",
   "Notify_all_in_this_room": "به اطلاع همه در این اتاق",
   "Num_Agents": "# نمایندگی",
   "Number_of_messages": "تعداد پیام ها",
   "OAuth_Application": "OAuth تأیید نرم افزار",
   "OAuth_Applications": "نرم افزار OAuth تأیید",
   "Objects": "اشیاء",
-  "Off_the_record_conversation": "خارج از رکورد مکالمات",
+  "Off": "خاموش",
+  "Off_the_record_conversation": "مکالمه محرمانه (Off-the-record)",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "خارج از ضبط مکالمات برای مرورگر یا دستگاه شما در دسترس نیست.",
   "Offline": "آفلاین",
   "Offline_DM_Email": "شما مستقیم توسط __user__ پیام ارسال شده است",
@@ -757,7 +793,10 @@
   "Offline_message": "آفلاین",
   "Offline_success_message": "پیام موفقیت آفلاین",
   "Offline_unavailable": "آفلاین در دسترس نیست",
+  "On": "روشن",
   "Online": "آنلاین",
+  "Only_authorized_users_can_write_new_messages": "تنها اعضای خاص می توانند پیام جدید بنویسند",
+  "Only_On_Desktop": "حالت دسکتاپ (تنها با enter روی دسکتاپ می فرستد)",
   "Only_you_can_see_this_message": "فقط شما میتوانید به این پیام را مشاهده",
   "Oops!": "اوه",
   "Open": "باز کن",
@@ -774,20 +813,20 @@
   "OS_Type": "نوع سیستم عامل",
   "OS_Uptime": "سیستم عامل آپ تایم",
   "others": "دیگران",
-  "OTR": "OTR",
-  "OTR_is_only_available_when_both_users_are_online": "OTR تنها در دسترس است که هر دو کاربران آنلاین",
+  "OTR": "مکالمه محرمانه",
+  "OTR_is_only_available_when_both_users_are_online": "تنها زمانی در دسترس است که دو طرف آنلاین باشند.",
   "Override_URL_to_which_files_are_uploaded_This_url_also_used_for_downloads_unless_a_CDN_is_given": "URL نادیده گرفتن که فایل های آپلود شده است. این URL نیز برای دریافت مگر اینکه یک CDN استفاده شده است",
   "Password": "کلمه عبور",
-  "Password_Change_Disabled": "مدیر Rocket.Chat خود را تغییر کلمه عبور را غیرفعال کرده است",
+  "Password_Change_Disabled": "مدیر Rocket.chat تغییر کلمه عبور را غیر فعال کرده است",
   "Password_changed_successfully": "رمز عبور با موفقیت تغییر",
   "Past_Chats": "گفتگو های گذشته",
   "Payload": "ظرفیت ترابری",
   "People": "مردم",
-  "Permalink": "permalink مشاهده مکالمات",
+  "Permalink": "لینک ثابت",
   "Permissions": "مجوز",
-  "Pin_Message": "پین پیام",
-  "Pinned_a_message": "دوخته یک پیام:",
-  "Pinned_Messages": "پیام دوخته",
+  "Pin_Message": "سنجاق کردن پیام",
+  "Pinned_a_message": "سنجاق کردن یک پیام:",
+  "Pinned_Messages": "پیام های سنجاق شده",
   "PiwikAnalytics_siteId_Description": "شناسه سایت برای استفاده برای شناسایی این سایت. به عنوان مثال: 17",
   "PiwikAnalytics_url_Description": "آدرس که در آن به Piwik ساکن، مطمئن شوید که شامل اسلش محاکمه. به عنوان مثال: //piwik.rocket.chat/",
   "Placeholder_for_email_or_username_login_field": "نگهدارنده برای ایمیل و یا ورود نام کاربری درست",
@@ -805,23 +844,28 @@
   "Please_select_enabled_yes_or_no": "لطفا یک گزینه برای فعال را انتخاب کنید",
   "Please_wait": "لطفا صبر کنید",
   "Please_wait_activation": "لطفا صبر کنید، این می تواند برخی از زمان.",
-  "Please_wait_while_OTR_is_being_established": "لطفا صبر کنید در حالی که OTR در حال استقرار",
+  "Please_wait_while_OTR_is_being_established": "در حال استقرار OTR. لطفا منتظر بمانید",
   "Please_wait_while_your_account_is_being_deleted": "لطفا صبر کنید در حالی که حساب شما در حال حذف ...",
-  "Please_wait_while_your_profile_is_being_saved": "لطفا صبر کنید در حالی که مشخصات خود را در حال ذخیره ...",
+  "Please_wait_while_your_profile_is_being_saved": "ذخیره سازی نمایه شما. لطفا شکیبا باشید...",
   "Port": "بندر",
   "Post_as": "ارسال به عنوان",
   "Post_to_Channel": "ارسال به کانال",
   "Post_to_s_as_s": "ارسال <strong>به %s</strong> <strong>به عنوان %s</strong>",
   "Preferences": "تنظیمات",
-  "Preferences_saved": "تنظیمات ذخیره شده",
+  "Preferences_saved": "تنظیمات ذخیره شد",
+  "preview-c-room": "پیش نمایش کانال عمومی",
   "Privacy": "حریم خصوصی",
   "Private": "خصوصی",
+  "Private_Channel": "کانال خصوصی",
   "Private_Group": "گروه خصوصی",
   "Private_Groups": "گروه های خصوصی",
   "Private_Groups_list": "فهرست گروه های خصوصی",
-  "Profile": "مشخصات",
-  "Profile_saved_successfully": "مشخصات موفقیت ذخیره",
+  "Profile": "نمایه",
+  "Profile_details": "جزئیات نمایه",
+  "Profile_picture": "تصویر نمایه",
+  "Profile_saved_successfully": "نمایه با موفقیت ذخیره شد",
   "Public": "عمومی",
+  "Public_Channel": "کانال عمومی",
   "Push": "فشار دادن",
   "Push_apn_cert": "APN بزنید",
   "Push_apn_dev_cert": "APN نویس بزنید",
@@ -846,9 +890,10 @@
   "Random": "تصادفی",
   "Reacted_with": "واکنش نشان داد با",
   "Reactions": "واکنش",
+  "Read_only_channel": "کانال فقط خواندنی",
   "Record": "رکورد",
   "Redirect_URI": "تغییر مسیر URI",
-  "Refresh_keys": "کلید تازه کردن",
+  "Refresh_keys": "تجدید کلیدها",
   "Refresh_your_page_after_install_to_enable_screen_sharing": "تازه کردن صفحه خود را پس از نصب برای فعال کردن اشتراک گذاری صفحه نمایش",
   "Register": "ثبت نام کاربر جدید",
   "Registration_Succeeded": "ثبت نام پیش",
@@ -861,6 +906,7 @@
   "Remove_from_room": "حذف از اتاق",
   "Remove_someone_from_room": "حذف فرد از اتاق",
   "Removed": "حذف شده",
+  "Reply": "پاسخ دادن",
   "Report_Abuse": "گزارش سوءاستفاده",
   "Report_exclamation_mark": "گزارش!",
   "Report_sent": "گزارش ارسال گردیده",
@@ -883,13 +929,14 @@
   "room_changed_topic": "توسط <em>__user_by__</em> <em>__room_topic__:</em> موضوع اتاق به تغییر",
   "Room_has_been_deleted": "اتاق حذف شده است",
   "Room_Info": "اطلاعات اتاق",
+  "room_is_blocked": "این اتاق مسدود شده است",
   "Room_name_changed": "توسط <em>__user_by__</em> <em>__room_name__:</em> نام اتاق به تغییر",
   "Room_name_changed_successfully": "نام اتاق موفقیت تغییر",
   "Room_not_found": "اتاق یافت نشد",
   "Room_topic_changed_successfully": "موضوع اتاق موفقیت تغییر",
   "Room_type_changed_successfully": "نوع اتاق موفقیت تغییر",
   "Room_unarchived": "اتاق بایگانی خارج شد",
-  "Room_uploaded_file_list": "لیست فایل های",
+  "Room_uploaded_file_list": "لیست فایل ها",
   "Room_uploaded_file_list_empty": "بدون فایل های موجود.",
   "Rooms": "اتاق",
   "Running_Instances": "اجرای نمونههای",
@@ -900,21 +947,22 @@
   "SAML_Custom_Generate_Username": "تولید نام کاربری",
   "SAML_Custom_Issuer": "صادرکننده سفارشی",
   "SAML_Custom_Provider": "ارائه دهنده سفارشی",
-  "Save": "صرفه جویی",
+  "Save": "ذخیره",
   "Save_changes": "ذخیره تغییرات",
-  "Save_Mobile_Bandwidth": "صرفه جویی پهنای باند موبایل",
+  "Save_Mobile_Bandwidth": "صرفه جویی پهنای باند تلفن همراه",
   "Save_to_enable_this_action": "ذخیره برای فعال کردن این اقدام",
-  "Saved": "ذخیره",
-  "Saving": "صرفه جویی در",
+  "Saved": "ذخیره شد",
+  "Saving": "در حال ذخیره سازی",
   "Scope": "محدوده",
   "Screen_Share": "صفحه نمایش به اشتراک",
   "Script_Enabled": "اسکریپت فعال",
-  "Search": "جستجو کردن",
+  "Search": "جست و جو",
   "Search_by_username": "جستجو بر اساس نام کاربری",
-  "Search_Messages": "پیام های جستجو",
+  "Search_Messages": "جست و جوی پیام ها",
   "Search_Private_Groups": "جستجوی گروه ها شخصی",
   "seconds": "ثانیه",
   "Secret_token": "علامت رمز",
+  "Security": "امنیت",
   "Select_a_department": "انتخاب بخش",
   "Select_an_avatar": "یک نماد را انتخاب کنید",
   "Select_file": "فایل را انتخاب کنید",
@@ -924,8 +972,8 @@
   "Selected_agents": "عوامل انتخاب شده",
   "Send": "ارسال",
   "Send_a_message": "ارسال یک پیام",
-  "Send_a_test_mail_to_my_user": "ارسال یک ایمیل به آزمون کاربر من",
-  "Send_a_test_push_to_my_user": "ارسال یک فشار آزمون به کاربر من",
+  "Send_a_test_mail_to_my_user": "ارسال یک ایمیل تستی به من",
+  "Send_a_test_push_to_my_user": "ارسال یک push تستی به من",
   "Send_confirmation_email": "ارسال ایمیل تایید",
   "Send_data_into_RocketChat_in_realtime": "ارسال داده ها را به Rocket.Chat در زمان واقعی است.",
   "Send_email": "ایمیل بفرست",
@@ -945,14 +993,15 @@
   "Settings": "تنظیمات",
   "Settings_updated": "تنظیمات به روز رسانی",
   "Should_be_a_URL_of_an_image": "باید یک URL از یک تصویر.",
-  "Should_exists_a_user_with_this_username": "کاربر در حال حاضر باید وجود داشته باشد.",
-  "Show_all": "نمایش همه",
+  "Should_exists_a_user_with_this_username": "این کاربر باید وجود داشته باشد.",
+  "Show_all": "همه را نشان بده",
   "Show_more": "بیشتر نشان بده، اطلاعات بیشتر",
-  "Show_only_online": "نمایش فقط آنلاین",
+  "Show_only_online": "فقط آنلاین ها را نشان بده",
   "Show_preregistration_form": "فرم پیش ثبت نام",
   "Showing_archived_results": "<p style=\";text-align:right;direction:rtl\"> نمایش نتایج: از <b>آرشیو %s را</b> </p>",
   "Showing_online_users": "<b>نمایش:</b> __total_showing__, <b>آنلاین:</b> __online__, <b>تعداد کل:</b> __total__",
   "Showing_results": "<p style=\";text-align:right;direction:rtl\"> نمایش نتایج: <b>از %s را</b> </p>",
+  "Sidebar_list_mode": "شیوه نمایش کانال های نوار کناری",
   "since_creation": "از %s را",
   "Site_Name": "نام سایت",
   "Site_Url": "آدرس سایت",
@@ -975,15 +1024,16 @@
   "SMTP_Username": "SMTP نام کاربری",
   "Sound": "صدا",
   "SSL": "SSL",
-  "Star_Message": "پیام ستاره",
+  "Star_Message": "ستاره دار کردن پیام",
   "Starred_Messages": "پیام های ستاره دار",
   "Start_audio_call": "شروع تماس صوتی",
   "Start_Chat": "شروع چت",
   "Start_of_conversation": "شروع مکالمه",
-  "Start_OTR": "شروع OTR",
+  "Start_OTR": "شروع مکالمه محرنامه",
   "Start_video_call": "شروع تماس ویدیویی",
   "Start_with_s_for_user_or_s_for_channel_Eg_s_or_s": "شروع با <code class=\"inline\">%s</code> برای کاربر یا <code class=\"inline\">%s</code> برای کانال. به عنوان مثال: <code class=\"inline\">%s</code> یا <code class=\"inline\">%s</code>",
   "Started_At": "آغاز شده در",
+  "Started_a_video_call": "یک مکالمه ویدیویی را آغاز کرد",
   "Statistics": "آمار",
   "Statistics_reporting": "ارسال آمار به Rocket.Chat",
   "Statistics_reporting_Description": "با ارسال آمار خود را، شما به ما کمک کند شناسایی که چگونه بسیاری از موارد از Rocket.Chat مستقر هستند، و همچنین چقدر خوب سیستم رفتار، بنابراین ما بیشتر می توانید آن را بهبود بخشد. نگران نباشید، به عنوان هیچ اطلاعات کاربر فرستاده می شود و تمام اطلاعات که دریافت می کنیم محرمانه نگه داشته.",
@@ -1014,19 +1064,19 @@
   "Sync_Users": "کاربران همگام سازی",
   "Tag": "برچسب",
   "Test_Connection": "اتصال تست",
-  "Test_Desktop_Notifications": "آزمون های دسک تاپ",
+  "Test_Desktop_Notifications": "امتحان اعلان های دسکتاپ",
   "Thank_you_exclamation_mark": "متشکرم!",
   "Thank_you_for_your_feedback": "با تشکر از شما برای نظرات شما",
   "The_application_name_is_required": "نام نرم افزار مورد نیاز است",
-  "The_channel_name_is_required": "نام کانال مورد نیاز است",
+  "The_channel_name_is_required": "نام کانال نیاز است",
   "The_emails_are_being_sent": "ایمیل در حال ارسال.",
   "The_field_is_required": "زمینه به %s مورد نیاز است.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "تغییر اندازه تصویر به کار نخواهد کرد زیرا ما نمی توانیم تشخیص ImageMagick را یا GraphicsMagick بر روی سرور خود نصب شده است.",
   "The_redirectUri_is_required": "redirectUri مورد نیاز است",
   "The_server_will_restart_in_s_seconds": "سرور در %s ثانیه راه اندازی مجدد خواهد",
   "The_setting_s_is_configured_to_s_and_you_are_accessing_from_s": "<strong>تنظیمات %s</strong> در <strong>به %s</strong> پیکربندی و شما <strong>از %s</strong> دسترسی!",
-  "The_user_will_be_removed_from_s": "کاربر خواهد شد از %s حذف",
-  "The_user_wont_be_able_to_type_in_s": "کاربر نمی خواهد قادر به تایپ در %s",
+  "The_user_will_be_removed_from_s": "کاربر از %s حذف خواهد شد",
+  "The_user_wont_be_able_to_type_in_s": "کاربر قادر به نوشتن در %s نخواهد بود",
   "Theme": "موضوع",
   "theme-color-content-background-color": "محتوای رنگ پس زمینه",
   "theme-color-custom-scrollbar-color": "سفارشی نمایشمیلهلغزش رنگ",
@@ -1049,7 +1099,7 @@
   "There_are_no_integrations": "هیچ یکپارچگی وجود دارد",
   "There_are_no_users_in_this_role": "هیچ کاربری در این نقش وجود دارد.",
   "This_email_has_already_been_used_and_has_not_been_verified__Please_change_your_password": "این ایمیل قبلا استفاده شده است و تأیید نشده است. لطفا رمز عبور خود را تغییر دهید.",
-  "This_is_a_desktop_notification": "این اعلان دسکتاپ",
+  "This_is_a_desktop_notification": "این یک اعلان دسکتاپ است",
   "This_is_a_push_test_messsage": "این messsage آزمون فشار است",
   "This_room_has_been_archived_by__username_": "این اتاق شده است _نام کاربری_ آرشیو",
   "This_room_has_been_unarchived_by__username_": "این اتاق شده است _نام کاربری_ از بایگانی خارج شد",
@@ -1067,84 +1117,93 @@
   "Trigger_removed": "ماشه حذف",
   "Trigger_Words": "کلمات محرک",
   "Triggers": "محرک های",
-  "True": "درست",
+  "True": "بله",
+  "Two-factor_authentication": "تایید هویت دومرحله ای",
+  "Two-factor_authentication_disabled": "تایید هویت دومرحله ای غیر فعال است",
+  "Two-factor_authentication_enabled": "تایید هویت دومرحله ای فعال است",
+  "Two-factor_authentication_is_currently_disabled": "تایید هویت دومرحله ای فعلا غیر فعال است",
+  "Two-factor_authentication_native_mobile_app_warning": "هشدار: وقتی این را فعال کنید دیگر قادر به ورود از طریق برنامه های موبایل نخواهید بود.",
   "Type": "نوع",
   "Type_your_email": "نوع ایمیل خود را",
   "Type_your_message": "نوع پیام خود را",
   "Type_your_name": "نامتان را بنویسید",
-  "Type_your_new_password": "رمز عبور جدید خود را تایپ کنید",
+  "Type_your_new_password": "کلمه عبور جدید را وارد کنید",
   "UI_DisplayRoles": "نقش ها",
-  "UI_Merge_Channels_Groups": "ادغام گروه های خصوصی با کانال",
+  "UI_Merge_Channels_Groups": "ادغام گروه های خصوصی با کانال ها",
   "Unarchive": "لغو بایگانی",
+  "Unblock_User": "آشتی کردن با کاربر",
   "Unmute_someone_in_room": "کسی باصدا کردن در اتاق",
-  "Unmute_user": "کاربران باصدا کردن",
+  "Unmute_user": "غیر صامت کردن کاربر",
   "Unnamed": "که نامش ذکر نشده",
-  "Unpin_Message": "پیام لغو پین",
+  "Unpin_Message": "حذف سنجاق",
   "Unread_Rooms": "اتاق خوانده نشده",
   "Unread_Rooms_Mode": "حالت اتاق خوانده نشده",
+  "Unread_Tray_Icon_Alert": "نمایش هشدار Tray Icon برای پیام های خوانده نشده",
   "Unstar_Message": "حذف ستاره",
   "Upload_file_question": "آپلود فایل؟",
   "Uploading_file": "آپلود فایل ...",
   "Uptime": "آپ تایم",
   "URL": "URL",
   "URL_room_prefix": "پیشوند آدرس اتاق",
-  "Use_account_preference": "استفاده از همه حساب",
-  "Use_Emojis": "استفاده از Emojis",
+  "Use_account_preference": "استفاده از تنظیمات حساب",
+  "Use_Emojis": "استفاده از شکلک ها",
   "Use_Global_Settings": "استفاده از تنظیمات عمومی",
-  "Use_initials_avatar": "استفاده از حروف اول نام کاربری خود را",
+  "Use_initials_avatar": "استفاده از حروف اول نام کاربری",
   "Use_service_avatar": "استفاده از %s آواتار ها",
   "Use_this_username": "با استفاده از این نام کاربری",
   "Use_uploaded_avatar": "استفاده از نماد های آپلود",
   "Use_url_for_avatar": "استفاده از URL برای نماد",
-  "User__username__is_now_a_moderator_of__room_name_": "_نام کاربری_ کاربر در حال حاضر به ناظم از __room_name__",
-  "User__username__is_now_a_owner_of__room_name_": "_نام کاربری_ کاربر در حال حاضر صاحب __room_name__",
-  "User__username__removed_from__room_name__moderators": "_نام کاربری_ کاربر از مدیران __room_name__ حذف",
-  "User__username__removed_from__room_name__owners": "_نام کاربری_ کاربر از صاحبان __room_name__ حذف",
-  "User_added": "اضافه شده توسط کاربر",
-  "User_added_by": "<em>__user_added__</em> کاربر اضافه شده توسط <em>__user_by__.</em>",
+  "Use_User_Preferences_or_Global_Settings": "استفاده از تنظیمات حساب یا تنظیمات کلی",
+  "User__username__is_now_a_moderator_of__room_name_": "__username__ از حالا مدیر __room_name__ است",
+  "User__username__is_now_a_owner_of__room_name_": "__username__ از الان صاحب __room_name__ است",
+  "User__username__removed_from__room_name__moderators": "__username__ از __room_name__  مدیران حذف شد",
+  "User__username__removed_from__room_name__owners": "__username__ از __room_name__ مالکان حذف شد",
+  "User_added": "کاربر اضافه شد",
+  "User_added_by": "کاربر <em>__user_by__</em> <em>__user_added__</em> را اضافه کرد.",
   "User_added_successfully": "کاربر با موفقیت اضافه شد",
-  "User_doesnt_exist": "کاربری با نام `@ %s` وجود دارد.",
+  "User_doesnt_exist": "کاربری با نام `@%s` وجود ندارد.",
   "User_has_been_activated": "کاربر فعال شده است",
   "User_has_been_deactivated": "کاربر غیر فعال شده است",
   "User_has_been_deleted": "کاربر حذف شده است",
-  "User_has_been_muted_in_s": "کاربر شده است به در %s خاموش",
+  "User_has_been_muted_in_s": "کاربر در %s صامت شده است",
   "User_has_been_removed_from_s": "کاربر از %s حذف شده است",
   "User_Info": "اطلاعات کاربر",
-  "User_is_no_longer_an_admin": "کاربر دیگر یک مدیر",
-  "User_is_now_an_admin": "کاربر در حال حاضر به یک مدیر",
-  "User_joined_channel": "کانال پیوسته است.",
-  "User_joined_channel_female": "کانال پیوسته است.",
-  "User_joined_channel_male": "کانال پیوسته است.",
+  "User_is_no_longer_an_admin": "کاربر دیگر مدیر نیست",
+  "User_is_now_an_admin": "کاربر حالا یک مدیر است",
+  "User_joined_channel": "به کانال پیوسته است.",
+  "User_joined_channel_female": "به کانال پیوسته است.",
+  "User_joined_channel_male": "به کانال پیوسته است.",
   "User_left": "کانال را ترک کرده است.",
   "User_left_female": "کانال را ترک کرده است.",
   "User_left_male": "کانال را ترک کرده است.",
-  "User_logged_out": "کاربر وارد شده است را",
+  "User_logged_out": "کاربر خارج شده است",
   "User_management": "مدیریت کاربر",
   "User_muted_by": "<em>__user_muted__</em> کاربر خاموش شده توسط <em>__user_by__.</em>",
   "User_not_found": "کاربر یافت نشد",
-  "User_not_found_or_incorrect_password": "کاربر یافت نشد و یا رمز عبور اشتباه",
-  "User_or_channel_name": "کاربر یا کانال نام",
-  "User_removed": "کاربر حذف",
-  "User_removed_by": "<em>__user_removed__</em> کاربر حذف شده توسط <em>__user_by__.</em>",
+  "User_not_found_or_incorrect_password": "کاربر یافت نشد یا کلمه عبور اشتباه است",
+  "User_or_channel_name": "نام کاربر یا کانال",
+  "User_removed": "کاربر حذف شد",
+  "User_removed_by": "کاربر <em>__user_by__</em> <em>__user_removed__</em> را حذف کرد.",
   "User_Settings": "تنظیمات کاربر",
   "User_unmuted_by": "<em>__user_unmuted__</em> کاربر لغو شد توسط <em>__user_by__.</em>",
-  "User_unmuted_in_room": "کاربر نادیده در اتاق",
-  "User_updated_successfully": "کاربر با موفقیت به روز",
+  "User_unmuted_in_room": "کاربر در اتاق غیر صامت شد",
+  "User_updated_successfully": "کاربر با موفقیت به روز شد",
   "User_uploaded_file": "یک فایل آپلود شد",
   "User_uploaded_image": "یک عکس آپلود شد",
   "Username": "نام کاربری",
   "Username_and_message_must_not_be_empty": "نام کاربری و پیام نباید خالی باشد.",
   "Username_cant_be_empty": "نام کاربری نمی تواند خالی باشد",
-  "Username_Change_Disabled": "مدیر Rocket.Chat خود را تغییر نام های کاربری را غیرفعال کرده است",
-  "Username_denied_the_OTR_session": "_نام کاربری_ را تکذیب کرد جلسه OTR",
+  "Username_Change_Disabled": "مدیر Rocket.chat تغییر نام کاربری را غیر فعال کرده است",
+  "Username_denied_the_OTR_session": "__username__ نشست OTR را رد کرد",
   "Username_description": "نام کاربری استفاده شده است به دیگران اجازه می دهد به شما اشاره در پیام است.",
   "Username_doesnt_exist": "نام کاربری ` %s` وجود ندارد.",
-  "Username_ended_the_OTR_session": "_نام کاربری_ به پایان رسید جلسه OTR",
+  "Username_ended_the_OTR_session": "__username__ نشست OTR را بست",
   "Username_invalid": "<strong> %s</strong> است یک نام کاربری معتبر نیست، <br/> استفاده از تنها حروف، اعداد، نقطه، خط فاصله و زیرین",
-  "Username_is_already_in_here": "`@ %s` در حال حاضر در اینجا.",
-  "Username_is_not_in_this_room": "کاربر `# %s` است در این اتاق نیست.",
+  "Username_is_already_in_here": "`@%s` در حال حاضر اینجاست.",
+  "Username_is_not_in_this_room": "`#%s` در این اتاق نیست.",
+  "Username_Placeholder": "لطفا نام کاربران را وارد کنید...",
   "Username_title": "ثبت نام نام کاربری",
-  "Username_wants_to_start_otr_Do_you_want_to_accept": "_نام کاربری_ می خواهد برای شروع OTR. آیا می خواهید به قبول می کنید؟",
+  "Username_wants_to_start_otr_Do_you_want_to_accept": "__username__ درخواست OTR می دهد. آیا قبل می کنید؟",
   "Users": "کاربران",
   "Users_in_role": "کاربران در نقش",
   "UTF8_Names_Slugify": "UTF8 نام slugify را",
@@ -1158,9 +1217,10 @@
   "Video_message": "پیام ویدویی",
   "Videocall_declined": "تماس ویدیویی  رد شد",
   "Videocall_enabled": "تماس ویدیویی فعال شد",
+  "view-c-room": "مشاهده کانال عمومی",
   "View_All": "مشاهده همه",
   "View_Logs": "نمایش سیاهههای مربوط",
-  "View_mode": "حالت نمایش",
+  "View_mode": "شیوه نمایش",
   "View_mode_info": "این تغییر مقدار از پیام های فضایی را بر روی صفحه نمایش.",
   "Viewing_room_administration": "دولت اتاق نمایش",
   "Visibility": "دید",
@@ -1194,15 +1254,15 @@
   "Yes_delete_it": "بله، آن را حذف کنید!",
   "Yes_hide_it": "بله، آن را پنهان!",
   "Yes_leave_it": "بله، آن را ترک کنید!",
-  "Yes_mute_user": "بله، کاربر قطع!",
-  "Yes_remove_user": "بله، حذف کاربر!",
+  "Yes_mute_user": "بله کاربر را صامت کن!",
+  "Yes_remove_user": "بله، کاربر را حذف کن!",
   "Yes_unarchive_it": "بلی از بایگانی خارج کن",
   "You": "شما",
   "you_are_in_preview_mode_of": "شما در حالت پیش نمایش از کانال # <strong>__room_name__</strong> هستند",
   "You_are_logged_in_as": "شما وارد شدید با عنوان",
   "You_are_not_authorized_to_view_this_page": "شما به این صفحه مجاز است.",
   "You_can_change_a_different_avatar_too": "شما می توانید نماد مورد استفاده برای ارسال از این ادغام را لغو کنید.",
-  "You_can_search_using_RegExp_eg": "شما می توانید با استفاده از استقبال میکنم جستجو کنید. به عنوان مثال",
+  "You_can_search_using_RegExp_eg": "می توانید با RegExp جست و جو کنید. مثال:",
   "You_can_use_an_emoji_as_avatar": "شما همچنین می توانید از Emoji به عنوان یک نماد استفاده کنید.",
   "You_can_use_webhooks_to_easily_integrate_livechat_with_your_CRM": "شما می توانید webhooks به راحتی ادغام livechat با CRM خود استفاده کنید.",
   "You_cant_leave_a_livechat_room_Please_use_the_close_button": "شما می توانید یک اتاق livechat در ترک نمی کند. لطفا، با استفاده از دکمه نزدیک است.",
@@ -1215,13 +1275,13 @@
   "You_need_to_change_your_password": "شما نیاز به تغییر رمز عبور خود را",
   "You_need_to_type_in_your_password_in_order_to_do_this": "شما نیاز به تایپ رمز عبور خود را به منظور انجام این کار!",
   "You_need_to_type_in_your_username_in_order_to_do_this": "شما نیاز به تایپ در نام کاربری خود را به منظور انجام این کار!",
-  "You_need_to_verifiy_your_email_address_to_get_notications": "شما نیاز به تأیید آدرس ایمیل خود را برای دریافت اطلاعیه",
+  "You_need_to_verifiy_your_email_address_to_get_notications": "برای دریافت اعلان ها از طریق ایمیل باید آن را تایید کنید",
   "You_need_to_write_something": "شما نیاز به نوشتن چیزی!",
   "You_should_inform_one_url_at_least": "شما باید حداقل یک URL را تعریف کنیم.",
   "You_should_name_it_to_easily_manage_your_integrations": "شما باید نام آن را به راحتی مدیریت یکپارچگی خود را.",
   "You_will_not_be_able_to_recover": "شما نمی خواهد قادر به بازیابی این ارسال!",
   "You_will_not_be_able_to_recover_file": "شما نمی خواهد قادر به بازیابی این فایل!",
-  "You_wont_receive_email_notifications_because_you_have_not_verified_your_email": "شما اطلاعیه ایمیل دریافت نمی کند چرا که شما از پست الکترونیک خود را تایید نمی کند.",
+  "You_wont_receive_email_notifications_because_you_have_not_verified_your_email": "چون ایمیل خود را تایید نکرده اید اعلان های ایمیلی را دریافت نمی کنید",
   "Your_email_has_been_queued_for_sending": "ایمیل شما برای ارسال صف",
   "Your_entry_has_been_deleted": "ورود شما حذف شده است.",
   "Your_file_has_been_deleted": "فایل شما حذف شده است.",
diff --git a/packages/rocketchat-i18n/i18n/fr.i18n.json b/packages/rocketchat-i18n/i18n/fr.i18n.json
index 01652705272d..5c7c1eac9910 100644
--- a/packages/rocketchat-i18n/i18n/fr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/fr.i18n.json
@@ -35,7 +35,6 @@
   "Accounts_BlockedUsernameList_Description": "Liste de noms d'utilisateurs bloqués (insensible à la casse), séparés par des virgules",
   "Accounts_CustomFields_Description": "Devrait être un JSON valide où les clés sont les noms des champs contenant un dictionnaire de champs de paramétrage. Exemple :<br/>\n<code>{\n \"role\": {\n  \"type\": \"select\",\n  \"defaultValue\": \"eleve\",\n  \"options\": [\"enseignant\", \"eleve\"],\n  \"required\": true,\n  \"modifyRecordField\": {\n   \"array\": true,\n   \"field\": \"roles\"\n  }\n },\n \"twitter\": {\n  \"type\": \"text\",\n  \"required\": true,\n  \"minLength\": 2,\n  \"maxLength\": 10\n }\n}</code> ",
   "Accounts_DefaultUsernamePrefixSuggestion": "Suggestion par défaut du préfixe du nom d'utilisateur",
-  "Accounts_Default_User_Preferences_desktopNotifications": "Alterte notification de bureau par défaut",
   "Accounts_denyUnverifiedEmail": "Refuser les e-mails non vérifiés",
   "Accounts_EmailVerification": "Vérification de l'adresse e-mail",
   "Accounts_EmailVerification_Description": "Vous devez avoir des paramètres SMTP corrects pour utiliser cette fonctionnalité",
@@ -416,6 +415,7 @@
   "Desktop": "Bureau",
   "Desktop_Notification_Test": "Test des notifications sur le bureau",
   "Desktop_Notifications": "Notifications sur le bureau",
+  "Desktop_Notifications_Default_Alert": "Alterte notification de bureau par défaut",
   "Desktop_Notifications_Disabled": "Les notifications du bureau sont désactivées, Modifiez les préférences de votre navigateur si vous avez besoin de les activer.",
   "Desktop_Notifications_Duration": "Durée des notifications",
   "Desktop_Notifications_Duration_Description": "Secondes pour afficher une notification de bureau. Cela peut affecter le Centre de Notification de OS X. Entrez 0 pour utiliser les paramètres du navigateur par défaut et ne pas affecter le Centre de Notification de OS X.",
@@ -1276,7 +1276,6 @@
   "Shared_Location": "Position partagée",
   "Should_be_a_URL_of_an_image": "Doit être l'URL d'une image.",
   "Should_exists_a_user_with_this_username": "L'utilisateur doit déjà exister.",
-  "Show_agent_email": "Afficher le email de l'agent",
   "Show_all": "Afficher tout",
   "Show_more": "Afficher plus",
   "show_offline_users": "montrer les utilisateur hors-ligne",
@@ -1612,4 +1611,4 @@
   "your_message_optional": "votre message (optionnel)",
   "Your_password_is_wrong": "Votre mot de passe est incorrect !",
   "Your_push_was_sent_to_s_devices": "Votre notification a été envoyée à %s appareils"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/hu.i18n.json b/packages/rocketchat-i18n/i18n/hu.i18n.json
index b6c804871b98..9dbf59257b56 100644
--- a/packages/rocketchat-i18n/i18n/hu.i18n.json
+++ b/packages/rocketchat-i18n/i18n/hu.i18n.json
@@ -2,7 +2,7 @@
   "#channel": "#csatorna",
   "0_Errors_Only": "0 - Csak hibák",
   "1_Errors_and_Information": "1 - Hibák és Információk",
-  "2_Erros_Information_and_Debug": "2 - Hibák, Információk és Debug",
+  "2_Erros_Information_and_Debug": "2 - Hibák, információk és hibakeresés",
   "403": "Tiltott",
   "500": "Belső Szerverhiba",
   "@username": "@felhasználónév",
@@ -18,7 +18,7 @@
   "Account_SID": "Fiók SID",
   "Accounts": "Fiókok",
   "Accounts_AllowDeleteOwnAccount": "Felhasználó törölheti saját fiókját",
-  "Accounts_AllowedDomainsList": "Engedélyezett domainek listája",
+  "Accounts_AllowedDomainsList": "Engedélyezett domain-ek listája",
   "Accounts_AllowedDomainsList_Description": "Engedélyezett domain-ek listája (vesszővel elválasztva)",
   "Accounts_AllowEmailChange": "E-mail cím megváltoztatható",
   "Accounts_AllowPasswordChange": "Jelszó megváltoztatható",
@@ -210,7 +210,7 @@
   "Away_male": "El",
   "Back": "Hát",
   "Back_to_applications": "Vissza az alkalmazások",
-  "Back_to_integrations": "Vissza az integrációk",
+  "Back_to_integrations": "Vissza az integrációkhoz",
   "Back_to_login": "Vissza a bejelentkezéshez",
   "Back_to_permissions": "Vissza az engedélyeket",
   "Block_User": "felhasználó blokkolása",
@@ -293,7 +293,9 @@
   "Created_at_s_by_s": "<strong>Alkotó:% <strong>s%</strong></strong> <strong>s</strong>",
   "Current_Chats": "jelenlegi beszélgetés",
   "Custom": "Szokás",
+  "Custom_Emoji": "Egyéni hangulatjelek",
   "Custom_Emoji_Add": "Új Emoji hozzáadása",
+  "Custom_Emoji_Added_Successfully": "Egyéni hangulatjel sikeresen hozzáadva",
   "Custom_Emoji_Has_Been_Deleted": "Az egyéni emoji törölve  lett",
   "Custom_Emoji_Info": "Info az egyéni Emojiról",
   "Custom_Emoji_Updated_Successfully": "Az egyéni emoji feltöltése sikeres",
@@ -313,10 +315,10 @@
   "Custom_Sounds": "Egyéni Hangok",
   "Custom_Translations": "Egyéni fordítás",
   "Dashboard": "Műszerfal",
-  "Date": "Dátum",
+  "Date": "Időpont",
   "days": "napok",
-  "DB_Migration": "adatbázis migráció",
-  "DB_Migration_Date": "Adatbázis migráció dátuma",
+  "DB_Migration": "Adatbázis migráció",
+  "DB_Migration_Date": "Adatbázis migráció időpontja",
   "Deactivate": "deaktiválása",
   "Default": "Alapértelmezett",
   "Delete": "Töröl",
@@ -327,7 +329,7 @@
   "Deleted": "Törölve!",
   "Department_removed": "Department eltávolított",
   "Departments": "Osztályok",
-  "Deployment_ID": "Telepítés ID",
+  "Deployment_ID": "Telepítés azonosító",
   "Description": "Leírás",
   "Desktop": "Desktop",
   "Desktop_Notification_Test": "Asztali értesítés teszt",
@@ -344,7 +346,7 @@
   "Domain": "Domain",
   "Domains": "Domains",
   "Drop_to_upload_file": "Dobd lehet feltölteni a fájlt",
-  "Dry_run": "Szárazon futás",
+  "Dry_run": "Tesztelés",
   "Dry_run_description": "Csak akkor küldünk egy e-mailt, hogy ugyanaz a cím, mint a From. Az e-mail kell tartozniuk felhasználó érvényes.",
   "Duplicate_archived_channel_name": "Archivált Channel névvel ' %s' létezik",
   "Duplicate_archived_private_group_name": "Archivált Private csoport név ' %s' létezik",
@@ -359,16 +361,16 @@
   "Email": "Email",
   "Email_address_to_send_offline_messages": "E-mail címét, hogy üzenetet küldjön",
   "Email_already_exists": "Az e-mail cím már létezik",
-  "Email_body": "E-mail test",
+  "Email_body": "E-mail szövege",
   "Email_Change_Disabled": "Az Rocket.Chat rendszergazda letiltotta a változó e-mail",
   "Email_Footer_Description": "Használhatja a következő szimbólumokat: <br /><ul><li> [Site_Name] és [Site_URL] Az Alkalmazás neve és URL ill. </li></ul>",
-  "Email_from": "Ból ből",
+  "Email_from": "Feladó",
   "Email_Header_Description": "Használhatja a következő szimbólumokat: <br /><ul><li> [Site_Name] és [Site_URL] Az Alkalmazás neve és URL ill. </li></ul>",
   "Email_Notification_Mode": "Offline-mail értesítések",
   "Email_Notification_Mode_All": "Minden Említés / DM",
   "Email_Notification_Mode_Disabled": "Tiltva",
   "Email_or_username": "Email or username",
-  "Email_subject": "Tantárgy",
+  "Email_subject": "Tárgy",
   "Email_verified": "Email hitelesítve",
   "Emoji": "Emoji",
   "Empty_title": "üres címet",
@@ -536,7 +538,7 @@
   "Importer_Archived": "archivált",
   "Importer_done": "Importálása befejeződött!",
   "Importer_finishing": "Utolsó simítások az import.",
-  "Importer_From_Description": "Behozatal __from __ 's adatok Rocket.Chat.",
+  "Importer_From_Description": "__from __  adatok importálása Rocket.Chat-be.",
   "Importer_import_cancelled": "Import törölték.",
   "Importer_import_failed": "Hiba történt a futás az import.",
   "Importer_importing_channels": "Importálása a csatornákat.",
@@ -557,14 +559,14 @@
   "Install_FxOs_error": "Sajnos ez nem működik rendeltetésszerűen! A következő hiba jelent meg:",
   "Install_FxOs_follow_instructions": "Kérjük, erősítse meg az alkalmazás telepítése a készülék (nyomja meg a \"telepítés\").",
   "Installation": "Telepítés",
-  "Installed_at": "telepítve",
+  "Installed_at": "Telepítés időpontja",
   "Instructions_to_your_visitor_fill_the_form_to_send_a_message": "Útmutató a látogató töltse ki az űrlapot, hogy küldjön egy üzenetet",
   "Integration_added": "Integráció került",
   "Integration_Incoming_WebHook": "Bejövő WebHook integráció",
   "Integration_New": "új integráció",
   "Integration_Outgoing_WebHook": "Kimenő WebHook integráció",
   "Integration_updated": "Integration frissült",
-  "Integrations": "Integráció",
+  "Integrations": "Integrációk",
   "InternalHubot": "Belső Hubot",
   "InternalHubot_ScriptsToLoad": "Scripts betölteni",
   "InternalHubot_ScriptsToLoad_Description": "Kérjük, vesszővel elválasztott listáját szkriptek betölteni https://github.com/github/hubot-scripts/tree/master/src/scripts",
@@ -703,7 +705,7 @@
   "Manager_added": "A menedzser hozzátette",
   "Manager_removed": "menedzser eltávolított",
   "Managing_assets": "vagyongazdálkodás",
-  "Managing_integrations": "kezelése integrációk",
+  "Managing_integrations": "Integrációk kezelése",
   "Mark_as_read": "Jelöld olvasottként",
   "Markdown_Headers": "árleszállítás fejlécek",
   "Markdown_SupportSchemesForLink": "Árleszállítás támogatási rendszereket link",
@@ -794,7 +796,7 @@
   "No_results_found": "Nincs találat",
   "No_starred_messages": "Nincsenek csillagozott üzenetek",
   "No_user_with_username_%s_was_found": "Nincs felhasználó <strong>felhasználónév: \" %s\"</strong> találtak!",
-  "Node_version": "node változat",
+  "Node_version": "Node verzió",
   "Not_authorized": "nem engedélyezett",
   "Not_Available": "Nem elérhető",
   "Not_found_or_not_allowed": "Nem található vagy Nem engedett",
@@ -824,15 +826,15 @@
   "Opened": "Nyitott",
   "optional": "választható",
   "Order": "Rendelés",
-  "OS_Arch": "OS Arch",
-  "OS_Cpus": "Operációs rendszer CPU Count",
-  "OS_Freemem": "OS Free Memory",
-  "OS_Loadavg": "OS Load Average",
-  "OS_Platform": "OS Platform",
-  "OS_Release": "OS Release",
-  "OS_Totalmem": "OS Összes memória",
-  "OS_Type": "OS Type",
-  "OS_Uptime": "OS üzemidő",
+  "OS_Arch": "Operációs rendszer architektúra",
+  "OS_Cpus": "Operációs rendszer CPU",
+  "OS_Freemem": "Operációs rendszer elérhető memória",
+  "OS_Loadavg": "Operációs rendszer terheltség",
+  "OS_Platform": "Operációs rendszer platform",
+  "OS_Release": "Operációs rendszer kernel",
+  "OS_Totalmem": "Operációs rendszer elérhető memória",
+  "OS_Type": "Operációs rendszer típusa",
+  "OS_Uptime": "Operációs rendszer indítása óta eltelt idő",
   "others": "mások",
   "OTR": "OTR",
   "OTR_is_only_available_when_both_users_are_online": "OTR csak ha mindkét online",
@@ -951,8 +953,8 @@
   "Room_unarchived": "szoba archivált",
   "Room_uploaded_file_list": "fájlok",
   "Room_uploaded_file_list_empty": "Nincs fájl is elérhető.",
-  "Rooms": "szobák",
-  "Running_Instances": "példányainak futtatása",
+  "Rooms": "Szobák",
+  "Running_Instances": "Futó példányok",
   "S_new_messages_since_s": " %s új üzenet óta %s",
   "SAML": "SAML",
   "SAML_Custom_Cert": "Egyedi tanúsítvány",
@@ -1063,7 +1065,7 @@
   "Stats_Total_Users": "felhasználók",
   "Stop_Recording": "Felvétel leállítása",
   "strike": "sztrájk",
-  "Subject": "Tantárgy",
+  "Subject": "Tárgy",
   "Submit": "Elküldés",
   "Success": "Siker",
   "Success_message": "A siker üzenet",
@@ -1105,7 +1107,7 @@
   "theme-color-unread-notification-color": "Olvasatlan értesítés Color",
   "theme-custom-css": "egyéni CSS",
   "There_are_no_agents_added_to_this_department_yet": "Nincsenek ügynökök hozzá ezen az osztályon még.",
-  "There_are_no_integrations": "Nincsenek integrációk",
+  "There_are_no_integrations": "Nincs használatban lévő integráció",
   "There_are_no_users_in_this_role": "Nincsenek felhasználók ebben a szerepben.",
   "This_email_has_already_been_used_and_has_not_been_verified__Please_change_your_password": "Ez az e-mail már felhasználták, és még nem igazolták. Kérjük, változtassa meg a jelszavát.",
   "This_is_a_desktop_notification": "Ez egy asztali értesítés",
@@ -1143,7 +1145,7 @@
   "Unstar_Message": "csillag eltávolítása",
   "Upload_file_question": "Fájl feltöltés?",
   "Uploading_file": "Fájl feltöltése ...",
-  "Uptime": "üzemidő",
+  "Uptime": "Indítás óta eltelt idő",
   "URL": "URL",
   "Use_account_preference": "Használja számla preferencia",
   "Use_Emojis": "Felhasználási hangulatjelek",
@@ -1199,7 +1201,7 @@
   "Username_is_not_in_this_room": "A felhasználó `# %s` nem ebben a szobában.",
   "Username_title": "Felhasználónév regisztrálása",
   "Username_wants_to_start_otr_Do_you_want_to_accept": "__username__ akar kezdeni OTR. Szeretné, hogy elfogadja?",
-  "Users": "felhasználók",
+  "Users": "Felhasználók",
   "Users_in_role": "Felhasználók szerepe",
   "UTF8_Names_Slugify": "UTF8 nevek Slugify",
   "UTF8_Names_Validation": "UTF8 nevek Validation",
diff --git a/packages/rocketchat-i18n/i18n/nl.i18n.json b/packages/rocketchat-i18n/i18n/nl.i18n.json
index 0d5670faea3a..8292b91b157c 100644
--- a/packages/rocketchat-i18n/i18n/nl.i18n.json
+++ b/packages/rocketchat-i18n/i18n/nl.i18n.json
@@ -299,7 +299,6 @@
   "Duplicate_archived_private_group_name": "Een gearchiveerde privé-group met naam '%s' bestaat al",
   "Duplicate_channel_name": "Een kanaal met de naam '% s' bestaat al",
   "Duplicate_private_group_name": "Een privé-groep met de naam '%s' bestaat al",
-  "Enable_Auto_Away": "Schakel Auto Away in",
   "Edit": "Wijzig",
   "Edit_Custom_Field": "Bewerken Aangepast veld",
   "Edit_Department": "Afdeling bewerken",
@@ -513,7 +512,6 @@
   "Invalid_secret_URL_message": "De gegeven URL is ongeldig.",
   "invisible": "onzichtbaar",
   "Invisible": "Onzichtbaar",
-  "Idle_Time_Limit": "Niet-actieve tijdslimiet",
   "Invitation_HTML": "Uitnodiging HTML",
   "Invitation_HTML_Default": "<h2> Je bent uitgenodigd voor <h1> [Site_Name] </h1></h2><p> Ga naar [Site_URL] en probeer de beste open source chat-oplossing die vandaag beschikbaar zijn! </p>",
   "Invitation_HTML_Description": "U mag de volgende plaatshouders gebruiken: <br /><ul><li> [email] voor de ontvanger e-mail. </li><li> [Site_Name] en [Site_URL] voor de toepassing Naam en URL respectievelijk. </li></ul>",
@@ -1132,7 +1130,6 @@
   "Username_is_already_in_here": "`@%s` is al hier.",
   "Username_is_not_in_this_room": "De gebruiker `#%s` is niet in deze kamer.",
   "Username_title": "Registreer Gebruikersnaam",
-  "User_Presence": "Aanwezigheid van de gebruiker",
   "Username_wants_to_start_otr_Do_you_want_to_accept": "__username__ wil OTR starten. Heeft u wilt accepteren?",
   "Users": "Gebruikers",
   "Users_in_role": "Gebruikers met rol",
@@ -1207,4 +1204,4 @@
   "Your_mail_was_sent_to_s": "Uw e-mail werd verzonden naar %s",
   "Your_password_is_wrong": "Je wachtwoord is verkeerd!",
   "Your_push_was_sent_to_s_devices": "Je push werd verzonden naar %s apparaten"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/pl.i18n.json b/packages/rocketchat-i18n/i18n/pl.i18n.json
index 6a731d8b78a1..530f250a3337 100644
--- a/packages/rocketchat-i18n/i18n/pl.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pl.i18n.json
@@ -33,7 +33,6 @@
   "Accounts_BlockedDomainsList_Description": "Oddzielonych przecinkami lista zablokowanych domen",
   "Accounts_BlockedUsernameList": "Lista zablokowanych użytkowników",
   "Accounts_BlockedUsernameList_Description": "Oddzielona przecinkami lista zablokowanych użytkowników (bez uwzględniania wielkości liter)",
-  "Accounts_Default_User_Preferences_mobileNotifications": "Domyślne powiadomnienia mobilne",
   "Accounts_denyUnverifiedEmail": "Odrzucaj niezweryfikowane adresy email",
   "Accounts_EmailVerification": "Weryfikacja adresu email",
   "Accounts_EmailVerification_Description": "Upewnij się, że masz odpowiednie ustawienia SMTP by korzystać z tej funkcji",
@@ -849,6 +848,7 @@
   "Min_length_is": "Minimalna długość to %s",
   "minutes": "minut",
   "Mobile": "Powiadomnienia mobilne",
+  "Mobile_Notifications_Default_Alert": "Domyślne powiadomnienia mobilne",
   "Monday": "Poniedziałek",
   "Monitor_history_for_changes_on": "Sprawdź historię zmian na",
   "More_channels": "Więcej kanałów",
@@ -1434,4 +1434,4 @@
   "your_message_optional": "twoja wiadomość (opcjonalnie)",
   "Your_password_is_wrong": "To nie jest poprawne hasło!",
   "Your_push_was_sent_to_s_devices": "Twój push została wysłany do urządzeń: %s"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 1847d68194db..95a6764b5395 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -33,10 +33,6 @@
   "Accounts_BlockedUsernameList_Description": "Lista de nomes de usuários bloqueados, separada por vírgulas (não diferencia maiúsculas)",
   "Accounts_CustomFields_Description": "Deve ser um JSON válido onde as chaves são os nomes de campos contendo um dicionário de configuração de campos. Exemplo:<br/><code>{\n \"role\": {\n  \"type\": \"select\",\n  \"defaultValue\": \"estudante\",\n  \"options\": [\"professor\", \"estudante\"],\n  \"required\": true,\n  \"modifyRecordField\": {\n   \"array\": true,\n   \"field\": \"roles\"\n  }\n },\n \"twitter\": {\n  \"type\": \"text\",\n  \"required\": true,\n  \"minLength\": 2,\n  \"maxLength\": 10\n }\n}</code> ",
   "Accounts_CustomFieldsToShowInUserInfo": "Campos personalizados a exibir",
-  "Accounts_Default_User_Preferences": "Preferências Padrões do Usuário",
-  "Accounts_Default_User_Preferences_audioNotifications": "Áudio padrão para alerta de notificação",
-  "Accounts_Default_User_Preferences_desktopNotifications": "Alerta padrão para notificações Desktop",
-  "Accounts_Default_User_Preferences_mobileNotifications": "Alerta padrão para notificações Mobile",
   "Accounts_denyUnverifiedEmail": "Proibir e-mail não verificado",
   "Accounts_EmailVerification": "Verificação de E-mail",
   "Accounts_EmailVerification_Description": "Certifique-se de que as configurações de SMTP estão corretas para usar este recurso",
@@ -377,7 +373,6 @@
   "EmojiCustomFilesystem": "Sistema de arquivos do emoji customizado",
   "Empty_title": "Título vazio",
   "Enable": "Habilitar",
-  "Enable_Auto_Away": "Habilitar Auto Ausência",
   "Enable_Desktop_Notifications": "Habilitar Notificações Desktop",
   "Enabled": "Ativado",
   "Encrypted_message": "Mensagem criptografada",
@@ -1226,7 +1221,6 @@
   "User_removed": "Usuário removido",
   "User_removed_by": "Usuário <em>__user_removed__</em> removido da conversa por <em>__user_by__</em>.",
   "User_Settings": "Configurações do Usuário",
-  "User_Presence": "Presença do Usuário",
   "User_unmuted_by": "<em>__user_by__</em> permitiu que <em>__user_unmuted__</em> fale na sala.",
   "User_unmuted_in_room": "Usuário pode falar na sala",
   "User_updated_successfully": "Usuário atualizado com sucesso",
@@ -1322,4 +1316,4 @@
   "your_message_optional": "sua mensagem (opcional)",
   "Your_password_is_wrong": "Sua senha está errada!",
   "Your_push_was_sent_to_s_devices": "Sua natificação foi enviada para %s dispositivos"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/pt.i18n.json b/packages/rocketchat-i18n/i18n/pt.i18n.json
index 11533f78fd73..a0407aec2946 100644
--- a/packages/rocketchat-i18n/i18n/pt.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt.i18n.json
@@ -382,7 +382,6 @@
   "Duplicate_channel_name": "Um canal com o nome '%s' já existe",
   "Duplicate_private_group_name": "Já existe um Grupo Privado com nome '%s'",
   "Duration": "Duração",
-  "Enable_Auto_Away": "Habilitar auto ausência",
   "Edit": "Editar",
   "Edit_Custom_Field": "Editar Campo Personalizado",
   "Edit_Department": "Editar Departamento",
@@ -564,7 +563,6 @@
   "How_responsive_was_the_chat_agent": "Quão responsivo foi o agente de bate-papo?",
   "How_satisfied_were_you_with_this_chat": "Ficou satisfeito com este bate-papo?",
   "How_to_handle_open_sessions_when_agent_goes_offline": "O que fazer com sessões abertas quando agente ficar offline",
-  "Idle_Time_Limit": "Tempo limite de ausência",
   "If_you_are_sure_type_in_your_password": "Se você tem certeza, digite sua senha:",
   "If_you_are_sure_type_in_your_username": "Se você tem certeza, digite seu nome de usuário:",
   "Importer_Archived": "Arquivado",
@@ -1217,7 +1215,6 @@
   "Use_this_username": "Usar este nome de usuário",
   "Use_uploaded_avatar": "Use o avatar de upload",
   "Use_url_for_avatar": "Use url para o avatar",
-  "User_Presence": "Presença do Utilizador",
   "User__username__is_now_a_moderator_of__room_name_": "Usuário __username__ agora é um moderador de __room_name__",
   "User__username__is_now_a_owner_of__room_name_": "Usuário __username__ agora é proprietário de __room_name__",
   "User__username__removed_from__room_name__moderators": "Usuário __username__ removido dos moderadores de __room_name__",
@@ -1249,10 +1246,6 @@
   "User_removed": "Usuário removido",
   "User_removed_by": "Usuário <em>__user_removed__</em> removido da conversa por <em>__user_by__</em>.",
   "User_Settings": "Configurações do Usuário",
-  "User_sent_a_message_on_channel": "<strong>__username__</strong> enviou uma mensagem em <strong>__channel__</strong>:",
-  "User_uploaded_a_file_on_channel": "<strong>__username__</strong> enviou um arquivo em <strong>__channel__</strong>:",
-  "User_sent_a_message_to_you": "<strong>__username__</strong> enviou uma mensagem para você:",
-  "User_uploaded_a_file_to_you": "<strong>__username__</strong> enviou um arquivo para você:",
   "User_unmuted_by": "<em>__user_by__</em> permitiu que <em>__user_unmuted__</em> fale na sala.",
   "User_unmuted_in_room": "Usuário pode falar na sala",
   "User_updated_successfully": "Usuário atualizado com sucesso",
@@ -1348,4 +1341,4 @@
   "your_message_optional": "sua mensagem (opcional)",
   "Your_password_is_wrong": "Sua senha está errada!",
   "Your_push_was_sent_to_s_devices": "Sua natificação foi enviada para %s dispositivos"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/ru.i18n.json b/packages/rocketchat-i18n/i18n/ru.i18n.json
index e53ffc4e24fa..3dd3258e3553 100644
--- a/packages/rocketchat-i18n/i18n/ru.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ru.i18n.json
@@ -6,23 +6,24 @@
   "403": "Запрещено",
   "500": "Внутренняя ошибка сервера",
   "@username": "@логин",
-  "@username_message": "@логин ",
-  "__username__is_no_longer__role__defined_by__user_by_": "__username__ больше не __role__, по решению __user_by__",
+  "@username_message": "@логин <message>",
+  "__username__is_no_longer__role__defined_by__user_by_": "__username__ больше не __role__ по решению __user_by__",
   "__username__was_set__role__by__user_by_": "__username__ был установлен __role__ по решению __user_by__",
   "Accept": "Принять",
   "Accept_incoming_livechat_requests_even_if_there_are_no_online_agents": "Принимать входящие запросы с livechat, даже если нет подключенных сотрудников",
-  "Accept_with_no_online_agents": "Принимать с не подключенными сотрудниками",
+  "Accept_with_no_online_agents": "Принимать с неподключенными сотрудниками",
+  "access-mailer": "Доступ к странице мейлера",
   "access-mailer_description": "Разрешить рассылку электронного сообщения всем пользователям",
   "access-permissions": "Доступ к странице разрешений",
   "access-permissions_description": "Изменяйте разрешения для разных ролей",
-  "Access_not_authorized": "Не авторизованный доступ",
-  "Access_Token_URL": "Маркер доступа URL-адреса",
+  "Access_not_authorized": "Неавторизованный доступ",
+  "Access_Token_URL": "Токен доступа URL-адреса",
   "Accessing_permissions": "Права доступа",
   "Account_SID": "SID учетной записи",
   "Accounts": "Учётные записи",
   "Accounts_AllowAnonymousRead": "Разрешить чтение анонимным пользователям",
   "Accounts_AllowAnonymousWrite": "Разрешить писать анонимным пользователям",
-  "Accounts_AllowDeleteOwnAccount": "Разрешить пользователям удалять собственный аккаунт",
+  "Accounts_AllowDeleteOwnAccount": "Разрешить пользователям удалять собственную учетную запись",
   "Accounts_AllowedDomainsList": "Список разрешенных доменов",
   "Accounts_AllowedDomainsList_Description": "Список разрешенных доменов, разделенный запятыми ",
   "Accounts_AllowEmailChange": "Разрешить изменять адрес электронной почты",
@@ -39,12 +40,11 @@
   "Accounts_CustomFields_Description": "Ожидается валидный JSON-объект, в котором каждый ключ - это имя поля, а содержимое - словарь настроек поля. Пример:<br/><code>{\n \"role\": {\n  \"type\": \"select\",\n  \"defaultValue\": \"student\",\n  \"options\": [\"teacher\", \"student\"],\n  \"required\": true,\n  \"modifyRecordField\": {\n   \"array\": true,\n   \"field\": \"roles\"\n  }\n },\n \"twitter\": {\n  \"type\": \"text\",\n  \"required\": true,\n  \"minLength\": 2,\n  \"maxLength\": 10\n }\n}\n</code>",
   "Accounts_CustomFieldsToShowInUserInfo": "Кастомные поля для отображения в информации пользователя",
   "Accounts_DefaultUsernamePrefixSuggestion": "Предлагаемая подсказка префикса логина",
-  "Accounts_Default_User_Preferences_desktopNotifications": "Стандартные оповещения на рабочем столе",
   "Accounts_denyUnverifiedEmail": "Запретить неподтверждённые адреса электронной почты",
   "Accounts_EmailVerification": "Подтверждение адреса электронной почты",
   "Accounts_EmailVerification_Description": "Убедитесь, что у вас верные настройки SMTP для использования этой функции",
   "Accounts_Enrollment_Email": "Электронное сообщение при регистрации",
-  "Accounts_Enrollment_Email_Default": "<h2>Добро пожаловать в <h1>[Site_Name]</h1></h2> <p>Зайдите в [Site_URL] и попробуйте лучшее решение для чата с открытым исходным кодом на сегодняшний день!</p>",
+  "Accounts_Enrollment_Email_Default": "<h2>Добро пожаловать на <h1>[Site_Name]</h1></h2> <p>Посетите [Site_URL] и попробуйте лучшее решение с открытым исходным кодом для общения на сегодняшний день!</p>",
   "Accounts_Enrollment_Email_Description": "Вы можете использовать следующие подстановки: <br/><ul><li>[name], [fname] и [lname] (полное имя пользователя, только имя, только фамилия).</li>\n<li>[email] - адрес электронной почты пользователя</li>\n<li>[Site_Name] и [Site_URL] - название вашего приложения и его URL</li>\n</ul>",
   "Accounts_Enrollment_Email_Subject_Default": "Добро пожаловать на [Site_Name]",
   "Accounts_ForgetUserSessionOnWindowClose": "Забыть сессию пользователя при закрытии окна",
@@ -60,13 +60,13 @@
   "Accounts_OAuth_Custom_Button_Label_Text": "Текст кнопки",
   "Accounts_OAuth_Custom_Enable": "Включить",
   "Accounts_OAuth_Custom_id": "Идентификатор",
-  "Accounts_OAuth_Custom_Identity_Path": "Единичный путь",
+  "Accounts_OAuth_Custom_Identity_Path": "Identity Path",
   "Accounts_OAuth_Custom_Login_Style": "Вид логина",
   "Accounts_OAuth_Custom_Merge_Users": "Объединить пользователей",
   "Accounts_OAuth_Custom_Scope": "Область",
   "Accounts_OAuth_Custom_Secret": "Ключ",
   "Accounts_OAuth_Custom_Token_Path": "Token Path",
-  "Accounts_OAuth_Custom_Token_Sent_Via": "Токен посланными через",
+  "Accounts_OAuth_Custom_Token_Sent_Via": "Токен отправлен через",
   "Accounts_OAuth_Custom_Username_Field": "Поле \"логин\"",
   "Accounts_OAuth_Drupal": "Включить вход через Drupal",
   "Accounts_OAuth_Drupal_callback_url": "URI перенаправления Drupal oAuth2",
@@ -74,46 +74,46 @@
   "Accounts_OAuth_Drupal_secret": "Секретный ключ клиента Drupal oAuth2",
   "Accounts_OAuth_Facebook": "Facebook логин",
   "Accounts_OAuth_Facebook_callback_url": "Обратный URL-адрес Facebook",
-  "Accounts_OAuth_Facebook_id": "Facebook App Id",
+  "Accounts_OAuth_Facebook_id": "Идентификатор Facebook App",
   "Accounts_OAuth_Facebook_secret": "Facebook Secret",
-  "Accounts_OAuth_Github": "OAuth разрешён",
+  "Accounts_OAuth_Github": "OAuth включен",
   "Accounts_OAuth_Github_callback_url": "Обратный URL-адрес Github",
   "Accounts_OAuth_GitHub_Enterprise": "OAuth включен",
   "Accounts_OAuth_GitHub_Enterprise_callback_url": "Обратный URL-адрес GitHub Enterprise",
-  "Accounts_OAuth_GitHub_Enterprise_id": "Client Id",
+  "Accounts_OAuth_GitHub_Enterprise_id": "Идентификатор клиента",
   "Accounts_OAuth_GitHub_Enterprise_secret": "Client Secret",
-  "Accounts_OAuth_Github_id": "Client Id",
+  "Accounts_OAuth_Github_id": "Идентификатор клиента",
   "Accounts_OAuth_Github_secret": "Client Secret",
   "Accounts_OAuth_Gitlab": "OAuth включен",
   "Accounts_OAuth_Gitlab_callback_url": "Обратный URL-адрес GitLab",
-  "Accounts_OAuth_Gitlab_id": "GitLab Id",
+  "Accounts_OAuth_Gitlab_id": "Идентификатор GitLab",
   "Accounts_OAuth_Gitlab_secret": "Client Secret",
   "Accounts_OAuth_Google": "Google логин",
   "Accounts_OAuth_Google_callback_url": "Обратный URL-адрес Google",
-  "Accounts_OAuth_Google_id": "Google ID",
+  "Accounts_OAuth_Google_id": "Идентификатор Google",
   "Accounts_OAuth_Google_secret": "Google пароль",
-  "Accounts_OAuth_Linkedin": "Логин LinkedIn",
+  "Accounts_OAuth_Linkedin": "LinkedIn логин",
   "Accounts_OAuth_Linkedin_callback_url": "Обратный URL-адрес Linkedin",
-  "Accounts_OAuth_Linkedin_id": "LinkedIn Id",
+  "Accounts_OAuth_Linkedin_id": "Идентификатор LinkedIn",
   "Accounts_OAuth_Linkedin_secret": "LinkedIn Secret",
-  "Accounts_OAuth_Meteor": "Логин Meteor",
+  "Accounts_OAuth_Meteor": "Meteor логин",
   "Accounts_OAuth_Meteor_callback_url": "Обратный URL-адрес Meteor",
-  "Accounts_OAuth_Meteor_id": "Meteor Id",
+  "Accounts_OAuth_Meteor_id": "Идентификатор Meteor",
   "Accounts_OAuth_Meteor_secret": "Meteor Secret",
   "Accounts_OAuth_Proxy_host": "Прокси хост",
   "Accounts_OAuth_Proxy_services": "Прокси сервисы",
   "Accounts_OAuth_Twitter": "Логин Twitter",
-  "Accounts_OAuth_Twitter_callback_url": "Обратный URL-адрес Twitter",
-  "Accounts_OAuth_Twitter_id": "Twitter ID",
+  "Accounts_OAuth_Twitter_callback_url": "Callback URL-адрес Twitter",
+  "Accounts_OAuth_Twitter_id": "Идентификатор Twitter",
   "Accounts_OAuth_Twitter_secret": "Twitter Secret",
   "Accounts_OAuth_Wordpress": "WordPress логин",
   "Accounts_OAuth_Wordpress_callback_url": "Обратный URL-адрес Wordpress",
-  "Accounts_OAuth_Wordpress_id": "WordPress ID",
-  "Accounts_OAuth_Wordpress_secret": "Пароль WordPress",
+  "Accounts_OAuth_Wordpress_id": "Идентификатор WordPress",
+  "Accounts_OAuth_Wordpress_secret": "WordPress Secret",
   "Accounts_PasswordReset": "Восстановление пароля",
   "Accounts_Registration_AuthenticationServices_Default_Roles": "Роли по-умолчанию для сервисов аутентификации",
   "Accounts_Registration_AuthenticationServices_Default_Roles_Description": "Роли по-умолчанию (разделенные запятой), назначаемые пользователям при регистрации через сервисы аутентификации",
-  "Accounts_Registration_AuthenticationServices_Enabled": "Регистрация со службами проверки подлинности",
+  "Accounts_Registration_AuthenticationServices_Enabled": "Регистрация сервисами проверки подлинности",
   "Accounts_RegistrationForm": "Регистрационная форма",
   "Accounts_RegistrationForm_Disabled": "Отключена",
   "Accounts_RegistrationForm_LinkReplacementText": "Текст замены ссылки регистрационной формы",
@@ -123,12 +123,13 @@
   "Accounts_RegistrationForm_SecretURL_Description": "Вы должны предоставить случайную строку, которая будет добавлена к вашему регистрационному URL-адресу. Например: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Требуется имя для регистрации",
   "Accounts_RequirePasswordConfirmation": "Запрашивать подтверждение пароля",
+  "Accounts_SearchFields": "Поля, которые следует учитывать при поиске",
   "Accounts_SetDefaultAvatar": "Установить аватар по-умолчанию",
   "Accounts_SetDefaultAvatar_Description": "Пытаться найти аватар по-умолчанию через аккаунт OAuth или Gravatar",
   "Accounts_ShowFormLogin": "Показать логин на основе формы",
   "Accounts_UseDefaultBlockedDomainsList": "Использовать список запрещённых доменов по умолчанию",
   "Accounts_UseDNSDomainCheck": "Использовать DNS проверку доменов",
-  "Accounts_UserAddedEmail_Default": "<h2>Добро пожаловать в <h1>[Site_Name]</h1></h2><p>Посетите [Site_URL] и опробйте лучшее решение для чатов с открытым исходным кодом на сегодняшний день!</p> <p>Вы можете войти в систему, используя адрес электронной почты: [email] и пароль: [password]. Возможно, вам потребуется изменить его после первого входа в систему.",
+  "Accounts_UserAddedEmail_Default": "<h2>Добро пожаловать в <h1>[Site_Name]</h1></h2><p>Посетите [Site_URL] и попробуйте лучшее решение для чатов с открытым исходным кодом на сегодняшний день!</p> <p>Вы можете войти в систему, используя адрес электронной почты: [email] и пароль: [password]. Возможно, вам потребуется изменить его после первого входа в систему.",
   "Accounts_UserAddedEmail_Description": "Вы можете использовать следующие подстановки: <br/><ul><li> [name], [fname], [lname] (полное имя пользователя, только имя или только фамилию, соответственно). </li><li> [email] - адрес электронной почты пользователя. </li><li> [password] - пароля пользователя. </li><li>[Site_Name] и [Site_URL] - название вашего приложения и его URL. </li></ul>",
   "Accounts_UserAddedEmailSubject_Default": "Вы были добавлены в [Site_Name]",
   "Activate": "Активировать",
@@ -137,23 +138,23 @@
   "add-oauth-service": "Добавлять сервисы Oauth",
   "add-oauth-service_description": "Разрешение на добавление новых сервисов Oauth",
   "add-user": "Добавлять пользователей",
-  "add-user-to-any-c-room": "Добавить пользователя к любому публичному чату",
-  "add-user-to-any-c-room_description": "Разрешение не добавление пользователя к любому публичному чату",
-  "add-user-to-any-p-room": "Добавить пользователя к любому приватному чату",
-  "add-user-to-any-p-room_description": "Разрешение на добавление пользователя к любому приватному чату",
-  "add-user-to-joined-room": "Добавить пользователя к любому публичному чату, к которому присоединён",
-  "add-user-to-joined-room_description": "Разрешение на добавление пользователя к тому публичному чату, к которому сейчас присоединён",
+  "add-user-to-any-c-room": "Добавить пользователя к любому публичному каналу",
+  "add-user-to-any-c-room_description": "Разрешение на добавление пользователя к любому публичному каналу",
+  "add-user-to-any-p-room": "Добавить пользователя к любому приватному каналу",
+  "add-user-to-any-p-room_description": "Разрешение на добавление пользователя к любому приватному каналу",
+  "add-user-to-joined-room": "Добавить пользователя к любому каналу, к которому присоединён",
+  "add-user-to-joined-room_description": "Разрешение на добавление пользователя к тому публичному каналу, к которому сейчас присоединён",
   "add-user_description": "Разрешение на добавление новых пользователей на сервер на странице пользователей",
-  "Add_agent": "Добавить сотрудника",
+  "Add_agent": "Добавить представителя",
   "Add_custom_oauth": "Добавить кастомный OAuth",
   "Add_Domain": "Добавить домен",
   "Add_files_from": "Добавить файлы",
   "Add_manager": "Добавить менеджера",
   "Add_Role": "Добавить роль",
   "Add_user": "Добавить пользователя",
-  "Add_User": "Добавить пользователя",
+  "Add_User": "Добавить Пользователя",
   "Add_users": "Добавить пользователей",
-  "Adding_OAuth_Services": "Добавление OAuth услуги",
+  "Adding_OAuth_Services": "Добавление сервисы OAuth ",
   "Adding_permission": "Добавление разрешения",
   "Adding_user": "Добавление пользователя",
   "Additional_emails": "Дополнительные адреса электронной почты",
@@ -161,32 +162,33 @@
   "Administration": "Администрирование",
   "Adult_images_are_not_allowed": "Изображения для взрослых запрещены",
   "After_OAuth2_authentication_users_will_be_redirected_to_this_URL": "После аутентификации OAuth2, пользователи будут перенаправляться на этот URL-адрес",
-  "Agent": "Агент",
-  "Agent_added": "Сотрудник добавлен",
-  "Agent_removed": "Сотрудник удален",
-  "Alias": "Алиас",
+  "Agent": "Представитель",
+  "Agent_added": "Представитель добавлен",
+  "Agent_removed": "Представитель удален",
+  "Alias": "Псевдоним",
   "Alias_Format": "Формат псевдонима",
-  "Alias_Format_Description": "Импортировать сообщения из Slack с псевдонимом; %s заменяется на логин. Если не указано, псевдоним не будет использоваться.",
-  "Alias_Set": "Настроки алиаса",
+  "Alias_Format_Description": "Импортировать сообщения из Slack с псевдонимом; %s заменяется на логин пользователя. Если не указано, псевдоним не будет использоваться.",
+  "Alias_Set": "Настройки псевдонима",
   "All": "Все",
   "All_channels": "Все каналы",
   "All_logs": "Все записи",
   "All_messages": "Все сообщения",
+  "All_users_in_the_channel_can_write_new_messages": "Все пользователи на канале могут писать новые сообщения",
   "Allow_Invalid_SelfSigned_Certs": "Разрешить недействительные самоподписанные сертификаты",
-  "Allow_Invalid_SelfSigned_Certs_Description": "Разрешить некорректные и самоподписанные SSL сертификаты.",
+  "Allow_Invalid_SelfSigned_Certs_Description": "Разрешить недействительные и самоподписанные SSL сертификаты для проверки ссылок и предосмотра.",
   "Allow_switching_departments": "Разрешить посетителю сменить отдел",
   "Always_open_in_new_window": "Всегда открывать в новом окне",
-  "Analytics_features_enabled": "Доступные функции",
+  "Analytics_features_enabled": "Включенные функции",
   "Analytics_features_messages_Description": "Отслеживать пользовательские события, связанные с сообщениями.",
   "Analytics_features_rooms_Description": "Отслеживать пользовательские события, связанные с действиями в чатах (создать, покинуть, удалить).",
   "Analytics_features_users_Description": "Отслеживать пользовательские события, связанные с пользователями (время сброса пароля, изменение аватара и т. д.).",
   "Analytics_Google": "Google Analytics",
-  "Analytics_Google_id": "ID отслеживания",
+  "Analytics_Google_id": "Идентификатор отслеживания",
   "and": "и",
   "And_more": "И еще __length__",
   "Animals_and_Nature": "Животные и природа",
   "Announcement": "Объявление",
-  "API": "Интерфейс приложения",
+  "API": "API",
   "API_Allow_Infinite_Count": "Разрешить получить всё",
   "API_Allow_Infinite_Count_Description": "Могут ли вызовы к REST API возвращать всё за один вызов?",
   "API_Analytics": "Аналитика",
@@ -195,23 +197,23 @@
   "API_Default_Count_Description": "Количество результатов REST API для использования по-умолчанию, если потребитель не указал его.",
   "API_Drupal_URL": "URL сервера Drupal",
   "API_Drupal_URL_Description": "Пример: https://domain.com (без слэша в конце)",
-  "API_Embed": "Embed вставки",
+  "API_Embed": "Встроенный просмотр ссылок",
   "API_Embed_Description": "Включить ли предварительный просмотр ссылок, когда пользователь выкладывает ссылку на веб-сайт.",
   "API_Embed_UserAgent": "Встроенный user agent",
   "API_EmbedCacheExpirationDays": "Время хранения кэша предварительного просмотра в днях",
-  "API_EmbedDisabledFor": "Запретить Embed для пользователей",
-  "API_EmbedDisabledFor_Description": "Разделенный запятыми список имен пользователей",
+  "API_EmbedDisabledFor": "Запретить встраивание для пользователей",
+  "API_EmbedDisabledFor_Description": "Список логинов, разделенных запятыми, для отключения предварительного просмотра ссылок.",
   "API_EmbedIgnoredHosts": "Игнорировать хосты для Embed",
-  "API_EmbedIgnoredHosts_Description": "Разделенных запятыми список хостов или CIDR адресов, например. локальный, 127.0.0.1, 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16",
+  "API_EmbedIgnoredHosts_Description": "Список хостов или адресов CIDR, разделенных запятыми, например. localhost, 127.0.0.1, 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16",
   "API_EmbedSafePorts": "Безопасные порты",
-  "API_EmbedSafePorts_Description": "Разделенных запятыми список портов, разрешенных для просмотра.",
+  "API_EmbedSafePorts_Description": "Список портов, разделенных запятыми, разрешенный для предварительного просмотра.",
   "API_Enable_CORS": "Включить CORS",
   "API_Enable_Direct_Message_History_EndPoint": "Включить конечную точку истории сообщений",
   "API_Enable_Direct_Message_History_EndPoint_Description": "Эта настройка включает `/api/v1/im.history.others`. Это разрешает просмотр сообщений из личных диалогов, в которых не участвует вызывающий.",
   "API_Enable_Shields": "Включить щиты",
   "API_Enable_Shields_Description": "Включить щиты, доступные в `/api/v1/shields.svg`",
   "API_GitHub_Enterprise_URL": "URL-адрес сервера",
-  "API_GitHub_Enterprise_URL_Description": "Пример: http://domain.com (без завершающего слеша)",
+  "API_GitHub_Enterprise_URL_Description": "Пример: http://domain.com (без завершающего слеша)",
   "API_Gitlab_URL": "GitLab URL",
   "API_Shield_Types": "Типы щитов",
   "API_Shield_Types_Description": "Типы щитов в виде списка с разделением запятой, выбирайте из `online`, `channel` либо используйте `*` для всех",
@@ -220,7 +222,7 @@
   "API_Upper_Count_Limit_Description": "Какое максимальное число записей REST API должен возвращать (если не снято ограничение)?",
   "API_User_Limit": "Лимит пользователя для добавления всех пользователей к чату",
   "API_Wordpress_URL": "WordPress URL",
-  "Apiai_Key": "Api.ai Key",
+  "Apiai_Key": "Ключ Api.ai",
   "Apiai_Language": "Api.ai Язык",
   "Appearance": "Внешний вид",
   "Application_added": "Приложение добавлено",
@@ -228,20 +230,29 @@
   "Application_updated": "Приложение обновлено",
   "Apply_and_refresh_all_clients": "Применить",
   "Archive": "Отправить канал в архив",
-  "archive-room_description": "Разрешение на архивирование публичного чата",
+  "archive-room": "Архивировать комнату",
+  "archive-room_description": "Разрешение на архивирование канала",
   "are_also_typing": "тоже печатает...",
   "are_typing": "печатает...",
   "Are_you_sure": "Вы уверены?",
-  "Are_you_sure_you_want_to_delete_your_account": "Вы уверены, что хотите удалить свой аккаунт?",
+  "Are_you_sure_you_want_to_delete_your_account": "Вы уверены, что хотите удалить свою учетную запись?",
+  "assign-admin-role": "Назначить на роль Администратора",
+  "assign-admin-role_description": "Разрешение назначить на роль Администратора другим пользователям",
   "Assign_admin": "Назначенный администратор",
   "at": "в",
   "AtlassianCrowd": "Atlassian Crowd",
   "Attachment_File_Uploaded": "Файл загружен",
+  "Attribute_handling": "Обработка атрибутов",
   "Audio_message": "Звуковое сообщение",
-  "Auth_Token": "Auth Токен",
-  "Author": "автор",
+  "Audio_Notification_Value_Description": "Может быть любой выборочный звук или один из звуков по умолчанию: beep, chelle, ding, droplet, highbell, seasons",
+  "Audio_Notifications_Default_Alert": "Звуковые уведомления",
+  "Audio_Notifications_Value": "Сообщение по умолчанию для аудио уведомления",
+  "Auth_Token": "Токен авторизации",
+  "Author": "Автор",
   "Authorization_URL": "Авторизация URL-адреса",
-  "Authorize": "Разрешить",
+  "Authorize": "Авторизовать",
+  "auto-translate": "Автоматический перевод",
+  "auto-translate_description": "Разрешение пользоваться автоматическим переводом",
   "Auto_Load_Images": "Автозагрузка изображений",
   "Auto_Translate": "Авто-перевод",
   "AutoLinker_Email": "Подсвечивать адрес электронной почты",
@@ -259,11 +270,11 @@
   "AutoTranslate_Enabled_Description": "<code class=\"inline\">Автоматический перевод</code> дает пользователю возможность переводить все сообщения на его язык. За перевод может взыматься оплата, обратитесь к <a target=\"_blank\" href=\"https://cloud.google.com/translate/pricing\">документации Google</a>",
   "AutoTranslate_GoogleAPIKey": "Google API ключ",
   "Available": "Доступен",
-  "Available_agents": "Свободные сотрудники",
+  "Available_agents": "Свободные представители",
   "Avatar": "Аватар",
   "Avatar_changed_successfully": "Аватар успешно изменен",
   "Avatar_URL": "URL-адрес Аватара",
-  "Avatar_url_invalid_or_error": "Предоставленный URL-адрес недействителен или недоступен. Повторите попытку с другим URL-адресом.",
+  "Avatar_url_invalid_or_error": "Предоставленный URL-адрес недействителен или недоступен. Пожалуйста, повторите попытку с другим URL-адресом.",
   "away": "отошёл",
   "Away": "Отошёл",
   "away_female": "отошла",
@@ -278,88 +289,114 @@
   "Back_to_login": "На страницу авторизации",
   "Back_to_permissions": "Назад к настройкам прав",
   "Backup_codes": "Коды резервного копирования",
-  "ban-user_description": "Разрешение банить пользователей в публичном чате",
+  "ban-user": "Забанить пользователя",
+  "ban-user_description": "Разрешение на бан пользователей на канале",
   "Beta_feature_Depends_on_Video_Conference_to_be_enabled": "Функция в бета тестировании. Зависит от Video Conference.",
   "Block_User": "Заблокировать пользователя",
-  "Body": "Основная часть",
+  "Body": "Тело",
   "bold": "жирный",
   "bot_request": "Запрос бота",
   "BotHelpers_userFields": "Пользовательские поля",
+  "BotHelpers_userFields_Description": "CSV полей пользователя, к которым можно получить доступ с помощью методов ботов помощников.",
   "Branch": "Ветка",
+  "Broadcast_Connected_Instances": "Широковещательные подключенные виртуальные машины",
+  "Bugsnag_api_key": "Ключ Bugsnag API",
+  "bulk-create-c": "Массовое создание каналов",
+  "bulk-create-c_description": "Разрешение на массовое создание каналов",
+  "bulk-register-user": "Массовое создание каналов",
+  "bulk-register-user_description": "Разрешение на массовое создание каналов",
   "busy": "занят",
   "Busy": "Занят",
   "busy_female": "занята",
-  "Busy_female": "Занята",
+  "Busy_female": "Занят",
   "busy_male": "занят",
-  "Busy_male": "Занят",
+  "Busy_male": "Занята",
   "by": "от",
   "cache_cleared": "Кэш очищен",
   "Cancel": "Отмена",
   "Cancel_message_input": "Отменить",
-  "Cannot_invite_users_to_direct_rooms": "Нельзя приглашать пользователей в приватные чаты",
-  "Cannot_open_conversation_with_yourself": "Нельзя создать чат с самим собой",
+  "Cannot_invite_users_to_direct_rooms": "Нельзя приглашать пользователей в личную переписку",
+  "Cannot_open_conversation_with_yourself": "Нельзя создавать чат с самим собой",
+  "CAS_autoclose": "Автозакрытие всплывающего окна авторизации",
+  "CAS_base_url": "SSO базовый URL",
+  "CAS_base_url_Description": "Базовый URL вашего внешнего сервиса SSO. Например: https://sso.example.undef/sso/",
   "CAS_button_color": "Цвет фона кнопки входа",
   "CAS_button_label_color": "Цвет текста кнопки входа",
   "CAS_button_label_text": "Текст кнопки входа",
   "CAS_enabled": "Включено",
+  "CAS_Login_Layout": "Стиль окна CAS авторизации",
+  "CAS_login_url": "SSO логин URL",
+  "CAS_login_url_Description": "Логин URL вашего внешнего сервиса SSO. Например: https://sso.example.undef/sso/login",
   "CAS_popup_height": "Высота всплывающего окна входа",
   "CAS_popup_width": "Ширина всплывающего окна входа",
+  "CAS_Sync_User_Data_Enabled": "Всегда синхронизировать пользовательские данные",
+  "CAS_Sync_User_Data_Enabled_Description": "Всегда синхронизировать внешние пользовательские данные CAS с доступными атрибутами при входе в систему. Примечание: атрибуты всегда синхронизируются при создании учетной записи.",
+  "CAS_Sync_User_Data_FieldMap": "Атрибуты карты",
   "CAS_Sync_User_Data_FieldMap_Description": "Используйте этот JSON для создания внутренних атрибутов (ключ) из внешних атрибутов (значение). Имена внешних атрибутов, обрамленные '%', будут интерполированы в строки значений.<br/>Например, `{\"email\":\"%email%\", \"name\":\"%firstname%, %lastname%\"}`<br/><br/>Map атрибутов всегда интерполируется. В CAS 1.0 доступен только атрибут `username`. Из внутренних атрибутов доступны: логин (username), имя (name), адрес электронной почты (email), комнаты (rooms); комнаты - это список комнат, к которым присоединить пользователя после создания, разделенный запятой, например: {\"rooms\": \"%team%,%department%\"} присоединит пользователей CAS при создании к каналам их команды и отдела.",
+  "CAS_version": "Версия CAS",
+  "CAS_version_Description": "Используйте только поддерживаемую версию CAS, поддерживаемую вашим сервисом CAS SSO.",
   "CDN_PREFIX": "CDN префикс",
   "Certificates_and_Keys": "Ключи и сертификаты",
   "Change_Room_Type": "Изменить тип канала",
   "Changing_email": "Изменение адреса электронной почты",
-  "channel": "чат",
+  "channel": "канал",
   "Channel": "Канал",
-  "Channel_already_exist": "Чат '#% s' уже существует.",
+  "Channel_already_exist": "Канал \"#%s\" уже существует.",
   "Channel_already_exist_static": "Такой канал уже существует",
-  "Channel_already_Unarchived": "Чат с именем `#% s` уже находится в состоянии \"разархивирован\"",
-  "Channel_Archived": "Чат с именем `#% s` заархивирован успешно",
-  "Channel_created": "Чат `#%s` создан.",
-  "Channel_doesnt_exist": "Канал `#%s` не существует.",
+  "Channel_already_Unarchived": "Канал с именем \"#%s\" уже находится в состоянии \"разархивирован\"",
+  "Channel_Archived": "Канал с именем \"#%s\" успешно архивирован ",
+  "Channel_created": "Канал \"#%s\" создан.",
+  "Channel_doesnt_exist": "Канала \"#%s\" не существует.",
   "Channel_name": "Имя канала",
-  "Channel_to_listen_on": "Чат для прослушивания",
-  "Channel_Unarchived": "Чат с именем `#% s` разархивирован успешно",
+  "Channel_Name_Placeholder": "Пожалуйста, введите название канала...",
+  "Channel_to_listen_on": "Канал для прослушивания",
+  "Channel_Unarchived": "Канал с именем \"#%s\" успешно разархивирован ",
   "Channels": "Каналы",
   "Channels_are_where_your_team_communicate": "Каналы для общения вашей команды",
   "Channels_list": "Список каналов",
   "Chat_button": "кнопка чат",
-  "Chat_closed": "чат закрыт",
+  "Chat_closed": "Чат закрыт",
   "Chat_closed_successfully": "Чат успешно закрыт",
   "Chat_Now": "Общатся сейчас",
-  "Chat_window": "окно чата",
+  "Chat_window": "Окно чата",
   "Chatops_Enabled": "Включить Chatops",
-  "Chatops_Title": "Панель Chatops",
+  "Chatops_Title": "Панель Chatops",
   "Chatops_Username": "Логин Chatops",
-  "Choose_a_room": "Выберите чат",
+  "Choose_a_room": "Выберите комнату",
   "Choose_messages": "Выбрать сообщения",
   "Choose_the_alias_that_will_appear_before_the_username_in_messages": "Выберите псевдоним, который появится перед логином в сообщениях.",
   "Choose_the_username_that_this_integration_will_post_as": "Выберите логин, под которым эта интеграция будет постить.",
-  "clean-channel-history": "Очистить историю публичного чата",
+  "clean-channel-history": "Очистить историю канала",
+  "clean-channel-history_description": "Разрешение удалять историю на каналах",
   "clear": "Очистить",
-  "Clear_all_unreads_question": "Удалить все \"непрочитанные\"?",
+  "Clear_all_unreads_question": "Удалить все непрочитанные?",
   "clear_cache_now": "Очистить кэш сейчас",
   "clear_history": "Очистить историю",
   "Click_here": "кликните сюда",
   "Click_here_for_more_info": "Больше информации здесь",
-  "Client_ID": "Client ID",
-  "Client_Secret": "Client Secret",
+  "Click_to_join": "Нажмите, чтобы присоединиться!",
+  "Client_ID": "Идентификатор клиента",
+  "Client_Secret": "Клиент Secret",
   "Clients_will_refresh_in_a_few_seconds": "Клиенты обновятся через пару секунд",
   "close": "закрыть",
   "Close": "Закрыть",
+  "close-livechat-room": "Закрыть комнату Livechat ",
   "close-livechat-room_description": "Разрешение на закрытие текущего чата LiveChat",
+  "close-others-livechat-room": "Закрыть комнату Livechat ",
+  "close-others-livechat-room_description": "Разрешение закрывать другие каналы LiveChat",
   "Closed": "Закрыто",
   "Closed_by_visitor": "Закрыто посетителем",
   "Closing_chat": "Закрыть чат",
   "Collapse_Embedded_Media_By_Default": "Сворачивать вложенные медиа по умолчанию",
   "Color": "Цвет",
   "Commands": "Команды",
+  "Comment_to_leave_on_closing_session": "Комментарий для выхода при закрытии сессии",
   "Compact": "Компактный",
   "Confirm_password": "Подтвердить пароль",
   "Content": "Содержимое",
-  "Conversation": "Диалог",
-  "Conversation_closed": "Разговор закрыт: __comment__.",
-  "Convert_Ascii_Emojis": "Конвертировать ASCII в Emoji",
+  "Conversation": "Беседа",
+  "Conversation_closed": "Беседа закрыта: __comment__.",
+  "Convert_Ascii_Emojis": "Конвертировать ASCII в эмодзи",
   "Copied": "Скопировано",
   "Copy": "Копировать",
   "Copy_to_clipboard": "Копировать в буфер обмена",
@@ -367,22 +404,24 @@
   "Count": "Количество",
   "Cozy": "Удобный",
   "Create": "Создать",
-  "create-c": "Создавать публичные чаты",
-  "create-c_description": "Разрешение на создание публичных чатов",
+  "create-c": "Создать публичные каналы",
+  "create-c_description": "Разрешение на создание публичных каналов",
   "create-d": "Создавать чаты личных сообщений",
   "create-d_description": "Разрешение на создание чатов личных сообщений",
   "create-p": "Создавать закрытые чаты",
   "create-p_description": "Разрешение создавать закрытые чаты",
   "create-user": "Создавать пользователей",
   "create-user_description": "Разрешение на создание пользователей",
-  "Create_A_New_Channel": "Создать новый чат",
-  "Create_new": "Создать чат",
+  "Create_A_New_Channel": "Создать новый канал ",
+  "Create_new": "Создать новый",
   "Created_at": "Создан",
   "Created_at_s_by_s": "Создано в <strong>%s</strong> при помощи <strong>%s</strong>",
+  "Created_at_s_by_s_triggered_by_s": "Создано в <strong>%s</strong> пользователем <strong>%s</strong> сработало на <strong>%s</strong>",
   "CRM_Integration": "Интеграция с CRM",
+  "CROWD_Reject_Unauthorized": "Отклонить неавторизованных",
   "Current_Chats": "Текущие чаты",
   "Current_Status": "Текущий статус",
-  "Custom": "Индивидуальное",
+  "Custom": "Пользовательские ",
   "Custom_Emoji": "Пользовательские смайлы",
   "Custom_Emoji_Add": "Добавить новый смайл",
   "Custom_Emoji_Added_Successfully": "Пользовательский смайл успешно добавлен",
@@ -393,10 +432,10 @@
   "Custom_Emoji_Info": "Информация о пользовательском смайле",
   "Custom_Emoji_Updated_Successfully": "Пользовательский смайл успешно обновлен",
   "Custom_Fields": "Пользовательские поля",
-  "Custom_oauth_helper": "Настраивая вашего поставщика OAuth, вам необходимо сообщить обратный URL-адрес. Используйте <pre>%s</pre> .",
+  "Custom_oauth_helper": "Настраивая вашего поставщика OAuth, вам необходимо сообщить обратный URL-адрес. Используйте <pre>%s</pre> .",
   "Custom_oauth_unique_name": "Кастомный uniquie name OAuth",
-  "Custom_Script_Logged_In": "Пользовательский сценарий для зарегистрированных пользователей",
-  "Custom_Script_Logged_Out": "Пользовательский сценарий для незарегистрированных пользователей",
+  "Custom_Script_Logged_In": "Пользовательский скрипт для зарегистрированных пользователей",
+  "Custom_Script_Logged_Out": "Пользовательский скрипт для незарегистрированных пользователей",
   "Custom_Scripts": "Пользовательские скрипты",
   "Custom_Sound_Add": "Добавить свой звук",
   "Custom_Sound_Delete_Warning": "Удаление звука нельзя отменить",
@@ -415,13 +454,13 @@
   "Date_to": "До",
   "days": "дней",
   "DB_Migration": "Миграция базы данных",
-  "DB_Migration_Date": "База данных Дата миграции",
+  "DB_Migration_Date": "Дата миграции базы данных",
   "Deactivate": "Деактивировать",
   "Decline": "Отклнонить",
   "Default": "По умолчанию",
   "Delete": "Удалить",
-  "delete-c": "Удалять публичные чаты",
-  "delete-c_description": "Разрешение на удаление публичных чатов",
+  "delete-c": "Удалить публичные каналы",
+  "delete-c_description": "Разрешение на удаление публичных каналов",
   "delete-d": "Удалять личные сообщения",
   "delete-d_description": "Разрешение на удаление личных сообщений",
   "delete-message": "Удалять сообщения",
@@ -430,44 +469,61 @@
   "delete-p_description": "Разрешение на удаление закрытых чатов",
   "delete-user": "Удалять пользователей",
   "delete-user_description": "Разрешение на удаление пользователей",
-  "Delete_message": "Удаленное сообщение",
-  "Delete_my_account": "Удалить мой аккаунт",
-  "Delete_Room_Warning": "Удаление чата так же удалит все сообщения в нем. Это действие невозможно отменить.",
-  "Delete_User_Warning": "Удаление пользователя удалит все сообщения от этого пользователя. Это действие невозможно отменить.",
+  "Delete_message": "Удалить сообщение",
+  "Delete_my_account": "Удалить мою учетную запись",
+  "Delete_Room_Warning": "Удаление комнаты удалит все сообщения в ней. Это действие невозможно отменить.",
+  "Delete_User_Warning": "Удаление пользователя удалит все сообщения этого пользователя. Это действие невозможно отменить.",
   "Deleted": "Удалено!",
   "Department": "Отдел",
   "Department_removed": "Отдел удален",
-  "Departments": "Разделы",
-  "Deployment_ID": "ID Инсталяции",
+  "Departments": "Отделы",
+  "Deployment_ID": "Идентификатор развертывания",
   "Description": "Описание",
-  "Desktop": "Рабочий стол",
-  "Desktop_Notification_Test": "Проверка уведомлений рабочего стола",
+  "Desktop": "Компьютер",
+  "Desktop_Notification_Test": "Проверка уведомлений на компьютере",
   "Desktop_Notifications": "Оповещения на рабочем столе",
+  "Desktop_Notifications_Default_Alert": "Стандартные оповещения на рабочем столе",
   "Desktop_Notifications_Disabled": "Оповещения отключены. Измените настройки браузера, чтобы включить уведомления.",
   "Desktop_Notifications_Duration": "Длительность",
-  "Desktop_Notifications_Duration_Description": "Секунды для отображения уведомлений на рабочем столе. Это может повлиять на OS X Центр уведомлений. Введите 0, чтобы использовать настройки браузера по умолчанию и не влиять на OS X Центр уведомлений.",
-  "Desktop_Notifications_Enabled": "Уведомления на рабочем столе включены",
+  "Desktop_Notifications_Duration_Description": "Количество секунд в течение которых отображаются уведомления на компьютере. Это может повлиять на центр уведомлений OS X. Введите 0, чтобы использовать настройки браузера по умолчанию и не влиять на центр уведомлений OS X.",
+  "Desktop_Notifications_Enabled": "Уведомления на компьютере включены",
   "Different_Style_For_User_Mentions": "Другой стиль для упоминаний пользователей",
-  "Direct_message_someone": "Личное сообщение кому-либо",
-  "Direct_Messages": "Личные сообщения",
+  "Direct_message_someone": "Личная переписка с кем-нибудь",
+  "Direct_Messages": "Личная переписка",
   "Direct_Reply": "Прямой ответ",
   "Direct_Reply_Debug": "Отладка прямого ответа",
   "Direct_Reply_Debug_Description": "[ВНИМАНИЕ] Режим отлатки будет отображать ваш пароль в открытом виде в консоли администратора",
+  "Direct_Reply_Delete": "Удалить перехваченную электронную почту",
+  "Direct_Reply_Enable": "Разрешить прямой ответ",
+  "Direct_Reply_Frequency": "Частота проверки почты",
+  "Direct_Reply_Frequency_Description": "(в минутах, по умолчанию/минимальное значение - 2)",
+  "Direct_Reply_Host": "Хост прямого ответа",
+  "Direct_Reply_IgnoreTLS": "Игнорировать TLS",
+  "Direct_Reply_Password": "Пароль",
+  "Direct_Reply_Port": "Порт прямого ответа",
+  "Direct_Reply_Protocol": "Протокол прямого ответа",
+  "Direct_Reply_Separator": "Разделитель",
+  "Direct_Reply_Separator_Description": "[Меняйте только, если вы точно знаете, что делаете, смотрите документацию] <br0/> разделитель между базой и тегом в электронной почте",
+  "Direct_Reply_Username": "Имя пользователя",
+  "Direct_Reply_Username_Description": "Пожалуйста, используйте абсолютную электронную почту, tagging не разрешено, оно будет переписана.",
   "Disable_Notifications": "Отключить уведомления",
   "Disable_two-factor_authentication": "Выключить двухфакторную аутентификацию",
   "Display_offline_form": "Показать оффлайн сообщение",
-  "Displays_action_text": "Вывести текст действия",
-  "Do_you_want_to_change_to_s_question": "Хотите изменить на <strong>%s</strong>?",
+  "Displays_action_text": "Показать текст действия",
+  "Do_you_want_to_change_to_s_question": "Хотите изменить на <strong>%s</strong>?",
   "Domain": "Домен",
+  "Domain_added": "домен добален",
+  "Domain_removed": "Домен удален",
   "Domains": "Домены",
+  "Domains_allowed_to_embed_the_livechat_widget": "Список доменов, разделенный запятой, куда можно встроить виджет Livechat. Оставьте пустым, чтобы разрешить любые домены.",
   "Download_Snippet": "Скачать",
   "Drop_to_upload_file": "Переместите сюда для загрузки файла",
   "Dry_run": "Пробный запуск",
   "Dry_run_description": "Мы отправим только одно электронное сообщение на адрес, указанный в поле \"От\". Адрес электронной почты должен принадлежать реальному пользователю.",
-  "Duplicate_archived_channel_name": "Архивный чат с именем `#%s`уже существует",
-  "Duplicate_archived_private_group_name": "Архивный групповой чат с именем '%s' уже существует",
-  "Duplicate_channel_name": "Чат с именем '%s' уже существует",
-  "Duplicate_private_group_name": "Приватный групповой чат с именем '%s' уже существует",
+  "Duplicate_archived_channel_name": "Архивный канал с именем \"#%s\" уже существует",
+  "Duplicate_archived_private_group_name": "Архивная приватная группа с именем \"%s\" уже существует",
+  "Duplicate_channel_name": "Канал с именем \"%s\" уже существует",
+  "Duplicate_private_group_name": "Приватная группа с именем \"%s\" уже существует",
   "Duration": "Длительность",
   "Edit": "Редактировать",
   "edit-message": "Редактировать сообщения",
@@ -478,19 +534,21 @@
   "edit-other-user-info_description": "Разрешить изменять имя, логин или адрес электронной почты другого пользователя.",
   "edit-other-user-password": "Редактировать пароль другого пользователя",
   "edit-other-user-password_description": "Разрешение на редактирование пароля другого пользователя. Требует разрешения на редактирование информации другого пользователя",
+  "edit-privileged-setting": "Изменить привилегированные параметры",
   "edit-privileged-setting_description": "Возможность редактирование настроек",
-  "edit-room": "Редактировать чат",
-  "edit-room_description": "Разрешение на редактирование имени, темы, типа (приватный или публичный) и статуса (активный или архивный) чата.",
+  "edit-room": "Редактировать комнату",
+  "edit-room_description": "Разрешение на редактирование имени, темы, типа (приватный или публичный) и статуса (активный или архивный) комнаты.",
   "Edit_Custom_Field": "Редактировать поле",
   "Edit_Department": "Редактировать отдел",
   "Edit_previous_message": "'%s' - редактировать предыдущее сообщение",
+  "Edit_Trigger": "Изменить триггер",
   "edited": "отредактировано",
-  "Editing_room": "Редактирование номера",
+  "Editing_room": "Редактирование комнаты",
   "Editing_user": "Редактирование пользователя",
   "Email": "Электронная почта",
   "Email_address_to_send_offline_messages": "Адрес электронной почты для отправки сообщения в оффлайн режиме",
   "Email_already_exists": "Такой адрес электронной почты уже используется",
-  "Email_body": "Тело сообщения",
+  "Email_body": "Тело письма",
   "Email_Change_Disabled": "Администратор вашего Rocket.Chat запретил изменение адреса электронной почты",
   "Email_Footer_Description": "Вы можете использовать следующие подстановки: <br/><ul><li>[Site_Name] и [Site_URL] для имени приложения и его URL соответственно.</li></ul>",
   "Email_from": "От",
@@ -499,20 +557,21 @@
   "Email_Notification_Mode_All": "Каждое упоминание",
   "Email_Notification_Mode_Disabled": "Отключено",
   "Email_or_username": "Адрес электронной почты или логин",
+  "Email_Placeholder": "Пожалуйста, введите ваше почтовый адрес...",
   "Email_subject": "Тема",
   "Email_verified": "Адрес электронной почты подтверждён",
-  "Emoji": "Emoji",
+  "Emoji": "Эмодзи ",
   "EmojiCustomFilesystem": "Файловая система пользовательских смайлов",
   "Empty_title": "Пустой заголовок",
   "Enable": "Включить",
-  "Enable_Desktop_Notifications": "Включить уведомления на рабочем столе",
+  "Enable_Desktop_Notifications": "Включить уведомления на компьютере",
   "Enable_Svg_Favicon": "Включить SVG favicon",
-  "Enable_two-factor_authentication": "Включить двухфакторную аутентификацию",
+  "Enable_two-factor_authentication": "Включить двухфакторную авторизацию",
   "Enabled": "Включено",
   "Encrypted_message": "Зашифрованное сообщение",
   "End_OTR": "Завершить конфиденциальную беседу",
-  "Enter_a_regex": "Введите regex",
-  "Enter_a_room_name": "Введите название чата",
+  "Enter_a_regex": "Введите регулярное выражение",
+  "Enter_a_room_name": "Введите название комнаты",
   "Enter_a_username": "Введите логин",
   "Enter_Alternative": "Альтернативный режим (отправка по Ctrl/Alt/Shift/CMD + Enter)",
   "Enter_authentication_code": "Введите код аутантификации",
@@ -522,32 +581,32 @@
   "Enter_Normal": "Обычный режим (отправка по Enter)",
   "Enter_to": "Выйти и ",
   "Error": "Ошибка",
-  "error-action-not-allowed": "__action__ не допускается",
+  "error-action-not-allowed": "__action__ не разрешено",
   "error-application-not-found": "Приложение не найдено",
-  "error-archived-duplicate-name": "Архивный чат с именем '__room_name__' уже существует ",
-  "error-avatar-invalid-url": "Неверный аватар URL: __url__",
+  "error-archived-duplicate-name": "Существует архивный канал с именем '__room_name__'",
+  "error-avatar-invalid-url": "Неверный URL аватара: __url__",
   "error-avatar-url-handling": "Ошибка при работе установки аватара из URL (__url__) для __username__",
   "error-cant-invite-for-direct-room": "Нельзя приглашать пользователей в личные сообщения",
   "error-could-not-change-email": "Невозможно изменить адрес электронной почты",
   "error-could-not-change-name": "Невозможно изменить имя",
   "error-could-not-change-username": "Не удалось изменить логин",
-  "error-delete-protected-role": "Нельзя удалить защищённую позицию",
+  "error-delete-protected-role": "Нельзя удалить защищённую роль",
   "error-department-not-found": "Отдел не найден",
   "error-direct-message-file-upload-not-allowed": "Передача файлов не разрешена в личных сообщениях",
-  "error-duplicate-channel-name": "Чат с именем '__channel_name__' уже существует",
+  "error-duplicate-channel-name": "Канал с именем '__channel_name__' уже существует",
   "error-email-domain-blacklisted": "Домен адреса электронной почты находится в черном списке",
   "error-email-send-failed": "Ошибка отправки электронного сообщения: __message__",
   "error-field-unavailable": "<strong>__field__</strong> уже используется :(",
-  "error-file-too-large": "Файл слишком велик",
+  "error-file-too-large": "Размер файл слишком большой",
   "error-importer-not-defined": "Импортер не был определен правильно, не хватает классификации импорта.",
-  "error-input-is-not-a-valid-field": "__input__ не является допустимым __field__",
-  "error-invalid-actionlink": "ссылка Неверное действие",
+  "error-input-is-not-a-valid-field": "__input__ недопустимое __field__",
+  "error-invalid-actionlink": "Недействительная ссылка",
   "error-invalid-arguments": "Недопустимые аргументы",
   "error-invalid-asset": "Недействительный актив",
-  "error-invalid-channel": "Недопустимый чат.",
-  "error-invalid-channel-start-with-chars": "Недопустимый чат. Начните с @ или #",
-  "error-invalid-custom-field": "Неверное поле",
-  "error-invalid-custom-field-name": "Неверное имя для поля. Используйте тельно буквы, цифры, дефисы и подчеркивания.",
+  "error-invalid-channel": "Недопустимый канал.",
+  "error-invalid-channel-start-with-chars": "Недопустимый канал. Начните с @ или #",
+  "error-invalid-custom-field": "Неверное пользовательское поле",
+  "error-invalid-custom-field-name": "Некорректное имя для поля. Используйте только буквы, цифры, дефисы и подчеркивания.",
   "error-invalid-date": "Указана неверная дата",
   "error-invalid-description": "Недопустимое описание",
   "error-invalid-domain": "Ошибочный домен",
@@ -557,44 +616,46 @@
   "error-invalid-file-type": "Неверный тип файла",
   "error-invalid-file-width": "Недопустимая ширина файла",
   "error-invalid-from-address": "Вы сообщили неверный адрес отправителя.",
-  "error-invalid-integration": "Invalid интеграция",
+  "error-invalid-integration": "Неверная интеграция",
   "error-invalid-message": "Неверное сообщение",
   "error-invalid-method": "Недопустимый метод",
   "error-invalid-name": "Неверное имя",
   "error-invalid-password": "Неверный пароль",
   "error-invalid-redirectUri": "Ошибочный redirectUri",
-  "error-invalid-role": "недопустимая роль",
+  "error-invalid-role": "Недопустимая роль",
   "error-invalid-room": "Такой комнаты не существует",
-  "error-invalid-room-name": "<strong>%s</strong> is not a valid room name,<br/> use only letters, numbers, hyphens and underscores",
-  "error-invalid-room-type": "<strong>__type__</strong> недопустимый тип чата.",
-  "error-invalid-settings": "Неверные настройки, предоставляемые",
-  "error-invalid-subscription": "Invalid подписка",
-  "error-invalid-token": "Недопустимый маркер",
+  "error-invalid-room-name": "<strong>__room_name__</strong> недопустимое имя комнаты",
+  "error-invalid-room-type": "<strong>__type__</strong> недопустимый тип комнаты.",
+  "error-invalid-settings": "Недействительные настройки",
+  "error-invalid-subscription": "Неверная подписка",
+  "error-invalid-token": "Недопустимый токен",
   "error-invalid-triggerWords": "Недействительные triggerWords",
-  "error-invalid-urls": "Недействительные URL",
+  "error-invalid-urls": "Недействительные URLы",
   "error-invalid-user": "Неверный пользователь",
   "error-invalid-username": "Неверный логин",
-  "error-invalid-webhook-response": "Webhook URL ответил со статусом, чем 200",
+  "error-invalid-webhook-response": "Webhook URL ответил статусом, отличным от 200",
   "error-message-deleting-blocked": "Удаление сообщений запрещено",
   "error-message-editing-blocked": "Редактирование сообщений запрещено",
   "error-message-size-exceeded": "Размер сообщения превышает Message_MaxAllowedSize",
   "error-missing-unsubscribe-link": "Для того, чтобы [unsubscribe], вы должны предоставить эту ссылку.",
   "error-no-tokens-for-this-user": "Нет токенов для этого пользователя",
   "error-not-allowed": "Не разрешено",
-  "error-not-authorized": "Не допускается",
+  "error-not-authorized": "Не авторизован",
   "error-push-disabled": "Push оповещения отключены",
-  "error-remove-last-owner": "Это последний владелец. Пожалуйста, назначьте нового владельца до удаления этого.",
-  "error-role-in-use": "Нельзя удалить позицию, потому что она используется",
-  "error-role-name-required": "Необходимо название роли",
+  "error-remove-last-owner": "Это последний владелец. Пожалуйста, назначьте нового владельца перед удалением этого.",
+  "error-role-in-use": "Нельзя удалить роль, потому что она используется",
+  "error-role-name-required": "Требуется название роли",
   "error-the-field-is-required": "Поле __field__ требуется.",
-  "error-too-many-requests": "Слишком много запросов. вы должны подождать __seconds__ секунд перед тем, как попробовать снова.",
+  "error-too-many-requests": "Ошибка, слишком много запросов. вы должны подождать __seconds__ секунд перед тем, как попробовать снова.",
   "error-user-is-not-activated": "Пользователь не активирован",
   "error-user-limit-exceeded": "Число пользователей, которых вы пытаетесь пригласить в #channel_name превышает лимит, установленный администратором",
-  "error-user-not-in-room": "Пользователь не в этом чате",
+  "error-user-not-in-room": "Пользователь не в этой комнате",
   "error-user-registration-disabled": "Регистрация пользователей отключена",
-  "error-user-registration-secret": "Регистрация пользователя допускается только с помощью секретной URL",
-  "error-you-are-last-owner": "Вы последний владелец чата. Пожалуйста, назначьте нового владельца до выхода из этого чата.",
+  "error-user-registration-secret": "Регистрация пользователя допускается только с помощью секретной ссылки",
+  "error-you-are-last-owner": "Вы последний владелец комнаты. Пожалуйста, назначьте нового владельца до выхода из этой комнаты.",
   "Error_changing_password": "Ошибка при изменении пароля",
+  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances": "Ошибка: требуется слежение за Oplog при запуске Rocket.Chat на виртуальных машинах",
+  "Error_RocketChat_requires_oplog_tailing_when_running_in_multiple_instances_details": "Пожалуйста, убедитесь, что ваш MongoDB находится в режиме ReplicaSet, а переменная среды MONGO_OPLOG_URL правильно определена на сервере приложений.",
   "Esc_to": "Выйти и",
   "Event_Trigger": "Событие",
   "Event_Trigger_Description": "Выберите тим события который будет запускать этот webhook",
@@ -602,42 +663,49 @@
   "every_hour": "Раз в час",
   "every_six_hours": "Раз в 6 часов",
   "Everyone_can_access_this_channel": "У всех есть доступ в этот канал",
-  "Example_s": "Пример: <code class=\"inline\">%s</code>",
+  "Example_s": "Пример: <code class=\"inline\">%s</code>",
   "Exclude_Botnames": "Исключить ботов",
   "Exclude_Botnames_Description": "Не обрабатывать сообщения от ботов, имена которых совпадают с регулярным выражением выше. Если незаполнено все сообщения будут обработаны.",
-  "False": "Нет",
+  "False": "Ложный",
   "Favorite_Rooms": "Включить избранные каналы",
   "Favorites": "Избранное",
   "Features_Enabled": "Доступные функции",
   "Field": "Поле",
   "Field_removed": "Поле удалено",
   "Field_required": "Обязательное поле",
-  "File_exceeds_allowed_size_of_bytes": "Превышен допустимый размер файла на __size__ байт",
+  "File_exceeds_allowed_size_of_bytes": "Файл превышает допустимый размер __size__.",
   "File_not_allowed_direct_messages": "Передача файлов не разрешена в личных сообщениях",
   "File_type_is_not_accepted": "Недопустимый тип файла",
   "File_uploaded": "Файл загружен",
-  "FileUpload": "Загрузка файлов",
+  "FileUpload": "Загрузка файла",
   "FileUpload_Disabled": "Загрузка файлов выключена.",
-  "FileUpload_Enabled": "Загрузка файлов включена",
+  "FileUpload_Enabled": "Загрузка файла включена",
   "FileUpload_Enabled_Direct": "Включить загрузку файлов в личных сообщениях",
   "FileUpload_File_Empty": "Пустой файл",
   "FileUpload_FileSystemPath": "Системный путь",
   "FileUpload_GoogleStorage_AccessId": "Идентификатор доступа Google Storage",
   "FileUpload_GoogleStorage_AccessId_Description": "Идентификатор доступа обычно представлен в формате адреса электронной почты. Например, \"example-test@example.iam.gserviceaccount.com\"",
+  "FileUpload_GoogleStorage_Bucket": "Название Google Storage Bucket",
+  "FileUpload_GoogleStorage_Bucket_Description": "Название Bucket куда будут загружаться файлы",
   "FileUpload_GoogleStorage_Secret": "Секретный ключ Google Storage",
+  "FileUpload_GoogleStorage_Secret_Description": "Пожалуйста, следуйте <a href=\"https://github.com/CulturalMe/meteor-slingshot#google-cloud\">этим инструкциям</a> и вставьте результат здесь.",
   "FileUpload_MaxFileSize": "Максимальный размер загружаемых файлов (в байтах)",
   "FileUpload_MediaType_NotAccepted": "Медиа-файлы не приняты",
-  "FileUpload_MediaTypeWhiteList": "Разрешённые медиа файлы",
-  "FileUpload_MediaTypeWhiteListDescription": "Список медиа файлов, разделённый запятой. Оставьте его пустым, чтобы разрешить все типы медиа файлов.",
+  "FileUpload_MediaTypeWhiteList": "Разрешённые медиа-файлы",
+  "FileUpload_MediaTypeWhiteListDescription": "Список медиа-файлов, разделённый запятой. Оставьте его пустым, чтобы разрешить все типы медиа файлов.",
   "FileUpload_ProtectFiles": "Защитить загруженные файлы",
   "FileUpload_ProtectFilesDescription": "Только авторизованные пользователи будут иметь доступ",
   "FileUpload_S3_Acl": "Amazon S3 acl",
-  "FileUpload_S3_AWSAccessKeyId": "Amazon S3 AWSAccessKeyId",
-  "FileUpload_S3_AWSSecretAccessKey": "Amazon S3 AWSSecretAccessKey",
-  "FileUpload_S3_Bucket": "Amazon S3 bucket",
+  "FileUpload_S3_AWSAccessKeyId": "Access Key",
+  "FileUpload_S3_AWSSecretAccessKey": "Secret Key",
+  "FileUpload_S3_Bucket": "Название Bucket",
   "FileUpload_S3_BucketURL": "Bucket URL",
   "FileUpload_S3_CDN": "Домен CDN для загрузок",
+  "FileUpload_S3_ForcePathStyle": "Форсировать Path Style",
   "FileUpload_S3_Region": "Регион",
+  "FileUpload_S3_SignatureVersion": "Версия подписи",
+  "FileUpload_S3_URLExpiryTimeSpan": "Время истечения срока действия URL-адресов",
+  "FileUpload_S3_URLExpiryTimeSpan_Description": "Время, после которого созданные URL-адреса Amazon S3 перестают быть действительными (в секундах). Если установлено менее 5 секунд, это поле будет проигнорировано.",
   "FileUpload_Storage_Type": "Тип хранения",
   "First_Channel_After_Login": "Открыть канал после авторизации",
   "Flags": "Флаги",
@@ -645,11 +713,14 @@
   "Fonts": "Шрифты",
   "Food_and_Drink": "Еда и питьё",
   "Footer": "Нижний колонтитул",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Чтобы продолжить, вы должны повторно ввести свой пароль для вашей безопасности",
+  "Footer_Direct_Reply": "Подвал, когда прямой ответ включен",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Для вашей же безопасности, вы должны повторно ввести свой пароль, чтобы продолжить",
   "force-delete-message": "Принудительное удаление сообщений",
   "force-delete-message_description": "Разрешение на удаление сообщений в обход всех ограничений",
-  "Force_SSL": "Принудительный SSL",
-  "Force_SSL_Description": "*ВНИМАНИЕ!* Ни в коем случае не используйте _Принудительный SSL_ в установках с обратным прокси (например, nginx). В таком случае вы должны делать переадресацию на нем, а не в Rocket.Chat.",
+  "Force_Disable_OpLog_For_Cache": "Форсировать отключение OpLog для кэша",
+  "Force_Disable_OpLog_For_Cache_Description": "Не использовать OpLog для синхронизации кеша, даже, если он доступен",
+  "Force_SSL": "Форсировать SSL",
+  "Force_SSL_Description": "* Внимание! * _Force SSL_ никогда не должен использоваться с обратным прокси (например, nginx). Если у вас есть обратный прокси-сервер, вы должны сделать перенаправление ТАМ. _Force SSL_ существует для таких платформ, как Heroku, которая не позволяет перенаправить конфигурацию в обратном прокси.",
   "Forgot_password": "Забыли пароль?",
   "Forgot_Password_Description": "Вы можете использовать следующие подстановки: <br/><ul><li>[Forgot_Password_Url] для URL восстановления пароля. </li><li>[name], [fname], [lname] для полного имени, имени или фамилии пользователя.</li><li>[email] для адреса электронной почты пользователя.</li><li>[Site_Name] и [Site_URL] для имени приложения и его URL.</li></ul>",
   "Forgot_Password_Email": "Нажмите <a href=\"[Forgot_Password_Url]\">сюда</a> для сброса вашего пароля.",
@@ -663,71 +734,110 @@
   "Friday": "Пятницу",
   "From": "От",
   "From_Email": "Адрес электронной почты отправителя",
-  "From_email_warning": "<b>Внимание</b>: Поле <b>От</b> зависит от настроек вашего почтового сервера.",
+  "From_email_warning": "<b>Внимание</b>: Поле <b>От</b> зависит от настроек вашего почтового сервера.",
   "General": "Общие настройки",
-  "github_no_public_email": "В настройках GitHub отсутствует публично доступный адрес электронной почты",
+  "github_no_public_email": "В вашей учетной записи GitHub отсутствует публично доступный адрес электронной почты",
   "Give_a_unique_name_for_the_custom_oauth": "Задайте uniquie name OAuth",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Задайте приложению имя. Оно будет видно всем пользователям.",
   "Global": "Общие",
-  "GoogleTagManager_id": "Google Tag Manager Id",
+  "Google_Vision_usage_limit_exceeded": "Превышен лимит использования Google Vision",
+  "GoogleCloudStorage": "Google Cloud Storage",
+  "GoogleNaturalLanguage_ServiceAccount_Description": "Учетная запись ключа JSON файла. Больше информации можно найти здесь [here](https://cloud.google.com/natural-language/docs/common/auth#set_up_a_service_account)",
+  "GoogleTagManager_id": "Идентификатор Google Tag Manager ",
+  "GoogleVision_Block_Adult_Images": "Блокировать изображения для взрослых",
+  "GoogleVision_Block_Adult_Images_Description": "Блокирование изображений для взрослых не будет работать, как только будет достигнут месячный лимит",
+  "GoogleVision_Current_Month_Calls": "Вызовов в текущем месяце",
+  "GoogleVision_Enable": "Включить Google Vision",
+  "GoogleVision_Max_Monthly_Calls": "Максимальное количество вызов в месяц",
+  "GoogleVision_Max_Monthly_Calls_Description": "Используйте 0 для безлимита",
+  "GoogleVision_ServiceAccount": "Учетная запись сервиса Google Vision",
+  "GoogleVision_ServiceAccount_Description": "Создайте серверный ключ (JSON формат) и вставьте данные JSON здесь",
+  "GoogleVision_Type_Document": "Определение и распознание текста",
+  "GoogleVision_Type_Faces": "Определение лиц",
+  "GoogleVision_Type_Labels": "Определение, что есть на изображении",
+  "GoogleVision_Type_Landmarks": "Определение достопримечательностей",
+  "GoogleVision_Type_Logos": "Определение логотипов",
+  "GoogleVision_Type_Properties": "Определение свойств (цвет)",
+  "GoogleVision_Type_SafeSearch": "Определение контента для взрослых",
+  "GoogleVision_Type_Similar": "Искать похожие изображения",
   "Group_mentions_only": "Только при упоминаниях в общих чатах",
+  "Guest_Pool": "Очередь посетителей",
   "Hash": "Хэш",
-  "Header": "Заголовок",
+  "Header": "Шапка",
   "Header_and_Footer": "Шапка и подвал",
   "Helpers": "Хелперы",
   "Hex_Color_Preview": "Превью для Hex-цветов",
   "Hidden": "Скрытый",
   "Hide_Avatars": "Спрятать аватары",
   "Hide_flextab": "Скрывать правую боковую панель по клику",
-  "Hide_Group_Warning": "Вы уверены, что хотите спрятать приватный групповой чат \"%s\"?",
+  "Hide_Group_Warning": "Вы уверены, что хотите спрятать группу \"%s\"?",
+  "Hide_Livechat_Warning": "Вы уверены, что хотите спрятать Livechat с \"%s\"?",
   "Hide_Private_Warning": "Вы уверены, что хотите спрятать беседу с \"%s\"?",
   "Hide_roles": "Скрывать роли пользователей",
   "Hide_room": "Скрыть комнату",
   "Hide_Room_Warning": "Вы уверены, что хотите спрятать комнату \"%s\"?",
-  "Hide_Unread_Room_Status": "Не помечать чат как непрочитанный",
-  "Hide_usernames": "Скрыть имена пользователей",
+  "Hide_Unread_Room_Status": "Скрыть статус \"непрочитанно\" у комнаты",
+  "Hide_usernames": "Скрыть логины",
   "Highlights": "Подсветка сообщений",
   "Highlights_How_To": "Чтобы получать уведомления, когда кто-то упоминает слово или фразу, добавьте её здесь. Вы можете разделять слова или фразы запятыми. Слова не чувствительны к регистру.",
   "Highlights_List": "Подсвечивать слова",
   "History": "История",
   "Host": "Хост",
-  "hours": "час(ы)",
+  "hours": "часы",
   "Hours": "Часы",
-  "How_friendly_was_the_chat_agent": "Насколько дружелюбен был сотрудник чата?",
-  "How_knowledgeable_was_the_chat_agent": "Насколько информирован был сотрудник чата?",
-  "How_responsive_was_the_chat_agent": "Насколько отзывчив был сотрудник чата?",
+  "How_friendly_was_the_chat_agent": "Насколько дружелюбен был представитель?",
+  "How_knowledgeable_was_the_chat_agent": "Насколько информирован был представитель?",
+  "How_long_to_wait_after_agent_goes_offline": "Как долго ждать после того как отключился представитель",
+  "How_responsive_was_the_chat_agent": "Насколько отзывчив был представитель ?",
   "How_satisfied_were_you_with_this_chat": "Насколько вы удовлетворены использованием этого чата?",
+  "How_to_handle_open_sessions_when_agent_goes_offline": "Как долго держать сессию открытой после того как представитель отключился ",
   "If_this_email_is_registered": "Если этот адрес электронной почты зарегистрирован, мы отправим на него инструкцию по сбросу пароля. Если вы не получили электронное сообщение, попробуйте снова позже.",
   "If_you_are_sure_type_in_your_password": "Если вы уверены, введите пароль:",
   "If_you_are_sure_type_in_your_username": "Если вы уверены, введите ваш логин:",
+  "Iframe_Integration": "Интеграция Iframe ",
+  "Iframe_Integration_receive_enable": "Разрешить получение",
+  "Iframe_Integration_receive_enable_Description": "Разрешить основному окну отправлять команды в Rocket.Chat.",
+  "Iframe_Integration_send_enable": "Разрешить отправку",
+  "Iframe_Integration_send_enable_Description": "Отправлять события основному окну ",
+  "IMAP_intercepter_already_running": "Перехватчик IMAP уже запущен",
+  "IMAP_intercepter_Not_running": "Перехватчик IMAP не запущен",
   "Impersonate_user": "Представляться пользователем",
   "Impersonate_user_description": "Когда включено, инеграция отправляет сообщения от имени пользователя, который заставил интеграцию сработать",
+  "Import": "Импортировать",
   "Importer_Archived": "Архивные",
+  "Importer_CSV_Information": "При импорте CSV требуется соблюдать определенный формат, пожалуйста, прочитайте документацию о том, каким должен быть zip архив:",
   "Importer_done": "Импорт данных завершен!",
   "Importer_finishing": "Завершить импорт данных.",
   "Importer_From_Description": "Импортировать данные из __from__ в Rocket.Chat.",
+  "Importer_HipChatEnterprise_BetaWarning": "Имейте в виду, что импорт всё ещё продолжается. Пожалуйста, сообщите о любых возникающих ошибках на GitHub:",
+  "Importer_HipChatEnterprise_Information": "Загруженный файл должен быть расшифрованным tar.gz, пожалуйста, прочитайте документацию для получения дополнительной информации:",
   "Importer_import_cancelled": "Импорт данных отменен.",
   "Importer_import_failed": "Во время импорта данных возникла ошибка.",
   "Importer_importing_channels": "Импортировать каналы.",
   "Importer_importing_messages": "Импортировать сообщения.",
   "Importer_importing_started": "Начать импорт данных.",
   "Importer_importing_users": "Импортировать пользователей.",
-  "Importer_not_in_progress": "Импортер на данный момент не в сети.",
+  "Importer_not_in_progress": "Импортер на данный момент не запущен.",
+  "Importer_not_setup": "Импортер настроен неправильно, так как он не возвращает никаких данных.",
   "Importer_Prepare_Restart_Import": "Перезапустить импорт данных.",
   "Importer_Prepare_Start_Import": "Начать импорт данных.",
   "Importer_Prepare_Uncheck_Archived_Channels": "Снимите флажок с архивных каналов",
   "Importer_Prepare_Uncheck_Deleted_Users": "Снимите флажок с удаленных пользователей",
   "Importer_progress_error": "Произошла ошибка при выполнении импорта данных.",
   "Importer_setup_error": "При настройке импортера возникла ошибка.",
+  "Importer_Source_File": "Выбор исходного файла",
+  "Incoming_Livechats": "Входящие Livechat",
   "Incoming_WebHook": "Входящий webhook",
+  "initials_avatar": "Инициалы аватара",
   "inline_code": "код",
   "Install_Extension": "Установить расширение",
   "Install_FxOs": "Установить Rocket.Chat на Firefox",
-  "Install_FxOs_done": "Отлично! Теперь вы можете использовать Rocket.Chat через иконку на вашем рабочем столе. Развлекайтесь вместе с Rocket.Chat!",
+  "Install_FxOs_done": "Отлично! Теперь вы можете использовать Rocket.Chat через иконку на вашем рабочем столе. Развлекайтесь вместе с Rocket.Chat!",
   "Install_FxOs_error": "Извините, что-то пошло не так! Появилась следующая ошибка:",
   "Install_FxOs_follow_instructions": "Подтвердите установку приложения на ваше устройство (при запросе нажмите \"Установить\").",
   "Installation": "Установка",
   "Installed_at": "Установленно",
+  "Instance_Record": "Быстрая запись",
   "Instructions_to_your_visitor_fill_the_form_to_send_a_message": "Инструкции для вашего посетителя заполнить форму, чтобы отправить сообщение",
   "Integration_added": "Интеграция была добавлена",
   "Integration_Advanced_Settings": "Дополнительные настройки",
@@ -741,6 +851,8 @@
   "Integration_Outgoing_WebHook_History_Error_Stacktrace": "Стек ошибки",
   "Integration_Outgoing_WebHook_History_Http_Response": "HTTP ответ",
   "Integration_Outgoing_WebHook_History_Http_Response_Error": "Ошибка ответа HTTP",
+  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Prepare_Script": "Сообщения, отправленные с этапа подготовки",
+  "Integration_Outgoing_WebHook_History_Messages_Sent_From_Process_Script": "Сообщения, отправленные с этапа предоставления ответов",
   "Integration_Outgoing_WebHook_History_Time_Ended_Or_Error": "Время завершения выполнения интеграции",
   "Integration_Outgoing_WebHook_History_Time_Triggered": "Время срабатывания интеграции",
   "Integration_Outgoing_WebHook_No_History": "Эта исходящая webhook-интеграция ещё не имеет записанной истории.",
@@ -752,13 +864,13 @@
   "Integration_Retry_Failed_Url_Calls_Description": "Должна ли инеграция пытаться снова в течение небольшого промежутка времени, если вызов по URL неудачен?",
   "Integration_Run_When_Message_Is_Edited": "Запускать после изменения",
   "Integration_Run_When_Message_Is_Edited_Description": "Запускать ли интеграцию после редактирования сообщения? Если нет, то интеграция будет запущена только для <strong>новых</strong> сообщений.",
-  "Integration_updated": "Интеграция была загружена",
+  "Integration_updated": "Интеграция была обновлена",
   "Integration_Word_Trigger_Placement": "Слово может быть где угодно",
   "Integration_Word_Trigger_Placement_Description": "Может ли быть слово быть расположено где угодно в сообщении, а не только в начале?",
   "Integrations": "Интеграции",
-  "Integrations_for_all_channels": "Введите <strong>all_public_channels</strong> для прослушивания всех публичных чатов, <strong>all_private_groups</strong> для прослушивания всех закрытых чатов, <strong>all_direct_messages</strong> - для прослушивания всех личных сообщений.",
+  "Integrations_for_all_channels": "Введите <strong>all_public_channels</strong> для прослушивания всех публичных каналов, <strong>all_private_groups</strong> для прослушивания всех приватных групп, <strong>all_direct_messages</strong> для прослушивания всех личных сообщений.",
   "Integrations_Outgoing_Type_FileUploaded": "Файл загружен",
-  "Integrations_Outgoing_Type_RoomArchived": "Комната заархивирована",
+  "Integrations_Outgoing_Type_RoomArchived": "Комната архивирована",
   "Integrations_Outgoing_Type_RoomCreated": "Создана комната (канал или приватный канал)",
   "Integrations_Outgoing_Type_RoomJoined": "Пользователь присоединился к комнате",
   "Integrations_Outgoing_Type_RoomLeft": "Пользователь покинул комнату",
@@ -767,17 +879,17 @@
   "InternalHubot": "Внутренний Hubot",
   "InternalHubot_PathToLoadCustomScripts": "Папка для загрузки скриптов",
   "InternalHubot_reload": "Перезагрузить скрипты",
-  "InternalHubot_ScriptsToLoad": "Сценарии для загрузки",
-  "InternalHubot_ScriptsToLoad_Description": "Пожалуйста, введите разделенный запятыми список скриптов для загрузки из https://github.com/github/hubot-scripts/tree/master/src/scripts",
+  "InternalHubot_ScriptsToLoad": "Скрипты для загрузки",
+  "InternalHubot_ScriptsToLoad_Description": "Пожалуйста, введите разделенный запятыми список скриптов для загрузки из вашей папки. Скрипты можно скачать здесь: https://github.com/github/hubot-scripts/tree/master/src/scripts",
   "InternalHubot_Username_Description": "Должно быть действительным логином бота, зарегистрированным на сервере.",
   "Invalid_confirm_pass": "Пароли не совпадают",
   "Invalid_email": "Введен некорректный адрес электронной почты",
-  "Invalid_Export_File": "Загруженный файл не является действительным экспортным файлом %s.",
+  "Invalid_Export_File": "Загруженный файл не является верным экспортным файлом %s.",
   "Invalid_Import_File_Type": "Недействительный тип импортируемого файла.",
   "Invalid_name": "Имя не может быть пустым",
   "Invalid_notification_setting_s": "Неверная настройка уведомлений: %s",
   "Invalid_pass": "Пароль не может быть пустым",
-  "Invalid_room_name": "<strong>%s</strong> - недопустимое имя для комнаты,<br/> допустимые символы: цифры, подчеркивание и латинские буквы.",
+  "Invalid_room_name": "<strong>%s</strong> недопустимое имя комнаты",
   "Invalid_secret_URL_message": "Предоставленный URL-адрес недействителен.",
   "Invalid_setting_s": "Неправильная настройка: %s",
   "Invalid_two_factor_code": "Неверный двухфакторный код",
@@ -785,33 +897,44 @@
   "Invisible": "Невидимый",
   "Invitation": "Приглашение",
   "Invitation_HTML": "Приглашение в формате HTML",
-  "Invitation_HTML_Default": "<h2>Вы были приглашены <h1>[Site_Name]</h1></h2><p>Посетите [Site_URL] и опробуйте лучшее решение для чатов с открытым исходным кодом на сегодняшний день!</p>",
+  "Invitation_HTML_Default": "<h2>Вы были приглашены на <h1>[Site_Name]</h1></h2><p>Посетите [Site_URL] и попробуйте лучшее решение с открытым исходным кодом для общения на сегодняшний день!</p>",
   "Invitation_HTML_Description": "Вы можете использовать следующие подстановки: <br/><ul><li>[email] для электронной почты получателя.</li><li>[Site_Name] и [Site_URL] для названия приложения и его URL.</li></ul>",
-  "Invitation_Subject": "Предмет приглашения",
-  "Invitation_Subject_Default": "Вы были приглашены [Site_Name]",
+  "Invitation_Subject": "Тема приглашения",
+  "Invitation_Subject_Default": "Вы были приглашены на [Site_Name]",
   "Invite_user_to_join_channel": "Пригласить пользователя в канал",
-  "Invite_user_to_join_channel_all_from": "Пригласить всех пользователей [#channel] присоединиться к этому чату",
-  "Invite_user_to_join_channel_all_to": "Пригласить всех пользователей этого чата присоединиться к [#channel]",
+  "Invite_user_to_join_channel_all_from": "Пригласить всех пользователей из [#channel] присоединиться к этому каналу",
+  "Invite_user_to_join_channel_all_to": "Пригласить всех пользователей этого канала присоединиться к [#channel]",
   "Invite_Users": "Пригласить пользователей",
   "IRC_Channel_Join": "Вывод команды JOIN",
   "IRC_Channel_Leave": "Вывод команды PART",
   "IRC_Channel_Users": "Вывод команды NAMES",
   "IRC_Channel_Users_End": "Конец вывода команды NAMES",
+  "IRC_Description": "Internet Relay Chat (IRC) - протокол прикладного уровня для обмена сообщениями в режиме реального времени. Пользователи присоединяются к уникальным каналам или комнатам для открытого обсуждения чего или кого угодно. IRC также позволяет обмениваться личными сообщениями и файлами. Данный пакет интегрирует эти возможности с Rocket.Chat.",
+  "IRC_Enabled": "Попытка интегрировать поддержку IRC. После изменения этого параметра потребуется перезапустить Rocket.Chat.",
+  "IRC_Hostname": "Сервер IRC для подключения.",
+  "IRC_Login_Fail": "Вывод при неудачном соединении с IRC-сервером.",
+  "IRC_Login_Success": "Вывод при успешном соединении с IRC-сервером.",
+  "IRC_Message_Cache_Size": "Ограничение кэша для обработки исходящих сообщений.",
+  "IRC_Port": "Порт для привязки к серверу IRC.",
   "IRC_Private_Message": "Вывод команды PRIVMSG",
+  "IRC_Quit": "Вывод после закрытия сеанса IRC.",
   "is_also_typing": "все ещё печатает",
   "is_also_typing_female": "все ещё печатает",
   "is_also_typing_male": "все ещё печатает",
   "is_typing": "печатает",
   "is_typing_female": "печатает",
   "is_typing_male": "печатает",
+  "IssueLinks_Incompatible": "Внимание: не включайте это и \"Предварительный просмотр Hex цвета\" одновременно",
+  "IssueLinks_LinkTemplate_Description": "Шаблон для проблемных ссылок; %s будет заменена на номер проблемы.",
   "It_works": "Оно работает",
   "italics": "курсив",
-  "Jitsi_Chrome_Extension": "Chrome Id Extension",
-  "Jitsi_Enable_Channels": "Включение в каналах",
+  "Jitsi_Chrome_Extension": "Идентификатор расширения для Chrome ",
+  "Jitsi_Enable_Channels": "Включить на канале",
   "join": "Присоединиться",
   "join-without-join-code": "Присоединяться к публичным чатам без кода входа",
   "join-without-join-code_description": "Разрешение на обход кода входа для публичных чатов с включенным кодом входа",
-  "Join_audio_call": "Присоединиться к разговору",
+  "Join_audio_call": "Присоединиться к аудиозвонку",
+  "Join_Chat": "Присоединиться к чату",
   "Join_default_channels": "Присоединить к публичным чатам по-умолчанию",
   "Join_the_Community": "Присоединиться к сообществу",
   "Join_the_given_channel": "Присоединиться к этому каналу",
@@ -821,108 +944,166 @@
   "Jump_to_first_unread": "Перейти к первому непрочитанному",
   "Jump_to_message": "Перейти к сообщению",
   "Jump_to_recent_messages": "Перейти к последнему сообщению",
+  "Just_invited_people_can_access_this_channel": "Только приглашенные люди имеют доступ к этому каналу",
   "Katex_Dollar_Syntax": "Разрешить доллар Синтаксис",
-  "Katex_Dollar_Syntax_Description": "Разрешить используя $$ Katex блок $$ и $ рядный Katex $ синтаксисом",
+  "Katex_Dollar_Syntax_Description": "Разрешить использование синтаксисов $$katex block$$ и $inline katex$ ",
   "Katex_Enabled": "Katex включен",
-  "Katex_Enabled_Description": "Разрешить используя <a target=\"_blank\" href=\"http://khan.github.io/KaTeX/\">Katex</a> для верстки математики в сообщениях",
+  "Katex_Enabled_Description": "Разрешить использование <a target=\"_blank\" href=\"http://khan.github.io/KaTeX/\">Katex</a> для отображения математических символов в сообщениях",
   "Katex_Parenthesis_Syntax": "Разрешить Скобки Синтаксис",
-  "Katex_Parenthesis_Syntax_Description": "Разрешить использование \\ [Katex блок \\] и \\ (встроенный Katex \\) синтаксисом",
+  "Katex_Parenthesis_Syntax_Description": "Разрешить использование синтаксисов \\[katex block\\]  и \\(inline katex\\)",
+  "Keyboard_Shortcuts_Edit_Previous_Message": "Редактировать предыдущее сообщение",
+  "Keyboard_Shortcuts_Keys_1": "<kbd>Ctrl</kbd>>+<kbd>p</kbd>",
+  "Keyboard_Shortcuts_Keys_2": "<kbd>Клавиша ↑</kbd>",
+  "Keyboard_Shortcuts_Keys_3": "<kbd>Command</kbd> (или <kbd>Alt</kbd>) + <kbd>клавиша ←</kbd>",
+  "Keyboard_Shortcuts_Keys_4": "<kbd>Command</kbd> (или <kbd>Alt</kbd>) + <kbd>клавиша ↑</kbd>",
+  "Keyboard_Shortcuts_Keys_5": "<kbd>Command</kbd> (или <kbd>Alt</kbd>) + <kbd>клавиша →</kbd>",
+  "Keyboard_Shortcuts_Keys_6": "<kbd>Command</kbd> (или <kbd>Alt</kbd>) + <kbd>клавиша ↓</kbd>",
+  "Keyboard_Shortcuts_Keys_7": "<kbd>Shift</kbd> + <kbd>Enter</kbd>",
+  "Keyboard_Shortcuts_Move_To_Beginning_Of_Message": "Перейти в начало сообщения",
+  "Keyboard_Shortcuts_Move_To_End_Of_Message": "Перейти в конец сообщения",
+  "Keyboard_Shortcuts_New_Line_In_Message": "Ввод новой строки в сообщении",
   "Keyboard_Shortcuts_Open_Channel_Slash_User_Search": "Открыть канал / поиск пользователей",
+  "Keyboard_Shortcuts_Title": "Горячие клавиши",
   "Knowledge_Base": "База знаний",
   "Label": "Подпись",
   "Language": "Язык",
-  "Language_Version": "Русская версия",
+  "Language_Version": "Английская версия",
   "Last_login": "Последний раз заходил",
   "Last_Message_At": "Последнее сообщение",
-  "Last_seen": "Последняя активность",
+  "Last_seen": "Последний раз видели",
   "Layout": "Внешний вид",
   "Layout_Home_Body": "Контент на главной",
   "Layout_Home_Title": "Название главной",
   "Layout_Login_Terms": "Правила составления логина",
   "Layout_Privacy_Policy": "Политика конфиденциальности",
-  "Layout_Sidenav_Footer": "Футер навигационной панели",
-  "Layout_Sidenav_Footer_description": "Размер футера 260 на 70 пикселей",
+  "Layout_Sidenav_Footer": "Колонтитул навигационной панели",
+  "Layout_Sidenav_Footer_description": "Размер колонтитула 260 на 70 пикселей",
   "Layout_Terms_of_Service": "Условия использования",
   "LDAP": "Протокол LDAP",
   "LDAP_CA_Cert": "Сертификат CA",
   "LDAP_Connect_Timeout": "Таймаут соединения (мсек)",
   "LDAP_Default_Domain": "Домен по умолчанию",
-  "LDAP_Description": "Протокол LDAP - это иерархическая база данных, которую используют многие компании для обеспечения единой регистрации - средство для совместного использования одного пароля для разных сайтов и сервисов. Для подробной информации по конфигурации читайте нашу wiki-страницу: https://rocket.chat/docs/administrator-guides/authentication/ldap/.",
+  "LDAP_Description": "Протокол LDAP - это иерархическая база данных, которую используют многие компании для обеспечения единой регистрации - средство для совместного использования одного пароля для разных сайтов и сервисов. Для подробной информации по конфигурации читайте нашу wiki-страницу: <url> https://rocket.chat/docs/administrator-guides/authentication/ldap/ </url0>",
+  "LDAP_BaseDN": "Base DN",
   "LDAP_BaseDN_Description": "Полностью соответствующее Отличительное Имя (ОМ) поддерева протокола LDAP, которое вы хотите найти для пользователей и групп. Вы можете добавлять столько, сколько желаете; однако, каждая группа должна быть определена в одной и той же доменной базе, как и пользователи, относящиеся к ней. Если вы укажете ограниченные группы пользователей, в пределах этих групп будут лишь те пользователи, относящиеся к ним. Вы рекомендуем вам указать верхний уровень дерева каталогов LDAP в качестве доменной базы и использовать фильтр поиска для контроля доступа.",
+  "LDAP_User_Search_Field": "Поле поиска",
   "LDAP_User_Search_Field_Description": "Атрибут LDAP, который идентифицирует пользователя LDAP, делающего попытку аутентификации. Это поле должно иметь значение `sAMAccountName` для большинства установок Active Directory, но она может иметь значение `uid` для других LDAP решений, таких как OpenLDAP. Вы можете использовать `mail` для указания пользователей по электронной почте или любой атрибут, какой пожелаете. <br>Вы можете использовать несколько значений, разделенных запятой, чтобы разрешить пользователям войти, используя множественные идентификаторы, такие как имя пользователя или электронная почта.",
-  "LDAP_User_Search_Filter_Description": "Если определено, только пользователям, которые соответствуют этому фильтру, разрешат авторизоваться. Если никакой фильтр не будет определен, то все пользователи в рамках указанной доменной базы будут в состоянии регистрироваться. <br/>Например для Активной Директории `memberOf=cn=ROCKET_CHAT,ou=General Groups`.<br/>Например для OpenLDAP (расширяемый соответствующий поиск) `ou:dn:=ROCKET_CHAT`.",
+  "LDAP_User_Search_Filter": "Фильтр",
+  "LDAP_User_Search_Filter_Description": "Если определено, только пользователям, которые соответствуют этому фильтру, разрешено авторизовываться. Если никакой фильтр не будет определен, то все пользователи в рамках указанной доменной базы будут в состоянии регистрироваться. <br/>Например для Активной Директории `memberOf=cn=ROCKET_CHAT,ou=General Groups`.<br/>Например: для OpenLDAP (расширяемый соответствующий поиск) `ou:dn:=ROCKET_CHAT`.",
+  "LDAP_User_Search_Scope": "Область",
+  "LDAP_Authentication": "Включить",
+  "LDAP_Authentication_Password": "Пароль",
+  "LDAP_Authentication_UserDN": "User DN",
   "LDAP_Authentication_UserDN_Description": "Пользователь LDAP, который выполняет пользовательские поиски, чтобы подтвердить подлинность других пользователей, когда они регистрируются. <br/>Это, как правило - сервисный аккаунт, созданный определенно для сторонней интеграции. Используйте полностью составное имя, например `cn=Administrator,cn=Users,dc=Example,dc=com`.",
   "LDAP_Enable": "Включить LDAP",
   "LDAP_Enable_Description": "Попытка использовать LDAP для аутентификации.",
   "LDAP_Encryption": "Шифрование",
-  "LDAP_Encryption_Description": "Метод шифрования раньше обеспечивал безопасность коммуникаций с сервером LDAP. Примеры содержат `plain` (без шифрования), `SSL/LDAPS`(зашифрованный с начала), а также `StartTLS`(модернизируйте до зашифрованной коммуникации после подключения).",
+  "LDAP_Encryption_Description": "Метод шифрования раньше обеспечивал безопасность коммуникаций с сервером LDAP. Примеры содержат `plain` (без шифрования), `SSL/LDAPS`(зашифрованный с начала), а также `StartTLS`(модернизируйте до зашифрованной коммуникации после подключения).",
+  "LDAP_Internal_Log_Level": "Уровень внутреннего логирования",
+  "LDAP_Group_Filter_Enable": "Включить фильтр групп пользователей LDAP",
+  "LDAP_Group_Filter_Group_Id_Attribute": "Атрибуты Group ID",
+  "LDAP_Group_Filter_Group_Id_Attribute_Description": "Например: *OpenLDAP:*cn",
+  "LDAP_Group_Filter_Group_Member_Attribute_Description": "Например: *OpenLDAP:*uniqueMember",
   "LDAP_Group_Filter_Group_Member_Format_Description": "Например, *OpenLDAP:*uid=#{username},ou=users,o=Company,c=com",
+  "LDAP_Group_Filter_Group_Name": "Имя группы",
+  "LDAP_Group_Filter_Group_Name_Description": "Имя группы, к которой принадлежит пользователь",
+  "LDAP_Group_Filter_ObjectClass_Description": "*Objectclass*, идентифицирует группы. <br/> Например: OpenLDAP: groupOfUniqueNames",
   "LDAP_Host": "Хост",
-  "LDAP_Host_Description": "Хост LDAP, например `ldap.example.com` или `10.0.0.30`.",
+  "LDAP_Host_Description": "Хост LDAP, например `ldap.example.com` или `10.0.0.30`.",
   "LDAP_Idle_Timeout": "Таймаут бездействия (мсек)",
+  "LDAP_Idle_Timeout_Description": "Сколько миллисекунд ждать после последней операции LDAP до закрытия соединения (каждая операция открывает новое соединение)",
+  "LDAP_Import_Users_Description": "Если включно, то процесс синхронизации будет импортировать всех пользователей LDAP <br0/> *Внимание!* Укажите фильтр поиска, чтобы не импортировать лишних пользователей.",
+  "LDAP_Login_Fallback": "Резервная авторизация",
+  "LDAP_Login_Fallback_Description": "Если подключение к сервису LDAP не удалось, то попробовать войти в локальную/по умолчанию систему локальных учетных записей. Может помочь, когда сервис LDAP по каким-то причинам не работает.",
   "LDAP_Merge_Existing_Users": "Объединить существующих пользователей",
   "LDAP_Merge_Existing_Users_Description": "*Внимание!* При импорте пользователя из LDAP, если пользователь с таким логином уже существует, данные из LDAP и пароль будут установлены уже существующему пользователю.",
   "LDAP_Port": "LDAP порт",
-  "LDAP_Port_Description": "Порт для доступа LDAP. Пример: `389` или `636` для LDAPS",
-  "LDAP_Reject_Unauthorized": "Отклонить запрещённых",
+  "LDAP_Port_Description": "Порт для доступа LDAP. Пример: `389` или `636` для LDAPS",
+  "LDAP_Reconnect": "Переподключение",
+  "LDAP_Reconnect_Description": "Пробовать переподключаться  автоматически, когда соединение прервано по каким-то причинам во время выполнения операций",
+  "LDAP_Reject_Unauthorized": "Отклонить неавторизованных",
+  "LDAP_Reject_Unauthorized_Description": "Отключите эту опцию, чтобы разрешить сертификаты, которые не могут быть проверены. Обычно для работы с самоподписанными сертификатами требуется отключение это опции",
   "LDAP_Sync_User_Avatar": "Синхронизация пользовательских аватаров",
-  "LDAP_Sync_User_Data": "Синхронизация данных",
+  "LDAP_Sync_Now": "Запуск фоновой синхронизации",
+  "LDAP_Sync_Now_Description": "Выполнить **Фоновую синхронизацию** сейчас, не дожидаясь **Интервала синхронизации**, даже если **Фоновая синхронизация** отключена. <br/> Действие выполняется асинхронно, см. журналы для получения дополнительной информации о процессе",
+  "LDAP_Background_Sync": "Фоновая синхронизация",
+  "LDAP_Background_Sync_Interval": "Интервал фоновой синхронизации",
+  "LDAP_Background_Sync_Interval_Description": "Интервал между синхронизациями. Пример: `каждые 24 часа` или `в первый день недели`, больше примеров в [Cron Text Parser] (http://bunkat.github.io/later/parsers.html#text)",
+  "LDAP_Background_Sync_Import_New_Users": "Фоновая синхронизация импортирует новых пользователей",
+  "LDAP_Background_Sync_Import_New_Users_Description": "Импортирует всех пользователей (на основе критериев вашего фильтра), которые существуют в LDAP, и не существует в Rocket.Chat",
+  "LDAP_Background_Sync_Keep_Existant_Users_Updated": "Фоновая синхронизация обновляет сущестующих пользователей",
+  "LDAP_Background_Sync_Keep_Existant_Users_Updated_Description": "Будут синхронизироваться аватар, поля, логин итд (на основе вашей конфигурации) всех пользователей уже импортированных из LDAP каждый **Интервал синхронизации**",
+  "LDAP_Sync_User_Data": "Синхронизация пользовательских данных",
   "LDAP_Sync_User_Data_Description": "Синхронизировать пользовательские данные с сервером при входе (например: имя, адрес электронной почты).",
   "LDAP_Sync_User_Data_FieldMap": "Карта пользовательских данных",
   "LDAP_Sync_User_Data_FieldMap_Description": "Настраивайте то, как будут заполняться поля аккаунта пользователя (такие как адрес электронной почты) из записи в LDAP (как только будет найден). <br/>Например `{\"cn\":\"name\", \"mail\":\"email\"}` выберет человекочитаемое имя человека из атрибута \"cn\", и его адрес электронной почты – из атрибута \"mail\". Дополнительно возможно использовать переменные, например: `{ \"#{givenName} #{sn}\": \"name\", \"mail\": \"email\" }` использует комбинацию имени и фамилии пользователя для поля `name` в Rocket.Chat. <br/> В Rocket.Chat доступны поля `name` и `email`.",
+  "LDAP_Search_Page_Size": "Размер страницы поиска",
+  "LDAP_Search_Page_Size_Description": "Максимальное количество записей, которое отображается на странице",
+  "LDAP_Search_Size_Limit": "Ограничение размера поиска",
+  "LDAP_Search_Size_Limit_Description": "Максимальное количество записей, которое отображается на странице <br/> **Внимание**! Число должно быть больше, чем число, указанное в **Размер страницы поиска**",
   "LDAP_Test_Connection": "Протестировать соединение",
+  "LDAP_Timeout": "Тайм-аут (мс)",
+  "LDAP_Timeout_Description": "Сколько миллисекунд ждать результата поиска, прежде чем вернуть ошибку",
   "LDAP_Unique_Identifier_Field": "Поле уникального идентификатора",
-  "LDAP_Unique_Identifier_Field_Description": "Какая область будет использоваться, чтобы связать пользователя LDAP и Rocket.Chat. Вы можете сообщать многократные значения, отделенные запятой, чтобы попытаться получить значение из отчета LDAP.<br/>Значение по умолчанию `objectGUID, ibm-entryUUID,GUID,dominoUNID,nsuniqueId,uidNumber`",
+  "LDAP_Unique_Identifier_Field_Description": "Какая поле будет использоваться, чтобы связать пользователя LDAP и Rocket.Chat. Вы можете указать несколько значений, отделенные запятой, чтобы попытаться получить значение из записей LDAP.<br/>Значение по умолчанию `objectGUID, ibm-entryUUID,GUID,dominoUNID,nsuniqueId,uidNumber`",
   "LDAP_Username_Field": "Поле \"Логин\"",
   "LDAP_Username_Field_Description": "Какое поле будет устанавливаться в качестве логина для новых пользователей. Оставьте поле пустым, чтобы использовать логин, введенный на странице входа.<br/>Вы также можете использовать теги шаблонов, например `#{givenName}.#{sn}`.<br/>Значение по умолчанию - `sAMAccountName`.",
+  "Execute_Synchronization_Now": "Выполнить синхронизацию сейчас",
+  "Least_Amount": "Наименьшее количество",
   "Leave_Group_Warning": "Вы уверены, что хотите покинуть группу \"%s\"?",
+  "Leave_Livechat_Warning": "Вы уверены, что хотите покинуть Livechat с \"%s\"?",
   "Leave_Private_Warning": "Вы уверены, что хотите покинуть беседу с \"%s\"?",
   "Leave_room": "Покинуть комнату",
   "Leave_Room_Warning": "Вы уверены, что хотите покинуть комнату \"%s\"?",
-  "Leave_the_current_channel": "Покинуть текущий чат",
+  "Leave_the_current_channel": "Покинуть текущий канал",
   "line": "строк",
   "List_of_Channels": "Список чатов",
-  "List_of_Direct_Messages": "Список личных сообщений",
-  "Livechat_agents": "Сотрудники Livechat",
-  "Livechat_Dashboard": "Информационная панель Livechat",
+  "List_of_Direct_Messages": "Список личных переписок",
+  "Livechat_agents": "Представители Livechat",
+  "Livechat_AllowedDomainsList": "Разрешенные домены Livechat",
+  "Livechat_Dashboard": "Информационная панель Livechat",
   "Livechat_enabled": "Livechat включен",
-  "Livechat_forward_open_chats": "Форвард открытых чатов",
+  "Livechat_forward_open_chats": "Форвард открытых каналов",
   "Livechat_forward_open_chats_timeout": "Тайм-аут (в секундах) для пересылки чатов",
-  "Livechat_guest_count": "Гостевой счетчик",
+  "Livechat_guest_count": "Счетчик гостей",
   "Livechat_managers": "Менеджеры Livechat",
-  "Livechat_offline": "Livechat форума",
-  "Livechat_online": "Livechat онлайн",
+  "Livechat_offline": "Livechat выключен",
+  "Livechat_online": "Livechat работает",
+  "Livechat_open_inquiery_show_connecting": "Показывать сообщение вместо окна ввода, когда к чату посетителя еще не подключился представитель.",
+  "Livechat_Queue": "Очередь Livechat",
   "Livechat_room_count": "Количество комнат Livechat",
-  "Livechat_title": "Название чата",
+  "Livechat_Routing_Method": "Livechat Routing Method",
+  "Livechat_Take_Confirm": "Вы хотите взять этого клиента?",
+  "Livechat_title": "Название Livechat",
   "Livechat_title_color": "Цвет фона заголовка Livechat",
-  "Livechat_Users": "Пользователи Livechat",
+  "Livechat_Users": "Пользователи Livechat",
   "Load_more": "Загрузить еще",
   "Loading...": "Загрузка...",
   "Loading_more_from_history": "Идёт загрузка из истории",
-  "Loading_suggestion": "Загрузка предпочтений...",
+  "Loading_suggestion": "Загрузка предпочтений",
   "Localization": "Язык",
-  "Log_Exceptions_to_Channel": "Логировать исключения в чат",
-  "Log_Exceptions_to_Channel_Description": "Чат, который получит все захваченные исключения. Оставьте пустым, чтобы игнорировать исключения.",
+  "Log_Exceptions_to_Channel": "Логировать исключения на канале",
+  "Log_Exceptions_to_Channel_Description": "Канал, который получит все захваченные исключения. Оставьте пустым, чтобы игнорировать исключения.",
   "Log_File": "Отображать файл и строки",
   "Log_Level": "Уровень логирования ",
   "Log_Package": "Отображать сборку",
   "Log_View_Limit": "Лимит строк",
   "Logged_out_of_other_clients_successfully": "Сеансы в других клиентах успешно завершены",
-  "Login": "Войти",
+  "Login": "Авторизация",
   "Login_with": "Авторизация через %s",
   "Logout": "Выйти",
   "Logout_Others": "Выйти со всех устройств",
   "mail-messages": "Посылать электронные сообщения",
   "mail-messages_description": "Разрешение на использование функции отправки электронных сообщений",
-  "Mail_Message_Invalid_emails": "Вы предоставили один или более недействительных адресов электронной почты: %s",
+  "Mail_Message_Invalid_emails": "Вы предоставили один или более недействительных адресов электронной почты: %s",
   "Mail_Message_Missing_to": "Вы должны выбрать одного или нескольких пользователей или указать один или несколько адресов электронной почты, разделенных запятыми.",
-  "Mail_Message_No_messages_selected_select_all": "Вы не выбрали ни одного сообщения. Хотели бы вы сделать <a href='#' class='select-all'>select all</a> сообщения видимыми?",
-  "Mail_Messages": "Отправить сообщения на адрес электронной почты",
+  "Mail_Message_No_messages_selected_select_all": "Вы не выбрали ни одного сообщения. Хотели бы вы <a href=\"#\" class=\"select-all\">выбрать все</a> видимые сообщения?",
+  "Mail_Messages": "Почтовые сообщения",
   "Mail_Messages_Instructions": "Нажимая на сообщения, выберите, какие из них вы хотите отправить по электронной почте",
-  "Mail_Messages_Subject": "Это выделенная часть из %s сообщений.",
+  "Mail_Messages_Subject": "Это выделенная часть из %s сообщений",
   "Mailer": "Mailer",
   "Mailer_body_tags": "Вам <b>необходимо</b> использовать [unsubscribe] как ссылку для отписки.<br/>Вы можете использовать [name], [fname] и [lname] в качестве полного имени пользователя, имени или фамилии.<br/>Вы можете использовать [email] для адреса электронной почты пользователя.",
-  "Mailing": "Почтовое отправление",
+  "Mailing": "Рассылка",
   "Make_Admin": "Сделать администратором",
   "manage-assets": "Управлять ресурсами",
   "manage-assets_description": "Разрешение на управление ресурсами сервера",
@@ -940,54 +1121,66 @@
   "Manager_removed": "Менеджер удален",
   "Managing_assets": "Управление активами",
   "Managing_integrations": "Управление интеграций",
+  "MapView_Enabled": "Включить просмотр карты",
+  "MapView_Enabled_Description": "Включение просмотра карта будет отображать кнопку поделиться местоположением в левой части поля ввода чата.",
+  "MapView_GMapsAPIKey": "Ключ Google Static Map API",
   "Mark_as_read": "Пометить как прочитанное",
   "Mark_as_unread": "Пометить как непрочитанное",
-  "Markdown_Headers": "Пометить заголовки",
+  "Markdown_Headers": "Разрешить заголовки Markdown в сообщениях",
+  "Markdown_Parser": "Парсер Markdown",
   "Markdown_SupportSchemesForLink": "Поддерживать Markdown систему ссылок",
   "Markdown_SupportSchemesForLink_Description": "Разрешённые Markdown системы через запятую",
+  "Max_length_is": "Максимальная длина %s",
   "Members_List": "Пользователи",
   "mention-all": "Упоминать всех",
   "mention-all_description": "Разрешение на использование упоминания @all",
   "Mentions": "Упоминания",
   "Mentions_default": "Упоминания (по умолчанию)",
+  "Mentions_only": "Только упоминания",
   "Message": "Сообщение",
-  "Message_AllowBadWordsFilter": "Разрешить Сообщение плохих слов фильтрации",
+  "Message_AllowBadWordsFilter": "Разрешить фильтрацию плохих слов в сообщениях",
   "Message_AllowDeleting": "Разрешить удаление сообщений",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Запретить удаление сообщений через (n) минут",
   "Message_AllowDeleting_BlockDeleteInMinutes_Description": "Введите 0, чтобы отключить запрет.",
+  "Message_AllowDirectMessagesToYourself": "Разрешить пользователю вести переписку с самим собой",
   "Message_AllowEditing": "Разрешить редактирование сообщений",
   "Message_AllowEditing_BlockEditInMinutes": "Запретить редактирование сообщений через (n) минут",
   "Message_AllowEditing_BlockEditInMinutesDescription": "Введите 0, чтобы отключить блокировку.",
   "Message_AllowPinning": "Разрешить прикреплять сообщения",
   "Message_AllowPinning_Description": "Разрешить прикреплять сообщения к любому из каналов",
+  "Message_AllowSnippeting": "Разрешить сниппеты в сообщениях",
   "Message_AllowStarring": "Разрешить отмечать сообщения",
-  "Message_AlwaysSearchRegExp": "Всегда искать с помощью RegExp",
-  "Message_AlwaysSearchRegExp_Description": "Мы рекомендуем установить `true` если ваш язык не поддерживается в <a target=\"_blank\" href=\"https://docs.mongodb.org/manual/reference/text-search-languages/#text-search-languages\">текстовом поиске MongoDB</a>.",
+  "Message_AllowUnrecognizedSlashCommand": "Разрешить нераспознанные слэш команды",
+  "Message_AlwaysSearchRegExp": "Всегда искать с помощью регулярного выражения",
+  "Message_AlwaysSearchRegExp_Description": "Мы рекомендуем установить `Включено`, если <a target=\"_blank\" href=\"https://docs.mongodb.org/manual/reference/text-search-languages/#text-search-languages\">текстовый поиск в MongoDB</a> не поддерживает ваш язык.",
   "Message_AudioRecorderEnabled": "Активировать запись аудио",
   "Message_AudioRecorderEnabledDescription": "Необходимо подтвердить принятие  'audio/wav' файлов в настройках \"Загрузка файла\".",
   "Message_BadWordsFilterList": "Добавить плохие слова в черный список",
-  "Message_BadWordsFilterListDescription": "Добавить список разделенных запятыми список плохих слов, чтобы фильтровать",
+  "Message_BadWordsFilterListDescription": "Добавить список плохих слов, разделенный запятыми, для фильтрации",
   "Message_DateFormat": "Формат даты",
   "Message_DateFormat_Description": "Смотрите также: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_deleting_blocked": "Это сообщение уже не может быть удалено",
-  "Message_editing": "редактирование сообщений",
+  "Message_editing": "Редактирование сообщений",
   "Message_GroupingPeriod": "Период объединения (в секундах)",
-  "Message_GroupingPeriodDescription": "Сообщения будут сгруппированы вместе с предыдущим сообщением, если они оба от одного пользователя и затраченное время было меньше, чем установленное в секундах.",
+  "Message_GroupingPeriodDescription": "Сообщения будут сгруппированы вместе с предыдущим сообщением, если они оба от одного пользователя и прошедшее время было меньше, чем установленное.",
   "Message_HideType_au": "Не показывать сообщение \"Пользователь присоединился\"",
   "Message_HideType_mute_unmute": "Не показывать сообщение \"Пользователь заглушен / не заглушен\"",
   "Message_HideType_ru": "Не показывать сообщение \"Пользователь удалён\"",
   "Message_HideType_uj": "Не показывать сообщение \"Пользователь присоединился к чату\"",
   "Message_HideType_ul": "Не показывать сообщение \"Пользователь покинул чат\"",
-  "Message_KeepHistory": "Хранить историю сообщений",
-  "Message_MaxAll": "Максимальный размер чата для сообщения с упоминанием всех",
+  "Message_KeepHistory": "Сохранять историю редактирования сообщений",
+  "Message_MaxAll": "Максимальный размер чата для сообщения с упоминанием всех.",
   "Message_MaxAllowedSize": "Максимально допустимый размер сообщения",
   "Message_pinning": "Закрепление сообщений",
   "Message_QuoteChainLimit": "Максимальная вложенность цитат",
   "Message_removed": "Сообщение удалено",
+  "Message_sent_by_email": "Сообщение отправлено по электронной почте",
+  "Message_SetNameToAliasEnabled": "Установить имя пользователя в качестве псевдонима в сообщении",
+  "Message_SetNameToAliasEnabled_Description": "Только если не установлен псевдоним. Псевдоним в старых сообщениях не изменится, если пользователь изменит имя.",
   "Message_ShowDeletedStatus": "Отображать статус \"Удалено\"",
   "Message_ShowEditedStatus": "Отображать статус \"Отредактировано\"",
   "Message_ShowFormattingTips": "Показывать советы по форматированию",
-  "Message_starring": "Сообщение в главной роли",
+  "Message_starring": "Помеченное сообщение",
   "Message_TimeAndDateFormat": "Формат даты и времени",
   "Message_TimeAndDateFormat_Description": "Подробнее в: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_TimeFormat": "Формат времени",
@@ -999,57 +1192,64 @@
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Сообщения, отосланные на Входящие WebHook, будут публиковаться здесь.",
   "Meta": "Мета",
   "Meta_custom": "Пользовательские мета-теги",
-  "Meta_fb_app_id": "Facebook App Id",
-  "Meta_google-site-verification": "Google Site Verification",
+  "Meta_fb_app_id": "Идентификатор Facebook App",
+  "Meta_google-site-verification": "Проверка Google Site",
   "Meta_language": "Язык",
   "Meta_msvalidate01": "MSValidate.01",
   "Meta_robots": "Боты",
   "Min_length_is": "Минимальная длина составляет %s",
-  "minutes": "минут(ы)",
-  "Mobile": "Мобильные уведомления",
+  "minutes": "минуты",
+  "Mobile": "Мобильные устройства",
+  "Mobile_Notifications_Default_Alert": "Уведомления на мобильных устройствах",
   "Monday": "Понедельник",
   "Monitor_history_for_changes_on": "Отслеживать историю на изменение в",
   "More_channels": "Другие каналы",
   "More_direct_messages": "Больше личных сообщений",
-  "More_groups": "Больше приватных чатов",
+  "More_groups": "Больше приватных групп",
   "More_unreads": "Еще \"непрочитанные\"",
   "Move_beginning_message": "'%s' - перейти к началу сообщения",
   "Move_end_message": "'%s' - перейти в конец сообщения",
   "Msgs": "Сообщения",
   "multi": "несколько",
+  "multi_line": "несколько строк",
   "mute-user": "Заглушить пользователя",
-  "mute-user_description": "Разрешение на заглушение других пользователей в том же публичном чате",
-  "Mute_someone_in_room": "Заблокировать кого-нибудь в чате",
+  "mute-user_description": "Разрешение на заглушение других пользователей в этом же канале",
+  "Mute_someone_in_room": "Заглушить кого-нибудь в комнате",
   "Mute_user": "Заглушить",
-  "Muted": "Заблокировано",
-  "My_Account": "Мой аккаунт",
+  "Muted": "Заглушен",
+  "My_Account": "Моя учетная запись",
+  "My_location": "Моё местонахождение",
   "n_messages": "%s сообщений",
   "N_new_messages": "%s новых сообщений",
   "Name": "Имя",
   "Name_cant_be_empty": "Имя не может быть пустым",
-  "Name_of_agent": "Имя сотрудника",
+  "Name_of_agent": "Имя представителя",
   "Name_optional": "Имя (опционально)",
+  "Name_Placeholder": "Пожалуйста, введите ваше имя...",
   "Navigation_History": "История навигации",
-  "New_Application": "Новое приложение",
+  "New_Application": "Новое приложение",
   "New_Custom_Field": "Новое пользовательское поле",
   "New_Department": "Новый отдел",
   "New_integration": "Новая интеграция",
-  "New_line_message_compose_input": "'%s' - добавить новую строку в сообщение",
-  "New_logs": "Новые регистрации",
+  "New_line_message_compose_input": "\"%s\" - добавить новую строку в сообщение",
+  "New_logs": "Новые логи",
   "New_Message_Notification": "Уведомление о новом сообщении",
   "New_messages": "Новые сообщения",
   "New_password": "Новый пароль",
+  "New_Password_Placeholder": "Пожалуйста, введите новый пароль...",
   "New_role": "Новая роль",
-  "New_Room_Notification": "Уведомление о новом публичном чате",
+  "New_Room_Notification": "Уведомление о новой публичной комнате",
   "New_Trigger": "Новый триггер",
   "New_videocall_request": "Новый запрос на видео-звонок",
+  "No_available_agents_to_transfer": "Нет доступных сотрудников для передачи",
   "No_channel_with_name_%s_was_found": "Канал с названием <strong>\"%s\"</strong> не найден!",
-  "No_channels_yet": "Вы пока не состоите в публичных чатах.",
-  "No_direct_messages_yet": "Можно писать пользователям приватные сообщения.",
+  "No_channels_yet": "Вы пока не участвуете ни в одном канале.",
+  "No_direct_messages_yet": "Нет личных переписок.",
   "No_Encryption": "Без шифрования",
   "No_group_with_name_%s_was_found": "Приватный канал с названием <strong>\"%s\"</strong> не найден!",
-  "No_groups_yet": "Вы не состоите ни в одном приватном чате.",
-  "No_livechats": "У вас нет livechats.",
+  "No_groups_yet": "Вы не состоите ни в одной приватной группе.",
+  "No_integration_found": "Не найдена интеграция, соответствующая идентификатору",
+  "No_livechats": "У вас нет livechats",
   "No_mentions_found": "Упоминания не найдены",
   "No_pinned_messages": "Нет прикрепленных сообщений",
   "No_results_found": "Ничего не найдено",
@@ -1057,53 +1257,68 @@
   "No_starred_messages": "Нет отмеченных сообщений",
   "No_such_command": "Несуществующая команда: \"__command__\"",
   "No_user_with_username_%s_was_found": "Пользователь с логином  <strong>\"%s\"</strong> не найден!",
-  "Node_version": "Node версия",
+  "Nobody_available": "Никто не доступен",
+  "Node_version": "Версия Node",
+  "None": "Отсутствует",
   "Normal": "Обычный",
-  "Not_authorized": "Запрещено",
+  "Not_authorized": "Не авторизован",
   "Not_Available": "Не доступен",
-  "Not_found_or_not_allowed": "Чат не существует или владелец ограничил доступ",
-  "Nothing": "Пусто",
+  "Not_found_or_not_allowed": "Не найден или владелец ограничил доступ",
+  "Nothing": "Ничего",
   "Nothing_found": "Ничего не найдено",
   "Notification_Desktop_Default_For": "Отображать уведомления для",
   "Notification_Duration": "Длительность показа уведомления",
   "Notification_Mobile_Default_For": "Включить push для",
   "Notifications": "Уведомления",
+  "Notifications_Max_Room_Members": "Максимальное количество участников комнаты до отключения всех текстовых уведомлений",
+  "Notifications_Max_Room_Members_Description": "Максимальное количество участников в комнате, превышение которого отключает все уведомления. Участники в индивидуальном порядке по-прежнему могут изменять настройки комнаты, чтобы получать все уведомления. 0 для отключения.",
+  "Notifications_Muted_Description": "Если вы выберете заглушить всех, комната не будет подсвечиваться в списке при появлении новых сообщений за исключением упоминания о вас. Заглушение уведомлений переопределяет настройки уведомлений.",
   "Notifications_Sound_Volume": "Громкость уведомления",
   "Notify_active_in_this_room": "Уведомить всех активных в этом чате",
   "Notify_all_in_this_room": "Уведомить всех в этом чате",
-  "Num_Agents": "# Сотрудники",
+  "Num_Agents": "# Представители",
   "Number_of_messages": "Количество сообщений",
-  "OAuth_Application": "Приложение OAuth",
+  "OAuth_Application": "Приложение OAuth",
   "OAuth_Applications": "Приложения OAuth",
   "Objects": "Объекты",
   "Off": "Выключено",
   "Off_the_record_conversation": "Конфиденциальная беседа",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Конфиденциальная беседа недоступна в вашем браузере или на вашем устройстве.",
+  "Office_Hours": "Рабочие часы",
+  "Office_hours_enabled": "Рабочие часы включены",
+  "Office_hours_updated": "Рабочие часы обновлены",
   "Offline": "Не в сети",
-  "Offline_DM_Email": " вам было отправлено сообщение пользователем __user__",
+  "Offline_DM_Email": "Тема письма Email для личных сообщений",
   "Offline_form": "Офлайн форма",
   "Offline_form_unavailable_message": "Офлайн сообщение",
-  "Offline_Mention_Email": " вас упомянул(а) __user__ в #__room__",
+  "Offline_Link_Message": "ПЕРЕЙТИ К СООБЩЕНИЮ",
+  "Offline_Mention_Email": "Тема сообщения электронной почты",
   "Offline_message": "Офлайн сообщение",
   "Offline_success_message": "Офлайн сообщение об отправке",
   "Offline_unavailable": "Offline недоступен",
   "On": "Включено",
   "Online": "В сети",
+  "Only_authorized_users_can_write_new_messages": "Только авторизованные пользователи могут писать новые сообщения",
   "Only_On_Desktop": "Режим рабочего стола (отправлять по Enter только с компьютера)",
   "Only_you_can_see_this_message": "Только вы можете видеть это сообщение",
-  "Oops!": "Ой",
+  "Oops!": "Упс",
   "Open": "Открыть",
-  "Open_channel_user_search": "`%s` - открыть чат / поиск пользователей",
+  "Open_channel_user_search": "\"%s\" - открыть канал / поиск пользователей",
+  "Open_days_of_the_week": "Рабочие дни",
+  "Open_Livechats": "Открыть Livechat",
   "Open_your_authentication_app_and_enter_the_code": "Откройте ваше приложение аутентификации и введите код. Вы также можете использовать один из кодов восстановления (backup codes).",
   "Opened": "Открыто",
-  "Opens_a_channel_group_or_direct_message": "Открывает чат, приватный чат или личное сообщение",
+  "Opened_in_a_new_window": "Открыть в новом окне",
+  "Opens_a_channel_group_or_direct_message": "Открывает канал, группу или личную переписку",
   "optional": "Опционально",
   "or": "или",
-  "Order": "Последовательность",
+  "Or_talk_as_anonymous": "Или говорить как аноним",
+  "Order": "Порядок",
+  "Original": "Оригинальный",
   "OS_Arch": "Архитектура ОС",
   "OS_Cpus": "Количество процессоров в ОС",
-  "OS_Freemem": "Свободное кол-во памяти",
-  "OS_Loadavg": "Загрузка ОС",
+  "OS_Freemem": "Свободное количество памяти",
+  "OS_Loadavg": "Среднее загрузка ОС",
   "OS_Platform": "Платформа ОС",
   "OS_Release": "Версия ОС",
   "OS_Totalmem": "Общее кол-во памяти в ОС",
@@ -1111,10 +1326,10 @@
   "OS_Uptime": "Аптайм ОС",
   "others": "другие",
   "OTR": "OTR",
-  "OTR_is_only_available_when_both_users_are_online": "Конфиденциальная беседа доступна, когда оба пользователя online.",
+  "OTR_is_only_available_when_both_users_are_online": "Конфиденциальная беседа доступна, когда оба пользователя в сети.",
   "Outgoing_WebHook": "Исходящий webhook",
   "Outgoing_WebHook_Description": "Отправьте данные из Rocket.Chat в реальном времени",
-  "Override_URL_to_which_files_are_uploaded_This_url_also_used_for_downloads_unless_a_CDN_is_given": "Отклонить URL-адрес, на который загружены файлы. Этот URL-адрес также используется для загрузок в том случае, если указан CDN.",
+  "Override_URL_to_which_files_are_uploaded_This_url_also_used_for_downloads_unless_a_CDN_is_given": "Отклонить URL-адрес, на который загружены файлы. Этот URL-адрес также используется для загрузок в том случае, если указан CDN.",
   "Page_title": "Заголовок страницы",
   "Page_URL": "URL страницы",
   "Password": "Пароль",
@@ -1126,11 +1341,15 @@
   "Permalink": "Постоянная ссылка",
   "Permissions": "Настройка прав",
   "pin-message": "Прикрепить сообщение",
-  "pin-message_description": "Разрешение прикреплять сообщение в публичном чате",
+  "pin-message_description": "Разрешение прикреплять сообщение на канале",
   "Pin_Message": "Прикрепить сообщение",
   "Pinned_a_message": "Прикрепленное сообщение:",
   "Pinned_Messages": "Прикрепленные сообщения",
+  "PiwikAdditionalTrackers": "Дополнительные сайты Piwik",
   "PiwikAdditionalTrackers_Description": "Вы можете отправлять статистику на несколько серверов Piwik добавив URL и siteId. Пример: \n[ { \"trackerURL\" : \"https://my.piwik.domain2/\", \"siteId\" : 42 }, { \"trackerURL\" : \"https://my.piwik.domain3/\", \"siteId\" : 15 } ]",
+  "PiwikAnalytics_cookieDomain": "Все субдомены",
+  "PiwikAnalytics_cookieDomain_Description": "Отслеживать посетителей всех субдоменов",
+  "PiwikAnalytics_domains": "Скрыть исходящие ссылки",
   "PiwikAnalytics_prependDomain": "Добавить имя домена",
   "PiwikAnalytics_siteId_Description": "Идентификатор. Используетя для идентификации этого сайта. Пример: 17",
   "PiwikAnalytics_url_Description": "URL, где находится Piwik, обязательно должен содержать слэш в конце. Пример: //piwik.rocket.chat/",
@@ -1140,53 +1359,55 @@
   "Please_add_a_comment_to_close_the_room": "Пожалуйста, добавьте комментарий, чтобы закрыть комнату",
   "Please_answer_survey": "Пожалуйста, уделите минуту для того, чтобы ответить на несколько вопросов об этом чате",
   "please_enter_valid_domain": "Пожалуйста, введите валидный домен",
-  "Please_enter_value_for_url": "Пожалуйста, введите значение для URL-адреса вашего аватара.",
+  "Please_enter_value_for_url": "Пожалуйста, введите ссылку на ваш аватар.",
   "Please_enter_your_new_password_below": "Введите ваш новый пароль ниже:",
   "Please_enter_your_password": "Повторно введите свой пароль",
   "Please_fill_a_label": "Заполните подпись",
-  "Please_fill_a_name": "Введите имя",
+  "Please_fill_a_name": "Пожалуйста, введите имя",
   "Please_fill_a_username": "Заполните логин",
+  "Please_fill_all_the_information": "Пожалуйста, заполните информацию",
   "Please_fill_name_and_email": "Заполните имя и адрес электронной почты",
   "Please_select_an_user": "Пожалуйста, выберите пользователя",
   "Please_select_enabled_yes_or_no": "Выберите вариант \"Разрешено\"",
-  "Please_wait": "Минуточку",
+  "Please_wait": "Пожалуйста, подождите",
   "Please_wait_activation": "Пожалуйста, подождите, это может занять некоторое время.",
   "Please_wait_while_OTR_is_being_established": "Подождите, ваша конфиденциальная беседа устанавливается",
-  "Please_wait_while_your_account_is_being_deleted": "Подождите, ваш аккаунт удаляется...",
-  "Please_wait_while_your_profile_is_being_saved": "Подождите, пока ваш профиль сохраняется...",
+  "Please_wait_while_your_account_is_being_deleted": "Пожалуйста, подождите, ваша учетная запись удаляется...",
+  "Please_wait_while_your_profile_is_being_saved": "Пожалуйста, подождите, пока ваш профиль сохраняется...",
   "Port": "Порт",
   "post-readonly": "Сообщение только для чтения",
-  "post-readonly_description": "Разрешение на отправку сообщений в публичный чат только для чтения",
+  "post-readonly_description": "Разрешение на отправление сообщений на канале только для чтения",
   "Post_as": "Отправить от имени",
-  "Post_to_Channel": "Опубликовать в публичный чат",
+  "Post_to_Channel": "Опубликовать на канале",
   "Post_to_s_as_s": "Отправить в <strong>%s</strong> от <strong>%s</strong>",
   "Preferences": "Настройки",
   "Preferences_saved": "Настройки сохранены",
-  "preview-c-room": "Предварительный просмотр публичного чата",
-  "preview-c-room_description": "Разрешение на просмотр содержимого публичного чата перед присоединением",
+  "preview-c-room": "Предварительный просмотр публичного канала",
+  "preview-c-room_description": "Разрешение на просмотр содержимого публичного канала перед присоединением",
   "Privacy": "Приватность",
   "Private": "Приватный канал",
   "Private_Channel": "Приватный канал",
   "Private_Group": "Приватная группа",
-  "Private_Groups": "Приватные чаты",
-  "Private_Groups_list": "Список приватных чатов",
+  "Private_Groups": "Приватные группы",
+  "Private_Groups_list": "Список приватных групп",
   "Profile": "Профиль",
   "Profile_details": "Детали профиля",
+  "Profile_picture": "Изображение профиля",
   "Profile_saved_successfully": "Профиль успешно сохранен",
   "Public": "Открытый",
   "Public_Channel": "Канал",
   "Push": "Push уведомления",
   "Push_apn_cert": "APN сертификат",
   "Push_apn_dev_cert": "APN Dev сертификат",
-  "Push_apn_dev_key": "APN Dev ключ",
-  "Push_apn_dev_passphrase": "APN Dev пароль",
-  "Push_apn_key": "APN ключ",
-  "Push_apn_passphrase": "APN Пароль",
+  "Push_apn_dev_key": "Ключ APN Dev",
+  "Push_apn_dev_passphrase": "APN Dev Passphrase",
+  "Push_apn_key": "Ключ APN",
+  "Push_apn_passphrase": "APN Passphrase",
   "Push_debug": "Отладка",
   "Push_enable": "Включить",
   "Push_enable_gateway": "Включить шлюз",
   "Push_gateway": "Шлюз",
-  "Push_gcm_api_key": "GCM API-ключ",
+  "Push_gcm_api_key": "Ключ GCM API",
   "Push_gcm_project_number": "GCM номер проекта",
   "Push_production": "Продакшн",
   "Push_show_message": "Показать сообщение в уведомлении",
@@ -1196,41 +1417,47 @@
   "Query_description": "Дополнительные условия для определения того, каким пользователям отправлять электронную почту. Отписавшиеся пользователи, автоматически удаляются из запроса. Должен быть валидным JSON. Например: \"{\"createdAt\":{\"$gt\":{\"$date\": \"2015-01-01T00:00:00.000Z\"}}}\"",
   "Queue": "Очередь",
   "quote": "цитата",
-  "Quote": "Цитировать",
-  "Random": "случайный",
+  "Quote": "цитата",
+  "Random": "Случайный",
   "React_when_read_only": "Разрешить реакции",
   "React_when_read_only_changed_successfully": "Разрешение на реакции при включенном режиме только для чтения изменено",
-  "Reacted_with": "реагирующего с",
+  "Reacted_with": "Реагирует с",
   "Reactions": "Реакции",
   "Read_only": "Только для чтения",
   "Read_only_changed_successfully": "Режим \"только для чтения\" успешно изменен",
-  "Read_only_channel": "Публичный чат только для чтения",
+  "Read_only_channel": "Канал только для чтения",
   "Read_only_group": "Группа только для чтения",
   "Record": "Запись",
-  "Redirect_URI": "Перенаправить URL-адрес",
+  "Redirect_URI": "Перенаправить URI",
   "Refresh_keys": "Обновить клавиши",
+  "Refresh_oauth_services": "Обновить сервисы OAuth",
   "Refresh_your_page_after_install_to_enable_screen_sharing": "Чтобы включить демонстрацию экрана, обновите страницу после установки",
-  "Register": "Зарегистрироваться",
+  "Regenerate_codes": "Восстановить коды",
+  "Register": "Зарегистрировать новую учетную запись",
   "Registration": "Регистрация",
   "Registration_Succeeded": "Успешная регистрация",
+  "Registration_via_Admin": "Регистрация через администратора",
   "Regular_Expressions": "Регулярные выражения",
   "Release": "Выпуск",
   "Reload": "Перезагрузить",
   "Remove": "Удалить",
   "remove-user": "Удалить пользователя",
   "remove-user_description": "Разрешение на удаление пользователя из чата",
-  "Remove_Admin": "Разжаловать администратора",
+  "Remove_Admin": "Удалить администратора",
+  "Remove_as_leader": "Удалить из лидеров",
   "Remove_as_moderator": "Удалить из модераторов",
   "Remove_as_owner": "Удалить из владельцев",
   "Remove_custom_oauth": "Удалить пользовательский OAuth",
   "Remove_from_room": "Удалить из канала",
+  "Remove_last_admin": "Удаление последнего администратора",
   "Remove_someone_from_room": "Удалить кого-то из канала",
   "Removed": "Удаленные",
   "Reply": "Ответить",
   "Report_Abuse": "Сообщить о нарушениях",
-  "Report_exclamation_mark": "Отчет!",
-  "Report_sent": "отчет отправлен",
+  "Report_exclamation_mark": "Соощить!",
+  "Report_sent": "Сообщение отправлено",
   "Report_this_message_question_mark": "Сообщить об этом сообщении?",
+  "Reporting": "Сообщаю",
   "Require_password_change": "Требуется смена пароля",
   "Resend_verification_email": "Отправить проверочное электронное письмо ещё раз",
   "Reset": "Восстановить",
@@ -1242,40 +1469,43 @@
   "Role": "Роль",
   "Role_Editing": "Редактировать роль",
   "Role_removed": "Роль удалена",
-  "Room": "Чат",
-  "Room_announcement_changed_successfully": "Объявление чата успешно изменено",
+  "Room": "Комната",
+  "Room_announcement_changed_successfully": "Объявление комнаты успешно изменено",
   "Room_archivation_state": "Статус",
   "Room_archivation_state_false": "В сети",
-  "Room_archivation_state_true": "Заархивировано",
+  "Room_archivation_state_true": "Архивировать",
   "Room_archived": "Комната в архиве",
-  "room_changed_announcement": "Объявление чата изменено на: <em>__room_announcement__</em> пользователем <em>__user_by__</em>",
-  "room_changed_description": "Описание чата изменено на: <em>__room_description__</em> пользователем <em>__user_by__</em>",
-  "room_changed_privacy": "<em>__user_by__</em> изменил тип чата на <em>__room_type__</em>",
-  "room_changed_topic": "<em>__user_by__</em>  изменил тему чата на <em>__room_topic__</em>",
-  "Room_default_change_to_private_will_be_default_no_more": "Этот публичный чат назначен по-умолчанию, если сделать его приватным, он перестанет быть чатом по-умолчанию. Продолжить?",
+  "room_changed_announcement": "Пользователь <em>__user_by__</em> изменил объявление комнаты на <em>__room_announcement__</em> ",
+  "room_changed_description": "Пользователь <em>__user_by__</em> изменил описание комнаты на <em>__room_description__</em>",
+  "room_changed_privacy": "Пользователь <em>__user_by__</em> изменил тип комнаты на <em>__room_type__</em>",
+  "room_changed_topic": "Пользователь <em>__user_by__</em>  изменил тему комнаты на <em>__room_topic__</em>",
+  "Room_default_change_to_private_will_be_default_no_more": "Этот канал является каналом по умолчанию, если сделать его приватной группой, он перестанет быть каналом по-умолчанию. Вы хотите продолжить?",
   "Room_description_changed_successfully": "Описание обновлено",
-  "Room_has_been_archived": "Чат был архивирован",
-  "Room_has_been_deleted": "Чат был удалён",
+  "Room_has_been_archived": "Комната была архивирована",
+  "Room_has_been_deleted": "Комната была удалена",
   "Room_has_been_unarchived": "Чат был разархивирован",
   "Room_Info": "Информация канала",
+  "room_is_blocked": "Комната была заблокирована",
   "room_is_read_only": "Эта группа доступна только для чтения",
   "room_name": "Имя комнаты",
-  "Room_name_changed": "Название чата изменено: <em>__room_name__</em> пользователем <em>__user_by__</em>",
-  "Room_name_changed_successfully": "Название чата успешно изменено",
-  "Room_not_found": "Чат не найден",
+  "Room_name_changed": "Пользователь <em>__user_by__</em> поменял название комнаты на <em>__room_name__</em>",
+  "Room_name_changed_successfully": "Название комнаты успешно изменено",
+  "Room_not_found": "Комната не найдена",
   "Room_password_changed_successfully": "Пароль комнаты успешно изменён",
-  "Room_topic_changed_successfully": "Тема чата успешно изменена",
-  "Room_type_changed_successfully": "Тип чата успешно изменен",
-  "Room_unarchived": "Чат в архиве",
+  "Room_topic_changed_successfully": "Тема комнаты успешно изменена",
+  "Room_type_changed_successfully": "Тип комнаты успешно изменён",
+  "Room_type_of_default_rooms_cant_be_changed": "Эта комната является комнатой по умолчанию и её тип не может быть изменён. Пожалуйста, обратитесь к вашему администратору.",
+  "Room_unarchived": "Комната разархивирована",
   "Room_uploaded_file_list": "Список файлов канала",
   "Room_uploaded_file_list_empty": "Нет доступных файлов",
-  "Rooms": "Чаты",
+  "Rooms": "Комнаты",
   "run-import": "Запускать импорт",
   "run-import_description": "Разрешение на запуск импортеров",
   "run-migration": "Запустить миграцию",
   "run-migration_description": "Разрешение на запуск миграций",
-  "Running_Instances": "Запущенные инстансы",
-  "S_new_messages_since_s": "%s новых сообщений с %s",
+  "Running_Instances": "Запущенные виртуальные машины",
+  "S_new_messages_since_s": "%s новых сообщений с %s",
+  "Same_Style_For_Mentions": "Такой же стиль для упоминаний",
   "SAML": "SAML разметка",
   "SAML_Custom_Cert": "Пользовательский сертификат",
   "SAML_Custom_Entry_point": "Пользовательская точка входа",
@@ -1287,28 +1517,31 @@
   "save-others-livechat-room-info": "Сохранить информацию о других комнатах livechat",
   "save-others-livechat-room-info_description": "Разрешение сохранять информацию от других комнатах livechat",
   "Save_changes": "Применить",
-  "Save_Mobile_Bandwidth": "Включить режим экономии трафика",
-  "Save_to_enable_this_action": "Сохранить, чтобы активировать это действие",
+  "Save_Mobile_Bandwidth": "Включить режим экономии трафика для мобильных устройств",
+  "Save_to_enable_this_action": "Сохраните, чтобы активировать это действие",
   "Saved": "Сохранено",
   "Saving": "Сохранение",
+  "Scan_QR_code": "Используйте приложения авторизаторы, такие как Google Authenticator, Authy или Duo, для того, чтобы отсканировать QR-код. Вам будет показан 6-значный код, который вы должны ввести ниже.",
+  "Scan_QR_code_alternative_s": "Если вы не можете отсканировать QR код, вы можете ввести код вручную: __code__",
   "Scope": "Область",
   "Screen_Share": "Демонстрация экрана",
   "Script_Enabled": "Использовать скрипт",
   "Search": "Поиск",
   "Search_by_username": "Поиск по логину",
   "Search_Messages": "Поиск сообщений",
-  "Search_Private_Groups": "Поиск приватных чатов",
-  "seconds": "секунд(ы)",
-  "Secret_token": "Секретный маркер",
+  "Search_Private_Groups": "Поиск приватных групп",
+  "seconds": "секунды",
+  "Secret_token": "Секретный токен",
   "Security": "Безопасность",
   "Select_a_department": "Выберите отдел",
   "Select_a_user": "Выберите пользователя",
   "Select_an_avatar": "Выберите аватар",
   "Select_file": "Выберите файл",
-  "Select_service_to_login": "Выберите сервис для аватара или загрузите изображение с компьютера",
+  "Select_role": "Выберите роль",
+  "Select_service_to_login": "Выберите сервис для загрузки вашего изображения или загрузите изображение с компьютера напрямую",
   "Select_user": "Выберите пользователя",
   "Select_users": "Выберите пользователей",
-  "Selected_agents": "Выбранные сотрудники",
+  "Selected_agents": "Выбранные представители",
   "Send": "Отправить",
   "Send_a_message": "Отправить сообщение",
   "Send_a_test_mail_to_my_user": "Проверка",
@@ -1320,20 +1553,23 @@
   "Send_invitation_email_error": "Вы не предоставили корректный адрес электронной почты.",
   "Send_invitation_email_info": "Вы можете отправить несколько электронных писем с приглашением за раз.",
   "Send_invitation_email_success": "Вы успешно отправили приглашения на следующие адреса электронной почты:",
-  "Send_request_on_chat_close": "Отправить запрос на чат закрытия",
+  "Send_request_on_chat_close": "Отправить запрос на закрытие чата",
   "Send_request_on_offline_messages": "Отправить запрос на сообщения в автономном режиме",
   "Send_Test": "Отправить тест",
   "Send_welcome_email": "Отправить электронное письмо с приветствием",
-  "Send_your_JSON_payloads_to_this_URL": "Отправить ваши полезные данные формата JSON на этот URL-адрес.",
+  "Send_your_JSON_payloads_to_this_URL": "Отправить ваши полезные данные формата JSON на этот URL-адрес.",
   "Sending": "Отправка...",
+  "Served_By": "Обслуживается",
   "Service": "Обработчик",
+  "Service_account_key": "Ключ Service account",
   "set-moderator": "Назначить модератора",
-  "set-moderator_description": "Разрешение на назначение другого пользователя модератором публичного чата",
+  "set-moderator_description": "Разрешение на назначение других пользователей модераторами канала",
   "set-owner": "Назначить владельца",
-  "set-owner_description": "Разрешение на назначение другого пользователя владельцем публичного чата",
-  "set-react-when-readonly_description": "Разрешение на изменение возможности реакций на сообщения в публичном чате только для чтения",
+  "set-owner_description": "Разрешение на назначение других пользователей владельцами канала",
+  "set-react-when-readonly": "Установить реакцию когда только для чтения",
+  "set-react-when-readonly_description": "Разрешение на изменение возможности реакций на сообщения на канале только для чтения",
   "set-readonly": "Установить только для чтения",
-  "set-readonly_description": "Разрешение переводить публичный чат в режим только для чтения",
+  "set-readonly_description": "Разрешение переводить канал в режим только для чтения",
   "Set_as_leader": "Назначит лидером",
   "Set_as_moderator": "Назначить модератором",
   "Set_as_owner": "Назначить владельцом",
@@ -1347,164 +1583,204 @@
   "Show_more": "Показать больше",
   "show_offline_users": "показывать оффлайн пользователей",
   "Show_on_registration_page": "Показывать на странице регистрации",
-  "Show_only_online": "Показать только online",
+  "Show_only_online": "Показать только подключенных",
   "Show_preregistration_form": "Показать предварительную регистрационную форму",
+  "Show_queue_list_to_all_agents": "Показывать список очередей всем представителям",
   "Show_the_keyboard_shortcut_list": "Показывать список горячих клавиш",
-  "Showing_archived_results": "<p>показано <b>%s</b> архивных результатов</p>",
-  "Showing_online_users": "Показано <b>__total_showing__</b> из __total__ пользователей",
-  "Showing_results": "<p>Отображено <b>%s</b> результатов</p>",
+  "Showing_archived_results": "<p>Показано <b>%s</b> архивных результатов</p>",
+  "Showing_online_users": "Показано: <b>__total_showing__</b>. Подключенных: __online__. Всего: __total__ пользователей",
+  "Showing_results": "<p>Показано <b>%s</b> результатов</p>",
   "Sidebar_list_mode": "Режим отображения списка каналов",
   "Sign_in_to_start_talking": "Войдите, чтобы начать разговор",
   "since_creation": "с %s",
   "Site_Name": "Название сайта",
   "Site_Url": "URL-адрес сайта",
-  "Site_Url_Description": "Пример: https://chat.domain.com/",
+  "Site_Url_Description": "Пример: https://chat.domain.com/",
   "Skip": "Пропустить",
   "SlackBridge_error": "В SlackBridge произошла ошибка во время импорта ваших сообщений в %s:%s",
   "SlackBridge_finish": "SlackBridge закончил импорт сообщений в %s. Пожалуйста, перезагрузите приложение, чтобы увидеть все сообщения.",
-  "SlackBridge_Out_All_Description": "Отправлять сообщения со всех общих чатов, которые есть в Slack и в которых есть бот",
+  "SlackBridge_Out_All_Description": "Отправлять сообщения из всех каналов, которые есть в Slack и в которых есть бот",
   "SlackBridge_Out_Channels": "Общие чаты для SlackBridge Out",
-  "SlackBridge_Out_Channels_Description": "Выберите, с каких общих чатов отправлять сообщения обратно в Slack",
+  "SlackBridge_Out_Channels_Description": "Выберите с каких каналов отправлять сообщения обратно в Slack",
   "SlackBridge_Out_Enabled": "Включить SlackBridge Out",
   "SlackBridge_Out_Enabled_Description": "Должен ли SlackBridge также отправлять ваши сообщения обратно в Slack",
-  "SlackBridge_start": "@%s начал импорт через SlackBridge в `#%s`. Вы получите уведомление после завершения.",
+  "SlackBridge_start": "@%s начал импорт через SlackBridge в \"#%s\". Вы получите уведомление после завершения.",
   "Slash_Gimme_Description": "Показать  (つ ◕_◕) つ  перед сообщением",
   "Slash_LennyFace_Description": "Показать  (͡ ° ͜ʖ ͡ °) после сообщения",
   "Slash_Shrug_Description": "Показать ¯ \\ _ (ツ) _ / ¯ после сообщения",
   "Slash_Tableflip_Description": "Показать  (╯ ° □ °) ╯( ┻━┻",
   "Slash_TableUnflip_Description": "Показать ┬─┬ ノ (゜ - ゜ ノ)",
   "Slash_Topic_Description": "Установить тему",
-  "Slash_Topic_Params": "тема сообщения",
+  "Slash_Topic_Params": "Тема сообщения",
   "Smarsh_Email": "Адрес электронной почты Smarsh",
   "Smarsh_Email_Description": "Адрес электронной почты Smarsh, на который отправлять .eml файл.",
   "Smarsh_Enabled": "Включить Smarsh",
   "Smarsh_Enabled_Description": "Включен ли Smarsh eml коннектор (требует заполнения поля \"Адрес электронной почты отправителя\" в \"Электронная почта\" -> \"SMTP\").",
   "Smarsh_Interval": "Период Smarsh",
   "Smarsh_Interval_Description": "Период времени ожидания перед отправкой чатов (требует заполнения поля \"Адрес электронной почты отправителя\" в \"Электронная почта\"->\"SMTP\").",
+  "Smarsh_MissingEmail_Email": "Отсутствует электронная почта",
+  "Smarsh_MissingEmail_Email_Description": "Почтовый адрес для учетной записи с пустым почтовым адресом (обычно такие бывает у учетных записей ботов)",
   "Smileys_and_People": "Смайлики и люди",
   "SMS_Enabled": "SMS включены",
   "SMTP": "Протокол SMTP",
   "SMTP_Host": "SMTP хост",
-  "SMTP_Password": "SMTP Пароль",
-  "SMTP_Port": "SMTP Порт",
-  "SMTP_Test_Button": "Настройка тестового протокола SMTP",
+  "SMTP_Password": "SMTP пароль",
+  "SMTP_Port": "SMTP порт",
+  "SMTP_Test_Button": "Настройка тестового протокола SMTP",
   "SMTP_Username": "SMTP логин",
   "snippet-message": "Сообщение со сниппетом",
   "snippet-message_description": "Разрешение на создание сообщений со сниппетом",
   "Snippet_Added": "Создано %s",
   "Snippet_Messages": "Сообщения со сниппетами",
   "Snippeted_a_message": "Создан сниппет __snippetLink__",
+  "Sort_by_activity": "Сортировать по активности",
   "Sound": "Звуковые оповещения",
   "Sound_File_mp3": "Звуковой файл (mp3)",
   "Split_by_categories": "Отдельно по категориям",
   "SSL": "SSL",
   "Star_Message": "Отметить сообщение",
   "Starred_Messages": "Отмеченные сообщения",
+  "Start": "Начать",
   "Start_audio_call": "Начать голосовой вызов",
   "Start_Chat": "Начать чат",
-  "Start_of_conversation": "Начало диалога",
+  "Start_of_conversation": "Начало беседы",
   "Start_OTR": "Начать конфиденциальную беседу",
   "Start_video_call": "Начать видеозвонок",
-  "Start_with_s_for_user_or_s_for_channel_Eg_s_or_s": "Начните с <code class=\"inline\">%s</code> для пользователя или <code class=\"inline\">%s</code> для публичного чата. Например: <code class=\"inline\">%s</code> или <code class=\"inline\">%s</code>",
+  "Start_video_conference": "Начать видео конференцию?",
+  "Start_with_s_for_user_or_s_for_channel_Eg_s_or_s": "Начните с <code class=\"inline\">%s</code> для пользователя или <code class=\"inline\">%s</code> для канала. Например: <code class=\"inline\">%s</code> или <code class=\"inline\">%s</code>",
   "Started_At": "Начато",
+  "Started_a_video_call": "Начать видеозвонок",
   "Statistics": "Статистика",
-  "Statistics_reporting": "Отправить статистику в Rocket.Chat",
-  "Statistics_reporting_Description": "Отправляя свою статистику, вы поможете нам определить, сколько Rocket.Chat развернуты, а также насколько хорошо ведет себя система, таким образом, мы можем дополнительно улучшить его. Не беспокойтесь, поскольку никакой информации о пользователе не передается, а вся информация, что мы получаем, конфиденциальна.",
+  "Statistics_reporting": "Отправлять статистику в Rocket.Chat",
+  "Statistics_reporting_Description": "Отправляя свою статистику, вы поможете нам определить, сколько Rocket.Chat развернуты, а также насколько хорошо ведет себя система, таким образом, мы можем дополнительно улучшить его. Не беспокойтесь, поскольку никакой информации о пользователях не передается, а вся информация, что мы получаем, конфиденциальна.",
   "Stats_Active_Users": "Активные пользователи",
-  "Stats_Avg_Channel_Users": "Среднее число пользователей в публичных чатах",
-  "Stats_Avg_Private_Group_Users": "Количество пользователей в приватных чатах",
-  "Stats_Away_Users": "Отошедших пользователей",
-  "Stats_Max_Room_Users": "Максимальное количество пользователей в чате",
+  "Stats_Avg_Channel_Users": "Среднее число пользователей на каналах",
+  "Stats_Avg_Private_Group_Users": "Среднее число пользователей в приватных группах",
+  "Stats_Away_Users": "Отошедшие пользователи",
+  "Stats_Max_Room_Users": "Максимальное количество пользователей в комнате",
   "Stats_Non_Active_Users": "Неактивные пользователи",
   "Stats_Offline_Users": "Пользователи не в сети",
   "Stats_Online_Users": "Пользователи в сети",
-  "Stats_Total_Channels": "Всего публичных чатов",
-  "Stats_Total_Direct_Messages": "Общее количество сообщений в личных чатах",
+  "Stats_Total_Channels": "Всего каналов",
+  "Stats_Total_Direct_Messages": "Общее количество личных переписок",
   "Stats_Total_Livechat_Rooms": "Всего чатов Livechat",
   "Stats_Total_Messages": "Всего сообщений",
   "Stats_Total_Messages_Channel": "Всего сообщений в публичных чатах",
   "Stats_Total_Messages_Direct": "Всего личных сообщений",
   "Stats_Total_Messages_Livechat": "Всего сообщений в Livechat чатах",
   "Stats_Total_Messages_PrivateGroup": "Всего сообщений в приватных чатах",
-  "Stats_Total_Private_Groups": "Всего приватных чатов",
-  "Stats_Total_Rooms": "Всего чатов",
+  "Stats_Total_Private_Groups": "Всего приватных групп",
+  "Stats_Total_Rooms": "Всего комнат",
   "Stats_Total_Users": "Всего пользователей",
   "Status": "Статус",
   "Stop_Recording": "Остановить запись",
   "strike": "зачеркнутый",
   "Subject": "Тема",
   "Submit": "Отправить",
-  "Success": "Выполнено",
-  "Success_message": "сообщение об успешном выполнении",
+  "Success": "Успех",
+  "Success_message": "Сообщение об успешном выполнении",
   "Sunday": "Воскресенье",
   "Survey": "Опрос",
   "Survey_instructions": "Оценивайте каждый вопрос по 5-балльной шкале, где 1 означает, что вы совсем недовольны, и 5 - полностью довольны.",
   "Symbols": "Символы",
   "Sync_success": "Синхронизация прошла успешно",
+  "Sync_in_progress": "Выполняется синхронизация",
   "Sync_Users": "Синхронизация пользователей",
   "System_messages": "Системные сообщения",
   "Tag": "Тег",
+  "Take_it": "Возьми это!",
+  "TargetRoom": "Целевая комната",
+  "TargetRoom_Description": "Комната, куда будут отправляться сообщения, которые являются результатом этого события. Разрешена только одна целевая комната, и она должна существовать.",
   "Team": "Команда",
   "Test_Connection": "Проверка соединения",
-  "Test_Desktop_Notifications": "Протестировать работу уведомлений рабочего стола",
+  "Test_Desktop_Notifications": "Протестировать работу уведомлений компьютера",
   "Thank_you_exclamation_mark": "Спасибо!",
   "Thank_you_for_your_feedback": "Спасибо за ваш отзыв",
-  "The_application_name_is_required": "Требуется наименование приложения",
-  "The_channel_name_is_required": "Введите имя публичного чата",
+  "The_application_name_is_required": "Требуется название приложения",
+  "The_channel_name_is_required": "Требуется название канала",
   "The_emails_are_being_sent": "Письма отправляются.",
   "The_field_is_required": "Поле %s обязательно.",
-  "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Изменить размер изображения не получится, потому что мы не можем обнаружить установленные на вашем сервере ImageMagick или GraphicsMagick.",
-  "The_redirectUri_is_required": "Требуется перенаправление URL-адреса",
-  "The_server_will_restart_in_s_seconds": "Сервер перезапустится через % секунд",
-  "The_setting_s_is_configured_to_s_and_you_are_accessing_from_s": "Параметр <strong>%s</strong> настраивается на <strong>%s</strong> и вы получаете доступ из <strong>%s</strong>!",
-  "The_user_will_be_removed_from_s": "Пользователь будет удален из %s",
+  "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Изменить размер изображения не получится, потому что мы не можем обнаружить установленные на вашем сервере ImageMagick или GraphicsMagick.",
+  "The_redirectUri_is_required": "Требуется redirectUri ",
+  "The_server_will_restart_in_s_seconds": "Сервер перезапустится через %s секунд",
+  "The_setting_s_is_configured_to_s_and_you_are_accessing_from_s": "Параметр <strong>%s</strong> настраивается на <strong>%s</strong> и вы получаете доступ из <strong>%s</strong>!",
+  "The_user_will_be_removed_from_s": "Пользователь будет удален из %s",
   "The_user_wont_be_able_to_type_in_s": "Пользователь не сможет отправлять сообщения в %s",
   "Theme": "Тема",
+  "theme-color-component-color": "Цвет компонента",
   "theme-color-content-background-color": "Цвет фона содержимого",
   "theme-color-custom-scrollbar-color": "Пользовательский цвет полосы прокрутки",
+  "theme-color-error-color": "Цвет ошибки",
   "theme-color-info-font-color": "Цвет шрифта информации",
   "theme-color-link-font-color": "Цвет шрифта ссылки",
+  "theme-color-pending-color": "Цвет ожидания",
+  "theme-color-primary-action-color": "Цвет основного действия",
   "theme-color-primary-background-color": "Основной цвет фона",
   "theme-color-primary-font-color": "Основной цвет шрифта",
+  "theme-color-secondary-action-color": "Цвет вторичного действия",
   "theme-color-secondary-background-color": "Второй цвет фона",
   "theme-color-secondary-font-color": "Второй цвет шрифта",
   "theme-color-selection-color": "Цвет выделения",
-  "theme-color-status-away": "Цвет статуса \"Нет на месте\"",
+  "theme-color-status-away": "Цвет статуса \"Отошёл\"",
   "theme-color-status-busy": "Цвет статуса \"Занят\"",
   "theme-color-status-offline": "Цвет статуса \"Не в сети\"",
   "theme-color-status-online": "Цвет статуса \"В сети\"",
+  "theme-color-success-color": "Цвет успеха",
   "theme-color-tertiary-background-color": "Третий цвет фона",
   "theme-color-tertiary-font-color": "Третий цвет шрифта",
+  "theme-color-transparent-dark": "Прозрачный темный",
+  "theme-color-transparent-darker": "Прозрачный темнее",
+  "theme-color-transparent-light": "Прозрачный светлый",
+  "theme-color-transparent-lighter": "Прозрачный светлее",
+  "theme-color-transparent-lightest": "Прозрачный самый светлый",
   "theme-color-unread-notification-color": "Цвет непрочитанных уведомлений",
+  "theme-color-rc-color-error": "Ошибка",
+  "theme-color-rc-color-error-light": "Ошибка светлая",
+  "theme-color-rc-color-alert": "Тревога",
+  "theme-color-rc-color-alert-light": "Тревога светлая",
+  "theme-color-rc-color-success": "Успех",
+  "theme-color-rc-color-success-light": "Успех светлый",
+  "theme-color-rc-color-button-primary": "Кнопка основная",
+  "theme-color-rc-color-button-primary-light": "Кнопка основная светлая",
+  "theme-color-rc-color-primary": "Основной",
+  "theme-color-rc-color-primary-darkest": "Основной самый темный",
+  "theme-color-rc-color-primary-dark": "Основной темный",
+  "theme-color-rc-color-primary-light": "Основной светлый",
+  "theme-color-rc-color-primary-light-medium": "Основной умеренно светлый",
+  "theme-color-rc-color-primary-lightest": "Основной самый светлый",
+  "theme-color-rc-color-content": "Содержимое",
   "theme-custom-css": "Пользовательский CSS",
   "theme-font-body-font-family": "Шрифт для тега body",
   "There_are_no_agents_added_to_this_department_yet": "В этот отдел еще не добавлены сотрудники.",
   "There_are_no_integrations": "Интеграций нет",
-  "There_are_no_users_in_this_role": "Пользователей в этой должности не найдено.",
-  "This_conversation_is_already_closed": "Эта беседа уже закрыта.",
+  "There_are_no_users_in_this_role": "Пользователей этой роле не найдено.",
+  "This_conversation_is_already_closed": "Беседа уже закрыта.",
   "This_email_has_already_been_used_and_has_not_been_verified__Please_change_your_password": "Такой адрес электронной почты уже использовался и не был подтверждён. Измените ваш пароль.",
-  "This_is_a_desktop_notification": "Это уведомление рабочего стола",
+  "This_is_a_desktop_notification": "Это уведомление компьютера",
   "This_is_a_push_test_messsage": "Это тестовое push-уведомление",
-  "This_room_has_been_archived_by__username_": "__username__ отправил этот чат в архив",
+  "This_room_has_been_archived_by__username_": "Комната была архивирована __username__",
   "This_room_has_been_unarchived_by__username_": "__username__ вернул этот чат из архива",
   "Thursday": "Четверг",
   "Time_in_seconds": "Время в секундах",
   "Title": "Заголовок",
   "Title_bar_color": "Цвет строки заголовка",
-  "Title_bar_color_offline": "Цвет заголовка",
-  "Title_offline": "Заголовок оффлайн формы",
-  "To_install_RocketChat_Livechat_in_your_website_copy_paste_this_code_above_the_last_body_tag_on_your_site": "Для того, чтобы установить Rocket.Chat Livechat на вашем сайте, скопируйте &amp; и вставьте этот код выше последнего <strong>&lt;/body&gt;</strong> тега на вашем сайте.",
+  "Title_bar_color_offline": "Цвет строки заголовка при отсутствии подключения",
+  "Title_offline": "Заголовок при отсутствии подключения",
+  "To_install_RocketChat_Livechat_in_your_website_copy_paste_this_code_above_the_last_body_tag_on_your_site": "Для того, чтобы установить Rocket.Chat Livechat на вашем сайте, скопируйте и вставьте этот код выше последнего <strong>&lt;/body&gt;</strong> тега на вашем сайте.",
   "to_see_more_details_on_how_to_integrate": "чтобы увидеть более подробную информацию о том, как интегрировать.",
   "To_users": "Пользователям",
   "Toggle_original_translated": "Переключить оригинал/перевод",
   "Topic": "Тема",
+  "Transcript_Enabled": "Спросить у посетителя хочет ли он получить переписку после окончания чата",
+  "Transcript_message": "Показать это сообщение, когда спрашиваем про получение переписке",
+  "Transcript_of_your_livechat_conversation": "Ваши переписки в Livechat.",
   "Translated": "Переведено",
   "Translations": "Переводы",
   "Travel_and_Places": "Путешествия и места",
   "Trigger_removed": "Триггер удален",
   "Trigger_Words": "Слова запуска",
-  "Triggers": "Триггер",
-  "True": "Да",
+  "Triggers": "Триггеры",
+  "True": "Истина",
   "Tuesday": "Вторник",
   "Two-factor_authentication": "Двухфакторная аутентификация",
   "Two-factor_authentication_disabled": "Двухфакторная аутентификация выключена",
@@ -1513,43 +1789,48 @@
   "Two-factor_authentication_native_mobile_app_warning": "Внимание: Если вы активируете эту функцию вы не сможете работать с мобильных приложений на данный момент.",
   "Type": "Тип",
   "Type_your_email": "Введите адрес электронной почты",
-  "Type_your_message": "Текст сообщения",
-  "Type_your_name": "Введите свое имя",
-  "Type_your_new_password": "Введите новый пароль",
+  "Type_your_message": "Текст вашего сообщения",
+  "Type_your_name": "Введите ваше имя",
+  "Type_your_new_password": "Введите ваш новый пароль",
+  "UI_Allow_room_names_with_special_chars": "Разрешить специальные символы в названии комнаты",
   "UI_Click_Direct_Message": "Нажмите, чтобы создать личное сообщение",
-  "UI_Click_Direct_Message_Description": "Не открывать профиль, перейти к диалогу",
-  "UI_DisplayRoles": "Показывать роли пользователей в сообщениях",
+  "UI_Click_Direct_Message_Description": "Не открывать профиль, перейти к беседе",
+  "UI_DisplayRoles": "Показывать роли пользователей",
   "UI_Merge_Channels_Groups": "Отображать каналы и приватные каналы в одном списке",
+  "UI_Unread_Counter_Style": "Стиль счетчика непрочитанных сообщений",
   "UI_Use_Name_Avatar": "Использовать инициалы полного имени для создания аватара",
   "UI_Use_Real_Name": "Использовать настоящее имя",
-  "Unarchive": "Восстановить",
+  "Unarchive": "Разархивировать",
   "unarchive-room": "Разархивировать чат",
   "unarchive-room_description": "Разрешение на разархивирование чатов",
   "Unblock_User": "Разблокировать пользователя",
-  "Unmute_someone_in_room": "Разблокировать кого-нибудь в чате",
-  "Unmute_user": "Разблокировать пользователя",
+  "Unmute_someone_in_room": "Сделать незаглушенным кого-нибудь в комнате",
+  "Unmute_user": "Сделать незаглушенным пользователя",
   "Unnamed": "Без названия",
   "Unpin_Message": "Открепить сообщение",
   "Unread_Count": "Количество непрочитанных",
+  "Unread_Count_DM": "Количество непрочитанных сообщений для личных переписки",
   "Unread_Messages": "Непрочитанные сообщения",
-  "Unread_Rooms": "Непрочитанные чаты",
-  "Unread_Rooms_Mode": "Режим \"непрочитанные чаты\"",
-  "Unread_Tray_Icon_Alert": "Иконка уведомлений о непрочитанном в трее",
+  "Unread_Rooms": "Непрочитанные комнаты",
+  "Unread_Rooms_Mode": "Режим непрочитанные комнаты",
+  "Unread_Tray_Icon_Alert": "Иконка уведомлений о непрочитанных сообщениях в трее",
   "Unstar_Message": "Убрать отметку",
   "Updated_at": "Обновлено в",
+  "Upload_user_avatar": "Загруженный аватар",
   "Upload_file_description": "Описание файла",
   "Upload_file_name": "Имя файла",
   "Upload_file_question": "Загрузить файл?",
   "Uploading_file": "Загрузка файла...",
   "Uptime": "Аптайм",
   "URL": "URL",
+  "URL_room_prefix": "Префикс URL комнаты",
   "Use_account_preference": "Параметры профиля",
-  "Use_Emojis": "Использовать Emojis",
+  "Use_Emojis": "Использовать эмодзи ",
   "Use_Global_Settings": "Использовать глобальные настройки",
   "Use_initials_avatar": "Использовать инициалы имени пользователя",
   "Use_service_avatar": "Использовать %s аватар",
   "Use_this_username": "Использовать этот логин",
-  "Use_uploaded_avatar": "Использовать загруженную аватарку",
+  "Use_uploaded_avatar": "Использовать загруженный аватар",
   "Use_url_for_avatar": "Использовать аватар по ссылке",
   "Use_User_Preferences_or_Global_Settings": "Использовать пользовательские или глобальные настройки",
   "User": "Пользователь",
@@ -1564,12 +1845,12 @@
   "User_added_by": "Пользователь <em>__user_added__</em> добавлен <em>__user_by__</em>.",
   "User_added_successfully": "Пользователь успешно добавлен",
   "User_and_group_mentions_only": "Только уведомления пользователя и группы",
-  "User_doesnt_exist": "Пользователя с логином `@%s` не существует.",
-  "User_has_been_activated": "Пользователь активирован",
-  "User_has_been_deactivated": "Пользователь деактивирован",
+  "User_doesnt_exist": "Пользователя с логином \"@%s\" не существует.",
+  "User_has_been_activated": "Пользователь был активирован",
+  "User_has_been_deactivated": "Пользователь был деактивирован",
   "User_has_been_deleted": "Пользователь был удален",
-  "User_has_been_muted_in_s": "Пользователь заблокирован в %s",
-  "User_has_been_removed_from_s": "Пользователь удален из %s",
+  "User_has_been_muted_in_s": "Пользователь был заглушен в %s",
+  "User_has_been_removed_from_s": "Пользователь был удален из %s",
   "User_Info": "Информация о пользователе",
   "User_Interface": "Пользовательский интерфейс",
   "User_is_blocked": "Пользователь заблокирован",
@@ -1586,37 +1867,38 @@
   "User_management": "Управление пользователями",
   "User_mentions_only": "Только уведомления",
   "User_muted": "Пользователь заглушен",
-  "User_muted_by": "Пользователь <em>__user_muted__</em> заблокирован пользователем <em>__user_by__</em>.",
+  "User_muted_by": "Пользователь <em>__user_muted__</em> заглушен пользователем <em>__user_by__</em>.",
   "User_not_found": "Пользователь не найден",
-  "User_not_found_or_incorrect_password": "Пользователь не найден, или введен неправильный пароль",
-  "User_or_channel_name": "Имя пользователя или публичного чата",
+  "User_not_found_or_incorrect_password": "Пользователь не найде, или введен неправильный пароль",
+  "User_or_channel_name": "Имя пользователя или канала",
   "User_removed": "Пользователь удален",
   "User_removed_by": "Пользователь <em>__user_removed__</em> удален <em>__user_by__</em>.",
   "User_Settings": "Пользовательские настройки",
-  "User_unmuted_by": "Пользователь <em>__user_unmuted__</em> разблокирован пользователем <em>__user_by__</em>.",
-  "User_unmuted_in_room": "Пользователь разблокирован в чате",
+  "User_unmuted_by": "Пользователь <em>__user_unmuted__</em> перестал быть заглушенным благодаря пользователю <em>__user_by__</em>.",
+  "User_unmuted_in_room": "Пользователь перестал быть заглушенным в комнате",
   "User_updated_successfully": "Пользователь успешно обновлен",
   "User_uploaded_file": "Загрузил файл",
   "User_uploaded_image": "Загрузил изображение",
   "Username": "Логин",
   "Username_and_message_must_not_be_empty": "Логин и сообщение не должны быть пустыми",
   "Username_cant_be_empty": "Логин не может быть пустым",
-  "Username_Change_Disabled": "Администратор отключил возможность изменения имен пользователей",
+  "Username_Change_Disabled": "Администратор отключил возможность изменения логина",
   "Username_denied_the_OTR_session": "__username__ отклонил конфиденциальную беседу",
   "Username_description": "Логин используется для упоминания вас в сообщениях",
   "Username_doesnt_exist": "Логин `%s` не существует.",
   "Username_ended_the_OTR_session": "__username__ завершил конфиденциальную беседу",
-  "Username_invalid": "<strong>%s</strong> &mdash; некорректное имя пользователя, <br/> можно использовать только латинские буквы, цифры, точки, подчеркивания и тире.",
-  "Username_is_already_in_here": "`@%s` уже здесь.",
-  "Username_is_not_in_this_room": "Пользователь `#%s` не в этом чате.",
+  "Username_invalid": "<strong>%s</strong> недопустимое имя пользователя, <br/>> используйте только буквы, цифры, точки, дефисы и подчеркивания",
+  "Username_is_already_in_here": "\"@%s\" уже здесь.",
+  "Username_is_not_in_this_room": "Пользователь \"#%s\" не в этой комнате.",
+  "Username_Placeholder": "Пожалуйста, введите логин...",
   "Username_title": "Зарегистрировать логин",
   "Username_wants_to_start_otr_Do_you_want_to_accept": "__username__ хочет начать конфиденциальную беседу. Принять?",
   "Users": "Пользователи",
   "Users_added": "Пользователь добавлен",
   "Users_in_role": "Пользователи с ролью",
-  "UTF8_Names_Slugify": "UTF-8 имена",
-  "UTF8_Names_Validation": "Проверка имён в UTF8",
-  "UTF8_Names_Validation_Description": "Специальные символы запрещены. Можно использовать - _ и . но только не в конце имени",
+  "UTF8_Names_Slugify": "UTF-8 имена Slugify",
+  "UTF8_Names_Validation": "Проверка имён UTF8",
+  "UTF8_Names_Validation_Description": "Регулярное выражение, которое будет использоваться для проверки логина или канала",
   "Validate_email_address": "Подтвердите адрес электронной почты",
   "Verification": "Подвтерждение",
   "Verification_Description": "Вы можете использовать следующие подстановки: <br/><ul><li>[Verification_Url] для URL верификации.</li><li>[name], [fname], [lname] для полного имени, имени или фамилии пользователя.</li><li>[email] для адреса электронной почты пользователя.</li><li>[Site_Name] и [Site_URL] для имени приложения и его URL.</li></ul>",
@@ -1626,20 +1908,20 @@
   "Verified": "Подтверждён",
   "Verify": "Подтверждение",
   "Version": "Версия",
-  "Video_Chat_Window": "Видео-чат",
+  "Video_Chat_Window": "Видеочат",
   "Video_Conference": "Видеоконференция",
   "Video_message": "Видеосообщение",
   "Videocall_declined": "Видео-звонок отклонён.",
   "Videocall_enabled": "Включить видео-звонки",
-  "view-c-room": "Просматривать публичный чат",
-  "view-c-room_description": "Разрешение на просмотр публичных чатов",
+  "view-c-room": "Смотреть публичные каналы",
+  "view-c-room_description": "Разрешение на просмотр публичных каналов",
   "view-d-room": "Просматривать личные сообщения",
   "view-d-room_description": "Разрешение на просмотр личных сообщений",
   "view-full-other-user-info": "Просмотр полной информации о других пользователях",
   "view-full-other-user-info_description": "Разрешение на просмотр полных профилей других пользователей, включая дату создания аккаунта, последнего входа и т. д.",
   "view-history": "Просматривать историю",
-  "view-history_description": "Разрешение на просмотр истории публичного чата",
-  "view-join-code_description": "Разрешение на просмотр кода присоединения публичного чата",
+  "view-history_description": "Разрешение на просмотр истории канала",
+  "view-join-code_description": "Разрешение на просмотр кода присоединения канала",
   "view-joined-room": "Просматривать чаты, к которым присоединился",
   "view-joined-room_description": "Разрешение на просмотр чатов, к которым сейчас присоединён",
   "view-l-room": "Просматривать LiveChat чаты",
@@ -1652,27 +1934,30 @@
   "view-logs_description": "Разрешение на просмотр логов сервера",
   "view-other-user-channels": "Просматривать публичные чаты, принадлежащие другим пользователям",
   "view-other-user-channels_description": "Разрешение на просмотр каналов, владельцами которых являются другие пользователи",
+  "view-outside-room": "Посмотреть внешнюю комнату",
   "view-p-room": "Просматривать закрытые чаты",
   "view-p-room_description": "Разрешение на просмотр закрытых чатов",
+  "view-privileged-setting": "Просмотр привилегированных настроек",
   "view-privileged-setting_description": "Разрешение просмотра настроек",
   "view-room-administration": "Просматривать административную информацию чатов",
-  "view-room-administration_description": "Разрешение на просмотр статистики общих, закрытых и личных чатов. Не включает возможность просматривать сообщения в чатах или архивах",
+  "view-room-administration_description": "Разрешение на просмотр статистики общих, приватных и личных каналов. Не включает возможность просматривать сообщения в переписке или архивах",
   "view-statistics": "Просматривать статистику",
   "view-statistics_description": "Разрешение на просмотр системной статистики, например число пользователей онлайн, ",
+  "view-user-administration": "Просмотр администрирования пользователей",
   "view-user-administration_description": "Разрешение на частичный просмотр списка других пользователей, которые сейчас в системе. Это разрешение не дает доступа к пользовательской информации из аккаунтов",
-  "View_All": "Посмотреть всех",
+  "View_All": "Смотреть всех участников",
   "View_Logs": "Показать лог",
   "View_mode": "Внешний вид сообщений",
-  "View_mode_info": "Сколько места сообщений занимают на экране.",
-  "Viewing_room_administration": "Администрация Просмотр номера",
+  "View_mode_info": "Сколько места сообщения занимают на экране.",
+  "Viewing_room_administration": "Просмотр администрирования комнаты",
   "Visibility": "Видимость",
-  "Visible": "Показывать",
+  "Visible": "Видимый",
   "Visitor": "Посетитель",
-  "Visitor_Info": "Информация для посетителей",
+  "Visitor_Info": "Информация о посетителе",
   "Visitor_Navigation": "Посетитель навигации",
   "Visitor_page_URL": "URL-адрес страницы посетителя",
-  "Visitor_time_on_site": "Время посетителя, проведённое на сайте",
-  "Wait_activation_warning": "Прежде чем вы сможете войти в ваш аккаунт, он должен быть активирован администратором.",
+  "Visitor_time_on_site": "Время, проведённое на сайте, посетителем",
+  "Wait_activation_warning": "Прежде чем вы сможете использовать вашу учетную запись, она должна быть активирована администратором.",
   "Warnings": "Предупреждения",
   "We_are_offline_Sorry_for_the_inconvenience": "Мы не в сети. Извините за доставленные неудобства.",
   "We_have_sent_password_email": "На вашу электронную почту было отправлено письмо с инструкциями. Если по каким-то причинам письмо не пришло, попробуйте еще раз и/или напишите нам.",
@@ -1681,45 +1966,47 @@
   "Webhooks": "Webhooks",
   "WebRTC_Enable_Channel": "Включить для каналов",
   "WebRTC_Enable_Direct": "Включить для личных сообщений",
-  "WebRTC_Enable_Private": "Включить для приватных чатов",
-  "WebRTC_Servers": "Серверы STUN/TURN",
-  "WebRTC_Servers_Description": "Список STUN/TURN серверов разделен запятой.<br/>Имя пользователя, пароль и порт разрешены в формате `username:password@stun:host:port` или `username:password@turn:host:port`.",
+  "WebRTC_Enable_Private": "Включить для приватных каналов",
+  "WebRTC_Servers": "Серверы STUN/TURN",
+  "WebRTC_Servers_Description": "Список STUN/TURN серверов, разделенных запятой.<br/>Имя пользователя, пароль и порт разрешены в формате `username:password@stun:host:port` или `username:password@turn:host:port`.",
   "Wednesday": "Среда",
   "Welcome": "Добро пожаловать, <em>%s</em>.",
   "Welcome_to_the": "Добро пожаловать в",
   "Why_do_you_want_to_report_question_mark": "Почему вы хотите сообщить?",
   "will_be_able_to": "в состоянии",
+  "Would_you_like_to_return_the_inquiry": "Вы хотите вернуть запрос?",
   "Yes": "Да",
   "Yes_archive_it": "Да, архивировать!",
   "Yes_clear_all": "Да, удалить все!",
-  "Yes_delete_it": "Да, удалить его!",
+  "Yes_delete_it": "Да, удалить!",
   "Yes_hide_it": "Да, спрятать!",
   "Yes_leave_it": "Да, покинуть!",
   "Yes_mute_user": "Да, заглушить пользователя!",
   "Yes_remove_user": "Да, удалить пользователя!",
   "Yes_unarchive_it": "Да, разархивировать.",
   "You": "Вы",
-  "you_are_in_preview_mode_of": "Вы находитесь в режиме предварительного просмотра публичного чата #<strong>__room_name__</strong>",
+  "you_are_in_preview_mode_of": "Вы находитесь в режиме предварительного просмотра канала #<strong>__room_name__</strong>",
   "You_are_logged_in_as": "Вы вошли как",
   "You_are_not_authorized_to_view_this_page": "Недостаточно прав для просмотра страницы.",
   "You_can_change_a_different_avatar_too": "Вы можете заменить аватар, используемый в интеграции.",
   "You_can_search_using_RegExp_eg": "Искать можно используя RegExp, например:",
-  "You_can_use_an_emoji_as_avatar": "Вы также можете использовать emoji в качестве аватара.",
-  "You_can_use_webhooks_to_easily_integrate_livechat_with_your_CRM": "Вы можете использовать webhooks легко интегрировать с LiveChat CRM.",
-  "You_cant_leave_a_livechat_room_Please_use_the_close_button": "Вы не можете оставить Livechat комнату. Пожалуйста, используйте кнопку закрытия.",
-  "You_have_been_muted": "Вы были заблокированы и не можете говорить в этом чате",
+  "You_can_use_an_emoji_as_avatar": "Вы также можете использовать эмодзи в качестве аватара.",
+  "You_can_use_webhooks_to_easily_integrate_livechat_with_your_CRM": "Вы можете использовать webhooks для легкой интеграции Livechat с вашей CRM.",
+  "You_cant_leave_a_livechat_room_Please_use_the_close_button": "Вы не можете покинуть Livechat комнату. Пожалуйста, используйте кнопку закрыть.",
+  "You_have_been_muted": "Вы были заглушены и не можете говорить в этой комнате",
+  "You_have_n_codes_remaining": "У вас__number__ кодов осталось.",
   "You_have_not_verified_your_email": "Вы не подтвердили ваш адрес электронной почты.",
   "You_have_successfully_unsubscribed": "Вы успешно отписаны от нашей почтовой рассылки.",
-  "You_must_join_to_view_messages_in_this_channel": "Вы должны войти, чтобы просматривать сообщения этого публичного чата",
+  "You_must_join_to_view_messages_in_this_channel": "Вы должны присоединиться, чтобы просматривать сообщения на этом канале",
   "You_need_confirm_email": "Необходимо подтвердить ваш адрес электронной почты для входа!",
   "You_need_install_an_extension_to_allow_screen_sharing": "Для демонстрации экрана вам необходимо установить расширение",
   "You_need_to_change_your_password": "Вам необходимо сменить пароль",
   "You_need_to_type_in_your_password_in_order_to_do_this": "Для этого действия необходимо ввести пароль!",
   "You_need_to_type_in_your_username_in_order_to_do_this": "Для этого действия необходимо ввести логин!",
   "You_need_to_verifiy_your_email_address_to_get_notications": "Вам необходимо подтвердить ваш адрес электронной почты для получения уведомлений",
-  "You_need_to_write_something": "Вам нужно написать что-нибудь!",
+  "You_need_to_write_something": "Вы должны написать что-нибудь!",
   "You_should_inform_one_url_at_least": "Вы должны определить по крайней мере один URL.",
-  "You_should_name_it_to_easily_manage_your_integrations": "Стоит указать для простоты управления интеграциями",
+  "You_should_name_it_to_easily_manage_your_integrations": "Стоит указать название для простоты управления вашими интеграциями",
   "You_will_not_be_able_to_recover": "Вы не сможете восстановить это сообщение!",
   "You_will_not_be_able_to_recover_file": "Восстановить этот файл будет невозможно!",
   "You_wont_receive_email_notifications_because_you_have_not_verified_your_email": "Вы не можете получать уведомления по электронной почте, потому что не подтвердили ваш адрес электронной почты.",
@@ -1729,6 +2016,6 @@
   "Your_mail_was_sent_to_s": "Ваше сообщение было отправлено на %s",
   "your_message": "Ваше сообщение",
   "your_message_optional": "Сообщение (опционально)",
-  "Your_password_is_wrong": "Неверный пароль!",
-  "Your_push_was_sent_to_s_devices": "Оповещение было отправлено на % устройств."
-}
+  "Your_password_is_wrong": "Ваш пароль неверен!",
+  "Your_push_was_sent_to_s_devices": "Оповещение было отправлено на %s устройств."
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/sl-SI.i18n.json b/packages/rocketchat-i18n/i18n/sl-SI.i18n.json
index 7cb0319c6130..a8e784cc3e6f 100644
--- a/packages/rocketchat-i18n/i18n/sl-SI.i18n.json
+++ b/packages/rocketchat-i18n/i18n/sl-SI.i18n.json
@@ -1,3 +1,7 @@
 {
-  "#channel": "#kanal"
+  "#channel": "#kanal",
+  "0_Errors_Only": "0 - Samo napake",
+  "1_Errors_and_Information": "1 - Napake in informacije",
+  "@username_message": "@uporabnik <message>",
+  "__username__is_no_longer__role__defined_by__user_by_": "__username__ ni več __role__ by __user_by__"
 }
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/tr.i18n.json b/packages/rocketchat-i18n/i18n/tr.i18n.json
index 5f0d6a8536ba..5f3b1ddcaae9 100644
--- a/packages/rocketchat-i18n/i18n/tr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/tr.i18n.json
@@ -40,7 +40,6 @@
   "Accounts_CustomFields_Description": "Anahtarların, alan ayarları sözlüğü bulunduran alan isimleri olduğu geçerli bir JSON olmalı. Örnek:<br/><code>{\n\n \"role\": {\n\n  \"type\": \"select\",\n\n  \"defaultValue\": \"student\",\n\n  \"options\": [\"teacher\", \"student\"],\n\n  \"required\": true,\n\n  \"modifyRecordField\": {\n\n   \"array\": true,\n\n   \"field\": \"roles\"\n\n  }\n\n },\n\n \"twitter\": {\n\n  \"type\": \"text\",\n\n  \"required\": true,\n\n  \"minLength\": 2,\n\n  \"maxLength\": 10\n\n }\n\n}</code> ",
   "Accounts_CustomFieldsToShowInUserInfo": "Kullanıcı Bilgilerini Göstermek için Özel alanlar",
   "Accounts_DefaultUsernamePrefixSuggestion": "Varsayılan kullanıcı adı ön eki tavsiyesi",
-  "Accounts_Default_User_Preferences_audioNotifications": "Sesli Mesaj için Varsayılan Uyarı",
   "Accounts_denyUnverifiedEmail": "Doğrulanmamış e-posta'yı reddet",
   "Accounts_EmailVerification": "E-Posta Doğrulama",
   "Accounts_EmailVerification_Description": "Bu özelliği kullanmak için doğru SMTP ayarlarına sahip olduğunuza emin olun",
@@ -113,6 +112,7 @@
   "Accounts_OAuth_Wordpress_secret": "WordPress Gizli Kodu",
   "Accounts_PasswordReset": "Parola Sıfırlama",
   "Accounts_Registration_AuthenticationServices_Default_Roles": "Doğrulama Servisi için Varsayılan İşlem",
+  "Accounts_Registration_AuthenticationServices_Default_Roles_Description": "Kimlik doğrulama servislerini kullanarak kayıt olan kullanıcılara verilecek varsayılan roller (virgülle ayrılmış olmalıdır)",
   "Accounts_Registration_AuthenticationServices_Enabled": "Kimlik Doğrulama Hizmetleri ile Kayıt Olma",
   "Accounts_RegistrationForm": "Kayıt formu",
   "Accounts_RegistrationForm_Disabled": "Devre Dışı",
@@ -123,6 +123,7 @@
   "Accounts_RegistrationForm_SecretURL_Description": "Kayıt URL'sine eklenmesi için rastgele bir harf dizisi sağlamalısınız. Örnek: https://open.rocket.chat/register/[secret_hash]",
   "Accounts_RequireNameForSignUp": "Üye Olmak İçin Ad İste",
   "Accounts_RequirePasswordConfirmation": "Şifre Doğrulaması Gerektir",
+  "Accounts_SearchFields": "Arama sırasında kullanılacak alanlar",
   "Accounts_SetDefaultAvatar": "Varsayılanı Avatar Seç",
   "Accounts_ShowFormLogin": "Form-tabanlı Girişi Göster",
   "Accounts_UseDefaultBlockedDomainsList": "Standart Engelli Domain Listesini Kullan",
@@ -138,6 +139,7 @@
   "add-user": "Kullanıcı Ekle",
   "add-user-to-any-c-room": "Herhangi bir Açık Kanal'a Kullanıcı Ekle",
   "add-user-to-any-c-room_description": "Herhangi bir Açık Kanal'a Kullanıcı Ekleme İzni",
+  "add-user-to-any-p-room_description": "Kullanıcıyı herhangi bir özel kanala ekleme yetkisi",
   "Add_agent": "Firma Temsilcisi Ekle",
   "Add_custom_oauth": "Özel oauth ekle",
   "Add_Domain": "Alan Adı Ekle",
@@ -183,6 +185,7 @@
   "Announcement": "Duyuru",
   "API": "API",
   "API_Analytics": "Mantıksal Analiz",
+  "API_Drupal_URL": "Drupal Sunucu URL ",
   "API_Drupal_URL_Description": "Örnek: https://domain.com ( Sonunda slash (eğik çizgi) olmayacak şekilde )",
   "API_Embed": "Gömülü ",
   "API_Embed_Description": "Bir kullanıcı web sitesi linki paylaştığında, bu linkin önizlemesinin gösterilip gösterilemeyeceği",
@@ -221,12 +224,16 @@
   "AtlassianCrowd": "Atlassian Crowd",
   "Attachment_File_Uploaded": "Dosya Yüklendi",
   "Audio_message": "Sesli Mesaj",
+  "Audio_Notifications_Default_Alert": "Sesli Mesaj için Varsayılan Uyarı",
+  "Audio_Notifications_Value": "Varsayılan mesaj bildirim sesi",
   "Auth_Token": "Kimlik Doğrulama Jetonu",
   "Author": "Yazar",
   "Authorization_URL": "yetkilendirme URL'si",
   "Authorize": "Yetki vermek",
+  "auto-translate": "Otomatik Çeviri",
   "auto-translate_description": "Otomatik tercüme aracı kullanım izni",
   "Auto_Load_Images": "Fotoğrafları Otomatik Yükle",
+  "Auto_Translate": "Otomatik Çeviri",
   "AutoLinker_Email": "AutoLinker E-posta",
   "AutoLinker_Phone": "AutoLinker Telefon",
   "AutoLinker_Phone_Description": "Otomatik olarak Telefon numaraları için bağlantılı. örneğin '(123) 456-7890`",
@@ -236,6 +243,9 @@
   "AutoLinker_Urls_TLD": "AutoLinker TLD URL'ler",
   "AutoLinker_Urls_www": "AutoLinker 'www' URL'ler",
   "AutoLinker_UrlsRegExp": "AutoLinker URL Düzenli İfade",
+  "Automatic_Translation": "Otomatik Çeviri",
+  "AutoTranslate_Enabled": "Otomatik Çeviriyi etkinleştir",
+  "AutoTranslate_GoogleAPIKey": "Google API Anahtarı",
   "Available": "Mevcut",
   "Available_agents": "mevcut maddeler",
   "Avatar": "Avatarı değiştir",
@@ -257,6 +267,7 @@
   "ban-user": "Kullanıcıyı Engelle",
   "ban-user_description": "Kanaldan bir kullanıcıyı engelleme izni",
   "Beta_feature_Depends_on_Video_Conference_to_be_enabled": "Beta özellik. Görüntülü konferans görüşmesinin aktif olmasını gerektirir.",
+  "Block_User": "Kullanıcıyı engelle",
   "Body": "vücut",
   "bold": "kalın",
   "bot_request": "Bot İsteği",
@@ -271,6 +282,7 @@
   "busy_male": "meşgul",
   "Busy_male": "Meşgul",
   "by": "tarafından",
+  "cache_cleared": "Önbellek temizlendi",
   "Cancel": "Vazgeç",
   "Cancel_message_input": "Vazgeç",
   "Cannot_invite_users_to_direct_rooms": "Odalar doğrudan kullanıcıları davet edemezsiniz",
@@ -281,14 +293,17 @@
   "CAS_button_label_color": "Giriş butonu yazı rengi",
   "CAS_button_label_text": "Giriş butonu etiketi",
   "CAS_enabled": "Etkin",
+  "CAS_login_url": "SSO Giriş URL",
   "CDN_PREFIX": "CDN Ön Ek",
   "Certificates_and_Keys": "Sertifikalar ve Anahtarlar",
   "Changing_email": "değişen e-posta",
+  "channel": "kanal",
   "Channel": "Kanal",
   "Channel_already_exist": "Kanal '#% s' zaten var.",
   "Channel_already_Unarchived": "adı `#% s` ile Kanal arşivlenmemiş durumda zaten",
   "Channel_Archived": "adı `#% s` ile Kanal başarıyla arşivlenen olmuştur",
   "Channel_doesnt_exist": "`# %s` isminde bir kanal bulunmamaktadır.",
+  "Channel_Name_Placeholder": "Lütfen kanal ismini giriniz...",
   "Channel_Unarchived": "adı `#% s` ile Kanal başarıyla Arşivlenmedi olmuştur",
   "Channels": "Kanallar",
   "Channels_list": "Kanallar",
@@ -303,8 +318,13 @@
   "Choose_messages": "mesajları seçin",
   "Choose_the_alias_that_will_appear_before_the_username_in_messages": "Mesajlarda kullanıcı adı önce görünecektir takma seçin.",
   "Choose_the_username_that_this_integration_will_post_as": "Bu bütünleşme olarak yayınlayacağız adını seçin.",
+  "clear": "Temizle",
   "Clear_all_unreads_question": "Tüm okunmayanlar temizlensin mi?",
+  "clear_cache_now": "Önbelleği şimdi temizle",
+  "clear_history": "Geçmişi temizle",
   "Click_here": "Buraya Tıkla",
+  "Click_here_for_more_info": "Daha fazla bilgi için buraya tıklayınız",
+  "Click_to_join": "Katılmak için tıklayınız!",
   "Client_ID": "Müşteri Kimliği",
   "Client_Secret": "Müşteri Sırrı",
   "Clients_will_refresh_in_a_few_seconds": "Müşteriler birkaç saniye içinde yenilenir",
@@ -318,6 +338,7 @@
   "Commands": "Komutlar",
   "Compact": "Kompakt",
   "Confirm_password": "Parolanızı onaylayın",
+  "Content": "İçerik",
   "Conversation": "Direkt Mesaj",
   "Conversation_closed": "Konuşma kapalı: __comment__.",
   "Convert_Ascii_Emojis": "ASCII kodu emojiye dönüştür",
@@ -328,18 +349,26 @@
   "Count": "saymak",
   "Cozy": "Rahat",
   "Create": "oluşturmak",
+  "create-c_description": "Herkese açık kanalları oluşturma yetkisi",
+  "create-user": "Kullanıcı oluşturma",
+  "create-user_description": "Kullanıcı oluşturma yetkisi",
   "Create_A_New_Channel": "Yeni Kanal Oluştur",
   "Create_new": "Yeni oluştur",
   "Created_at": "Oluşturulma saati",
   "Created_at_s_by_s": "<strong> %s</strong> <strong>tarafından %s</strong> konumundaki düzenlendi",
+  "CRM_Integration": "CRM Entegrasyonu",
+  "CROWD_Reject_Unauthorized": "Doğrulanmamışları reddet",
   "Current_Chats": "Güncel Sohbetler",
   "Custom": "görenek",
   "Custom_Emoji_Add": "Yeni",
+  "Custom_Emoji_Delete_Warning": "Emoji silme işlemi geri alınamaz",
+  "Custom_Emoji_Error_Invalid_Emoji": "Geçersiz emoji",
   "Custom_Fields": "Özel Alanlar",
   "Custom_oauth_helper": "OAuth sağlayıcısı kurarken, bir geri bildirim URL bildirmek gerekir.  <pre> %s </pre> kullan.",
   "Custom_oauth_unique_name": "Özel oauth benzersiz ad",
   "Custom_Script_Logged_In": "Özel Senaryo kullanıcılar giriş için",
   "Custom_Script_Logged_Out": "Özel Senaryo çıkış yapmış kullanıcılar için",
+  "Custom_Sound_Error_Invalid_Sound": "Geçersiz ses",
   "Custom_Translations": "Özel Çeviriler",
   "Dashboard": "gösterge paneli",
   "Date": "tarih",
@@ -349,6 +378,7 @@
   "Deactivate": "Devre dışı bırak",
   "Default": "Varsayılan",
   "Delete": "Sil",
+  "delete-message": "Mesaj Silme",
   "Delete_message": "mesajı sil",
   "Delete_my_account": "Hesabımı sil",
   "Delete_Room_Warning": "Bir odayı silmek, oda içinde gönderilen tüm mesajları silecektir. Bu işlem geri alınamaz.",
@@ -368,11 +398,18 @@
   "Desktop_Notifications_Enabled": "Masaüstü Bildirimleri Etkin",
   "Direct_message_someone": "Doğrudan mesaj birisi",
   "Direct_Messages": "Direkt Mesajlar",
+  "Direct_Reply_Password": "Şifre",
+  "Direct_Reply_Separator": "Ayraç",
+  "Direct_Reply_Username": "Kullanıcı Adı",
+  "Disable_Notifications": "Bildirimleri kapat",
   "Display_offline_form": "Ekran çevrimdışı formu",
   "Displays_action_text": "Görüntüler aksiyon metni",
   "Do_you_want_to_change_to_s_question": "<strong> %s</strong> değiştirmek istiyor musunuz?",
   "Domain": "domain",
+  "Domain_added": "alan adı eklendi",
+  "Domain_removed": "Alan adı kaldırıldı",
   "Domains": "Etki",
+  "Download_Snippet": "İndir",
   "Drop_to_upload_file": "Dosya yüklemek için sürükle",
   "Dry_run": "kuru çalışma",
   "Dry_run_description": "Sadece itibaren aynı adrese bir e-posta göndereceğiz. E-posta geçerli bir kullanıcı ait olmalıdır.",
@@ -382,6 +419,8 @@
   "Duplicate_private_group_name": "' %s' isminde bir Özel Grup mevcut",
   "Duration": "Süre",
   "Edit": "Düzenle",
+  "edit-message": "Mesajı Düzenle",
+  "edit-message_description": "Bir odada bulunan mesajı düzenleme yetkisi",
   "Edit_Custom_Field": "Düzenleme Özel Alan",
   "Edit_Department": "Düzenleme Bölümü",
   "edited": "düzenlendi",
@@ -425,6 +464,7 @@
   "error-could-not-change-username": "adını değiştirmek olamazdı",
   "error-delete-protected-role": "Korunan rol silinemiyor",
   "error-department-not-found": "Bölümü bulunamadı",
+  "error-direct-message-file-upload-not-allowed": "Doğrudan mesajlarda dosya paylaşımına izin verilmiyor",
   "error-duplicate-channel-name": "'__channel_name__'  isminde bir kanal var",
   "error-email-domain-blacklisted": "E-posta alanı kara listede",
   "error-field-unavailable": "<strong>__field__</strong> başka biri tarafından kullanılıyor :(",
@@ -441,6 +481,7 @@
   "error-invalid-description": "geçersiz açıklama",
   "error-invalid-domain": "geçersiz alan",
   "error-invalid-email": "Geçersiz e-posta __email__",
+  "error-invalid-email-address": "Geçersiz eposta adresi",
   "error-invalid-file-height": "Geçersiz dosya yüksekliği",
   "error-invalid-file-type": "Geçersiz dosya türü",
   "error-invalid-file-width": "Geçersiz dosya genişliği",
@@ -483,6 +524,10 @@
   "error-you-are-last-owner": "Sen son sahibi. oda ayrılmadan önce yeni sahibini ayarlayın.",
   "Error_changing_password": "Şifre değiştirmede hata",
   "Esc_to": "Esc için",
+  "every_30_minutes": "30 dakikada bir",
+  "every_hour": "Saatte bir",
+  "every_six_hours": "6 saatte bir",
+  "Everyone_can_access_this_channel": "Bu kanala herkes erişebilir",
   "Example_s": "Örnek: <code class=\"inline\">%s</code>",
   "Exclude_Botnames": "Botları Dışarıda Bırak",
   "False": "Yanlış",
@@ -520,11 +565,13 @@
   "Force_SSL": "kuvvet SSL",
   "Force_SSL_Description": "* Dikkat! * _Force SSL_ ters proxy ile asla kullanılmamalıdır. Eğer ters proxy varsa, ORADA yönlendirme yapmak gerekir. Bu seçenek, ters vekil de yönlendirme yapılandırması izin vermez Heroku gibi dağıtımlar için var.",
   "Forgot_password": "Şifrenizi mi unuttunuz",
+  "Forgot_password_section": "Şifremi unuttum",
   "Forward": "İlet",
   "Forward_chat": "Sohbeti İlet",
   "Forward_to_department": "Bölüme İlet",
   "Forward_to_user": "Kullanıcıya İlet",
   "Frequently_Used": "Sıklıkla kullanılan",
+  "Friday": "Cuma",
   "From": "itibaren",
   "From_Email": "E-posta Gönderen",
   "From_email_warning": "<b>Uyarı:</b> <b>Nereden</b> alanı, posta sunucusu ayarlarını tabidir.",
@@ -534,6 +581,7 @@
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Uygulamayı bir ad verin. Bu kullanıcılar tarafından görülecektir.",
   "Global": "global",
   "GoogleTagManager_id": "Google Etiket Yöneticisi Kimliği",
+  "GoogleVision_Type_Faces": "Yüz Tanıma",
   "Guest_Pool": "Misafir Havuzu",
   "Hash": "esrar",
   "Header": "üstbilgi",
@@ -561,6 +609,7 @@
   "Iframe_Integration_receive_enable_Description": "Ata Pencere'nin Rocket Chat'e Komutlar Göndermesine İzin Ver",
   "Iframe_Integration_send_enable": "Göndermeyi Etkinleştir",
   "Iframe_Integration_send_enable_Description": "Olayları Ata Pencere'ye Gönder",
+  "Import": "İçeri Aktar",
   "Importer_Archived": "arşivlenen",
   "Importer_done": "Alma tamamlandığı!",
   "Importer_finishing": "ithalat kadar bitirme.",
@@ -589,11 +638,14 @@
   "Installed_at": "kurulu",
   "Instructions_to_your_visitor_fill_the_form_to_send_a_message": "senin ziyaretçiye talimatlar bir mesaj göndermek için formu doldurunuz",
   "Integration_added": "Entegrasyon eklendi",
+  "Integration_Advanced_Settings": "Gelişmiş Ayarlar",
   "Integration_Incoming_WebHook": "Gelen WebHook Entegrasyonu",
   "Integration_New": "yeni Entegrasyon",
   "Integration_Outgoing_WebHook": "Giden WebHook Entegrasyonu",
   "Integration_updated": "Entegrasyon güncellendi",
   "Integrations": "Entegrasyonlar",
+  "Integrations_Outgoing_Type_SendMessage": "Mesaj gönderildi",
+  "Integrations_Outgoing_Type_UserCreated": "Kullanıcı Oluşturuldu",
   "InternalHubot": "İç Hubot",
   "InternalHubot_ScriptsToLoad": "Scripts yüklemek için",
   "InternalHubot_ScriptsToLoad_Description": "https://github.com/github/hubot-scripts/tree/master/src/scripts yüklemek için komut bir virgülle ayrılmış listesini girin",
@@ -609,6 +661,7 @@
   "Invalid_secret_URL_message": "sağlanan URL geçersiz.",
   "invisible": "görünmez",
   "Invisible": "Görünmez",
+  "Invitation": "Davet",
   "Invitation_HTML": "Davet HTML",
   "Invitation_HTML_Default": "<h2> Sen davet edildi <h1> [Site_Name] </h1></h2><p> [Site_URL] gidin ve bugün mevcut en iyi açık kaynak sohbet çözümü deneyin! </p>",
   "Invitation_HTML_Description": "Aşağıdaki yer tutucuları kullanabilirsiniz: <br /><ul><li> Alıcı e-posta için [email]. </li><li> [Site_Name] ve [Site_URL] sırasıyla Uygulama Adı ve URL. </li></ul>",
@@ -643,6 +696,7 @@
   "Katex_Enabled_Description": "Kullanımına izin <a target=\"_blank\" href=\"http://khan.github.io/KaTeX/\">Katex</a> mesajlarında matematik dizgi için",
   "Katex_Parenthesis_Syntax": "İzin Parantez Sözdizimi",
   "Katex_Parenthesis_Syntax_Description": "\\ [Katex blok \\] ve \\ (inline Katex \\) sözdizimi kullanımına izin",
+  "Keyboard_Shortcuts_Title": "Klavye Kısayolları",
   "Knowledge_Base": "Bilgi tabanı",
   "Label": "Etiket",
   "Language": "Dil",
@@ -665,6 +719,8 @@
   "LDAP_BaseDN_Description": "Eğer kullanıcılar ve gruplar için aramak istediğiniz bir LDAP alt ağacının tam ayırt edici ad (DN). İstediğiniz kadar ekleyebilirsiniz; Ancak, her grup kendisine ait kullanıcılarıyla aynı etki tabanı tanımlanmış olmalıdır. Eğer kısıtlı kullanıcı grupları belirtirseniz, bu gruplara ait sadece kullanıcıların kapsamında olacak. Size etki temel olarak LDAP dizin ağacının üst düzeyini belirlemek ve erişim kontrolü için arama filtresi kullanmanızı öneririz.",
   "LDAP_User_Search_Field_Description": "kimlik girişimleri LDAP kullanıcı tanımlayan LDAP özelliği. Bu alan `en Active Directory yüklemeleri için sAMAccountName` olmalı, ama böyle OpenLDAP gibi diğer LDAP çözümleri için` uid` olabilir. E-posta ya da her türlü özellik istediğiniz kullanıcıları tanımlamak için `mail` kullanabilirsiniz. <br> Kullanıcıların kullanıcı adı veya e-posta gibi çoklu tanımlayıcıları kullanarak giriş için izin virgülle ayrılmış birden fazla değer kullanabilirsiniz.",
   "LDAP_User_Search_Filter_Description": "Bu filtreyle eşleşen belirtilen, sadece kullanıcıların oturum izin verilecek olursa filtre belirtilirse., belirtilen etki alanı tabanının kapsamındaki tüm kullanıcılar oturum mümkün olacak. <br/> Active Directory örneğin `memberOf = cn = ROCKET_CHAT, ou = Genel gruplarının iş. <br/> OpenLDAP için (örn genişletilebilir maç arama) `ou: dn: = ROCKET_CHAT`.",
+  "LDAP_Authentication": "Etkinleştir",
+  "LDAP_Authentication_Password": "Şifre",
   "LDAP_Authentication_UserDN_Description": "oturum açtıklarında diğer kullanıcıların kimliğini doğrulamak için kullanıcı aramaları gerçekleştiren LDAP kullanıcı. <br/> Bu genellikle üçüncü parti entegrasyonları için özel olarak oluşturulan bir hizmet hesabıdır. Bir tam adını kullanın, örneğin cn = Yönetici 'olarak, cn Kullanıcıları, dc = Örnek, dc = com` =.",
   "LDAP_Enable": "Etkinleştir",
   "LDAP_Enable_Description": "Kimlik doğrulama için LDAP kullanmak için deneyin.",
@@ -735,6 +791,7 @@
   "Managing_assets": "varlıkları yönetmek",
   "Managing_integrations": "entegrasyonları yönetme",
   "Mark_as_read": "Okundu olarak işaretle",
+  "Mark_as_unread": "Okunmamış olarak işaretle",
   "Markdown_Headers": "Markdown Başlıkları",
   "Markdown_SupportSchemesForLink": "Bağlantı için Markdown Destek Programları",
   "Markdown_SupportSchemesForLink_Description": "izin verilen programların virgülle ayrılmış listesi",
@@ -773,6 +830,7 @@
   "Message_ShowEditedStatus": "Düzenlenen Durumu Göster",
   "Message_ShowFormattingTips": "Biçimlendirme İpuçlarını göster",
   "Message_starring": "oynadığı Mesaj",
+  "Message_TimeAndDateFormat": "Saat ve tarih biçimi",
   "Message_TimeFormat": "Zaman formatı",
   "Message_TimeFormat_Description": "Ayrıca bkz: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_too_long": "çok uzun İleti",
@@ -785,6 +843,8 @@
   "Meta_msvalidate01": "MSValidate.01",
   "Meta_robots": "Robotlar",
   "minutes": "dakika",
+  "Mobile": "Mobil",
+  "Monday": "Pazartesi",
   "More_channels": "Daha fazla",
   "More_direct_messages": "Daha direkt mesajlar",
   "More_groups": "Daha fazla özel grup",
@@ -825,11 +885,13 @@
   "No_starred_messages": "Favori iletin yok",
   "No_user_with_username_%s_was_found": "<strong>\" %s\"</strong> adında hiçbir kullanıcı bulunamadı!",
   "Node_version": "düğüm versiyonu",
+  "Normal": "Normal",
   "Not_authorized": "Yetkili değil",
   "Not_Available": "Müsait değil",
   "Not_found_or_not_allowed": "Bulunamadı veya izin verilmiyor",
   "Nothing": "Hiçbir şey",
   "Nothing_found": "Bulunamadı",
+  "Notification_Duration": "Bildirim süresi",
   "Notifications": "Bildirimler",
   "Notify_all_in_this_room": "Bu odadaki tüm bildirimleri göster",
   "Num_Agents": "# Ajanlar",
@@ -837,6 +899,7 @@
   "OAuth_Application": "OAuth Uygulaması",
   "OAuth_Applications": "OAuth Uygulamaları",
   "Objects": "nesneler",
+  "Off": "Kapalı",
   "Off_the_record_conversation": "Off-the-record Konuşma",
   "Off_the_record_conversation_is_not_available_for_your_browser_or_device": "Off-kayıt konuşma tarayıcınız veya aygıt için geçerli değildir.",
   "Offline": "Çevrimdışı",
@@ -847,6 +910,7 @@
   "Offline_message": "Çevrimdışı mesaj",
   "Offline_success_message": "Çevrimdışı başarı mesajı",
   "Offline_unavailable": "Çevrimdışı kullanılamıyor",
+  "On": "Açık",
   "Online": "Çevrimiçi",
   "Only_you_can_see_this_message": "Sadece siz bu mesajı görebilirsiniz",
   "Oops!": "Hata",
@@ -931,6 +995,7 @@
   "Push_test_push": "Test",
   "Query": "Sorgu",
   "Query_description": "e-posta göndermek için hangi kullanıcıların belirlemek için ek şartlar. Abone olmayan kullanıcılar otomatik sorgudan kaldırılır. Bu geçerli bir JSON olmalıdır. Örnek: \"{\" createdAt \": {\" $ gt \": {\" $ tarihi \":\" 2015-01-01T00: 00: 00.000Z \"}}}\"",
+  "Queue": "Kuyruk",
   "quote": "alıntı",
   "Quote": "Alıntı",
   "Random": "rasgele",
@@ -941,8 +1006,10 @@
   "Refresh_keys": "Yenile tuşları",
   "Refresh_your_page_after_install_to_enable_screen_sharing": "Ekran paylaşımını etkinleştirmek için yükledikten sonra sayfayı yenileyin",
   "Register": "Yeni hesap ",
+  "Registration": "Kayıt",
   "Registration_Succeeded": "Kayıt Başarılı",
   "Release": "serbest bırakma",
+  "Reload": "Yeniden yükle",
   "Remove": "Kaldır",
   "Remove_Admin": "Yöneticiliğini kaldır",
   "Remove_as_moderator": "moderatör olarak kaldır",
@@ -951,6 +1018,7 @@
   "Remove_from_room": "odadan kaldır",
   "Remove_someone_from_room": "odadan birini çıkarın",
   "Removed": "Kaldırılan",
+  "Reply": "Yanıtla",
   "Report_Abuse": "Uygunsuz",
   "Report_exclamation_mark": "Rapor!",
   "Report_sent": "rapor gönderildi",
@@ -990,6 +1058,7 @@
   "SAML_Custom_Generate_Username": "Kullanıcı Adı Üret",
   "SAML_Custom_Issuer": "Özel Yayıncı",
   "SAML_Custom_Provider": "Özel Sağlayıcı",
+  "Saturday": "Cumartesi",
   "Save": "Kaydet",
   "Save_changes": "Değişiklikleri kaydet",
   "Save_Mobile_Bandwidth": "Mobil Kotanı Koru",
@@ -1006,8 +1075,10 @@
   "seconds": "saniye",
   "Secret_token": "gizli belirteç",
   "Select_a_department": "Bir bölümü seçmek",
+  "Select_a_user": "Kullanıcı seç",
   "Select_an_avatar": "Bir avatar seç",
   "Select_file": "Dosya seç",
+  "Select_role": "Rol seç",
   "Select_service_to_login": "Bilgisayarınızdan veya aşağıda ki servislerden birini kullanarak resim yükleyebilirsiniz",
   "Select_user": "seç kullanıcı",
   "Select_users": "seç kullanıcılar",
@@ -1038,8 +1109,11 @@
   "Should_exists_a_user_with_this_username": "Kullanıcı zaten mevcut olması gerekir.",
   "Show_all": "Tümünü göster",
   "Show_more": "Daha fazla göster",
+  "show_offline_users": "çevrimdışı kullanıcıları göster",
+  "Show_on_registration_page": "Kayıt sayfasında göster",
   "Show_only_online": "yalnızca çevrimiçi göster",
   "Show_preregistration_form": "ön kayıt formunu göster",
+  "Show_queue_list_to_all_agents": "Kuyruk listesini tüm temsilcilere göster",
   "Showing_archived_results": "<p> <b> %s</b> arşivlenmiş sonuçlar gösteriliyor </p>",
   "Showing_online_users": "__total__ kullanıcıdan <b>__total_showing__</b>  gösteriliyor",
   "Showing_results": "<p> <b>%s</b> kayıt bulundu</p>",
@@ -1067,6 +1141,7 @@
   "SSL": "SSL",
   "Star_Message": "Favorilere ekle",
   "Starred_Messages": "Favori İletilerim",
+  "Start": "Başlat",
   "Start_audio_call": "Ses aramayı başlatmak",
   "Start_Chat": "Sohbete Başla",
   "Start_of_conversation": "Konuşma Başladı",
@@ -1134,6 +1209,10 @@
   "theme-color-tertiary-background-color": "Tersiyer Arka Plan Rengi",
   "theme-color-tertiary-font-color": "Tersiyer Yazı Rengi",
   "theme-color-unread-notification-color": "Okunmamış Bildirim Rengi",
+  "theme-color-rc-color-error": "Hata",
+  "theme-color-rc-color-alert": "Uyarı",
+  "theme-color-rc-color-success": "Başarı",
+  "theme-color-rc-color-content": "İçerik",
   "theme-custom-css": "özel CSS",
   "There_are_no_agents_added_to_this_department_yet": "Bu bölüme eklenen herhangi bir müşteri temsilcisi henüz yoktur.",
   "There_are_no_integrations": "Entegrasyon yok.",
@@ -1143,6 +1222,7 @@
   "This_is_a_push_test_messsage": "Bu itme testi messsage olduğunu",
   "This_room_has_been_archived_by__username_": "Bu oda __username__ tarafından arşivlenmiştir.",
   "This_room_has_been_unarchived_by__username_": "Bu oda __username__ tarafından arşivden kaldırıldılmıştır.",
+  "Thursday": "Perşembe",
   "Time_in_seconds": "Zaman, saniye olarak",
   "Title": "Başlık",
   "Title_bar_color": "Başlık çubuğu rengi",
@@ -1157,6 +1237,7 @@
   "Trigger_Words": "tetikleyici Kelimeler",
   "Triggers": "tetikleyiciler",
   "True": "Doğru",
+  "Tuesday": "Salı",
   "Type": "tip",
   "Type_your_email": "E-postanızı yazın",
   "Type_your_message": "Mesajınızı yazın",
@@ -1172,6 +1253,9 @@
   "Unread_Rooms": "Okunmamış Odalar",
   "Unread_Rooms_Mode": "Okunmamış Odalar Modu",
   "Unstar_Message": "Yıldızı kaldır",
+  "Updated_at": "Güncelleme zamanı",
+  "Upload_file_description": "Dosya açıklaması",
+  "Upload_file_name": "Dosya adı",
   "Upload_file_question": "Dosya yükle",
   "Uploading_file": "Dosya yükleniyor ...",
   "Uptime": "uptime",
@@ -1183,6 +1267,7 @@
   "Use_this_username": "Bu kullanıcı adını kullan",
   "Use_uploaded_avatar": "Yüklenen avatarı kullanın",
   "Use_url_for_avatar": "avatar için url kullanın",
+  "User": "Kullanıcı",
   "User__username__is_now_a_moderator_of__room_name_": "Kullanıcı __username__ adlı şimdi __room_name__ bir moderatör olduğunu",
   "User__username__is_now_a_owner_of__room_name_": "Kullanıcı __username__ adlı şimdi __room_name__ bir sahibidir",
   "User__username__removed_from__room_name__moderators": "Kullanıcı __username__ adlı __room_name__ moderatörler kaldırıldı",
@@ -1197,6 +1282,7 @@
   "User_has_been_muted_in_s": "Kullanıcı %s sesi kapatıldı",
   "User_has_been_removed_from_s": "Kullanıcı %s kaldırıldı",
   "User_Info": "Kullanıcı bilgisi",
+  "User_Interface": "Kullanıcı Arayüzü",
   "User_is_no_longer_an_admin": "Kullanıcı artık bir yönetici değil",
   "User_is_now_an_admin": "Kullanıcı şimdi bir yönetici",
   "User_joined_channel": "Kanala katıldı.",
@@ -1228,17 +1314,24 @@
   "Username_invalid": "<strong>%s</strong> geçerli bir kullanıcı adı değil,<br/> Kullanıcı adınızı seçerken sadece harfler, sayılar, noktalar, tireler ve alt çizgiler kullanın",
   "Username_is_already_in_here": "`@ %s` zaten burada.",
   "Username_is_not_in_this_room": "Kullanıcı `# %s` bu odada değil.",
+  "Username_Placeholder": "Lütfen kullanıcı adlarını giriniz...",
   "Username_title": "Bir kullanıcı adı belirle",
   "Username_wants_to_start_otr_Do_you_want_to_accept": "__username__ adlı OTR başlamak istiyor. kabul etmek istiyor musunuz?",
   "Users": "Kullanıcılar",
+  "Users_added": "Kullanıcılar eklendi",
   "Users_in_role": "rolü Kullanıcılar",
   "UTF8_Names_Slugify": "UTF8 İsimler Slugify",
   "UTF8_Names_Validation": "UTF8 İsimler Doğrulama",
   "UTF8_Names_Validation_Description": "özel karakterler ve boşluklar izin vermeyin. _ Ve - kullanabilirsiniz. ancak adının sonunda",
+  "Validate_email_address": "Eposta adresini doğrula",
+  "Verification_Email": "Hesabınızı doğrulamak için <a href=\"[Verification_Url]\">buraya</a> tıklayın",
   "Verification_email_sent": "Doğrulama e-postası gönderildi",
   "Verified": "Doğrulanmış",
+  "Verify": "Doğrula",
   "Version": "versiyon",
   "Video_Chat_Window": "Görüntülü Sohbet",
+  "Video_Conference": "Video Konferans",
+  "view-statistics": "İstatistikleri Görüntüle",
   "View_All": "Hepsini Gör",
   "View_Logs": "Görünüm Günlükleri",
   "View_mode": "Görünüm modu",
@@ -1262,6 +1355,7 @@
   "WebRTC_Enable_Private": "Özel Kanallar için etkinleştir",
   "WebRTC_Servers": "STUN / DÖNÜŞ Sunucular",
   "WebRTC_Servers_Description": "virgülle ayrılmış STUN ve TURN sunucularının listesi. <br/> şifre @ sersemletici: Kullanıcı adı, şifre ve port biçiminde `adı izin verilen konak: port` veya` kullanıcı adı: şifre @ dönüş: host: port`.",
+  "Wednesday": "Çarşamba",
   "Welcome": "Hoşgeldin <em>%s</em>.",
   "Welcome_to_the": "Hoşgeldiniz",
   "Why_do_you_want_to_report_question_mark": "Neden rapor istiyorsun?",
@@ -1285,6 +1379,7 @@
   "You_have_been_muted": "Sen yok sayıldı ve bu odada konuşamıyor",
   "You_have_not_verified_your_email": "E-postanızı kontrol etmediniz.",
   "You_have_successfully_unsubscribed": "Mail listemizin aboneliğinden başarıyla çıktınız.",
+  "You_must_join_to_view_messages_in_this_channel": "Bu kanaldaki mesajları görmek için giriş yapmalısınız",
   "You_need_confirm_email": "Giriş yapabilmek için öncelikle e-posta adresinizi onaylamanız gerekmektedir!",
   "You_need_install_an_extension_to_allow_screen_sharing": "Ekran paylaşımını sağlamak için bir uzantı yüklemeye gerek",
   "You_need_to_change_your_password": "Şifrenizi değiştirmek gerekir",
@@ -1303,4 +1398,4 @@
   "Your_mail_was_sent_to_s": "Posta %s gönderildi",
   "Your_password_is_wrong": "Parolanız yanlış!",
   "Your_push_was_sent_to_s_devices": "Sizin itme %s cihazlara gönderildi"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-importer-csv/server/importer.js b/packages/rocketchat-importer-csv/server/importer.js
index 11568c5d52a5..89710bad7567 100644
--- a/packages/rocketchat-importer-csv/server/importer.js
+++ b/packages/rocketchat-importer-csv/server/importer.js
@@ -169,169 +169,175 @@ export class CsvImporter extends Base {
 		const startedByUserId = Meteor.userId();
 		Meteor.defer(() => {
 			super.updateProgress(ProgressStep.IMPORTING_USERS);
-			//Import the users
-			for (const u of this.users.users) {
-				if (!u.do_import) {
-					continue;
-				}
-
-				Meteor.runAsUser(startedByUserId, () => {
-					let existantUser = RocketChat.models.Users.findOneByEmailAddress(u.email);
 
-					//If we couldn't find one by their email address, try to find an existing user by their username
-					if (!existantUser) {
-						existantUser = RocketChat.models.Users.findOneByUsername(u.username);
-					}
-
-					if (existantUser) {
-						//since we have an existing user, let's try a few things
-						u.rocketId = existantUser._id;
-						RocketChat.models.Users.update({ _id: u.rocketId }, { $addToSet: { importIds: u.id } });
-					} else {
-						const userId = Accounts.createUser({ email: u.email, password: Date.now() + u.name + u.email.toUpperCase() });
-						Meteor.runAsUser(userId, () => {
-							Meteor.call('setUsername', u.username, {joinDefaultChannelsSilenced: true});
-							RocketChat.models.Users.setName(userId, u.name);
-							RocketChat.models.Users.update({ _id: userId }, { $addToSet: { importIds: u.id } });
-							u.rocketId = userId;
-						});
+			try {
+				//Import the users
+				for (const u of this.users.users) {
+					if (!u.do_import) {
+						continue;
 					}
 
-					super.addCountCompleted(1);
-				});
-			}
-			this.collection.update({ _id: this.users._id }, { $set: { 'users': this.users.users }});
+					Meteor.runAsUser(startedByUserId, () => {
+						let existantUser = RocketChat.models.Users.findOneByEmailAddress(u.email);
 
-			//Import the channels
-			super.updateProgress(ProgressStep.IMPORTING_CHANNELS);
-			for (const c of this.channels.channels) {
-				if (!c.do_import) {
-					continue;
-				}
+						//If we couldn't find one by their email address, try to find an existing user by their username
+						if (!existantUser) {
+							existantUser = RocketChat.models.Users.findOneByUsername(u.username);
+						}
 
-				Meteor.runAsUser(startedByUserId, () => {
-					const existantRoom = RocketChat.models.Rooms.findOneByName(c.name);
-					//If the room exists or the name of it is 'general', then we don't need to create it again
-					if (existantRoom || c.name.toUpperCase() === 'GENERAL') {
-						c.rocketId = c.name.toUpperCase() === 'GENERAL' ? 'GENERAL' : existantRoom._id;
-						RocketChat.models.Rooms.update({ _id: c.rocketId }, { $addToSet: { importIds: c.id } });
-					} else {
-						//Find the rocketchatId of the user who created this channel
-						let creatorId = startedByUserId;
-						for (const u of this.users.users) {
-							if (u.username === c.creator && u.do_import) {
-								creatorId = u.rocketId;
-							}
+						if (existantUser) {
+							//since we have an existing user, let's try a few things
+							u.rocketId = existantUser._id;
+							RocketChat.models.Users.update({ _id: u.rocketId }, { $addToSet: { importIds: u.id } });
+						} else {
+							const userId = Accounts.createUser({ email: u.email, password: Date.now() + u.name + u.email.toUpperCase() });
+							Meteor.runAsUser(userId, () => {
+								Meteor.call('setUsername', u.username, {joinDefaultChannelsSilenced: true});
+								RocketChat.models.Users.setName(userId, u.name);
+								RocketChat.models.Users.update({ _id: userId }, { $addToSet: { importIds: u.id } });
+								u.rocketId = userId;
+							});
 						}
 
-						//Create the channel
-						Meteor.runAsUser(creatorId, () => {
-							const roomInfo = Meteor.call(c.isPrivate ? 'createPrivateGroup' : 'createChannel', c.name, c.members);
-							c.rocketId = roomInfo.rid;
-						});
+						super.addCountCompleted(1);
+					});
+				}
+				this.collection.update({ _id: this.users._id }, { $set: { 'users': this.users.users }});
 
-						RocketChat.models.Rooms.update({ _id: c.rocketId }, { $addToSet: { importIds: c.id } });
+				//Import the channels
+				super.updateProgress(ProgressStep.IMPORTING_CHANNELS);
+				for (const c of this.channels.channels) {
+					if (!c.do_import) {
+						continue;
 					}
 
-					super.addCountCompleted(1);
-				});
-			}
-			this.collection.update({ _id: this.channels._id }, { $set: { 'channels': this.channels.channels }});
-
-			//If no channels file, collect channel map from DB for message-only import
-			if (this.channels.channels.length === 0) {
-				for (const cname of this.messages.keys()) {
 					Meteor.runAsUser(startedByUserId, () => {
-						const existantRoom = RocketChat.models.Rooms.findOneByName(cname);
-						if (existantRoom || cname.toUpperCase() === 'GENERAL') {
-							this.channels.channels.push({
-								id: cname.replace('.', '_'),
-								name: cname,
-								rocketId: (cname.toUpperCase() === 'GENERAL' ? 'GENERAL' : existantRoom._id),
-								do_import: true
+						const existantRoom = RocketChat.models.Rooms.findOneByName(c.name);
+						//If the room exists or the name of it is 'general', then we don't need to create it again
+						if (existantRoom || c.name.toUpperCase() === 'GENERAL') {
+							c.rocketId = c.name.toUpperCase() === 'GENERAL' ? 'GENERAL' : existantRoom._id;
+							RocketChat.models.Rooms.update({ _id: c.rocketId }, { $addToSet: { importIds: c.id } });
+						} else {
+							//Find the rocketchatId of the user who created this channel
+							let creatorId = startedByUserId;
+							for (const u of this.users.users) {
+								if (u.username === c.creator && u.do_import) {
+									creatorId = u.rocketId;
+								}
+							}
+
+							//Create the channel
+							Meteor.runAsUser(creatorId, () => {
+								const roomInfo = Meteor.call(c.isPrivate ? 'createPrivateGroup' : 'createChannel', c.name, c.members);
+								c.rocketId = roomInfo.rid;
 							});
+
+							RocketChat.models.Rooms.update({ _id: c.rocketId }, { $addToSet: { importIds: c.id } });
 						}
+
+						super.addCountCompleted(1);
 					});
 				}
-			}
+				this.collection.update({ _id: this.channels._id }, { $set: { 'channels': this.channels.channels }});
+
+				//If no channels file, collect channel map from DB for message-only import
+				if (this.channels.channels.length === 0) {
+					for (const cname of this.messages.keys()) {
+						Meteor.runAsUser(startedByUserId, () => {
+							const existantRoom = RocketChat.models.Rooms.findOneByName(cname);
+							if (existantRoom || cname.toUpperCase() === 'GENERAL') {
+								this.channels.channels.push({
+									id: cname.replace('.', '_'),
+									name: cname,
+									rocketId: (cname.toUpperCase() === 'GENERAL' ? 'GENERAL' : existantRoom._id),
+									do_import: true
+								});
+							}
+						});
+					}
+				}
+
+				//If no users file, collect user map from DB for message-only import
+				if (this.users.users.length === 0) {
+					for (const [ch, messagesMap] of this.messages.entries()) {
+						const csvChannel = this.getChannelFromName(ch);
+						if (!csvChannel || !csvChannel.do_import) {
+							continue;
+						}
+						Meteor.runAsUser(startedByUserId, () => {
+							for (const msgs of messagesMap.values()) {
+								for (const msg of msgs.messages) {
+									if (!this.getUserFromUsername(msg.username)) {
+										const user = RocketChat.models.Users.findOneByUsername(msg.username);
+										if (user) {
+											this.users.users.push({
+												rocketId: user._id,
+												username: user.username
+											});
+										}
+									}
+								}
+							}
+						});
+					}
+				}
 
-			//If no users file, collect user map from DB for message-only import
-			if (this.users.users.length === 0) {
+				//Import the Messages
+				super.updateProgress(ProgressStep.IMPORTING_MESSAGES);
 				for (const [ch, messagesMap] of this.messages.entries()) {
 					const csvChannel = this.getChannelFromName(ch);
 					if (!csvChannel || !csvChannel.do_import) {
 						continue;
 					}
+
+					const room = RocketChat.models.Rooms.findOneById(csvChannel.rocketId, { fields: { usernames: 1, t: 1, name: 1 } });
 					Meteor.runAsUser(startedByUserId, () => {
-						for (const msgs of messagesMap.values()) {
+						const timestamps = {};
+						for (const [msgGroupData, msgs] of messagesMap.entries()) {
+							super.updateRecord({ 'messagesstatus': `${ ch }/${ msgGroupData }.${ msgs.messages.length }` });
 							for (const msg of msgs.messages) {
-								if (!this.getUserFromUsername(msg.username)) {
-									const user = RocketChat.models.Users.findOneByUsername(msg.username);
-									if (user) {
-										this.users.users.push({
-											rocketId: user._id,
-											username: user.username
-										});
+								if (isNaN(new Date(parseInt(msg.ts)))) {
+									this.logger.warn(`Timestamp on a message in ${ ch }/${ msgGroupData } is invalid`);
+									super.addCountCompleted(1);
+									continue;
+								}
+
+								const creator = this.getUserFromUsername(msg.username);
+								if (creator) {
+									let suffix = '';
+									if (timestamps[msg.ts] === undefined) {
+										timestamps[msg.ts] = 1;
+									} else {
+										suffix = `-${ timestamps[msg.ts] }`;
+										timestamps[msg.ts] += 1;
 									}
+									const msgObj = {
+										_id: `csv-${ csvChannel.id }-${ msg.ts }${ suffix }`,
+										ts: new Date(parseInt(msg.ts)),
+										msg: msg.text,
+										rid: room._id,
+										u: {
+											_id: creator._id,
+											username: creator.username
+										}
+									};
+
+									RocketChat.sendMessage(creator, msgObj, room, true);
 								}
+
+								super.addCountCompleted(1);
 							}
 						}
 					});
 				}
-			}
 
-
-			//Import the Messages
-			super.updateProgress(ProgressStep.IMPORTING_MESSAGES);
-			for (const [ch, messagesMap] of this.messages.entries()) {
-				const csvChannel = this.getChannelFromName(ch);
-				if (!csvChannel || !csvChannel.do_import) {
-					continue;
-				}
-
-				const room = RocketChat.models.Rooms.findOneById(csvChannel.rocketId, { fields: { usernames: 1, t: 1, name: 1 } });
-				Meteor.runAsUser(startedByUserId, () => {
-					const timestamps = {};
-					for (const [msgGroupData, msgs] of messagesMap.entries()) {
-						super.updateRecord({ 'messagesstatus': `${ ch }/${ msgGroupData }.${ msgs.messages.length }` });
-						for (const msg of msgs.messages) {
-							if (isNaN(new Date(parseInt(msg.ts)))) {
-								this.logger.warn(`Timestamp on a message in ${ ch }/${ msgGroupData } is invalid`);
-								super.addCountCompleted(1);
-								continue;
-							}
-
-							const creator = this.getUserFromUsername(msg.username);
-							if (creator) {
-								let suffix = '';
-								if (timestamps[msg.ts] === undefined) {
-									timestamps[msg.ts] = 1;
-								} else {
-									suffix = `-${ timestamps[msg.ts] }`;
-									timestamps[msg.ts] += 1;
-								}
-								const msgObj = {
-									_id: `csv-${ csvChannel.id }-${ msg.ts }${ suffix }`,
-									ts: new Date(parseInt(msg.ts)),
-									msg: msg.text,
-									rid: room._id,
-									u: {
-										_id: creator._id,
-										username: creator.username
-									}
-								};
-
-								RocketChat.sendMessage(creator, msgObj, room, true);
-							}
-
-							super.addCountCompleted(1);
-						}
-					}
-				});
+				super.updateProgress(ProgressStep.FINISHING);
+				super.updateProgress(ProgressStep.DONE);
+			} catch (e) {
+				this.logger.error(e);
+				super.updateProgress(ProgressStep.ERROR);
 			}
 
-			super.updateProgress(ProgressStep.FINISHING);
-			super.updateProgress(ProgressStep.DONE);
 			const timeTook = Date.now() - started;
 			this.logger.log(`CSV Import took ${ timeTook } milliseconds.`);
 		});
diff --git a/packages/rocketchat-importer-hipchat-enterprise/server/importer.js b/packages/rocketchat-importer-hipchat-enterprise/server/importer.js
index 7e566662a3d6..bc74cd5ff5ba 100644
--- a/packages/rocketchat-importer-hipchat-enterprise/server/importer.js
+++ b/packages/rocketchat-importer-hipchat-enterprise/server/importer.js
@@ -240,193 +240,200 @@ export class HipChatEnterpriseImporter extends Base {
 		const startedByUserId = Meteor.userId();
 		Meteor.defer(() => {
 			super.updateProgress(ProgressStep.IMPORTING_USERS);
-			//Import the users
-			for (const u of this.users.users) {
-				this.logger.debug(`Starting the user import: ${ u.username } and are we importing them? ${ u.do_import }`);
-				if (!u.do_import) {
-					continue;
-				}
 
-				Meteor.runAsUser(startedByUserId, () => {
-					let existantUser = RocketChat.models.Users.findOneByEmailAddress(u.email);
+			try {
+				//Import the users
+				for (const u of this.users.users) {
+					this.logger.debug(`Starting the user import: ${ u.username } and are we importing them? ${ u.do_import }`);
+					if (!u.do_import) {
+						continue;
+					}
+
+					Meteor.runAsUser(startedByUserId, () => {
+						let existantUser = RocketChat.models.Users.findOneByEmailAddress(u.email);
+
+						//If we couldn't find one by their email address, try to find an existing user by their username
+						if (!existantUser) {
+							existantUser = RocketChat.models.Users.findOneByUsername(u.username);
+						}
+
+						if (existantUser) {
+							//since we have an existing user, let's try a few things
+							u.rocketId = existantUser._id;
+							RocketChat.models.Users.update({ _id: u.rocketId }, { $addToSet: { importIds: u.id } });
+						} else {
+							const userId = Accounts.createUser({ email: u.email, password: Date.now() + u.name + u.email.toUpperCase() });
+							Meteor.runAsUser(userId, () => {
+								Meteor.call('setUsername', u.username, {joinDefaultChannelsSilenced: true});
+								//TODO: Use moment timezone to calc the time offset - Meteor.call 'userSetUtcOffset', user.tz_offset / 3600
+								RocketChat.models.Users.setName(userId, u.name);
+								//TODO: Think about using a custom field for the users "title" field
+
+								if (u.avatar) {
+									Meteor.call('setAvatarFromService', `data:image/png;base64,${ u.avatar }`);
+								}
+
+								//Deleted users are 'inactive' users in Rocket.Chat
+								if (u.deleted) {
+									Meteor.call('setUserActiveStatus', userId, false);
+								}
+
+								RocketChat.models.Users.update({ _id: userId }, { $addToSet: { importIds: u.id } });
+								u.rocketId = userId;
+							});
+						}
+
+						super.addCountCompleted(1);
+					});
+				}
+				this.collection.update({ _id: this.users._id }, { $set: { 'users': this.users.users }});
 
-					//If we couldn't find one by their email address, try to find an existing user by their username
-					if (!existantUser) {
-						existantUser = RocketChat.models.Users.findOneByUsername(u.username);
+				//Import the channels
+				super.updateProgress(ProgressStep.IMPORTING_CHANNELS);
+				for (const c of this.channels.channels) {
+					if (!c.do_import) {
+						continue;
 					}
 
-					if (existantUser) {
-						//since we have an existing user, let's try a few things
-						u.rocketId = existantUser._id;
-						RocketChat.models.Users.update({ _id: u.rocketId }, { $addToSet: { importIds: u.id } });
-					} else {
-						const userId = Accounts.createUser({ email: u.email, password: Date.now() + u.name + u.email.toUpperCase() });
-						Meteor.runAsUser(userId, () => {
-							Meteor.call('setUsername', u.username, {joinDefaultChannelsSilenced: true});
-							//TODO: Use moment timezone to calc the time offset - Meteor.call 'userSetUtcOffset', user.tz_offset / 3600
-							RocketChat.models.Users.setName(userId, u.name);
-							//TODO: Think about using a custom field for the users "title" field
-
-							if (u.avatar) {
-								Meteor.call('setAvatarFromService', `data:image/png;base64,${ u.avatar }`);
+					Meteor.runAsUser(startedByUserId, () => {
+						const existantRoom = RocketChat.models.Rooms.findOneByName(c.name);
+						//If the room exists or the name of it is 'general', then we don't need to create it again
+						if (existantRoom || c.name.toUpperCase() === 'GENERAL') {
+							c.rocketId = c.name.toUpperCase() === 'GENERAL' ? 'GENERAL' : existantRoom._id;
+							RocketChat.models.Rooms.update({ _id: c.rocketId }, { $addToSet: { importIds: c.id } });
+						} else {
+							//Find the rocketchatId of the user who created this channel
+							let creatorId = startedByUserId;
+							for (const u of this.users.users) {
+								if (u.id === c.creator && u.do_import) {
+									creatorId = u.rocketId;
+								}
 							}
 
-							//Deleted users are 'inactive' users in Rocket.Chat
-							if (u.deleted) {
-								Meteor.call('setUserActiveStatus', userId, false);
-							}
+							//Create the channel
+							Meteor.runAsUser(creatorId, () => {
+								const roomInfo = Meteor.call(c.isPrivate ? 'createPrivateGroup' : 'createChannel', c.name, []);
+								c.rocketId = roomInfo.rid;
+							});
 
-							RocketChat.models.Users.update({ _id: userId }, { $addToSet: { importIds: u.id } });
-							u.rocketId = userId;
-						});
+							RocketChat.models.Rooms.update({ _id: c.rocketId }, { $set: { ts: c.created, topic: c.topic }, $addToSet: { importIds: c.id } });
+						}
+
+						super.addCountCompleted(1);
+					});
+				}
+				this.collection.update({ _id: this.channels._id }, { $set: { 'channels': this.channels.channels }});
+
+				//Import the Messages
+				super.updateProgress(ProgressStep.IMPORTING_MESSAGES);
+				for (const [ch, messagesMap] of this.messages.entries()) {
+					const hipChannel = this.getChannelFromRoomIdentifier(ch);
+					if (!hipChannel.do_import) {
+						continue;
 					}
 
-					super.addCountCompleted(1);
-				});
-			}
-			this.collection.update({ _id: this.users._id }, { $set: { 'users': this.users.users }});
+					const room = RocketChat.models.Rooms.findOneById(hipChannel.rocketId, { fields: { usernames: 1, t: 1, name: 1 } });
+					Meteor.runAsUser(startedByUserId, () => {
+						for (const [msgGroupData, msgs] of messagesMap.entries()) {
+							super.updateRecord({ 'messagesstatus': `${ ch }/${ msgGroupData }.${ msgs.messages.length }` });
+							for (const msg of msgs.messages) {
+								if (isNaN(msg.ts)) {
+									this.logger.warn(`Timestamp on a message in ${ ch }/${ msgGroupData } is invalid`);
+									super.addCountCompleted(1);
+									continue;
+								}
 
-			//Import the channels
-			super.updateProgress(ProgressStep.IMPORTING_CHANNELS);
-			for (const c of this.channels.channels) {
-				if (!c.do_import) {
-					continue;
-				}
+								const creator = this.getRocketUserFromUserId(msg.userId);
+								if (creator) {
+									switch (msg.type) {
+										case 'user':
+											RocketChat.sendMessage(creator, {
+												_id: msg.id,
+												ts: msg.ts,
+												msg: msg.text,
+												rid: room._id,
+												u: {
+													_id: creator._id,
+													username: creator.username
+												}
+											}, room, true);
+											break;
+										case 'topic':
+											RocketChat.models.Messages.createRoomSettingsChangedWithTypeRoomIdMessageAndUser('room_changed_topic', room._id, msg.text, creator, { _id: msg.id, ts: msg.ts });
+											break;
+									}
+								}
 
-				Meteor.runAsUser(startedByUserId, () => {
-					const existantRoom = RocketChat.models.Rooms.findOneByName(c.name);
-					//If the room exists or the name of it is 'general', then we don't need to create it again
-					if (existantRoom || c.name.toUpperCase() === 'GENERAL') {
-						c.rocketId = c.name.toUpperCase() === 'GENERAL' ? 'GENERAL' : existantRoom._id;
-						RocketChat.models.Rooms.update({ _id: c.rocketId }, { $addToSet: { importIds: c.id } });
-					} else {
-						//Find the rocketchatId of the user who created this channel
-						let creatorId = startedByUserId;
-						for (const u of this.users.users) {
-							if (u.id === c.creator && u.do_import) {
-								creatorId = u.rocketId;
+								super.addCountCompleted(1);
 							}
 						}
+					});
+				}
 
-						//Create the channel
-						Meteor.runAsUser(creatorId, () => {
-							const roomInfo = Meteor.call(c.isPrivate ? 'createPrivateGroup' : 'createChannel', c.name, []);
-							c.rocketId = roomInfo.rid;
-						});
-
-						RocketChat.models.Rooms.update({ _id: c.rocketId }, { $set: { ts: c.created, topic: c.topic }, $addToSet: { importIds: c.id } });
+				//Import the Direct Messages
+				for (const [directMsgRoom, directMessagesMap] of this.directMessages.entries()) {
+					const hipUser = this.getUserFromDirectMessageIdentifier(directMsgRoom);
+					if (!hipUser.do_import) {
+						continue;
 					}
 
-					super.addCountCompleted(1);
-				});
-			}
-			this.collection.update({ _id: this.channels._id }, { $set: { 'channels': this.channels.channels }});
-
-			//Import the Messages
-			super.updateProgress(ProgressStep.IMPORTING_MESSAGES);
-			for (const [ch, messagesMap] of this.messages.entries()) {
-				const hipChannel = this.getChannelFromRoomIdentifier(ch);
-				if (!hipChannel.do_import) {
-					continue;
-				}
+					//Verify this direct message user's room is valid (confusing but idk how else to explain it)
+					if (!this.getRocketUserFromUserId(hipUser.id)) {
+						continue;
+					}
 
-				const room = RocketChat.models.Rooms.findOneById(hipChannel.rocketId, { fields: { usernames: 1, t: 1, name: 1 } });
-				Meteor.runAsUser(startedByUserId, () => {
-					for (const [msgGroupData, msgs] of messagesMap.entries()) {
-						super.updateRecord({ 'messagesstatus': `${ ch }/${ msgGroupData }.${ msgs.messages.length }` });
+					for (const [msgGroupData, msgs] of directMessagesMap.entries()) {
+						super.updateRecord({ 'messagesstatus': `${ directMsgRoom }/${ msgGroupData }.${ msgs.messages.length }` });
 						for (const msg of msgs.messages) {
 							if (isNaN(msg.ts)) {
-								this.logger.warn(`Timestamp on a message in ${ ch }/${ msgGroupData } is invalid`);
+								this.logger.warn(`Timestamp on a message in ${ directMsgRoom }/${ msgGroupData } is invalid`);
 								super.addCountCompleted(1);
 								continue;
 							}
 
-							const creator = this.getRocketUserFromUserId(msg.userId);
-							if (creator) {
-								switch (msg.type) {
-									case 'user':
-										RocketChat.sendMessage(creator, {
-											_id: msg.id,
-											ts: msg.ts,
-											msg: msg.text,
-											rid: room._id,
-											u: {
-												_id: creator._id,
-												username: creator.username
-											}
-										}, room, true);
-										break;
-									case 'topic':
-										RocketChat.models.Messages.createRoomSettingsChangedWithTypeRoomIdMessageAndUser('room_changed_topic', room._id, msg.text, creator, { _id: msg.id, ts: msg.ts });
-										break;
-								}
+							//make sure the message sender is a valid user inside rocket.chat
+							const sender = this.getRocketUserFromUserId(msg.senderId);
+							if (!sender) {
+								continue;
 							}
 
-							super.addCountCompleted(1);
-						}
-					}
-				});
-			}
-
-			//Import the Direct Messages
-			for (const [directMsgRoom, directMessagesMap] of this.directMessages.entries()) {
-				const hipUser = this.getUserFromDirectMessageIdentifier(directMsgRoom);
-				if (!hipUser.do_import) {
-					continue;
-				}
-
-				//Verify this direct message user's room is valid (confusing but idk how else to explain it)
-				if (!this.getRocketUserFromUserId(hipUser.id)) {
-					continue;
-				}
-
-				for (const [msgGroupData, msgs] of directMessagesMap.entries()) {
-					super.updateRecord({ 'messagesstatus': `${ directMsgRoom }/${ msgGroupData }.${ msgs.messages.length }` });
-					for (const msg of msgs.messages) {
-						if (isNaN(msg.ts)) {
-							this.logger.warn(`Timestamp on a message in ${ directMsgRoom }/${ msgGroupData } is invalid`);
-							super.addCountCompleted(1);
-							continue;
-						}
-
-						//make sure the message sender is a valid user inside rocket.chat
-						const sender = this.getRocketUserFromUserId(msg.senderId);
-						if (!sender) {
-							continue;
-						}
+							//make sure the receiver of the message is a valid rocket.chat user
+							const receiver = this.getRocketUserFromUserId(msg.receiverId);
+							if (!receiver) {
+								continue;
+							}
 
-						//make sure the receiver of the message is a valid rocket.chat user
-						const receiver = this.getRocketUserFromUserId(msg.receiverId);
-						if (!receiver) {
-							continue;
-						}
+							let room = RocketChat.models.Rooms.findOneById([receiver._id, sender._id].sort().join(''));
+							if (!room) {
+								Meteor.runAsUser(sender._id, () => {
+									const roomInfo = Meteor.call('createDirectMessage', receiver.username);
+									room = RocketChat.models.Rooms.findOneById(roomInfo.rid);
+								});
+							}
 
-						let room = RocketChat.models.Rooms.findOneById([receiver._id, sender._id].sort().join(''));
-						if (!room) {
 							Meteor.runAsUser(sender._id, () => {
-								const roomInfo = Meteor.call('createDirectMessage', receiver.username);
-								room = RocketChat.models.Rooms.findOneById(roomInfo.rid);
+								RocketChat.sendMessage(sender, {
+									_id: msg.id,
+									ts: msg.ts,
+									msg: msg.text,
+									rid: room._id,
+									u: {
+										_id: sender._id,
+										username: sender.username
+									}
+								}, room, true);
 							});
 						}
-
-						Meteor.runAsUser(sender._id, () => {
-							RocketChat.sendMessage(sender, {
-								_id: msg.id,
-								ts: msg.ts,
-								msg: msg.text,
-								rid: room._id,
-								u: {
-									_id: sender._id,
-									username: sender.username
-								}
-							}, room, true);
-						});
 					}
 				}
+
+				super.updateProgress(ProgressStep.FINISHING);
+				super.updateProgress(ProgressStep.DONE);
+			} catch (e) {
+				this.logger.error(e);
+				super.updateProgress(ProgressStep.ERROR);
 			}
 
-			super.updateProgress(ProgressStep.FINISHING);
-			super.updateProgress(ProgressStep.DONE);
 			const timeTook = Date.now() - started;
 			this.logger.log(`HipChat Enterprise Import took ${ timeTook } milliseconds.`);
 		});
diff --git a/packages/rocketchat-importer-hipchat/server/importer.js b/packages/rocketchat-importer-hipchat/server/importer.js
index 072d720d0f44..6f2fcb57f1b3 100644
--- a/packages/rocketchat-importer-hipchat/server/importer.js
+++ b/packages/rocketchat-importer-hipchat/server/importer.js
@@ -41,7 +41,7 @@ export class HipChatImporter extends Base {
 			if (entry.entryName.indexOf(this.roomPrefix) > -1) {
 				let roomName = entry.entryName.split(this.roomPrefix)[1];
 				if (roomName === 'list.json') {
-					this.updateProgress(ProgressStep.PREPARING_CHANNELS);
+					super.updateProgress(ProgressStep.PREPARING_CHANNELS);
 					const tempRooms = JSON.parse(entry.getData().toString()).rooms;
 					tempRooms.forEach(room => {
 						room.name = s.slugify(room.name);
@@ -62,7 +62,7 @@ export class HipChatImporter extends Base {
 			} else if (entry.entryName.indexOf(this.usersPrefix) > -1) {
 				const usersName = entry.entryName.split(this.usersPrefix)[1];
 				if (usersName === 'list.json') {
-					this.updateProgress(ProgressStep.PREPARING_USERS);
+					super.updateProgress(ProgressStep.PREPARING_USERS);
 					return tempUsers = JSON.parse(entry.getData().toString()).users;
 				} else {
 					return this.logger.warn(`Unexpected file in the ${ this.name } import: ${ entry.entryName }`);
@@ -91,7 +91,7 @@ export class HipChatImporter extends Base {
 			'count.channels': tempRooms.length
 		});
 		this.addCountToTotal(tempRooms.length);
-		this.updateProgress(ProgressStep.PREPARING_MESSAGES);
+		super.updateProgress(ProgressStep.PREPARING_MESSAGES);
 		let messagesCount = 0;
 		Object.keys(tempMessages).forEach(channel => {
 			const messagesObj = tempMessages[channel];
@@ -132,7 +132,7 @@ export class HipChatImporter extends Base {
 		this.addCountToTotal(messagesCount);
 		if (tempUsers.length === 0 || tempRooms.length === 0 || messagesCount === 0) {
 			this.logger.warn(`The loaded users count ${ tempUsers.length }, the loaded channels ${ tempRooms.length }, and the loaded messages ${ messagesCount }`);
-			this.updateProgress(ProgressStep.ERROR);
+			super.updateProgress(ProgressStep.ERROR);
 			return this.getProgress();
 		}
 		const selectionUsers = tempUsers.map(function(user) {
@@ -142,13 +142,14 @@ export class HipChatImporter extends Base {
 			return new SelectionChannel(room.room_id, room.name, room.is_archived, true, false);
 		});
 		const selectionMessages = this.importRecord.count.messages;
-		this.updateProgress(ProgressStep.USER_SELECTION);
+		super.updateProgress(ProgressStep.USER_SELECTION);
 		return new Selection(this.name, selectionUsers, selectionChannels, selectionMessages);
 	}
 
 	startImport(importSelection) {
 		super.startImport(importSelection);
 		const start = Date.now();
+
 		importSelection.users.forEach(user => {
 			this.users.users.forEach(u => {
 				if (u.user_id === user.user_id) {
@@ -157,156 +158,168 @@ export class HipChatImporter extends Base {
 			});
 		});
 		this.collection.update({_id: this.users._id}, { $set: { 'users': this.users.users } });
+
 		importSelection.channels.forEach(channel =>
 			this.channels.channels.forEach(c => c.room_id === channel.channel_id && (c.do_import = channel.do_import))
 		);
 		this.collection.update({ _id: this.channels._id }, { $set: { 'channels': this.channels.channels }});
+
 		const startedByUserId = Meteor.userId();
 		Meteor.defer(() => {
-			this.updateProgress(ProgressStep.IMPORTING_USERS);
-			this.users.users.forEach(user => {
-				if (!user.do_import) {
-					return;
-				}
-				Meteor.runAsUser(startedByUserId, () => {
-					const existantUser = RocketChat.models.Users.findOneByEmailAddress(user.email);
-					if (existantUser) {
-						user.rocketId = existantUser._id;
-						this.userTags.push({
-							hipchat: `@${ user.mention_name }`,
-							rocket: `@${ existantUser.username }`
-						});
-					} else {
-						const userId = Accounts.createUser({
-							email: user.email,
-							password: Date.now() + user.name + user.email.toUpperCase()
-						});
-						user.rocketId = userId;
-						this.userTags.push({
-							hipchat: `@${ user.mention_name }`,
-							rocket: `@${ user.mention_name }`
-						});
-						Meteor.runAsUser(userId, () => {
-							Meteor.call('setUsername', user.mention_name, {
-								joinDefaultChannelsSilenced: true
+			super.updateProgress(ProgressStep.IMPORTING_USERS);
+
+			try {
+				this.users.users.forEach(user => {
+					if (!user.do_import) {
+						return;
+					}
+
+					Meteor.runAsUser(startedByUserId, () => {
+						const existantUser = RocketChat.models.Users.findOneByEmailAddress(user.email);
+						if (existantUser) {
+							user.rocketId = existantUser._id;
+							this.userTags.push({
+								hipchat: `@${ user.mention_name }`,
+								rocket: `@${ existantUser.username }`
 							});
-							Meteor.call('setAvatarFromService', user.photo_url, undefined, 'url');
-							return Meteor.call('userSetUtcOffset', parseInt(moment().tz(user.timezone).format('Z').toString().split(':')[0]));
-						});
-						if (user.name != null) {
-							RocketChat.models.Users.setName(userId, user.name);
-						}
-						if (user.is_deleted) {
-							Meteor.call('setUserActiveStatus', userId, false);
+						} else {
+							const userId = Accounts.createUser({
+								email: user.email,
+								password: Date.now() + user.name + user.email.toUpperCase()
+							});
+							user.rocketId = userId;
+							this.userTags.push({
+								hipchat: `@${ user.mention_name }`,
+								rocket: `@${ user.mention_name }`
+							});
+							Meteor.runAsUser(userId, () => {
+								Meteor.call('setUsername', user.mention_name, {
+									joinDefaultChannelsSilenced: true
+								});
+								Meteor.call('setAvatarFromService', user.photo_url, undefined, 'url');
+								return Meteor.call('userSetUtcOffset', parseInt(moment().tz(user.timezone).format('Z').toString().split(':')[0]));
+							});
+							if (user.name != null) {
+								RocketChat.models.Users.setName(userId, user.name);
+							}
+							if (user.is_deleted) {
+								Meteor.call('setUserActiveStatus', userId, false);
+							}
 						}
-					}
-					return this.addCountCompleted(1);
+						return this.addCountCompleted(1);
+					});
 				});
-			});
-			this.collection.update({ _id: this.users._id }, { $set: { 'users': this.users.users }});
-			this.updateProgress(ProgressStep.IMPORTING_CHANNELS);
-			this.channels.channels.forEach(channel => {
-				if (!channel.do_import) {
-					return;
-				}
-				Meteor.runAsUser(startedByUserId, () => {
-					channel.name = channel.name.replace(/ /g, '');
-					const existantRoom = RocketChat.models.Rooms.findOneByName(channel.name);
-					if (existantRoom) {
-						channel.rocketId = existantRoom._id;
-					} else {
-						let userId = '';
-						this.users.users.forEach(user => {
-							if (user.user_id === channel.owner_user_id) {
-								userId = user.rocketId;
+
+				this.collection.update({ _id: this.users._id }, { $set: { 'users': this.users.users }});
+
+				super.updateProgress(ProgressStep.IMPORTING_CHANNELS);
+				this.channels.channels.forEach(channel => {
+					if (!channel.do_import) {
+						return;
+					}
+					Meteor.runAsUser(startedByUserId, () => {
+						channel.name = channel.name.replace(/ /g, '');
+						const existantRoom = RocketChat.models.Rooms.findOneByName(channel.name);
+						if (existantRoom) {
+							channel.rocketId = existantRoom._id;
+						} else {
+							let userId = '';
+							this.users.users.forEach(user => {
+								if (user.user_id === channel.owner_user_id) {
+									userId = user.rocketId;
+								}
+							});
+							if (userId === '') {
+								this.logger.warn(`Failed to find the channel creator for ${ channel.name }, setting it to the current running user.`);
+								userId = startedByUserId;
 							}
-						});
-						if (userId === '') {
-							this.logger.warn(`Failed to find the channel creator for ${ channel.name }, setting it to the current running user.`);
-							userId = startedByUserId;
+							Meteor.runAsUser(userId, () => {
+								const returned = Meteor.call('createChannel', channel.name, []);
+								return channel.rocketId = returned.rid;
+							});
+							RocketChat.models.Rooms.update({
+								_id: channel.rocketId
+							}, {
+								$set: {
+									'ts': new Date(channel.created * 1000)
+								}
+							});
 						}
-						Meteor.runAsUser(userId, () => {
-							const returned = Meteor.call('createChannel', channel.name, []);
-							return channel.rocketId = returned.rid;
-						});
-						RocketChat.models.Rooms.update({
-							_id: channel.rocketId
-						}, {
-							$set: {
-								'ts': new Date(channel.created * 1000)
-							}
-						});
-					}
-					return this.addCountCompleted(1);
+						return this.addCountCompleted(1);
+					});
 				});
-			});
-			this.collection.update({
-				_id: this.channels._id
-			}, {
-				$set: {
-					'channels': this.channels.channels
-				}
-			});
-			this.updateProgress(ProgressStep.IMPORTING_MESSAGES);
-			const nousers = {};
 
-			Object.keys(this.messages).forEach(channel => {
-				const messagesObj = this.messages[channel];
-				Meteor.runAsUser(startedByUserId, () => {
-					const hipchatChannel = this.getHipChatChannelFromName(channel);
-					if (hipchatChannel != null ? hipchatChannel.do_import : undefined) {
-						const room = RocketChat.models.Rooms.findOneById(hipchatChannel.rocketId, {
-							fields: {
-								usernames: 1,
-								t: 1,
-								name: 1
-							}
-						});
+				this.collection.update({ _id: this.channels._id }, { $set: { 'channels': this.channels.channels }});
+
+				super.updateProgress(ProgressStep.IMPORTING_MESSAGES);
+				const nousers = {};
 
-						Object.keys(messagesObj).forEach(date => {
-							const msgs = messagesObj[date];
-							this.updateRecord({
-								'messagesstatus': `${ channel }/${ date }.${ msgs.messages.length }`
+				Object.keys(this.messages).forEach(channel => {
+					const messagesObj = this.messages[channel];
+					Meteor.runAsUser(startedByUserId, () => {
+						const hipchatChannel = this.getHipChatChannelFromName(channel);
+						if (hipchatChannel != null ? hipchatChannel.do_import : undefined) {
+							const room = RocketChat.models.Rooms.findOneById(hipchatChannel.rocketId, {
+								fields: {
+									usernames: 1,
+									t: 1,
+									name: 1
+								}
 							});
 
-							msgs.messages.forEach(message => {
-								if (message.from != null) {
-									const user = this.getRocketUser(message.from.user_id);
-									if (user != null) {
-										const msgObj = {
-											msg: this.convertHipChatMessageToRocketChat(message.message),
-											ts: new Date(message.date),
-											u: {
-												_id: user._id,
-												username: user.username
-											}
-										};
-										RocketChat.sendMessage(user, msgObj, room, true);
-									} else if (!nousers[message.from.user_id]) {
-										nousers[message.from.user_id] = message.from;
+							Object.keys(messagesObj).forEach(date => {
+								const msgs = messagesObj[date];
+								this.updateRecord({
+									'messagesstatus': `${ channel }/${ date }.${ msgs.messages.length }`
+								});
+
+								msgs.messages.forEach(message => {
+									if (message.from != null) {
+										const user = this.getRocketUser(message.from.user_id);
+										if (user != null) {
+											const msgObj = {
+												msg: this.convertHipChatMessageToRocketChat(message.message),
+												ts: new Date(message.date),
+												u: {
+													_id: user._id,
+													username: user.username
+												}
+											};
+											RocketChat.sendMessage(user, msgObj, room, true);
+										} else if (!nousers[message.from.user_id]) {
+											nousers[message.from.user_id] = message.from;
+										}
+									} else if (!_.isArray(message)) {
+										console.warn('Please report the following:', message);
 									}
-								} else if (!_.isArray(message)) {
-									console.warn('Please report the following:', message);
-								}
-								this.addCountCompleted(1);
+									this.addCountCompleted(1);
+								});
 							});
+						}
+					});
+				});
+
+				this.logger.warn('The following did not have users:', nousers);
+				super.updateProgress(ProgressStep.FINISHING);
+
+				this.channels.channels.forEach(channel => {
+					if (channel.do_import && channel.is_archived) {
+						Meteor.runAsUser(startedByUserId, () => {
+							return Meteor.call('archiveRoom', channel.rocketId);
 						});
 					}
 				});
-			});
-			this.logger.warn('The following did not have users:', nousers);
-			this.updateProgress(ProgressStep.FINISHING);
-			this.channels.channels.forEach(channel => {
-				if (channel.do_import && channel.is_archived) {
-					Meteor.runAsUser(startedByUserId, () => {
-						return Meteor.call('archiveRoom', channel.rocketId);
-					});
-				}
-			});
-			this.updateProgress(ProgressStep.DONE);
+
+				super.updateProgress(ProgressStep.DONE);
+			} catch (e) {
+				this.logger.error(e);
+				super.updateProgress(ProgressStep.ERROR);
+			}
+
 			const timeTook = Date.now() - start;
 			return this.logger.log(`Import took ${ timeTook } milliseconds.`);
 		});
+
 		return this.getProgress();
 	}
 
diff --git a/packages/rocketchat-importer-slack-users/server/importer.js b/packages/rocketchat-importer-slack-users/server/importer.js
index c482a33716f5..0be7fbec801d 100644
--- a/packages/rocketchat-importer-slack-users/server/importer.js
+++ b/packages/rocketchat-importer-slack-users/server/importer.js
@@ -82,50 +82,57 @@ export class SlackUsersImporter extends Base {
 		Meteor.defer(() => {
 			super.updateProgress(ProgressStep.IMPORTING_USERS);
 
-			for (const u of this.users.users) {
-				if (!u.do_import) {
-					continue;
-				}
-
-				Meteor.runAsUser(startedByUserId, () => {
-					const existantUser = RocketChat.models.Users.findOneByEmailAddress(u.email) || RocketChat.models.Users.findOneByUsername(u.username);
-
-					let userId = existantUser._id;
-					if (existantUser) {
-						//since we have an existing user, let's try a few things
-						u.rocketId = existantUser._id;
-						RocketChat.models.Users.update({ _id: u.rocketId }, { $addToSet: { importIds: u.id } });
-
-						RocketChat.models.Users.setEmail(existantUser._id, u.email);
-						RocketChat.models.Users.setEmailVerified(existantUser._id, u.email);
-					} else {
-						userId = Accounts.createUser({ username: u.username + Random.id(), password: Date.now() + u.name + u.email.toUpperCase() });
+			try {
+				for (const u of this.users.users) {
+					if (!u.do_import) {
+						continue;
+					}
 
-						if (!userId) {
-							console.warn('An error happened while creating a user.');
-							return;
+					Meteor.runAsUser(startedByUserId, () => {
+						const existantUser = RocketChat.models.Users.findOneByEmailAddress(u.email) || RocketChat.models.Users.findOneByUsername(u.username);
+
+						let userId;
+						if (existantUser) {
+							//since we have an existing user, let's try a few things
+							userId = existantUser._id;
+							u.rocketId = existantUser._id;
+							RocketChat.models.Users.update({ _id: u.rocketId }, { $addToSet: { importIds: u.id } });
+
+							RocketChat.models.Users.setEmail(existantUser._id, u.email);
+							RocketChat.models.Users.setEmailVerified(existantUser._id, u.email);
+						} else {
+							userId = Accounts.createUser({ username: u.username + Random.id(), password: Date.now() + u.name + u.email.toUpperCase() });
+
+							if (!userId) {
+								console.warn('An error happened while creating a user.');
+								return;
+							}
+
+							Meteor.runAsUser(userId, () => {
+								Meteor.call('setUsername', u.username, {joinDefaultChannelsSilenced: true});
+								RocketChat.models.Users.setName(userId, u.name);
+								RocketChat.models.Users.update({ _id: userId }, { $addToSet: { importIds: u.id } });
+								RocketChat.models.Users.setEmail(userId, u.email);
+								RocketChat.models.Users.setEmailVerified(userId, u.email);
+								u.rocketId = userId;
+							});
 						}
 
-						Meteor.runAsUser(userId, () => {
-							Meteor.call('setUsername', u.username, {joinDefaultChannelsSilenced: true});
-							RocketChat.models.Users.setName(userId, u.name);
-							RocketChat.models.Users.update({ _id: userId }, { $addToSet: { importIds: u.id } });
-							RocketChat.models.Users.setEmail(userId, u.email);
-							RocketChat.models.Users.setEmailVerified(userId, u.email);
-							u.rocketId = userId;
-						});
-					}
+						if (this.admins.includes(u.user_id)) {
+							Meteor.call('setAdminStatus', userId, true);
+						}
 
-					if (this.admins.includes(u.user_id)) {
-						Meteor.call('setAdminStatus', userId, true);
-					}
+						super.addCountCompleted(1);
+					});
+				}
 
-					super.addCountCompleted(1);
-				});
+				super.updateProgress(ProgressStep.FINISHING);
+				super.updateProgress(ProgressStep.DONE);
+			} catch (e) {
+				this.logger.error(e);
+				super.updateProgress(ProgressStep.ERROR);
 			}
 
-			super.updateProgress(ProgressStep.FINISHING);
-			super.updateProgress(ProgressStep.DONE);
 			const timeTook = Date.now() - started;
 			this.logger.log(`Slack Users Import took ${ timeTook } milliseconds.`);
 		});
diff --git a/packages/rocketchat-importer-slack/server/importer.js b/packages/rocketchat-importer-slack/server/importer.js
index ced00651a758..d5ff5d5dc404 100644
--- a/packages/rocketchat-importer-slack/server/importer.js
+++ b/packages/rocketchat-importer-slack/server/importer.js
@@ -32,13 +32,13 @@ export class SlackImporter extends Base {
 			}
 
 			if (entry.entryName === 'channels.json') {
-				this.updateProgress(ProgressStep.PREPARING_CHANNELS);
+				super.updateProgress(ProgressStep.PREPARING_CHANNELS);
 				tempChannels = JSON.parse(entry.getData().toString()).filter(channel => channel.creator != null);
 				return;
 			}
 
 			if (entry.entryName === 'users.json') {
-				this.updateProgress(ProgressStep.PREPARING_USERS);
+				super.updateProgress(ProgressStep.PREPARING_USERS);
 				tempUsers = JSON.parse(entry.getData().toString());
 
 				tempUsers.forEach(user => {
@@ -78,7 +78,7 @@ export class SlackImporter extends Base {
 		this.addCountToTotal(tempChannels.length);
 
 		// Insert the messages records
-		this.updateProgress(ProgressStep.PREPARING_MESSAGES);
+		super.updateProgress(ProgressStep.PREPARING_MESSAGES);
 
 		let messagesCount = 0;
 		Object.keys(tempMessages).forEach(channel => {
@@ -109,14 +109,14 @@ export class SlackImporter extends Base {
 		if ([tempUsers.length, tempChannels.length, messagesCount].some(e => e === 0)) {
 			this.logger.warn(`The loaded users count ${ tempUsers.length }, the loaded channels ${ tempChannels.length }, and the loaded messages ${ messagesCount }`);
 			console.log(`The loaded users count ${ tempUsers.length }, the loaded channels ${ tempChannels.length }, and the loaded messages ${ messagesCount }`);
-			this.updateProgress(ProgressStep.ERROR);
+			super.updateProgress(ProgressStep.ERROR);
 			return this.getProgress();
 		}
 
 		const selectionUsers = tempUsers.map(user => new SelectionUser(user.id, user.name, user.profile.email, user.deleted, user.is_bot, !user.is_bot));
 		const selectionChannels = tempChannels.map(channel => new SelectionChannel(channel.id, channel.name, channel.is_archived, true, false));
 		const selectionMessages = this.importRecord.count.messages;
-		this.updateProgress(ProgressStep.USER_SELECTION);
+		super.updateProgress(ProgressStep.USER_SELECTION);
 
 		return new Selection(this.name, selectionUsers, selectionChannels, selectionMessages);
 	}
@@ -150,7 +150,7 @@ export class SlackImporter extends Base {
 		const startedByUserId = Meteor.userId();
 		Meteor.defer(() => {
 			try {
-				this.updateProgress(ProgressStep.IMPORTING_USERS);
+				super.updateProgress(ProgressStep.IMPORTING_USERS);
 				this.users.users.forEach(user => {
 					if (!user.do_import) {
 						return;
@@ -209,7 +209,7 @@ export class SlackImporter extends Base {
 				});
 				this.collection.update({ _id: this.users._id }, { $set: { 'users': this.users.users }});
 
-				this.updateProgress(ProgressStep.IMPORTING_CHANNELS);
+				super.updateProgress(ProgressStep.IMPORTING_CHANNELS);
 				this.channels.channels.forEach(channel => {
 					if (!channel.do_import) {
 						return;
@@ -265,7 +265,7 @@ export class SlackImporter extends Base {
 
 				const missedTypes = {};
 				const ignoreTypes = { 'bot_add': true, 'file_comment': true, 'file_mention': true };
-				this.updateProgress(ProgressStep.IMPORTING_MESSAGES);
+				super.updateProgress(ProgressStep.IMPORTING_MESSAGES);
 				Object.keys(this.messages).forEach(channel => {
 					const messagesObj = this.messages[channel];
 
@@ -431,7 +431,7 @@ export class SlackImporter extends Base {
 					console.log('Missed import types:', missedTypes);
 				}
 
-				this.updateProgress(ProgressStep.FINISHING);
+				super.updateProgress(ProgressStep.FINISHING);
 
 				this.channels.channels.forEach(channel => {
 					if (channel.do_import && channel.is_archived) {
@@ -440,12 +440,12 @@ export class SlackImporter extends Base {
 						});
 					}
 				});
-				this.updateProgress(ProgressStep.DONE);
+				super.updateProgress(ProgressStep.DONE);
 
 				this.logger.log(`Import took ${ Date.now() - start } milliseconds.`);
 			} catch (e) {
 				this.logger.error(e);
-				this.updateProgress(ProgressStep.ERROR);
+				super.updateProgress(ProgressStep.ERROR);
 			}
 		});
 
diff --git a/packages/rocketchat-lib/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-lib/.npm/package/npm-shrinkwrap.json
index 44139fd581df..4ee2c0388940 100644
--- a/packages/rocketchat-lib/.npm/package/npm-shrinkwrap.json
+++ b/packages/rocketchat-lib/.npm/package/npm-shrinkwrap.json
@@ -6,25 +6,20 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz",
       "integrity": "sha1-yM4n3grMdtiW0rH6099YjZ6C8BQ="
     },
+    "ajv": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU="
+    },
     "amdefine": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
     },
-    "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-    },
-    "ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
-    },
     "asap": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz",
-      "integrity": "sha1-UidltQw1EEkOUtfc/ghe+bqWlY8="
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
     },
     "asn1": {
       "version": "0.2.3",
@@ -32,9 +27,9 @@
       "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
     },
     "assert-plus": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
     "ast-types": {
       "version": "0.8.15",
@@ -47,14 +42,14 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "aws-sign2": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz",
-      "integrity": "sha1-Cin/t5wxyecS7rCH6OemS0pW11U="
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
     },
     "bad-words": {
       "version": "1.3.1",
@@ -72,9 +67,9 @@
       "integrity": "sha1-e0F0wvlESXU7EcJlHAg9qEGnsIQ="
     },
     "bcrypt-pbkdf": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz",
-      "integrity": "sha1-PKdrhSQccXC/fZcD57mqdGMAQNQ="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40="
     },
     "bintrees": {
       "version": "1.0.1",
@@ -82,9 +77,9 @@
       "integrity": "sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ="
     },
     "boom": {
-      "version": "2.10.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8="
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE="
     },
     "bugsnag": {
       "version": "1.8.0",
@@ -92,46 +87,41 @@
       "integrity": "sha1-5BKdm6KaxRQSANGG/4wK/vdDN8c="
     },
     "caseless": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-      "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c="
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
-    "chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg="
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
     },
     "combined-stream": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
       "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk="
     },
-    "commander": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-      "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q="
-    },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cryptiles": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g="
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
+      "dependencies": {
+        "boom": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw=="
+        }
+      }
     },
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
-      }
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA="
     },
     "delayed-stream": {
       "version": "1.0.0",
@@ -148,11 +138,6 @@
       "resolved": "https://registry.npmjs.org/es3ify/-/es3ify-0.1.4.tgz",
       "integrity": "sha1-rZ+l3xrjTz8x4SEbWBiy1RB439E="
     },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-    },
     "esmangle-evaluator": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/esmangle-evaluator/-/esmangle-evaluator-1.0.1.tgz",
@@ -164,20 +149,30 @@
       "integrity": "sha1-t303q8046gt3Qmu4vCkizmtCZBE="
     },
     "extend": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
-      "integrity": "sha1-WkdDU7nzNT3dgXbf03uRyDpG8dQ="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
     },
     "extsprintf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
-      "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
     "falafel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/falafel/-/falafel-1.2.0.tgz",
       "integrity": "sha1-wY0k71CRF0pJfzGM0ksCaiXN2rQ="
     },
+    "fast-deep-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
+      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8="
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+    },
     "foreach": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
@@ -189,61 +184,39 @@
       "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz",
-      "integrity": "sha1-icNTQAi5fq2ky7FX1Y9vXfAl6uQ="
-    },
-    "generate-function": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ="
-    },
-    "generate-object-property": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA="
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8="
     },
     "getpass": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz",
-      "integrity": "sha1-KD/9n8ElaECHUxHBtg6MQBhxEOY=",
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
-      }
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo="
     },
-    "graceful-readlink": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-      "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0="
-    },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE="
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0="
     },
     "hawk": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ="
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ=="
     },
     "hoek": {
-      "version": "2.16.3",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
+      "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ=="
     },
     "http-signature": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE="
     },
     "immediate": {
       "version": "3.0.6",
@@ -260,16 +233,6 @@
       "resolved": "https://registry.npmjs.org/inline-process-browser/-/inline-process-browser-1.0.0.tgz",
       "integrity": "sha1-RqYbFT3TybFiSxoAYm7bT39BTyI="
     },
-    "is-my-json-valid": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz",
-      "integrity": "sha1-k27do8o8IR/ZjzstPgjaQ/eykVs="
-    },
-    "is-property": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ="
-    },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -285,35 +248,30 @@
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
-    "jodid25519": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz",
-      "integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc="
-    },
     "jsbn": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz",
-      "integrity": "sha1-ZQmH2g3XT06/WhE3eiqi0nPpff0="
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
     },
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
       "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
+    },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
-    "jsonpointer": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk="
-    },
     "jsprim": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz",
-      "integrity": "sha1-KnJW9wQSop7jZwqspiWZTE3P8lI="
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI="
     },
     "jstransform": {
       "version": "3.0.0",
@@ -326,9 +284,9 @@
       "integrity": "sha1-/9oh17uibzd8rYZdNkmy/Izjn+o="
     },
     "localforage": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.4.2.tgz",
-      "integrity": "sha1-X66KkdFG0eqbTG3NDt3r3PamFlM="
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.5.5.tgz",
+      "integrity": "sha1-VfwcOoikf2f1+sbxIxsl/xNVZCM="
     },
     "lokijs": {
       "version": "1.4.1",
@@ -336,14 +294,14 @@
       "integrity": "sha1-6he+ktLqfKuhyBbWwgBkJOjbC/4="
     },
     "mime-db": {
-      "version": "1.26.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz",
-      "integrity": "sha1-6v/NDk/Gk1z4E02iRuLmw1MFrf8="
+      "version": "1.30.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
     },
     "mime-types": {
-      "version": "2.1.14",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz",
-      "integrity": "sha1-9+99l1g/yvO30oK2+LVnnaselO4="
+      "version": "2.1.17",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+      "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo="
     },
     "node-dogstatsd": {
       "version": "0.0.6",
@@ -365,20 +323,15 @@
       "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.9.2.tgz",
       "integrity": "sha1-D9mnT8X60a45aLWGvaXGMr1sBaU="
     },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o="
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "private": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.6.tgz",
-      "integrity": "sha1-VcapdtD5uvuZJIUTUP5HubX7t8E="
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
     },
     "prom-client": {
       "version": "7.0.1",
@@ -386,9 +339,9 @@
       "integrity": "sha1-+pO6MbdlVLLvEWC+gEdiqfbzr+Q="
     },
     "promise": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz",
-      "integrity": "sha1-SJZUxpJha4qlWwck+oCbt9tJxb8="
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
+      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg=="
     },
     "punycode": {
       "version": "1.4.1",
@@ -396,9 +349,9 @@
       "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
     },
     "qs": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz",
-      "integrity": "sha1-9AOyZPI7wBIox0ExtAfxjV6l1EI="
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
     },
     "readable-stream": {
       "version": "1.0.34",
@@ -416,21 +369,26 @@
           "integrity": "sha1-Q761fsJujPI3092LM+QlM1d/Jlk="
         },
         "source-map": {
-          "version": "0.5.6",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
         }
       }
     },
     "request": {
-      "version": "2.79.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
-      "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4="
+      "version": "2.83.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
+      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw=="
+    },
+    "safe-buffer": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
     },
     "sntp": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
+      "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg=="
     },
     "source-map": {
       "version": "0.1.31",
@@ -438,16 +396,9 @@
       "integrity": "sha1-n3BNDWnZ4TioG63267T94z0VHGE="
     },
     "sshpk": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz",
-      "integrity": "sha1-1agEziJpVRVjjnmNviMnPeBwpfo=",
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-        }
-      }
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M="
     },
     "stack-trace": {
       "version": "0.0.9",
@@ -464,16 +415,6 @@
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
       "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
     },
-    "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8="
-    },
-    "supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-    },
     "tdigest": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz",
@@ -490,14 +431,14 @@
       "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg="
     },
     "tough-cookie": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo="
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE="
     },
     "tunnel-agent": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-      "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us="
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0="
     },
     "tweetnacl": {
       "version": "0.14.5",
@@ -515,14 +456,14 @@
       "integrity": "sha1-p8IW0mdUUWljeztu3GypEZ4v+T8="
     },
     "uuid": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
-      "integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
     },
     "verror": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
-      "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw="
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA="
     },
     "xtend": {
       "version": "4.0.1",
diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js
index 4add4c27d43b..c473d2de4383 100644
--- a/packages/rocketchat-lib/client/MessageAction.js
+++ b/packages/rocketchat-lib/client/MessageAction.js
@@ -106,17 +106,22 @@ Meteor.startup(function() {
 			const url = RocketChat.MessageAction.getPermaLink(message._id);
 			const roomInfo = RocketChat.models.Rooms.findOne(message.rid, { fields: { t: 1 } });
 			let text = `[ ](${ url }) `;
+			let inputValue = '';
 
 			if (roomInfo.t !== 'd' && message.u.username !== Meteor.user().username) {
 				text += `@${ message.u.username } `;
 			}
 
 			if (input.value && !input.value.endsWith(' ')) {
-				input.value += ' ';
+				inputValue += ' ';
 			}
-			input.value += text;
-			input.focus();
-			$(input).trigger('change').trigger('input');
+			inputValue += text;
+
+			$(input)
+				.focus()
+				.val(inputValue)
+				.trigger('change')
+				.trigger('input');
 		},
 		condition(message) {
 			if (RocketChat.models.Subscriptions.findOne({rid: message.rid}) == null) {
diff --git a/packages/rocketchat-lib/package.js b/packages/rocketchat-lib/package.js
index b63c00708e7b..48c4c7217eae 100644
--- a/packages/rocketchat-lib/package.js
+++ b/packages/rocketchat-lib/package.js
@@ -9,7 +9,7 @@ Npm.depends({
 	'bad-words': '1.3.1',
 	'object-path': '0.9.2',
 	'node-dogstatsd': '0.0.6',
-	'localforage': '1.4.2',
+	'localforage': '1.5.5',
 	'lokijs': '1.4.1',
 	'bugsnag': '1.8.0',
 	'prom-client': '7.0.1'
diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info
index 6bf0194dea8c..950fc9f603aa 100644
--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "0.60.0-develop"
+	"version": "0.61.0-develop"
 }
diff --git a/packages/rocketchat-lib/server/functions/deleteMessage.js b/packages/rocketchat-lib/server/functions/deleteMessage.js
index 50fd5999864e..aa7101cbfdf5 100644
--- a/packages/rocketchat-lib/server/functions/deleteMessage.js
+++ b/packages/rocketchat-lib/server/functions/deleteMessage.js
@@ -29,6 +29,12 @@ RocketChat.deleteMessage = function(message, user) {
 		});
 	}
 
+	// update last message
+	if (RocketChat.settings.get('Store_Last_Message')) {
+		const lastMessage = RocketChat.models.Messages.getLastMessageSentWithNoTypeByRoomId(message.rid);
+		RocketChat.models.Rooms.setLastMessageById(message.rid, lastMessage);
+	}
+
 	if (showDeletedStatus) {
 		RocketChat.models.Messages.setAsDeletedByIdAndUser(message._id, user);
 	} else {
diff --git a/packages/rocketchat-lib/server/lib/notifyUsersOnMessage.js b/packages/rocketchat-lib/server/lib/notifyUsersOnMessage.js
index b7f97dba1aac..f673c56ec103 100644
--- a/packages/rocketchat-lib/server/lib/notifyUsersOnMessage.js
+++ b/packages/rocketchat-lib/server/lib/notifyUsersOnMessage.js
@@ -9,7 +9,11 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
 		RocketChat.models.Rooms.incMsgCountById(message.rid, 1);
 		return message;
 	} else if (message.editedAt) {
-		// skips this callback if the message was edited
+
+		// only updates last message if it was edited (skip rest of callback)
+		if (RocketChat.settings.get('Store_Last_Message') && (!room.lastMessage || room.lastMessage._id === message._id)) {
+			RocketChat.models.Rooms.setLastMessageById(message.rid, message);
+		}
 		return message;
 	}
 
diff --git a/packages/rocketchat-lib/server/models/Messages.js b/packages/rocketchat-lib/server/models/Messages.js
index f93d03ae64e2..3adbe4ad4c64 100644
--- a/packages/rocketchat-lib/server/models/Messages.js
+++ b/packages/rocketchat-lib/server/models/Messages.js
@@ -279,11 +279,26 @@ RocketChat.models.Messages = new class extends RocketChat.models._Base {
 	}
 
 	findOneBySlackTs(slackTs) {
-		const query =	{slackTs};
+		const query = {slackTs};
 
 		return this.findOne(query);
 	}
 
+	getLastMessageSentWithNoTypeByRoomId(rid) {
+		const query = {
+			rid,
+			t: { $exists: false }
+		};
+
+		const options = {
+			sort: {
+				ts: -1
+			}
+		};
+
+		return this.findOne(query, options);
+	}
+
 	cloneAndSaveAsHistoryById(_id) {
 		const me = RocketChat.models.Users.findOneById(Meteor.userId());
 		const record = this.findOneById(_id);
diff --git a/packages/rocketchat-lib/server/models/Rooms.js b/packages/rocketchat-lib/server/models/Rooms.js
index 31b5a28c136c..1d7273febd1c 100644
--- a/packages/rocketchat-lib/server/models/Rooms.js
+++ b/packages/rocketchat-lib/server/models/Rooms.js
@@ -556,6 +556,18 @@ class ModelRooms extends RocketChat.models._Base {
 		return this.update(query, update);
 	}
 
+	setLastMessageById(_id, lastMessage) {
+		const query = {_id};
+
+		const update = {
+			$set: {
+				lastMessage
+			}
+		};
+
+		return this.update(query, update);
+	}
+
 	replaceUsername(previousUsername, username) {
 		const query = {usernames: previousUsername};
 
diff --git a/packages/rocketchat-lib/server/models/Users.js b/packages/rocketchat-lib/server/models/Users.js
index 1eb92c9f8047..5381c8f7ce4d 100644
--- a/packages/rocketchat-lib/server/models/Users.js
+++ b/packages/rocketchat-lib/server/models/Users.js
@@ -22,7 +22,7 @@ class ModelUsers extends RocketChat.models._Base {
 
 	findOneByUsername(username, options) {
 		if (typeof username === 'string') {
-			username = new RegExp(username, 'i');
+			username = new RegExp(`^${ username }$`, 'i');
 		}
 
 		const query = {username};
diff --git a/packages/rocketchat-livechat/.app/.meteor/packages b/packages/rocketchat-livechat/.app/.meteor/packages
index 4cf1c124f0ea..f688a528da4f 100644
--- a/packages/rocketchat-livechat/.app/.meteor/packages
+++ b/packages/rocketchat-livechat/.app/.meteor/packages
@@ -12,7 +12,7 @@ deps@1.0.12
 session@1.1.7
 ddp@1.4.0
 livedata@1.0.18
-mongo@1.3.0
+mongo@1.3.1
 blaze
 ui
 spacebars
diff --git a/packages/rocketchat-livechat/.app/.meteor/release b/packages/rocketchat-livechat/.app/.meteor/release
index 0fa8d22ddad0..56a7a07fee76 100644
--- a/packages/rocketchat-livechat/.app/.meteor/release
+++ b/packages/rocketchat-livechat/.app/.meteor/release
@@ -1 +1 @@
-METEOR@1.6
+METEOR@1.6.0.1
diff --git a/packages/rocketchat-livechat/.app/.meteor/versions b/packages/rocketchat-livechat/.app/.meteor/versions
index afcbc4d476a6..9de32a733006 100644
--- a/packages/rocketchat-livechat/.app/.meteor/versions
+++ b/packages/rocketchat-livechat/.app/.meteor/versions
@@ -8,22 +8,21 @@ base64@1.0.10
 binary-heap@1.0.10
 blaze@2.3.2
 blaze-tools@1.0.10
-boilerplate-generator@1.3.0
+boilerplate-generator@1.3.1
 caching-compiler@1.1.9
 caching-html-compiler@1.1.2
 callback-hook@1.0.10
 cfs:http-methods@0.0.32
 check@1.2.5
-coffeescript@1.12.7_3
-coffeescript-compiler@1.12.7_3
+coffeescript@1.12.6_1
 ddp@1.4.0
 ddp-client@2.2.0
 ddp-common@1.3.0
 ddp-rate-limiter@1.0.7
-ddp-server@2.1.0
+ddp-server@2.1.1
 deps@1.0.12
 diff-sequence@1.0.7
-dynamic-import@0.2.0
+dynamic-import@0.2.1
 ecmascript@0.9.0
 ecmascript-runtime@0.5.0
 ecmascript-runtime-client@0.5.0
@@ -46,16 +45,16 @@ livedata@1.0.18
 localstorage@1.2.0
 logging@1.1.19
 mdg:validation-error@0.5.1
-meteor@1.8.1
+meteor@1.8.2
 meteorspark:util@0.2.0
 minifier-css@1.2.16
-minifier-js@2.2.1
-minimongo@1.4.0
+minifier-js@2.2.2
+minimongo@1.4.3
 mizzao:timesync@0.5.0
-modules@0.11.0
-modules-runtime@0.9.0
-momentjs:moment@2.19.1
-mongo@1.3.0
+modules@0.11.2
+modules-runtime@0.9.1
+momentjs:moment@2.20.1
+mongo@1.3.1
 mongo-dev-server@1.1.0
 mongo-id@1.0.6
 nooitaf:colors@1.1.2_1
@@ -70,18 +69,18 @@ rate-limit@1.0.8
 reactive-dict@1.2.0
 reactive-var@1.0.11
 retry@1.0.9
-rocketchat:streamer@0.6.0
+rocketchat:streamer@0.6.1
 routepolicy@1.0.12
 service-configuration@1.0.11
 session@1.1.7
 sha@1.0.9
-shell-server@0.3.0
+shell-server@0.3.1
 smoral:sweetalert@1.1.1
 spacebars@1.0.15
 spacebars-compiler@1.1.3
 srp@1.0.10
 standard-minifier-css@1.3.5
-standard-minifier-js@2.2.1
+standard-minifier-js@2.2.3
 tap:i18n@1.8.2
 templating@1.3.2
 templating-compiler@1.3.3
diff --git a/packages/rocketchat-livechat/.app/i18n/de.i18n.json b/packages/rocketchat-livechat/.app/i18n/de.i18n.json
index e797bae4e1a3..a6cffab45d7e 100644
--- a/packages/rocketchat-livechat/.app/i18n/de.i18n.json
+++ b/packages/rocketchat-livechat/.app/i18n/de.i18n.json
@@ -20,7 +20,7 @@
   "Options": "Optionen",
   "Please_answer_survey": "Bitte nehmen Sie sich einen Moment Zeit, um kurz einige Fragen zu dem Gespräch zu beantworten.",
   "Please_choose_a_department": "Wähle eine Abteilung",
-  "Please_fill_name_and_email": "Bitte geben Sie einen Namen und eine E-Mail-Adresse ein.",
+  "Please_fill_name_and_email": "Bitte gib einen Namen und eine E-Mail-Adresse ein",
   "Powered_by": "Powered by",
   "Request_video_chat": "Video-Chat anfragen",
   "Select_a_department": "Abteilung auswählen",
@@ -30,7 +30,7 @@
   "Skip": "Überspringen",
   "Start_Chat": "Chat beginnen",
   "Survey": "Umfrage",
-  "Survey_instructions": "Bewerten Sie jede Frage nach Ihrer Zufriedenheit. 1 bedeutet, dass Sie völlig unzufrieden sind und 5 bedeutet, dass Sie vollständig zufrieden sind.",
+  "Survey_instructions": "Bewerte jede Frage: 1 bedeutet, \"total unzufrieden\", 5 \"vollständig zufrieden\".",
   "Thank_you_for_your_feedback": "Vielen Dank für Ihre Rückmeldung.",
   "Thanks_We_ll_get_back_to_you_soon": "Vielen Dank! Wir kommen auf Sie zeitnah zurück.",
   "transcript_sent": "Transkript versendet",
@@ -39,7 +39,7 @@
   "Type_your_name": "Geben Sie Ihren Namen ein",
   "User_joined": "Benutzer.in wurde Mitglied",
   "User_left": "Benutzer.in abgemeldet",
-  "We_are_offline_Sorry_for_the_inconvenience": "Wir sind offline. Entschuldigen Sie die Unannehmlichkeiten.",
+  "We_are_offline_Sorry_for_the_inconvenience": "Tut uns leid, aber wir sind offline.",
   "Yes": "Ja",
   "You": "Sie",
   "You_must_complete_all_fields": "Sie müssen alle Felder ausfüllen"
diff --git a/packages/rocketchat-livechat/.app/i18n/ru.i18n.json b/packages/rocketchat-livechat/.app/i18n/ru.i18n.json
index a9d97d3923e5..a4c38d477cf7 100644
--- a/packages/rocketchat-livechat/.app/i18n/ru.i18n.json
+++ b/packages/rocketchat-livechat/.app/i18n/ru.i18n.json
@@ -1,17 +1,17 @@
 {
   "Additional_Feedback": "Дополнительная обратная связь",
   "Appearance": "Внешний вид",
-  "Are_you_sure_do_you_want_end_this_chat": "Вы уверены что хотите завершить этот чат?",
+  "Are_you_sure_do_you_want_end_this_chat": "Вы уверены, что хотите завершить этот чат?",
   "Are_you_sure_do_you_want_end_this_chat_and_switch_department": "Вы действительно хотите завершить этот чат и сменить отдел?",
   "Cancel": "Отмена",
   "Change": "Изменить",
   "Chat_ended": "Чат закончен!",
   "Choose_a_new_department": "Выберите новый отдел",
   "Close_menu": "Закрыть меню",
-  "Conversation_finished": "Разговор закончен",
+  "Conversation_finished": "Беседа закончена",
   "End_chat": "Закончить чат",
   "How_friendly_was_the_chat_agent": "Насколько дружелюбен был сотрудник чата?",
-  "How_knowledgeable_was_the_chat_agent": "Насколько информативен был сотрудник чата?",
+  "How_knowledgeable_was_the_chat_agent": "Насколько компетентен был сотрудник чата?",
   "How_responsive_was_the_chat_agent": "Насколько отзывчив был сотрудник чата?",
   "How_satisfied_were_you_with_this_chat": "Насколько Вы удовлетворены использованием этого чата?",
   "Installation": "Установка",
@@ -33,9 +33,9 @@
   "Survey_instructions": "Оцените каждый вопрос по 5-балльной шкале, где 1 означает, что Вы совсем недовольны, и 5 - полностью довольны.",
   "Thank_you_for_your_feedback": "Спасибо за Ваш отзыв",
   "Thanks_We_ll_get_back_to_you_soon": "Спасибо! Мы свяжемся с вами в ближайшее время.",
-  "transcript_sent": "Расшифровка отправлена",
+  "transcript_sent": "Переписка отправлена",
   "Type_your_email": "Введите адрес электронной почты",
-  "Type_your_message": "Текст сообщения",
+  "Type_your_message": "Введите своё сообщение",
   "Type_your_name": "Введите свое имя",
   "User_joined": "Пользователь присоединился",
   "User_left": "Пользователь вышел",
diff --git a/packages/rocketchat-livechat/.app/package.json b/packages/rocketchat-livechat/.app/package.json
index 9c8601e0a693..63624d815bd0 100644
--- a/packages/rocketchat-livechat/.app/package.json
+++ b/packages/rocketchat-livechat/.app/package.json
@@ -20,12 +20,12 @@
     "email": "support@rocket.chat"
   },
   "dependencies": {
-    "autolinker": "^1.4.4",
+    "autolinker": "^1.6.0",
     "jquery": "^3.2.1",
     "babel-runtime": "^6.26.0",
     "bcrypt": "^1.0.3",
-    "moment": "^2.19.1",
-    "toastr": "^2.1.2",
+    "moment": "^2.20.1",
+    "toastr": "^2.1.4",
     "underscore": "^1.8.3",
     "underscore.string": "^3.3.4"
   }
diff --git a/packages/rocketchat-livechat/app/package-lock.json b/packages/rocketchat-livechat/app/package-lock.json
index ca28ccbd474c..5fef930bdf66 100644
--- a/packages/rocketchat-livechat/app/package-lock.json
+++ b/packages/rocketchat-livechat/app/package-lock.json
@@ -86,7 +86,7 @@
     "bcrypt": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz",
-      "integrity": "sha1-sC3cbAtS6ha40883XVoy54DatUg=",
+      "integrity": "sha512-pRyDdo73C8Nim3jwFJ7DWe3TZCgwDfWZ6nHS5LSdU77kWbj1frruvdndP02AOavtD4y8v6Fp2dolbHgp4SDrfg==",
       "requires": {
         "nan": "2.6.2",
         "node-pre-gyp": "0.6.36"
@@ -314,7 +314,7 @@
     "glob": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
       "requires": {
         "fs.realpath": "1.0.0",
         "inflight": "1.0.6",
@@ -469,7 +469,7 @@
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "requires": {
         "brace-expansion": "1.1.8"
       }
@@ -488,9 +488,9 @@
       }
     },
     "moment": {
-      "version": "2.19.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.1.tgz",
-      "integrity": "sha1-VtoaLRy/AdOLfhr8McELz6GSkWc="
+      "version": "2.20.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz",
+      "integrity": "sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg=="
     },
     "ms": {
       "version": "2.0.0",
@@ -530,7 +530,7 @@
     "npmlog": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "requires": {
         "are-we-there-yet": "1.1.4",
         "console-control-strings": "1.1.0",
@@ -626,7 +626,7 @@
     "readable-stream": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-      "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
+      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
       "requires": {
         "core-util-is": "1.0.2",
         "inherits": "2.0.3",
@@ -640,7 +640,7 @@
     "regenerator-runtime": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-      "integrity": "sha1-flT+W1zNXWYk6mJVw0c74JC4AuE="
+      "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
     },
     "request": {
       "version": "2.83.0",
@@ -682,12 +682,12 @@
     "safe-buffer": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
     },
     "semver": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-      "integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4="
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
     },
     "set-blocking": {
       "version": "2.0.0",
@@ -738,11 +738,18 @@
     },
     "string_decoder": {
       "version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
       "requires": {
         "safe-buffer": "5.1.1"
       }
     },
+    "string_decoder": {
+      "version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+      "requires": {
+        "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
+      }
+    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -787,9 +794,12 @@
       }
     },
     "toastr": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/toastr/-/toastr-2.1.2.tgz",
-      "integrity": "sha1-/WkGaudXilszV3JfycfDNem2gd8="
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/toastr/-/toastr-2.1.4.tgz",
+      "integrity": "sha1-i0O+ZPudDEFIcURvLbjoyk6V8YE=",
+      "requires": {
+        "jquery": "3.2.1"
+      }
     },
     "tough-cookie": {
       "version": "2.3.3",
@@ -840,7 +850,7 @@
     "uuid": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-      "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ="
+      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
     },
     "verror": {
       "version": "1.10.0",
@@ -855,7 +865,7 @@
     "wide-align": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-      "integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=",
+      "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
       "requires": {
         "string-width": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"
       }
diff --git a/packages/rocketchat-sandstorm/server/lib.js b/packages/rocketchat-sandstorm/server/lib.js
index 325e90ea629e..fe002e07756f 100644
--- a/packages/rocketchat-sandstorm/server/lib.js
+++ b/packages/rocketchat-sandstorm/server/lib.js
@@ -5,8 +5,8 @@ RocketChat.Sandstorm = {};
 
 if (process.env.SANDSTORM === '1') {
 	const Future = Npm.require('fibers/future');
-	const Capnp = Npm.require('capnp');
-	const SandstormHttpBridge = Npm.require('sandstorm/sandstorm-http-bridge.capnp').SandstormHttpBridge;
+	const Capnp = Npm.require('/node_modules/capnp.js');
+	const SandstormHttpBridge = Capnp.importSystem('sandstorm/sandstorm-http-bridge.capnp').SandstormHttpBridge;
 
 	let capnpConnection = null;
 	let httpBridge = null;
diff --git a/packages/rocketchat-sandstorm/server/powerbox.js b/packages/rocketchat-sandstorm/server/powerbox.js
index 87e8cb86f9a6..c1f2d28b0590 100644
--- a/packages/rocketchat-sandstorm/server/powerbox.js
+++ b/packages/rocketchat-sandstorm/server/powerbox.js
@@ -3,9 +3,9 @@
 RocketChat.Sandstorm.offerUiView = function() {};
 
 if (process.env.SANDSTORM === '1') {
-	const Capnp = Npm.require('capnp');
-	const Powerbox = Npm.require('sandstorm/powerbox.capnp');
-	const Grain = Npm.require('sandstorm/grain.capnp');
+	const Capnp = Npm.require('/node_modules/capnp.js');
+	const Powerbox = Capnp.importSystem('sandstorm/powerbox.capnp');
+	const Grain = Capnp.importSystem('sandstorm/grain.capnp');
 
 	RocketChat.Sandstorm.offerUiView = function(token, serializedDescriptor, sessionId) {
 		const httpBridge = getHttpBridge();
diff --git a/packages/rocketchat-emoji/client/emojiPicker.css b/packages/rocketchat-theme/client/imports/components/emojiPicker.css
similarity index 85%
rename from packages/rocketchat-emoji/client/emojiPicker.css
rename to packages/rocketchat-theme/client/imports/components/emojiPicker.css
index 0f301babf00c..c0e7050ecbf0 100644
--- a/packages/rocketchat-emoji/client/emojiPicker.css
+++ b/packages/rocketchat-theme/client/imports/components/emojiPicker.css
@@ -3,6 +3,12 @@
 
 	font-size: 18px;
 
+	&--disabled {
+		cursor: default;
+
+		color: var(--message-box-container-border-color);
+	}
+
 	&::before {
 		transition: transform 0.2s ease;
 	}
@@ -223,3 +229,31 @@
 		}
 	}
 }
+
+.emoji {
+	position: relative;
+
+	display: inline-block;
+	overflow: hidden;
+
+	width: 22px;
+	height: 22px;
+	margin: 0 0.15em;
+
+	vertical-align: middle;
+	white-space: nowrap;
+	text-indent: 100%;
+
+	background-repeat: no-repeat;
+	background-position: center;
+	background-size: cover;
+
+	font-size: inherit;
+	line-height: normal;
+	image-rendering: auto;
+}
+
+.emoji.big {
+	width: 44px !important;
+	height: 44px !important;
+}
diff --git a/packages/rocketchat-theme/client/imports/components/messages.css b/packages/rocketchat-theme/client/imports/components/messages.css
index 0d22af91ec84..930eabbc87e9 100644
--- a/packages/rocketchat-theme/client/imports/components/messages.css
+++ b/packages/rocketchat-theme/client/imports/components/messages.css
@@ -5,7 +5,7 @@
 
 	display: none;
 
-	color: #6c727a;
+	color: var(--color-darkest);
 
 	font-size: 1rem;
 
@@ -79,10 +79,6 @@
 	padding: 0;
 }
 
-.first-unread .message-actions {
-	top: 18px;
-}
-
 .rtl .message-actions {
 	right: auto;
 	left: 2px;
diff --git a/packages/rocketchat-theme/client/imports/components/modal.css b/packages/rocketchat-theme/client/imports/components/modal.css
index 6f6a8701883a..2242466f7517 100644
--- a/packages/rocketchat-theme/client/imports/components/modal.css
+++ b/packages/rocketchat-theme/client/imports/components/modal.css
@@ -57,11 +57,11 @@
 		padding: 16px;
 
 		animation: dropdown-show 0.1s cubic-bezier(0.45, 0.05, 0.55, 0.95);
-		align-items: center;
+		align-items: stretch;
 	}
 
 	&__content-icon {
-		margin: 1.2rem;
+		margin: 1.2rem auto;
 
 		font-size: 6rem;
 
@@ -116,6 +116,11 @@
 		& > .rc-button {
 			margin: 0;
 		}
+
+		&--empty {
+			padding: 0;
+			background: transparent;
+		}
 	}
 }
 
diff --git a/packages/rocketchat-theme/client/imports/components/modal/create-channel.css b/packages/rocketchat-theme/client/imports/components/modal/create-channel.css
index e3bcb5cdf0a1..c311719344ca 100644
--- a/packages/rocketchat-theme/client/imports/components/modal/create-channel.css
+++ b/packages/rocketchat-theme/client/imports/components/modal/create-channel.css
@@ -7,9 +7,14 @@
 	animation-name: fadeIn;
 	animation-duration: 1s;
 
+	&__wrapper {
+		overflow-x: hidden;
+		overflow-y: auto;
+	}
+
 	&__header,
 	&__switches,
-	&__inputs,
+	&__inputs:not(:last-child),
 	& .rc-input:not(:last-child) {
 		margin-bottom: var(--create-channel-gap-between-elements);
 	}
@@ -30,11 +35,6 @@
 		font-size: var(--create-channel-description-text-size);
 	}
 
-	&__content {
-		overflow-x: hidden;
-		overflow-y: auto;
-	}
-
 	&__switches {
 		display: flex;
 		flex-wrap: wrap;
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index cf88ae264c92..779e02e6c689 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -29,6 +29,10 @@
 				margin: 0 auto;
 			}
 
+			&__room-type {
+				height: var(--sidebar-item-big-height);
+			}
+
 			&__user-thumb {
 				width: var(--sidebar-item-big-thumb-size);
 				height: var(--sidebar-item-big-thumb-size);
@@ -36,6 +40,7 @@
 
 			&__message {
 				flex-direction: column;
+				height: var(--sidebar-item-big-thumb-size);
 
 				&-top,
 				&-bottom {
@@ -44,10 +49,6 @@
 					width: 100%;
 					align-items: center;
 				}
-
-				&-bottom {
-					margin-top: 6px;
-				}
 			}
 		}
 	}
@@ -71,7 +72,8 @@
 	border-radius: var(--sidebar-item-radius);
 
 	background-color: var(--sidebar-item-background);
-	align-items: center;
+
+	align-items: stretch;
 
 	&:hover {
 		background-color: var(--sidebar-item-hover-background);
@@ -110,6 +112,19 @@
 	&__icon {
 		font-size: 1rem;
 		fill: currentColor;
+		display: flex;
+		align-items: center;
+	}
+
+	&__room-type {
+		left: 4px;
+		font-size: 1rem;
+		fill: currentColor;
+		display: flex;
+		align-items: center;
+		position: absolute;
+		height: var(--sidebar-item-height);
+		color: var(--sidebar-item-text-color);
 	}
 
 	&__user-thumb {
@@ -121,7 +136,7 @@
 		position: absolute;
 
 		top: 50%;
-		left: 10px;
+		left: 8px;
 
 		width: var(--sidebar-item-user-status-size);
 		height: var(--sidebar-item-user-status-size);
@@ -180,15 +195,10 @@
 
 		margin: 0 -3px;
 		align-items: center;
-		justify-content: center;
+		justify-content: space-between;
 
 		&-top {
 			overflow: hidden;
-			flex: 1;
-		}
-
-		&-bottom {
-			flex: 0 0;
 		}
 	}
 
@@ -217,10 +227,20 @@
 		text-overflow: ellipsis;
 
 		font-size: 12px;
-		line-height: 12px;
+		line-height: normal;
+
+		& .emojione {
+			width: 13px !important;
+			min-width: 13px;
+			height: 13px !important;
+			min-height: 13px;
+		}
 
-		& > p, & code, & pre {
+		& > p,
+		& code,
+		& pre {
 			display: inline;
+
 			white-space: unset;
 		}
 
@@ -261,30 +281,49 @@
 	}
 }
 
-.rtl .sidebar-item__menu {
-	right: auto;
-	left: 0;
-}
+.rtl .sidebar-item {
+	&__menu {
+		right: auto;
+		left: 0;
+	}
+
+	&__user-status {
+		right: 8px;
+		left: initial;
+	}
 
-.rtl .sidebar-item__user-status {
-	right: 4px;
-	left: initial;
+	&__room-type {
+		right: 4px;
+		left: initial;
+	}
 }
 
 @media (width <= 400px) {
 	.sidebar-item {
-		padding: 0 calc(var(--sidebar-small-default-padding) - 8px);
+		padding: 0 0 0 var(--sidebar-small-default-padding);
 
 		& .badge {
 			margin: 0 0 0 3px;
 		}
 
 		&__user-status {
+			left: 4px;
+		}
+
+		&__room-type {
 			left: 0;
 		}
 	}
 
-	.rtl .sidebar-item__user-status {
-		right: 0;
+	.rtl .sidebar-item {
+		padding: 0 var(--sidebar-small-default-padding) 0 0;
+
+		&__user-status {
+			right: 4px;
+		}
+
+		&__room-type {
+			right: 0;
+		}
 	}
 }
diff --git a/packages/rocketchat-theme/client/imports/forms/select-avatar.css b/packages/rocketchat-theme/client/imports/forms/select-avatar.css
index 2a9bbbcc7c29..bb61ffdfb20d 100644
--- a/packages/rocketchat-theme/client/imports/forms/select-avatar.css
+++ b/packages/rocketchat-theme/client/imports/forms/select-avatar.css
@@ -31,6 +31,10 @@
 			margin-right: 10px;
 			margin-bottom: 10px;
 
+			&.disabled {
+				opacity: 0.4;
+			}
+
 			cursor: pointer;
 
 			& .avatar {
diff --git a/packages/rocketchat-theme/client/imports/forms/tags.css b/packages/rocketchat-theme/client/imports/forms/tags.css
index 6b636573afac..438243035323 100644
--- a/packages/rocketchat-theme/client/imports/forms/tags.css
+++ b/packages/rocketchat-theme/client/imports/forms/tags.css
@@ -46,6 +46,7 @@
 	&__input {
 		margin: 0.25rem;
 		padding: 0.35rem 0.5rem;
+		flex: 1;
 
 		border: 0;
 
diff --git a/packages/rocketchat-theme/client/imports/general/base.css b/packages/rocketchat-theme/client/imports/general/base.css
index c0d5e79e69b9..dd10edadfd98 100644
--- a/packages/rocketchat-theme/client/imports/general/base.css
+++ b/packages/rocketchat-theme/client/imports/general/base.css
@@ -130,24 +130,31 @@ button {
 		content: "";
 
 		background: var(--rc-color-error);
+
+		pointer-events: none;
 	}
 
 	&::after {
 		position: absolute;
 		z-index: 2;
-		top: -10px;
+		top: -6px;
 		right: 0;
 
-		padding: 0 1rem;
+		padding: 0 5px;
+		padding-bottom: 2px;
 
 		content: attr(data-unread-text);
 		text-align: right;
-		text-transform: uppercase;
+		text-transform: lowercase;
 
 		color: var(--rc-color-error);
 		background: #ffffff;
 
 		font-size: 10px;
+
+		pointer-events: none;
+		line-height: 10px;
+		border-radius: 2px;
 	}
 }
 
@@ -162,7 +169,7 @@ button {
 		}
 
 		&::after {
-			top: -30px;
+			top: -26px;
 		}
 	}
 }
diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index a04728e8e675..0cb6da9e5778 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -1728,6 +1728,7 @@
 	height: 40px;
 	padding: 0 20px;
 
+	cursor: pointer;
 	text-align: center;
 	white-space: nowrap;
 	text-overflow: ellipsis;
@@ -1739,7 +1740,7 @@
 	line-height: 40px;
 
 	& ~ .container-bars {
-		top: 95px;
+		top: 45px;
 	}
 }
 
@@ -2145,8 +2146,8 @@
 
 .rc-old .container-bars {
 	position: absolute;
-	z-index: 1;
-	top: 4px; /* --header-height */
+	z-index: 2;
+	top: 5px; /* --header-height */
 	right: 10px;
 	left: 10px;
 
@@ -2879,7 +2880,7 @@
 	}
 
 	&.new-day {
-		margin-top: 60px;
+		margin-top: 40px;
 
 		&::before {
 			position: absolute;
@@ -2897,6 +2898,8 @@
 
 			font-size: 12px;
 			font-weight: 600;
+
+			pointer-events: none;
 		}
 
 		&::after {
@@ -2911,6 +2914,8 @@
 			content: " ";
 
 			border-width: 1px 0 0;
+
+			pointer-events: none;
 		}
 	}
 
@@ -3093,6 +3098,7 @@
 		&:hover .edited {
 			display: none;
 		}
+
 	}
 
 	&.system .body {
@@ -4529,7 +4535,7 @@ body:not(.is-cordova) {
 	}
 }
 
-.rc-old .social-login {
+.rc-old .oauth-login {
 	margin-bottom: 16px;
 	margin-left: -4px;
 	flex-wrap: wrap;
@@ -5580,7 +5586,7 @@ body:not(.is-cordova) {
 		}
 	}
 
-	.rc-old .social-login {
+	.rc-old .oauth-login {
 		margin-bottom: 6px;
 	}
 
diff --git a/packages/rocketchat-theme/client/main.css b/packages/rocketchat-theme/client/main.css
index 3c9f5af48013..9b5c2bbef76d 100644
--- a/packages/rocketchat-theme/client/main.css
+++ b/packages/rocketchat-theme/client/main.css
@@ -34,6 +34,7 @@
 @import 'imports/components/slider.css';
 @import 'imports/components/chip.css';
 @import 'imports/components/messages.css';
+@import 'imports/components/emojiPicker.css';
 
 /* Modal */
 @import 'imports/components/modal/full-modal.css';
diff --git a/packages/rocketchat-ui-account/client/accountProfile.html b/packages/rocketchat-ui-account/client/accountProfile.html
index 83854cec4fd6..0e29c9e56cc0 100644
--- a/packages/rocketchat-ui-account/client/accountProfile.html
+++ b/packages/rocketchat-ui-account/client/accountProfile.html
@@ -47,9 +47,23 @@ <h2 style="flex: 1 1; white-space: nowrap;">{{_ "Profile"}}</h2>
 													</label>
 													<input type="file" name="" value="" id="upload-avatar" style="display:none;">
 												</div>
+												<div class="rc-select-avatar__list-item rc-tooltip js-select-avatar-url {{selectUrl}}"  aria-label="{{_ "Use_url_for_avatar" }}">
+													<label class="rc-select-avatar__upload-label avatar">
+														{{> icon block="rc-select-avatar__upload-icon" icon="permalink"}}
+													</label>
+												</div>
 												{{#each service in services}}
 													{{ > avatarService service}}
 												{{/each}}
+												<div class="rc-input">
+
+													<label class="rc-input__label">
+														<div class="rc-input__title">{{_ "Use_url_for_avatar"}}</div>
+														<div class="rc-input__wrapper">
+															<input name="avatar_url" class="rc-input__element js-avatar-url-input" placeholder="{{_ "Use_url_for_avatar"}}">
+														</div>
+													</label>
+												</div>
 											</div>
 										{{else}}
 											<div class="rc-select-avatar__loading">
diff --git a/packages/rocketchat-ui-account/client/accountProfile.js b/packages/rocketchat-ui-account/client/accountProfile.js
index 76418e2181cf..0904b661e006 100644
--- a/packages/rocketchat-ui-account/client/accountProfile.js
+++ b/packages/rocketchat-ui-account/client/accountProfile.js
@@ -51,6 +51,9 @@ Template.accountProfile.helpers({
 	nameInvalid() {
 		return !validateName(Template.instance().realname.get());
 	},
+	selectUrl() {
+		return Template.instance().url.get().trim() ? '' : 'disabled';
+	},
 	services() {
 		const suggestions = Template.instance().suggestions.get();
 		return ['gravatar', 'facebook', 'google', 'github', 'gitlab', 'linkedIn', 'twitter']
@@ -153,6 +156,7 @@ Template.accountProfile.onCreated(function() {
 	self.password = new ReactiveVar;
 	self.suggestions = new ReactiveVar;
 	self.avatar = new ReactiveVar;
+	self.url = new ReactiveVar('');
 	self.usernameAvaliable = new ReactiveVar(true);
 
 	RocketChat.Notifications.onLogged('updateAvatar', () => self.avatar.set());
@@ -185,7 +189,12 @@ Template.accountProfile.onCreated(function() {
 	this.save = function(typedPassword, cb) {
 		const avatar = self.avatar.get();
 		if (avatar) {
-			Meteor.call('setAvatarFromService', avatar.blob, avatar.contentType, avatar.service, function(err) {
+			const params = [avatar.blob];
+
+			params.push(avatar.contentType);
+
+			params.push(avatar.service);
+			Meteor.call('setAvatarFromService', ...params, function(err) {
 				if (err && err.details && err.details.timeToReset) {
 					toastr.error(t('error-too-many-requests', {
 						seconds: parseInt(err.details.timeToReset / 1000)
@@ -295,6 +304,23 @@ Template.accountProfile.events({
 			}
 		});
 	},
+	'click .js-select-avatar-url'(e, instance, ...args) {
+		const url = instance.url.get().trim();
+		if (!url) {
+			return;
+		}
+		setAvatar.apply({
+			suggestion: {
+				service: 'url',
+				blob: url,
+				contentType: ''
+			}
+		}, [e, instance, ...args]);
+	},
+	'input .js-avatar-url-input'(e, instance) {
+		const text = e.target.value;
+		instance.url.set(text);
+	},
 	'click .js-select-avatar'(...args) {
 		this.suggestion ? setAvatar.apply(this, args) : loginWith.apply(this, args);
 	},
diff --git a/packages/rocketchat-ui-account/client/avatar/avatar.js b/packages/rocketchat-ui-account/client/avatar/avatar.js
index 10bd7de73310..555bf769cd7e 100644
--- a/packages/rocketchat-ui-account/client/avatar/avatar.js
+++ b/packages/rocketchat-ui-account/client/avatar/avatar.js
@@ -11,6 +11,11 @@ Template.avatar.helpers({
 				return;
 			}
 			Session.get(`avatar_random_${ username }`);
+
+			if (this.roomIcon) {
+				username = `@${ username }`;
+			}
+
 			url = getAvatarUrlFromUsername(username);
 		}
 		return `background-image:url(${ url });`;
diff --git a/packages/rocketchat-ui-login/client/login/services.html b/packages/rocketchat-ui-login/client/login/services.html
index 7eb0c3dfebbc..90e3f3d024b2 100644
--- a/packages/rocketchat-ui-login/client/login/services.html
+++ b/packages/rocketchat-ui-login/client/login/services.html
@@ -1,6 +1,6 @@
 <template name='loginServices'>
 	{{#if loginService.length}}
-		<div class="social-login buttons-group">
+		<div class="oauth-login buttons-group">
 			{{#each loginService}}
 				<button type="button" class="button external-login {{service.service}}" title="{{displayName}}" style="{{#if service.buttonColor}}background-color:{{service.buttonColor}};{{/if}}{{#if service.buttonLabelColor}}color:{{service.buttonLabelColor}};{{/if}}"><i class="icon-{{icon}} service-icon"></i><i class="icon-spin animate-spin loading-icon hidden"></i><span>{{service.buttonLabelText}}</span></button>
 			{{/each}}
diff --git a/packages/rocketchat-ui-message/client/message.html b/packages/rocketchat-ui-message/client/message.html
index e871bc1b2321..9beba25aa67e 100644
--- a/packages/rocketchat-ui-message/client/message.html
+++ b/packages/rocketchat-ui-message/client/message.html
@@ -51,6 +51,9 @@
 			{{/if}}
 		</span>
 		<div class="body color-primary-font-color {{system true}}" dir="auto" data-unread-text="{{_ "Unread_Messages"}}">
+			{{#if isSnippet}}
+				<div class="snippet-name">{{_ "Snippet_name"}}: {{snippetName}}</div>
+			{{/if}}
 			{{{body}}}
 			{{#if hasOembed}}
 				{{#each urls}}
diff --git a/packages/rocketchat-ui-message/client/message.js b/packages/rocketchat-ui-message/client/message.js
index d04782670e15..8938fa772141 100644
--- a/packages/rocketchat-ui-message/client/message.js
+++ b/packages/rocketchat-ui-message/client/message.js
@@ -281,6 +281,9 @@ Template.message.helpers({
 		}
 
 		return RocketChat.MessageAction.getButtons(Template.currentData(), context, messageGroup);
+	},
+	isSnippet() {
+		return this.actionContext === 'snippeted';
 	}
 });
 
diff --git a/packages/rocketchat-ui-message/client/messageBox.html b/packages/rocketchat-ui-message/client/messageBox.html
index 9a8ff55e5bb1..4f4a0039c063 100644
--- a/packages/rocketchat-ui-message/client/messageBox.html
+++ b/packages/rocketchat-ui-message/client/messageBox.html
@@ -22,7 +22,7 @@
 			{{#if allowedToSend}}
 				{{> messagePopupConfig getPopupConfig}}
 				<label class="rc-message-box__container">
-					<div class="rc-message-box__icon emoji-picker-icon">
+					<div class="rc-message-box__icon emoji-picker-icon {{#unless isEmojiEnable}}emoji-picker-icon--disabled{{/unless}}">
 						{{> icon block="rc-input__icon-svg" icon="emoji"}}
 					</div>
 					<textarea autofocus name="msg" maxlength="{{maxMessageLength}}" placeholder="{{_ 'Message'}}" rows="1" class="rc-message-box__textarea js-input-message autogrow-short"></textarea>
diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
index 9c857c5e855b..27dad816708c 100644
--- a/packages/rocketchat-ui-message/client/messageBox.js
+++ b/packages/rocketchat-ui-message/client/messageBox.js
@@ -266,6 +266,9 @@ Template.messageBox.helpers({
 	},
 	embeddedVersion() {
 		return RocketChat.Layout.isEmbedded();
+	},
+	isEmojiEnable() {
+		return RocketChat.getUserPreference(Meteor.user(), 'useEmojis');
 	}
 });
 
diff --git a/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js b/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js
index 36e244bcd970..01cc37dd6588 100644
--- a/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js
+++ b/packages/rocketchat-ui-message/client/popup/messagePopupConfig.js
@@ -311,6 +311,10 @@ Template.messagePopupConfig.helpers({
 				getFilter(collection, filter) {
 					const key = `:${ filter }`;
 
+					if (!RocketChat.getUserPreference(Meteor.user(), 'useEmojis')) {
+						return [];
+					}
+
 					if (!RocketChat.emoji.packages.emojione || RocketChat.emoji.packages.emojione.asciiList[key]) {
 						return [];
 					}
diff --git a/packages/rocketchat-ui-message/startup/messageBoxActions.js b/packages/rocketchat-ui-message/startup/messageBoxActions.js
index 32d230fc2313..bf8057dd349d 100644
--- a/packages/rocketchat-ui-message/startup/messageBoxActions.js
+++ b/packages/rocketchat-ui-message/startup/messageBoxActions.js
@@ -52,20 +52,17 @@ RocketChat.messageBox.actions.add('Add_files_from', 'Computer', {
 	condition: () => RocketChat.settings.get('FileUpload_Enabled'),
 	action({event}) {
 		event.preventDefault();
-		const input = document.createElement('input');
-		input.style.display = 'none';
-		input.type = 'file';
-		input.setAttribute('multiple', 'multiple');
-		document.body.appendChild(input);
-
-		input.click();
+		const $input = $(document.createElement('input'));
+		$input.css('display', 'none');
+		$input.attr({
+			id: 'fileupload-input',
+			type: 'file',
+			multiple: 'multiple'
+		});
 
-		// Simple hack for cordova aka codegueira
-		if (typeof device !== 'undefined' && device.platform && device.platform.toLocaleLowerCase() === 'ios') {
-			input.click();
-		}
+		$(document.body).append($input);
 
-		input.addEventListener('change', function(e) {
+		$input.one('change', function(e) {
 			const filesToUpload = [...e.target.files].map(file => {
 				Object.defineProperty(file, 'type', {
 					value: mime.lookup(file.name)
@@ -76,9 +73,15 @@ RocketChat.messageBox.actions.add('Add_files_from', 'Computer', {
 				};
 			});
 			fileUpload(filesToUpload);
-		}, {once: true});
+			$input.remove();
+		});
+
+		$input.click();
 
-		input.remove();
+		// Simple hack for cordova aka codegueira
+		if ((typeof device !== 'undefined' && device.platform && device.platform.toLocaleLowerCase() === 'ios') || navigator.userAgent.match(/(iPad|iPhone|iPod)/g)) {
+			$input.click();
+		}
 	}
 });
 
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.html b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
index ca993384ec4f..53746c6f7392 100644
--- a/packages/rocketchat-ui-sidenav/client/sidebarItem.html
+++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
@@ -3,20 +3,17 @@
 		{{#if statusClass}}
 			<div class="sidebar-item__user-status sidebar-item__user-status--{{statusClass}}"></div>
 		{{/if}}
+		{{#if icon}}
+			<div class="{{#if isRoom}}sidebar-item__room-type{{else}}sidebar-item__icon{{/if}}">
+				{{> icon block="sidebar-item__icon" icon=icon}}
+			</div>
+		{{/if}}
 		<a class="sidebar-item__link" href="{{#if route}}{{route}}{{else}}{{pathFor pathSection group=pathGroup}}{{/if}}" title="{{name}}">
-			{{#if icon}}
-				<div class="sidebar-item__picture" style="{{#if isRoom}}{{colorStyle}}{{/if}}">
-					{{> icon block="sidebar-item__icon" icon=icon}}
+			<div class="sidebar-item__picture">
+				<div class="sidebar-item__user-thumb">
+					{{> avatar username=username roomIcon=icon}}
 				</div>
-			{{else}}
-				{{#if avatar}}
-					<div class="sidebar-item__picture">
-						<div class="sidebar-item__user-thumb">
-							{{> avatar username=username}}
-						</div>
-					</div>
-				{{/if}}
-			{{/if}}
+			</div>
 			<div class="sidebar-item__body">
 				<div class="sidebar-item__message">
 					<div class="sidebar-item__message-top">
diff --git a/packages/rocketchat-ui/client/lib/RoomManager.js b/packages/rocketchat-ui/client/lib/RoomManager.js
index 46c8805cbb0e..c50521198617 100644
--- a/packages/rocketchat-ui/client/lib/RoomManager.js
+++ b/packages/rocketchat-ui/client/lib/RoomManager.js
@@ -25,14 +25,10 @@ const RoomManager = new function() {
 						return RocketChat.roomTypes.findRoom(type, name, user);
 					});
 
-					if (room == null) {
-						record.ready = true;
-					} else {
+					if (room != null) {
 						openedRooms[typeName].rid = room._id;
 
 						RoomHistoryManager.getMoreIfIsEmpty(room._id);
-						record.ready = RoomHistoryManager.isLoading(room._id) === false;
-						Dep.changed();
 
 						if (openedRooms[typeName].streamActive !== true) {
 							openedRooms[typeName].streamActive = true;
@@ -69,7 +65,10 @@ const RoomManager = new function() {
 							RocketChat.Notifications.onRoom(openedRooms[typeName].rid, 'deleteMessage', onDeleteMessageStream); // eslint-disable-line no-use-before-define
 						}
 					}
-					return Dep.changed();
+					Meteor.defer(() => {
+						record.ready = true;
+						Dep.changed();
+					});
 				});
 			});
 		}
diff --git a/packages/rocketchat-ui/client/lib/chatMessages.js b/packages/rocketchat-ui/client/lib/chatMessages.js
index 8fa06d14def9..6a416132355f 100644
--- a/packages/rocketchat-ui/client/lib/chatMessages.js
+++ b/packages/rocketchat-ui/client/lib/chatMessages.js
@@ -255,6 +255,9 @@ this.ChatMessages = class ChatMessages {
 				}
 
 				Meteor.call('sendMessage', msgObject);
+
+				localStorage.setItem(`messagebox_${ rid }`, '');
+
 				return done();
 			});
 
diff --git a/packages/rocketchat-ui/client/lib/fileUpload.js b/packages/rocketchat-ui/client/lib/fileUpload.js
index a95ac12c8d17..7b8cc28efaba 100644
--- a/packages/rocketchat-ui/client/lib/fileUpload.js
+++ b/packages/rocketchat-ui/client/lib/fileUpload.js
@@ -150,7 +150,8 @@ fileUpload = function(filesToUpload) {
 				closeOnCancel: false,
 				confirmButtonText: t('Send'),
 				cancelButtonText: t('Cancel'),
-				html: true
+				html: true,
+				onRendered: () => $('#file-name').focus()
 			}, function(isConfirm) {
 
 				const record = {
diff --git a/packages/rocketchat-ui/client/lib/readMessages.js b/packages/rocketchat-ui/client/lib/readMessages.js
index 8fb246850e93..e03ee4afbc63 100644
--- a/packages/rocketchat-ui/client/lib/readMessages.js
+++ b/packages/rocketchat-ui/client/lib/readMessages.js
@@ -180,6 +180,7 @@ const readMessage = new class {
 
 			if (firstUnreadRecord != null) {
 				room.unreadFirstId = firstUnreadRecord._id;
+				$(room.dom).find(`.message.first-unread:not(#${ firstUnreadRecord._id })`).removeClass('first-unread');
 				$(room.dom).find(`.message#${ firstUnreadRecord._id }`).addClass('first-unread');
 			}
 		}
diff --git a/packages/rocketchat-ui/client/views/app/createChannel.html b/packages/rocketchat-ui/client/views/app/createChannel.html
index be4ba848d3e2..ebb65ef3ae8c 100644
--- a/packages/rocketchat-ui/client/views/app/createChannel.html
+++ b/packages/rocketchat-ui/client/views/app/createChannel.html
@@ -5,7 +5,7 @@
 				{{> Template.dynamic template=roomType.creationTemplate }}
 			</div>
 		{{/each}}
-		<div class="room-type-creation">
+		<div class="create-channel__wrapper">
 			<header class="create-channel__header">
 				<h1 class="create-channel__title">{{_ "Create_A_New_Channel"}}</h1>
 				<p class="create-channel__description">{{_ "Channels_are_where_your_team_communicate"}}</p>
diff --git a/packages/rocketchat-ui/client/views/app/createChannel.js b/packages/rocketchat-ui/client/views/app/createChannel.js
index 2a2363ea6987..8d79b12af7b3 100644
--- a/packages/rocketchat-ui/client/views/app/createChannel.js
+++ b/packages/rocketchat-ui/client/views/app/createChannel.js
@@ -146,6 +146,10 @@ Template.createChannel.events({
 		const {username} = Blaze.getData(target);
 		t.selectedUsers.set(t.selectedUsers.get().filter(user => user.username !== username));
 	},
+	'click .rc-tags__tag-icon'(e, t) {
+		const {username} = Blaze.getData(t.find('.rc-tags__tag-text'));
+		t.selectedUsers.set(t.selectedUsers.get().filter(user => user.username !== username));
+	},
 	'change [name=setTokensRequired]'(e, t) {
 		t.tokensRequired.set(e.currentTarget.checked);
 		t.change();
diff --git a/packages/rocketchat-ui/client/views/app/modal.html b/packages/rocketchat-ui/client/views/app/modal.html
index 8c6b18a2e331..98ba88a958cd 100644
--- a/packages/rocketchat-ui/client/views/app/modal.html
+++ b/packages/rocketchat-ui/client/views/app/modal.html
@@ -38,9 +38,9 @@ <h1 class="rc-modal__title">{{title}}</h1>
 						<div class="rc-modal__content-error"></div>
 					{{/if}}
 				</main>
-				<div class="rc-modal__footer">
+				<div class="rc-modal__footer {{#unless showFooter}}rc-modal__footer--empty{{/unless}}">
 					<input class="rc-button rc-button--nude js-close {{#unless showCancelButton}}rc-button--invisible{{/unless}}" type="submit" data-button="cancel" value="{{cancelButtonText}}">
-					<input style="background-color:{{confirmButtonColor}}" class="rc-button rc-button--primary js-confirm" type="submit" data-button="create" value="{{confirmButtonText}}">
+					<input style="background-color:{{confirmButtonColor}}" class="rc-button rc-button--primary js-confirm {{#unless showConfirmButton}}rc-button--invisible{{/unless}}" type="submit" data-button="create" value="{{confirmButtonText}}">
 				</div>
 			{{/if}}
 		</div>
diff --git a/packages/rocketchat-ui/client/views/app/modal.js b/packages/rocketchat-ui/client/views/app/modal.js
index 45871b51fd06..1d2c05478f64 100644
--- a/packages/rocketchat-ui/client/views/app/modal.js
+++ b/packages/rocketchat-ui/client/views/app/modal.js
@@ -5,6 +5,9 @@ this.modal = {
 	open(config = {}, fn) {
 		config.confirmButtonText = config.confirmButtonText || t('Send');
 		config.cancelButtonText = config.cancelButtonText || t('Cancel');
+		config.closeOnConfirm = config.closeOnConfirm == null ? true : config.closeOnConfirm;
+		config.showConfirmButton = config.showConfirmButton == null ? true : config.showConfirmButton;
+		config.showFooter = config.showConfirmButton === true || config.showCancelButton === true;
 
 		if (config.type === 'input') {
 			config.input = true;
@@ -46,6 +49,23 @@ this.modal = {
 		const errorEl = document.querySelector('.rc-modal__content-error');
 		errorEl.innerHTML = text;
 		errorEl.style.display = 'block';
+	},
+	onKeydown(e) {
+		if (e.key === 'Enter') {
+			e.preventDefault();
+			e.stopPropagation();
+
+			if (modal.config.input) {
+				return modal.confirm($('.js-modal-input').val());
+			}
+
+			modal.confirm(true);
+		} else if (e.key === 'Escape') {
+			e.preventDefault();
+			e.stopPropagation();
+
+			modal.close();
+		}
 	}
 };
 
@@ -63,29 +83,29 @@ Template.rc_modal.onRendered(function() {
 		this.data.onRendered();
 	}
 
-	document.addEventListener('keydown', function(e) {
-		e.preventDefault();
-		e.stopPropagation();
+	if (this.data.input) {
+		$('.js-modal-input').focus();
+	}
 
-		if (e.key === 'Enter') {
-			modal.confirm(true);
-		}
+	document.addEventListener('keydown', modal.onKeydown);
+});
 
-		if (e.key === 'Escape') {
-			modal.close();
-		}
-	}, {once: true});
+Template.rc_modal.onDestroyed(function() {
+	document.removeEventListener('keydown', modal.onKeydown);
 });
 
 Template.rc_modal.events({
 	'click .js-action'(e, instance) {
 		!this.action || this.action.call(instance.data.data, e, instance);
+		e.stopPropagation();
 		modal.close();
 	},
-	'click .js-close'() {
+	'click .js-close'(e) {
+		e.stopPropagation();
 		modal.close();
 	},
 	'click .js-confirm'(e, instance) {
+		e.stopPropagation();
 		if (instance.data.input) {
 			return modal.confirm($('.js-modal-input').val());
 		}
@@ -98,6 +118,7 @@ Template.rc_modal.events({
 		}
 
 		if (e.currentTarget === e.target) {
+			e.stopPropagation();
 			modal.close();
 		}
 	}
diff --git a/packages/rocketchat-ui/client/views/app/room.html b/packages/rocketchat-ui/client/views/app/room.html
index 1b4b615fa9e4..9d238118da27 100644
--- a/packages/rocketchat-ui/client/views/app/room.html
+++ b/packages/rocketchat-ui/client/views/app/room.html
@@ -51,7 +51,7 @@ <h2>
 					<div class="messages-container-main">
 						{{#unless embeddedVersion}}
 							{{#if showAnnouncement}}
-							<div class="fixed-title announcement" title="{{RocketChatMarkdown roomAnnouncement}}">
+							<div class="fixed-title announcement" aria-label="{{RocketChatMarkdown roomAnnouncement}}">
 								{{{RocketChatMarkdown roomAnnouncement}}}
 							</div>
 							{{/if}}
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index 46245ee405a6..beaf9905b7c7 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -588,7 +588,11 @@ Template.room.events({
 	'click .message-actions__menu'(e, i) {
 		mountPopover(e, i, this);
 	},
-
+	'click .time a'(e) {
+		e.preventDefault();
+		const repliedMessageId = this._arguments[1].attachments[0].message_link.split('?msg=')[1];
+		FlowRouter.go(FlowRouter.current().context.pathname, null, {msg: repliedMessageId, hash: Random.id()});
+	},
 	'click .mention-link'(e, instance) {
 		if (!Meteor.userId()) {
 			return;
@@ -700,6 +704,15 @@ Template.room.events({
 			removeClass.forEach(message => $(`.messages-box #${ message }`).removeClass('selected'));
 			addClass.forEach(message => $(`.messages-box #${ message }`).addClass('selected'));
 		}
+	},
+	'click .announcement'(e) {
+		modal.open({
+			title: t('Announcement'),
+			text: $(e.target).attr('aria-label'),
+			showConfirmButton: false,
+			showCancelButton: true,
+			cancelButtonText: t('Close')
+		});
 	}
 });
 
@@ -815,6 +828,8 @@ Template.room.onCreated(function() {
 			ChatMessage.update({ rid: this.data._id, 'u._id': role.u._id }, { $pull: { roles: role._id } }, { multi: true });
 		}
 	});
+
+	this.sendToBottomIfNecessary = () => {};
 }); // Update message to re-render DOM
 
 Template.room.onDestroyed(function() {
@@ -915,26 +930,36 @@ Template.room.onRendered(function() {
 
 	const rtl = $('html').hasClass('rtl');
 
-	const updateUnreadCount = _.throttle(function() {
-		let lastInvisibleMessageOnScreen;
+	const getElementFromPoint = function(topOffset = 0) {
 		const messageBoxOffset = messageBox.offset();
 
+		let element;
 		if (rtl) {
-			lastInvisibleMessageOnScreen = document.elementFromPoint((messageBoxOffset.left + messageBox.width()) - 1, messageBoxOffset.top + 1);
+			element = document.elementFromPoint((messageBoxOffset.left + messageBox.width()) - 1, messageBoxOffset.top + topOffset + 1);
 		} else {
-			lastInvisibleMessageOnScreen = document.elementFromPoint(messageBoxOffset.left + 1, messageBoxOffset.top + 1);
+			element = document.elementFromPoint(messageBoxOffset.left + 1, messageBoxOffset.top + topOffset + 1);
 		}
 
-		if ((lastInvisibleMessageOnScreen != null ? lastInvisibleMessageOnScreen.id : undefined) != null) {
-			const lastMessage = ChatMessage.findOne(lastInvisibleMessageOnScreen.id);
-			if (lastMessage != null) {
-				const subscription = ChatSubscription.findOne({ rid: template.data._id });
-				const count = ChatMessage.find({ rid: template.data._id, ts: { $lte: lastMessage.ts, $gt: (subscription != null ? subscription.ls : undefined) } }).count();
-				template.unreadCount.set(count);
-			} else {
-				template.unreadCount.set(0);
-			}
+		if (element && element.classList.contains('message')) {
+			return element;
 		}
+	};
+
+	const updateUnreadCount = _.throttle(function() {
+		const lastInvisibleMessageOnScreen = getElementFromPoint(0) || getElementFromPoint(20) || getElementFromPoint(40);
+
+		if (lastInvisibleMessageOnScreen == null || lastInvisibleMessageOnScreen.id == null) {
+			return template.unreadCount.set(0);
+		}
+
+		const lastMessage = ChatMessage.findOne(lastInvisibleMessageOnScreen.id);
+		if (lastMessage == null) {
+			return template.unreadCount.set(0);
+		}
+
+		const subscription = ChatSubscription.findOne({ rid: template.data._id }, {reactive: false});
+		const count = ChatMessage.find({ rid: template.data._id, ts: { $lte: lastMessage.ts, $gt: subscription && subscription.ls } }).count();
+		template.unreadCount.set(count);
 	}, 300);
 
 	readMessage.onRead(function(rid) {
diff --git a/server/lib/accounts.js b/server/lib/accounts.js
index a3a43fcfce59..40d433672c1c 100644
--- a/server/lib/accounts.js
+++ b/server/lib/accounts.js
@@ -176,6 +176,12 @@ Accounts.validateLoginAttempt(function(login) {
 		});
 	}
 
+	if (!login.user.roles || !Array.isArray(login.user.roles)) {
+		throw new Meteor.Error('error-user-has-no-roles', 'User has no roles', {
+			'function': 'Accounts.validateLoginAttempt'
+		});
+	}
+
 	if (login.user.roles.includes('admin') === false && login.type === 'password' && RocketChat.settings.get('Accounts_EmailVerification') === true) {
 		const validEmail = login.user.emails.filter(email => email.verified === true);
 		if (validEmail.length === 0) {
diff --git a/server/methods/getUsernameSuggestion.js b/server/methods/getUsernameSuggestion.js
index 45d6143f43a9..69eefeb4fbae 100644
--- a/server/methods/getUsernameSuggestion.js
+++ b/server/methods/getUsernameSuggestion.js
@@ -15,9 +15,7 @@ function usernameIsAvaliable(username) {
 		return false;
 	}
 
-	return !RocketChat.models.Users.findOneByUsername({
-		$regex: new RegExp(`^${ username }$`, 'i')
-	});
+	return !RocketChat.models.Users.findOneByUsername(username);
 }
 
 function generateSuggestion(user) {
diff --git a/server/methods/loadHistory.js b/server/methods/loadHistory.js
index 5fca01e78bdf..76ef737b2eef 100644
--- a/server/methods/loadHistory.js
+++ b/server/methods/loadHistory.js
@@ -19,6 +19,7 @@ RocketChat.settings.get(/Message_HideType_.+/, function(key, value) {
 
 Meteor.methods({
 	loadHistory(rid, end, limit = 20, ls) {
+		this.unblock();
 		check(rid, String);
 
 		if (!Meteor.userId() && RocketChat.settings.get('Accounts_AllowAnonymousRead') === false) {
diff --git a/server/startup/avatar.js b/server/startup/avatar.js
index 0109c70945c3..600bb305a0e1 100644
--- a/server/startup/avatar.js
+++ b/server/startup/avatar.js
@@ -75,12 +75,8 @@ Meteor.startup(function() {
 					initials = username;
 				} else {
 					color = RocketChat.getAvatarColor(username);
-					username = username.replace(/[^A-Za-z0-9]/g, '.').replace(/\.+/g, '.').replace(/(^\.)|(\.$)/g, '');
 
-					const usernameParts = username.split('.');
-
-					initials = usernameParts.length > 1 ? _.first(usernameParts)[0] + _.last(usernameParts)[0] : username.replace(/[^A-Za-z0-9]/g, '').substr(0, 2);
-					initials = initials.toUpperCase();
+					initials = username.replace(/[^A-Za-z0-9]/g, '').substr(0, 1).toUpperCase();
 				}
 
 				const svg = `<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg xmlns=\"http://www.w3.org/2000/svg\" pointer-events=\"none\" width=\"50\" height=\"50\">\n<rect height="50" width="50" fill=\"${ color }\"/>\n<text text-anchor=\"middle\" y=\"50%\" x=\"50%\" dy=\"0.36em\" pointer-events=\"auto\" fill=\"#ffffff\" font-family=\"Helvetica, Arial, Lucida Grande, sans-serif\" font-weight="400" font-size="28">\n${ initials }\n</text>\n</svg>`;
diff --git a/tests/chimp-config.js b/tests/chimp-config.js
index 5e01594a635f..d03dcfc8273a 100644
--- a/tests/chimp-config.js
+++ b/tests/chimp-config.js
@@ -27,7 +27,7 @@ module.exports = {
 	// 	chai: false,
 	screenshotsOnError: true,
 	screenshotsPath: '.screenshots',
-	captureAllStepScreenshots: true,
+	captureAllStepScreenshots: false,
 	saveScreenshotsToDisk: true,
 	// 	// Note: With a large viewport size and captureAllStepScreenshots enabled,
 	// 	// you may run out of memory. Use browser.setViewportSize to make the
diff --git a/tests/data/checks.js b/tests/data/checks.js
index 0122d9948338..b187bc273880 100644
--- a/tests/data/checks.js
+++ b/tests/data/checks.js
@@ -44,7 +44,7 @@ export function checkIfUserIsValid(username, email, password) {
 		sideNav.logout.click();
 
 		loginPage.open();
-		loginPage.login({email, password});
+		loginPage.loginSucceded({email, password});
 		mainContent.mainContent.waitForExist(5000);
 	} else {
 		console.log('	User already logged');
@@ -77,7 +77,7 @@ export function checkIfUserIsAdmin(username, email, password) {
 		sideNav.logout.click();
 
 		loginPage.open();
-		loginPage.login({email, password});
+		loginPage.loginSucceded({email, password});
 	} else {
 		console.log('	User already logged');
 	}
diff --git a/tests/pageobjects/login.page.js b/tests/pageobjects/login.page.js
index e0150d40a15a..318970150b14 100644
--- a/tests/pageobjects/login.page.js
+++ b/tests/pageobjects/login.page.js
@@ -1,4 +1,5 @@
 import Page from './Page';
+import mainContent from './main-content.page';
 
 class LoginPage extends Page {
 	get registerButton() { return browser.element('button.register'); }
@@ -66,6 +67,12 @@ class LoginPage extends Page {
 		this.submit();
 	}
 
+	loginSucceded({email, password}) {
+		this.login({email, password});
+
+		mainContent.mainContent.waitForVisible(5000);
+	}
+
 	submit() {
 		this.submitButton.waitForVisible(5000);
 		this.submitButton.click();