Merge branch 'master' into meteor-1.2

Conflicts: .meteor/versions
10 years ago · 4db78f01ac
parent 873af3eafe 3838bac984
commit 4db78f01ac
102 changed files with 895 additions and 284 deletions
--- a/.meteor/packages
+++ b/.meteor/packages
@ -29,6 +29,7 @@ rocketchat:emojione
 rocketchat:favico
 rocketchat:file
 rocketchat:gitlab
+rocketchat:wordpress
 rocketchat:highlight
 rocketchat:ldap
 rocketchat:logger
--- a/.meteor/versions
+++ b/.meteor/versions
@ -143,6 +143,7 @@ routepolicy@1.0.6
 service-configuration@1.0.5
 session@1.1.1
 sha@1.0.4
+rocketchat:wordpress@0.0.1
 simple:highlight.js@1.0.9
 simple:json-routes@1.0.4
 spacebars@1.0.7
--- a/README.md
+++ b/README.md
@ -14,7 +14,12 @@ Get the app for your Android phone:

 [![Rocket.Chat on Google Play](https://developer.android.com/images/brand/en_app_rgb_wo_45.png)](https://play.google.com/store/apps/details?id=com.konecty.rocket.chat)

-Now compatible with all Android devices as old as version 4.0.x - [dowload here](https://github.com/RocketChat/Rocket.Chat/wiki/Build-the-Android-Cordova-Web-App-and-connect-to-your-own-Rocket.Chat-Server).
+Now compatible with all Android devices as old as version 4.0.x - [dowload here](https://github.com/RocketChat/Rocket.Chat/wiki/Build-the-Android-Cordova-Web-App-and-connect-to-your-own-Rocket.Chat-Server), even on BlackBerry Passport!
+
+Host your own Rocket.Chat server in four seconds flat:
+
+[![Rocket.Chat on Sandstorm.io](https://raw.githubusercontent.com/Sing-Li/bbug/master/images/sandstorm.jpg)](https://apps.sandstorm.io/app/vfnwptfn02ty21w715snyyczw0nqxkv3jvawcah10c6z7hj1hnu0)
+

 Try it on Ubuntu:

--- a/client/stylesheets/base.less
+++ b/client/stylesheets/base.less
@ -1781,6 +1781,15 @@ a.github-fork {
 				border: 1px solid;
 				padding: 20px;
 				border-radius: 5px;
+
+				.section-helper {
+					padding: 20px 20px 40px;
+
+					pre {
+						display: inline;
+						background-color: #eee;
+					}
+				}
 			}
 		}
 		h1,
--- a/client/stylesheets/utils/_colors.import.less
+++ b/client/stylesheets/utils/_colors.import.less
@ -258,6 +258,9 @@ label.required:after {
 	&.meteor-developer {
 		background-color: #de4f4f;
 	}
+	&.wordpress {
+		background-color: #1e8cbe;
+	}
 }

 .burger {
--- a/client/views/admin/admin.coffee
+++ b/client/views/admin/admin.coffee
@ -35,15 +35,16 @@ Template.admin.helpers
 		if description?.indexOf(':') is -1
 			description = 'project:' + description
 		return TAPi18next.t description
-
 	sectionIsCustomOath: (section) ->
 		return /^Custom OAuth:\s.+/.test section
+	callbackURL: (section) ->
+		id = s.strRight(section, 'Custom OAuth: ').toLowerCase()
+		return Meteor.absoluteUrl('_oauth/' + id)

 Template.admin.events
 	"click .submit .save": (e, t) ->
 		group = FlowRouter.getParam('group')
 		settings = Settings.find({ group: group }).fetch()
-		console.log 'will save settings', JSON.stringify settings
 		updateSettings = []
 		for setting in settings
 			value = null
@ -57,8 +58,6 @@ Template.admin.events
 			if value?
 				updateSettings.push { _id: setting._id, value: value }

-		console.log 'changed settings', JSON.stringify updateSettings
-
 		if not _.isEmpty updateSettings
 			RocketChat.settings.batchSet updateSettings, (err, success) ->
 				return toastr.error TAPi18next.t 'project:Error_updating_settings' if err
--- a/client/views/admin/admin.html
+++ b/client/views/admin/admin.html
@ -23,6 +23,15 @@
 									<h1>{{section}}</h1>
 								{{/if}}
 								<div class="section-content">
+									{{#if section}}
+										{{#if sectionIsCustomOath section}}
+											<div class="section-helper">
+												{{#with callbackURL section}}
+													{{{_ "Custom_oauth_helper" .}}}
+												{{/with}}
+											</div>
+										{{/if}}
+									{{/if}}
 									{{#each settings}}
 										{{#if $eq type 'string'}}
 											<div class="input-line double-col">
--- a/client/views/app/room.coffee
+++ b/client/views/app/room.coffee
@ -1,12 +1,19 @@
+isSubscribed = (_id) ->
+	return ChatSubscription.find({ rid: _id }).count() > 0
+
+favoritesEnabled = ->
+	return !RocketChat.settings.get 'Disable_Favorite_Rooms'
+
+
 # @TODO bug com o botão para "rolar até o fim" (novas mensagens) quando há uma mensagem com texto que gere rolagem horizontal
 Template.room.helpers
 	favorite: ->
 		sub = ChatSubscription.findOne { rid: this._id }, { fields: { f: 1 } }
-		return 'icon-star favorite-room' if sub?.f? and sub.f
+		return 'icon-star favorite-room' if sub?.f? and sub.f and favoritesEnabled
 		return 'icon-star-empty'

 	subscribed: ->
-		return ChatSubscription.find({ rid: this._id }).count() > 0
+		return isSubscribed(this._id)

 	messagesHistory: ->
 		return ChatMessage.find { rid: this._id, t: { '$ne': 't' }  }, { sort: { ts: 1 } }
@ -231,6 +238,9 @@ Template.room.helpers
 	adminClass: ->
 		return 'admin' if RocketChat.authz.hasRole(Meteor.userId(), 'admin')

+	showToggleFavorite: ->
+		return true if isSubscribed(this._id) and favoritesEnabled()
+
 Template.room.events
 	"touchstart .message": (e, t) ->
 		message = this._arguments[1]
@ -331,9 +341,6 @@ Template.room.events
 		input.focus()
 		input.get(0).updateAutogrow()

-	'click .add-user': (event) ->
-		toggleAddUser()
-
 	'click .edit-room-title': (event) ->
 		event.preventDefault()
 		Session.set('editRoomTitle', true)
@ -342,10 +349,6 @@ Template.room.events
 			$('#room-title-field').focus().select()
 		, 10

-	'keydown #user-add-search': (event) ->
-		if event.keyCode is 27 # esc
-			toggleAddUser()
-
 	'keydown #room-title-field': (event) ->
 		if event.keyCode is 27 # esc
 			Session.set('editRoomTitle', false)
@ -371,24 +374,6 @@ Template.room.events
 			# Session.set('flexOpened', true)
 		RocketChat.TabBar.setTemplate 'membersList'

-	'autocompleteselect #user-add-search': (event, template, doc) ->
-		roomData = Session.get('roomData' + Session.get('openedRoom'))
-
-		if roomData.t is 'd'
-			Meteor.call 'createGroupRoom', roomData.usernames, doc.username, (error, result) ->
-				if error
-					return Errors.throw error.reason
-
-				if result?.rid?
-					$('#user-add-search').val('')
-		else if roomData.t in ['c', 'p']
-			Meteor.call 'addUserToRoom', { rid: roomData._id, username: doc.username }, (error, result) ->
-				if error
-					return Errors.throw error.reason
-
-				$('#user-add-search').val('')
-				toggleAddUser()
-
 	'scroll .wrapper': _.throttle (e, instance) ->
 		if RoomHistoryManager.hasMore(@_id) is true and RoomHistoryManager.isLoading(@_id) is false
 			if e.target.scrollTop is 0
@ -641,14 +626,3 @@ renameRoom = (rid, name) ->
 					toastr.error t('Duplicate_private_group_name', name)
 				return
 			toastr.error error.reason
-
-toggleAddUser = ->
-	console.log 'room toggleAddUser' if window.rocketDebug
-	btn = $('.add-user')
-	$('.add-user-search').toggleClass('show-search')
-	if $('i', btn).hasClass('icon-plus')
-		$('#user-add-search').focus()
-		$('i', btn).removeClass('icon-plus').addClass('icon-cancel')
-	else
-		$('#user-add-search').val('')
-		$('i', btn).removeClass('icon-cancel').addClass('icon-plus')
--- a/client/views/app/room.html
+++ b/client/views/app/room.html
@ -9,7 +9,7 @@
 			<header class="fixed-title">
 				{{> burger}}
 				<h2>
-					{{#if subscribed}}
+					{{#if showToggleFavorite}}
 						<a href="#favorite" class="toggle-favorite"><i class="{{favorite}}"></i></a>
 					{{/if}}
 					<i class="{{roomIcon}} status-{{userStatus}}"></i>
--- a/client/views/app/sideNav/channels.coffee
+++ b/client/views/app/sideNav/channels.coffee
@ -6,15 +6,22 @@ Template.channels.helpers
 		return 'active' if ChatSubscription.findOne({ t: { $in: ['c']}, f: { $ne: true }, open: true, rid: Session.get('openedRoom') }, { fields: { _id: 1 } })?

 	rooms: ->
-		return ChatSubscription.find { t: { $in: ['c']}, f: { $ne: true }, open: true }, { sort: 't': 1, 'name': 1 }
+		query =
+			t: { $in: ['c']},
+			open: true
+
+		if !RocketChat.settings.get 'Disable_Favorite_Rooms'
+			query.f = { $ne: true }
+
+		return ChatSubscription.find query, { sort: 't': 1, 'name': 1 }

 Template.channels.events
 	'click .add-room': (e, instance) ->
 		if RocketChat.authz.hasAtLeastOnePermission('create-c')
 			SideNav.setFlex "createChannelFlex"
 			SideNav.openFlex()
-		else 
-			e.preventDefault()	
+		else
+			e.preventDefault()

 	'click .more-channels': ->
 		SideNav.setFlex "listChannelsFlex"
--- a/client/views/app/sideNav/sideNav.coffee
+++ b/client/views/app/sideNav/sideNav.coffee
@ -6,6 +6,8 @@ Template.sideNav.helpers
 		return SideNav.getFlex().data
 	footer: ->
 		return RocketChat.settings.get 'Layout_Sidenav_Footer'
+	showStarredRooms: ->
+		return !RocketChat.settings.get 'Disable_Favorite_Rooms'

 Template.sideNav.events
 	'click .close-flex': ->
--- a/client/views/app/sideNav/sideNav.html
+++ b/client/views/app/sideNav/sideNav.html
@ -9,7 +9,9 @@
 			</div>
 			<div class="rooms-list">
 				<div class="wrapper">
-					{{> starredRooms }}
+					{{#if showStarredRooms }}
+						{{> starredRooms }}
+					{{/if}}
 					{{> channels }}
 					{{> directMessages }}
 					{{> privateGroups }}
--- a/client/views/app/tabBar/membersList.coffee
+++ b/client/views/app/tabBar/membersList.coffee
@ -67,10 +67,6 @@ Template.membersList.helpers
 		return Meteor.users.findOne({ username: String(username) }) or { username: String(username) }

 Template.membersList.events
-	'keydown #user-add-search': (event) ->
-		if event.keyCode is 27 # esc
-			toggleAddUser()
-
 	"click .flex-tab .user-image > a" : (e) ->
 		RocketChat.TabBar.openFlex()
 		Session.set('showUserInfo', $(e.currentTarget).data('username'))
@ -91,4 +87,3 @@ Template.membersList.events
 					return Errors.throw error.reason

 				$('#user-add-search').val('')
-				toggleAddUser()
--- a/client/views/app/userInfo.html
+++ b/client/views/app/userInfo.html
@ -49,6 +49,7 @@
 					{{#if services.linkedin.id}} <p><i class="icon-linkedin"></i><a href="{{services.linkedin.publicProfileUrl}}" target="_blank">{{linkedinUsername}}</a></p> {{/if}}
 					{{#if servicesMeteor.id}} <p><i class="icon-meteor"></i>{{servicesMeteor.username}}</p> {{/if}}
 					{{#if services.twitter.id}} <p><i class="icon-twitter"></i><a href="https://twitter.com/{{services.twitter.screenName}}" target="_blank">{{services.twitter.screenName}}</a></p> {{/if}}
+					{{#if services.wordpress.id}} <p><i class="icon-wordpress"></i>{{services.wordpress.user_login}}</p> {{/if}}
 				{{/if}}
 			</div>
 		</div>
--- a/client/views/login/services.coffee
+++ b/client/views/login/services.coffee
@ -22,6 +22,9 @@ Template.loginServices.helpers
 				when 'gitlab'
 					serviceName = 'Gitlab'
 					icon = service.service
+				when 'wordpress'
+					serviceName = 'WordPress'
+					icon = service.service
 				else
 					serviceName = _.capitalize service.service
 					icon = service.service
--- a/i18n/de.i18n.json
+++ b/i18n/de.i18n.json
@ -1,6 +1,7 @@
 {
  "Access_online_demo" : "Öffne die online demo",
  "Access_Online_Demo" : "Öffne die Online Demo",
+  "Accounts" : "Kontos",
  "Accounts_denyUnverifiedEmail" : "Nicht verifizierte E-Mails ablehnen",
  "Accounts_EmailVerification" : "E-Mail-Verifizierung",
  "Accounts_OAuth_Facebook" : "Facebook Login",
@ -27,13 +28,20 @@
  "Accounts_OAuth_Custom_URL" : "URL",
  "Accounts_OAuth_Custom_Token_Path" : "Token Pfad",
  "Accounts_OAuth_Custom_Identity_Path" : "Identitäts Pfad",
+  "Accounts_OAuth_Custom_Authorize_Path" : "Autorisierungspfad",
  "Accounts_OAuth_Custom_Secret" : "Secret",
  "Accounts_OAuth_Custom_Enable" : "Aktivieren",
+  "Accounts_OAuth_Custom_Button_Label_Text" : "Button-Text",
+  "Accounts_OAuth_Custom_Button_Label_Color" : "Button-Text-Farbe",
+  "Accounts_OAuth_Custom_Button_Color" : "Buttonfarbe",
+  "Activate" : "Aktivieren",
  "Add_Members" : "Mitglieder hinzufügen",
  "Add_users" : "Benutzer hinzufügen",
  "Administration" : "Administration",
  "All_channels" : "Alle Kanäle",
+  "Allow_Invalid_SelfSigned_Certs" : "Selbstsignierte SSL-Zertifikate zulassen für die Link-Validierung und der Vorschauen",
  "and" : "und",
+  "API" : "API",
  "API_Analytics" : "Analytics",
  "API_Embed" : "Einbetten",
  "are_also_typing" : "schreiben auch",
@ -46,6 +54,7 @@
  "Away_female" : "Abwesend",
  "away_male" : "abwesend",
  "Away_male" : "Abwesend",
+  "Auto_Load_Images" : "Automatisches Laden der Bilder",
  "Back_to_login" : "Zurück zum Login",
  "bold" : "fett",
  "busy" : "beschäftigt",
@ -64,19 +73,25 @@
  "Confirm_password" : "Bestätigen Sie Ihr Passwort",
  "Contact" : "Kontakt",
  "Conversation" : "Konversation",
+  "Convert_Ascii_Emojis" : "Konvertiere ASCII zu Emoji",
  "Create_new" : "Neu erstellen",
  "Create_new_direct_message_room" : "Erstellen Sie einen neuen Direktnachrichten-Raum",
  "Create_new_private_group" : "Erstellen Sie eine neue private Gruppe",
  "Create_new_public_channel" : "Erstelle einen neuen öffentlichen Channel",
  "Created_at" : "Erstellt am",
  "days" : "Tage",
+  "Deactivate" : "Deaktivieren",
  "Delete_User_Warning" : "Beim Löschen eines Benutzers, werden alle seine Nachrichten ebenfalls gelöscht. Dies kann nicht rückgängig gemacht werden.",
+  "Delete" : "Löschen",
  "Deleted" : "Gelöscht!",
  "Direct_Messages" : "Private Nachrichten",
+  "Disable_New_Message_Notification" : "Deaktiviere Benachrichtigung bei neuen Nachrichten",
+  "Disable_New_Room_Notification" : "Deaktiviere Benachrichtigung bei neuen Raum Nachrichten",
  "Drop_to_upload_file" : "Ablegen um Datei zu uploaden",
  "Duplicate_channel_name" : "Ein Kanal mit dem Namen, '%s', existiert",
  "Duplicate_private_group_name" : "Eine private Gruppe mit dem Namen, '%s', existiert",
  "E-mail" : "E-Mail",
+  "Edit" : "Bearbeiten",
  "edited" : "bearbeitet",
  "Email_already_exists" : "E-Mail existiert bereits",
  "Email_or_username" : "Email oder Username",
@ -90,9 +105,12 @@
  "Follow_social_profiles" : "Folge uns in sozialen Netzen, fork uns auf github und teile deine Gedanken über die rocket.chat app auf unserem trello board.",
  "Forgot_password" : "Passwort vergessen?",
  "Fork_it_on_github" : "Fork es auf GitHub",
+  "From_Email" : "E-Mail von",
+  "General" : "Allgemein",
  "Get_to_know_the_team" : "Lernen Sie das Rocket.Team kennen",
  "github_no_public_email" : "Sie haben keine öffentliche Email-Adresse in Ihrem Github Account",
  "Have_your_own_chat" : "Erstelle deinen eigenen web chat. Entwickelt mit Meteor.com, der Rocket.Chat ist eine tolle Lösung für Entwickler, die schnell und einfach einen eigene Chat Plattform aufbauen wollen.",
+  "Has_more" : "Mehr",
  "Hide_room" : "Raum verstecken",
  "History" : "Chronik",
  "hours" : "Stunden",
@ -104,6 +122,9 @@
  "Invalid_room_name" : "<strong>%s</strong> ist kein zulässiger Raumname.<br/> Benutze nur Buchstaben, Nummern und Bindestriche.",
  "invisible" : "unsichtbar",
  "Invisible" : "Unsichtbar",
+  "Invitation HTML" : "Einladungs HTML",
+  "Invitation_Subject" : "Einladungs Betreff",
+  "Invite_Users" : "Benutzer einladen",
  "is_also_typing" : "schreibt auch",
  "is_also_typing_female" : "schreibt auch",
  "is_also_typing_male" : "schreibt auch",
@ -117,13 +138,20 @@
  "Language_Version" : "Deutsche Version",
  "Last_login" : "Letztes login",
  "Last_message" : "Letzte Nachricht",
+  "Layout" : "Layout",
  "Layout_Home_Body" : "Home Body",
  "Layout_Home_Title" : "Home Title",
+  "Layout_Login_Header" : "Login Header",
+  "Layout_Login_Terms" : "Nutzungsbedingungen zu Anmeldung",
+  "Layout_Privacy_Policy" : "Datenschutzbestimmungen",
  "Layout_Sidenav_Footer" : "Seiten Navigations Footer",
  "Layout_Sidenav_Footer_description" : "Die Footer Größe ist 260x70",
+  "Layout_Terms_of_Service" : "Nutzungsbedingungen",
+  "LDAP" : "LDAP",
  "Leave_room" : "Raum verlassen",
  "line" : "Zeilen",
  "Load_more" : "Mehr laden",
+  "Loading_more_from_history" : "Lade mehr aus der Historie",
  "Loading..." : "Wird geladen ...",
  "Loading_suggestion" : "Vorschläge werden geladen...",
  "Login" : "Login",
@ -131,6 +159,7 @@
  "login_with" : "Oder melden Sie sich direkt mit folgenden Accounts an",
  "Logout" : "Abmelden",
  "Make_Admin" : "zum Admin machen",
+  "Mark_as_read" : "Als gelesen markieren",
  "Members" : "Mitglieder",
  "Members_List" : "Mitgliederliste",
  "Members_placeholder" : "Mitglieder",
@ -140,12 +169,14 @@
  "Message_AllowPinning" : "Erlaube es Nachrichten anzuheften",
  "Message_deleting_not_allowed" : "Nachrichten löschen nicht erlaubt",
  "Message_editing_not_allowed" : "Nachrichten bearbeiten nicht erlaubt",
+  "Message_MaxAllowedSize" : "Maximale Größe der Nachricht",
  "Message_pinning_not_allowed" : "Nachrichten anheften erlaubt",
  "Message_KeepHistory" : "Nachrichtenverlauf behalten",
  "Message_removed" : "Nachricht entfernt",
  "Message_pinned" : "Nachricht angeheftet",
  "Message_ShowDeletedStatus" : "Zeige Löschstatus",
  "Message_ShowEditedStatus" : "Zeige Bearbeitungsstatus",
+  "Meta" : "Meta",
  "Meta_fb_app_id" : "Facebook APP ID",
  "Meta_google-site-verification" : "Google Seiten",
  "Meta_language" : "Sprache",
@ -153,6 +184,8 @@
  "Meta_robots" : "Robots",
  "minutes" : "Minuten",
  "More_channels" : "Mehr Channels",
+  "More_groups" : "Weitere private Gruppen",
+  "More_unreads" : "Mehr ungelesene",
  "Msgs" : "Mttl",
  "multi" : "mehrere",
  "My_Account" : "Mein Konto",
@ -172,8 +205,11 @@
  "Not_found_or_not_allowed" : "Nicht gefunden oder erlaubt",
  "Nothing_found" : "Nichts gefunden",
  "Notify_all_in_this_room" : "Alle in diesem Raum benachrichtigen",
+  "Only_you_can_see_this_message" : "Nur Sie können diese Nachricht sehen",
  "Online" : "Online",
  "Oops!" : "Oops",
+  "Opt_out_statistics" : "Meine anonymen Statitstiken nicht an Rocke.Chat senden",
+  "Opt_out_statistics_warning" : "Durch das Absenden Ihrer anonymen Statistiken, werden Sie uns helfen, festzustellen, wie viele Instanzen von Rocket.Chat eingesetzt werden, und wie gut das System verhält, so können wir es weiter verbessern. Wenn Sie weiterhin das Senden von anonymen Statistiken möchten, deaktivieren Sie das Kontrollkästchen oben. Danke.",
  "others" : "andere",
  "Password" : "Passwort",
  "Password_changed_successfully" : "Passwort erfolgreich geändert",
@ -181,11 +217,15 @@
  "Please_wait_activation" : "Bitte warten. ",
  "Please_wait_statistics" : "Bitte warten, Statistiken werden generiert.",
  "Powered_by" : "Powered by",
+  "Preferences" : "Einstellungen",
+  "Preferences_saved" : "Einstellungen gespeichert",
  "Privacy" : "Datenschutz",
  "Private_Groups" : "Private Gruppen",
+  "Private_Groups_list" : "Liste der Private Gruppen",
  "Profile" : "Profil",
  "Profile_saved_successfully" : "Profil erfolgreich gespeichert",
  "Proudly_developed" : "Stolz mit Meteor entwickelt",
+  "Push" : "Push",
  "Push_apn_cert" : "APN Cert",
  "Push_apn_dev_cert" : "APN Dev Cert",
  "Push_apn_dev_key" : "APN Dev Key",
@ -209,9 +249,12 @@
  "Room_name_changed_successfully" : "Raumname erfolgreich umbenannt",
  "Room_not_found" : "Raum nicht gefunden",
  "room_user_count" : "%s Benutzer",
+  "Rooms" : "Räume",
  "Save" : "Speichern",
  "Save_changes" : "Änderungen speichern",
+  "Save_Mobile_Bandwidth" : "Mobilfunkbandbreite verringern",
  "Search" : "Suche",
+  "Search_Messages" : "Nachrichten suchen",
  "Search_settings" : "Sucheinstellungen",
  "seconds" : "Sekunden",
  "See_all" : "Alle anzeigen",
@ -220,7 +263,13 @@
  "Select_file" : "Datei wählen",
  "Select_service_to_login" : "Wählen Sie einen Service um sich einzuloggen, ein Bild auszuwählen oder eines direkt von Ihrem Computer hochzuladen",
  "Selected_users" : "Ausgewählte Mitglieder",
+  "Send" : "Absenden",
  "Send_confirmation_email" : "Bestätigungsmail versendet",
+  "Send_invitation_email" : "Einladungs E-Mail senden",
+  "Send_invitation_email_error" : "Sie haben kein gültige E-Mail-Adresse angegeben.",
+  "Send_invitation_email_info" : "Sie können mehrere E-Mail-Einladungen auf einmal absenden.",
+  "Send_invitation_email_success" : "Sie haben erfolgreich eine Einladung per E-Mail an folgende Adressen versendet:",
+  "Send_invitation_email_warning" : "Um Einladungs-E-Mails zu senden, müssen Sie zuerst die SMTP-Einstellungen konfigurieren.",
  "Send_Message" : "Nachricht senden",
  "Settings" : "Einstellungen",
  "Settings_updated" : "Einstellungen aktualisiert",
@ -229,16 +278,21 @@
  "Silence" : "Ruhe",
  "since_creation" : "seit %s",
  "Site_Name" : "Seitenname:",
+  "SAML" : "SAML",
+  "SMTP" : "SMTP",
  "SMTP_Host" : "SMTP Host",
  "SMTP_Password" : "SMTP Passwort",
  "SMTP_Port" : "SMTP Port",
  "SMTP_Username" : "SMTP Benutzername",
+  "Sound" : "Sound",
  "Start_of_conversation" : "Beginn der Konversation",
+  "Statistics" : "Statistiken",
  "Stats_Active_Users" : "Aktive Benutzer",
  "Stats_Avg_Channel_Users" : "Durchschnittliche Kanal Benutzer",
  "Stats_Avg_Private_Group_Users" : "Durchschnittliche Benutzer in Privater Gruppe",
  "Stats_Max_Room_Users" : "Maximale Raum Benutzer",
  "Stats_Non_Active_Users" : "Ina",
+  "Stats_Away_Users" : "Beschäftige Benutzer",
  "Stats_Offline_Users" : "Benutzer offline",
  "Stats_Online_Users" : "Benutzer online",
  "Stats_OS_Arch" : "OS Arch",
@ -251,17 +305,19 @@
  "Stats_OS_Type" : "OS Typ",
  "Stats_OS_Uptime" : "OS Uptime",
  "Stats_Total_Channels" : "Anzahl Kanäle",
-  "Stats_Total_Direct_Messages" : "Anzahl der Direktnachrichten",
+  "Stats_Total_Direct_Messages" : "Anzahl der Direktnachrichtenräume",
  "Stats_Total_Messages" : "Anzahl der Nachrichten",
  "Stats_Total_Private_Groups" : "Anzahl der Privaten Gruppen",
  "Stats_Total_Rooms" : "Anzahl der Räume",
  "Stats_Total_Users" : "Anzahl der Benutzer",
  "strike" : "durchgestrichen",
  "Submit" : "Abschicken",
+  "S_new_messages_since_s" : "%s neue Nachrichten seit %s",
  "The_field_is_required" : "Das Feld %s ist erforderlich.",
  "True" : "Wahr",
  "Unnamed" : "Unbenannt",
  "Upload_file_question" : "Datei hochladen?",
+  "Use_Emojis" : "Verwende Emojis",
  "Use_initials_avatar" : "Benutze deine Initialien",
  "use_menu" : "Benutze das Seitenmenü um deine Chats zu öffnen",
  "Use_service_avatar" : "Benutze %s avatar",
@ -269,9 +325,11 @@
  "Use_uploaded_avatar" : "Benutze diesen Avatar",
  "User_added" : "Benutzer <em>__user_added__</em> wurde hinzugefügt.",
  "User_added_by" : "Benutzer <em>__user_added__</em> hinzugefügt von <em>__user_by__</em>.",
+  "User_Channels" : "Benutzer Kanäle",
  "User_has_been_activated" : "Benutzer wurde aktiviert",
  "User_has_been_deactivated" : "Benutzer wurde deaktiviert",
  "User_has_been_deleted" : "Benutzer wurde gelöscht",
+  "User_Info" : "Benutzer-Info",
  "User_is_no_longer_an_admin" : "Der Benutzer ist kein Admin mehr",
  "User_is_not_activated" : "Benutzer ist nicht aktiviert",
  "User_is_now_an_admin" : "Benutzer ist jetzt ein Admin",
@ -285,6 +343,7 @@
  "User_removed_by" : "Benutzer <em>__user_removed__</em> entfernt von <em>__user_by__</em>.",
  "User_Settings" : "Benutzereinstellungen",
  "User_updated_successfully" : "Benutzer erfolgreich aktualisiert",
+  "Users" : "Benutzer",
  "Username" : "Benutzername",
  "Username_cant_be_empty" : "Der Benutzername darf nicht leer sein",
  "Username_description" : "Der Benutzername wird dazu benutzt Sie in Nachtichten zu markieren.",
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@ -1,7 +1,7 @@
 {
  "Access_online_demo" : "Access the online demo",
  "Access_Online_Demo" : "Access the Online Demo",
-  "Accounts": "Accounts",
+  "Accounts" : "Accounts",
  "Accounts_denyUnverifiedEmail" : "Deny unverified e-mail",
  "Accounts_EmailVerification" : "E-mail Verification",
  "Accounts_OAuth_Facebook" : "Facebook Login",
@ -81,12 +81,14 @@
  "Create_new_public_channel" : "Create a new public channel",
  "Created_at" : "Created at",
  "Custom_oauth_unique_name" : "Custom oauth unique name",
+  "Custom_oauth_helper" : "When setting up your OAuth Provider, you'll have to inform a Callback URL. Use <pre>%s</pre> .",
  "days" : "days",
  "Deactivate" : "Deactivate",
  "Delete_User_Warning" : "Deleting a user will delete all messages from that user as well. This cannot be undone.",
  "Delete" : "Delete",
  "Deleted" : "Deleted!",
  "Direct_Messages" : "Direct Messages",
+  "Disable_Favorite_Rooms" : "Disable Favorites",
  "Disable_New_Message_Notification" : "Disable New Message Notification",
  "Disable_New_Room_Notification" : "Disable New Room Notification",
  "Drop_to_upload_file" : "Drop to upload file",
@ -108,7 +110,7 @@
  "Forgot_password" : "Forgot your password",
  "Fork_it_on_github" : "Fork it on github",
  "From_Email" : "From Email",
-  "General": "General",
+  "General" : "General",
  "Get_to_know_the_team" : "Get to know the Rocket.Team",
  "github_no_public_email" : "You don't have any email as public email in your GitHub account",
  "Give_a_unique_name_for_the_custom_oauth" : "Give a unique name for the custom oauth",
@ -214,8 +216,8 @@
  "Only_you_can_see_this_message" : "Only you can see this message",
  "Online" : "Online",
  "Oops!" : "Oops",
-  "Opt_out_statistics" : "Don't send my anonymous statistics to Rocket.Chat",
-  "Opt_out_statistics_warning" : "By sending your anonymous statistics, you'll help us identify how many instances of Rocket.Chat are deployed, as well as how good the system is behaving, so we can further improve it. If you want to continue sending us your anonymous statistics, uncheck the above checkbox. Thank you.",
+  "Opt_out_statistics" : "Don't send my statistics to Rocket.Chat",
+  "Opt_out_statistics_warning" : "By sending your statistics, you'll help us identify how many instances of Rocket.Chat are deployed, as well as how good the system is behaving, so we can further improve it. Don't worry, as no user information is sent and all the information we receive is kept confidential. If you want to continue sending us your statistics, uncheck the above checkbox. Thank you.",
  "others" : "others",
  "Password" : "Password",
  "Password_changed_successfully" : "Password changed successfully",
@ -350,7 +352,7 @@
  "User_removed_by" : "User <em>__user_removed__</em> removed by <em>__user_by__</em>.",
  "User_Settings" : "User Settings",
  "User_updated_successfully" : "User updated successfully",
-  "Users": "Users",
+  "Users" : "Users",
  "Username" : "Username",
  "Username_cant_be_empty" : "The username cannot be empty",
  "Username_description" : "The username is used to allow others to mention you in messages.",
@ -370,4 +372,4 @@
  "You_will_not_be_able_to_recover" : "You will not be able to recover!",
  "Your_entry_has_been_deleted" : "Your entry has been deleted.",
  "Your_Open_Source_solution" : "Your own Open Source chat solution"
-}
+}
--- a/i18n/fi.i18n.json
+++ b/i18n/fi.i18n.json
@ -1,6 +1,7 @@
 {
  "Access_online_demo" : "Access the online demo",
  "Access_Online_Demo" : "Access the Online Demo",
+  "Accounts" : "Tilit",
  "Accounts_denyUnverifiedEmail" : "Estä vahvistamaton sähköpostiosoite",
  "Accounts_EmailVerification" : "Sähköpostiosoitteen varmistaminen",
  "Accounts_OAuth_Facebook" : "Facebook-tunnus",
@ -33,12 +34,14 @@
  "Accounts_OAuth_Custom_Button_Label_Text" : "Painikkeen teksti",
  "Accounts_OAuth_Custom_Button_Label_Color" : "Painikkeen tekstin väri",
  "Accounts_OAuth_Custom_Button_Color" : "Painikkeen väri",
+  "Activate" : "Aktivoi",
  "Add_Members" : "Lisää osallistujia",
  "Add_users" : "Lisää käyttäjiä",
  "Administration" : "Ylläpito",
  "All_channels" : "Kaikki kanavat",
  "Allow_Invalid_SelfSigned_Certs" : "Salli virheelliset ja itse allekirjoitetut SSL varmenteet linkin validointiin ja esikatseluihin",
  "and" : "ja",
+  "API" : "API",
  "API_Analytics" : "Analytics",
  "API_Embed" : "Upota",
  "are_also_typing" : "kirjoittavat myös",
@ -77,7 +80,9 @@
  "Create_new_public_channel" : "Luo uusi julkinen kanava",
  "Created_at" : "Luotu",
  "days" : "päivää",
+  "Deactivate" : "Deaktivoi",
  "Delete_User_Warning" : "Käyttäjän poistaminen poistaa myös käyttäjän kaikki viestit. Toimintoa ei voi perua.",
+  "Delete" : "Poista",
  "Deleted" : "Poistettu!",
  "Direct_Messages" : "Yksityisviestit",
  "Disable_New_Message_Notification" : "Poista uuden viestin ilmoitus käytöstä",
@ -86,6 +91,7 @@
  "Duplicate_channel_name" : "Kanava nimeltä '%s' on olemassa jo",
  "Duplicate_private_group_name" : "Privaattiryhmä '%s' on olemassa jo",
  "E-mail" : "Sähköpostiosoite",
+  "Edit" : "Muokkaa",
  "edited" : "muokattu",
  "Email_already_exists" : "Sähköpostiosoite on jo olemassa",
  "Email_or_username" : "Sähköpostiosoite tai käyttäjänimi",
@ -100,6 +106,7 @@
  "Forgot_password" : "Unohditko salasanasi?",
  "Fork_it_on_github" : "Forkkaa GitHubissa",
  "From_Email" : "Sähköpostilta",
+  "General" : "Yleinen",
  "Get_to_know_the_team" : "Tutustu Rocket.Teamiin",
  "github_no_public_email" : "GitHub-tunnukseltasi ei löydy julkisia sähköpostiosoitetietoja",
  "Have_your_own_chat" : "Have your own web chat. Developed with Meteor.com, the Rocket.Chat is a great solution for developers looking forward to build and evolve their own chat platform.",
@ -115,6 +122,9 @@
  "Invalid_room_name" : "<strong>%s</strong> ei ole hyväksyttävä kanavan nimi,<br/> käytä vain kirjaimia, numeroita ja viivaa",
  "invisible" : "näkymätön",
  "Invisible" : "Näkymätön",
+  "Invitation HTML" : "Kutsu HTML",
+  "Invitation_Subject" : "Kutsu aihe",
+  "Invite_Users" : "Kutsu käyttäjiä",
  "is_also_typing" : "kirjoittaa myös",
  "is_also_typing_female" : "kirjoittaa myös",
  "is_also_typing_male" : "kirjoittaa myös",
@ -128,6 +138,7 @@
  "Language_Version" : "Suomi",
  "Last_login" : "Viimeisin kirjautuminen",
  "Last_message" : "Viimeinen viesti",
+  "Layout" : "Layout",
  "Layout_Home_Body" : "Etusivun runko",
  "Layout_Home_Title" : "Etusivun otsikko",
  "Layout_Login_Header" : "Kirjautumisruudun ylätunniste",
@ -136,6 +147,7 @@
  "Layout_Sidenav_Footer" : "Sivunavigoinnin alatunniste",
  "Layout_Sidenav_Footer_description" : "Alatunnisteen koko on 260x70",
  "Layout_Terms_of_Service" : "Käyttöehdot",
+  "LDAP" : "LDAP",
  "Leave_room" : "Poistu kanavalta",
  "line" : "viiva",
  "Load_more" : "Lataa lisää",
@ -157,12 +169,14 @@
  "Message_AllowPinning" : "Salli viestien kiinnittäminen",
  "Message_deleting_not_allowed" : "Viestin poisto ei sallittu",
  "Message_editing_not_allowed" : "Viestin muokkaus ei sallittu",
+  "Message_MaxAllowedSize" : "Viestin suurin sallittu koko",
  "Message_pinning_not_allowed" : "Viestien kiinnittäminen ei sallittu",
  "Message_KeepHistory" : "Säilytä viestihistoria",
  "Message_removed" : "Viesti poistettu\n",
  "Message_pinned" : "Viesti kiinnitetty",
  "Message_ShowDeletedStatus" : "Näytä poistotila",
  "Message_ShowEditedStatus" : "Näytä muokkaustila",
+  "Meta" : "Meta",
  "Meta_fb_app_id" : "Facebook APP ID",
  "Meta_google-site-verification" : "Google sivuston vahvistaminen",
  "Meta_language" : "Kieli",
@ -191,6 +205,7 @@
  "Not_found_or_not_allowed" : "Ei löydy tai ei sallittu",
  "Nothing_found" : "Ei löytynyt",
  "Notify_all_in_this_room" : "Ilmoita kaikille kanavallaolijoille",
+  "Only_you_can_see_this_message" : "Vain sinä voit nähdä tämän viestin",
  "Online" : "Online",
  "Oops!" : "Oho",
  "Opt_out_statistics" : "Älä lähetä anonyymejä tilastoja Rocket.Chatille",
@ -210,6 +225,7 @@
  "Profile" : "Profiili",
  "Profile_saved_successfully" : "Profiili tallennettu onnistuneesti",
  "Proudly_developed" : "Proudly developed with Meteor",
+  "Push" : "Työnnä",
  "Push_apn_cert" : "APN Cert",
  "Push_apn_dev_cert" : "APN Cert (kehitys)",
  "Push_apn_dev_key" : "APN Avain (kehitys)",
@ -233,6 +249,7 @@
  "Room_name_changed_successfully" : "Huoneen nimi vaihdettu",
  "Room_not_found" : "Huonetta ei löytynyt",
  "room_user_count" : "%s käyttäjää",
+  "Rooms" : "Huoneet",
  "Save" : "Tallenna",
  "Save_changes" : "Tallenna",
  "Save_Mobile_Bandwidth" : "Säästä kaistaa mobiilissa",
@ -246,7 +263,9 @@
  "Select_file" : "Valitse tiedosto",
  "Select_service_to_login" : "Valitse kirjautumiseen käytettävä palvelu tai lataa kuvasi suoraan koneeltasi",
  "Selected_users" : "Valitut käyttäjät",
+  "Send" : "Lähetä",
  "Send_confirmation_email" : "Lähetä vahvistussähköposti",
+  "Send_invitation_email" : "Lähetä kutsu sähköposti",
  "Send_Message" : "Lähetä viesti",
  "Settings" : "Asetukset",
  "Settings_updated" : "Asetukset päivitetty",
@ -255,12 +274,15 @@
  "Silence" : "Hiljaisuus",
  "since_creation" : "%s saakka",
  "Site_Name" : "Sivuston nimi:",
+  "SAML" : "SAML",
+  "SMTP" : "SMTP",
  "SMTP_Host" : "SMTP-palvelin",
  "SMTP_Password" : "SMTP Salasana",
  "SMTP_Port" : "SMTP-portti",
  "SMTP_Username" : "SMTP Käyttäjätunnus",
  "Sound" : "Ääni",
  "Start_of_conversation" : "Keskustelun alku",
+  "Statistics" : "Tilastot",
  "Stats_Active_Users" : "Aktiivisia käyttäjiä",
  "Stats_Avg_Channel_Users" : "Keskimääräinen kanavan käyttäjämäärä",
  "Stats_Avg_Private_Group_Users" : "Keskimääräinen käyttäjämäärä",
@ -293,7 +315,7 @@
  "Upload_file_question" : "Lähetä tiedosto?",
  "Use_Emojis" : "Käytä Emojia",
  "Use_initials_avatar" : "Käytä käyttäjätunnuksen nimikirjaimia",
-  "use_menu" : "Käytä sivuvalikkoa Use the side menu to access your rooms and chats",
+  "use_menu" : "Käytä sivuvalikkoa käyttääksesi huoneitasi ja chattejasi",
  "Use_service_avatar" : "Käytä %s avataria",
  "Use_this_username" : "Käytä tätä käyttäjänimieä",
  "Use_uploaded_avatar" : "Käytä ladattua avataria",
@ -317,6 +339,7 @@
  "User_removed_by" : "Käyttäjä <em>__user_removed__</em> poistettu <em>__user_by__</em> toimesta.",
  "User_Settings" : "Käyttäjä",
  "User_updated_successfully" : "Käyttäjän tiedot päivitetty",
+  "Users" : "Käyttäjät",
  "Username" : "Käyttäjänimi",
  "Username_cant_be_empty" : "Käyttäjänimi ei voi olla tyhjä",
  "Username_description" : "Käyttäjänimeä käytetään sinun mainitsemiseen muiden viesteissä.",
--- a/i18n/fr.i18n.json
+++ b/i18n/fr.i18n.json
@ -1,7 +1,7 @@
 {
  "Access_online_demo" : "Accédez à la démo en ligne",
  "Access_Online_Demo" : "Accédez à la démo en ligne",
-  "Accounts": "Comptes",
+  "Accounts" : "Comptes",
  "Accounts_denyUnverifiedEmail" : "Refuser les emails non vérifiées",
  "Accounts_EmailVerification" : "Vérification de l'e-mail",
  "Accounts_OAuth_Facebook" : "Connexion avec Facebook",
@ -26,15 +26,16 @@
  "Accounts_OAuth_Twitter_secret" : "Twitter Secret",
  "Accounts_OAuth_Custom_ID" : "ID",
  "Accounts_OAuth_Custom_URL" : "URL",
-  "Accounts_OAuth_Custom_Token_Path" : "Token Path",
+  "Accounts_OAuth_Custom_Token_Path" : "URL de Token",
  "Accounts_OAuth_Custom_Identity_Path" : "URL d'identification",
-  "Accounts_OAuth_Custom_Authorize_Path" : "URL d'authorisation",
+  "Accounts_OAuth_Custom_Authorize_Path" : "URL d'autorisation",
  "Accounts_OAuth_Custom_Secret" : "Secret",
  "Accounts_OAuth_Custom_Enable" : "Activer",
  "Accounts_OAuth_Custom_Button_Label_Text" : "Texte du bouton",
  "Accounts_OAuth_Custom_Button_Label_Color" : "Couleur de texte du bouton",
  "Accounts_OAuth_Custom_Button_Color" : "Couleur du bouton",
  "Activate" : "Activer",
+  "Add_custom_oauth" : "Ajouter OAuth personnalisé",
  "Add_Members" : "Ajouter des membres",
  "Add_users" : "Ajouter des utilisateurs",
  "Administration" : "Administration",
@ -73,12 +74,13 @@
  "Confirm_password" : "Confirmez votre mot de passe",
  "Contact" : "Contact",
  "Conversation" : "Conversation",
-  "Convert_Ascii_Emojis" : "Convert ASCII to Emoji",
+  "Convert_Ascii_Emojis" : "Convertir code ASCII vers émoticônes",
  "Create_new" : "Créer nouveau",
  "Create_new_direct_message_room" : "Créer un nouveau canal de discussion privé",
  "Create_new_private_group" : "Créer un nouveau groupe privé",
  "Create_new_public_channel" : "Créer un nouveau canal publique.",
  "Created_at" : "Créé le",
+  "Custom_oauth_unique_name" : "Nom unique OAuth personnalisé",
  "days" : "jours",
  "Deactivate" : "Désactiver",
  "Delete_User_Warning" : "Supprimer un utilisateur va également supprimer tous les messages de celui-ci. Cette action ne peut être annulée.",
@ -98,17 +100,18 @@
  "Email_verified" : "Email vérifié",
  "Enter_info" : "Entrez vos identifiants de connexion",
  "Enter_to" : "Entrée pour",
-  "Error_changing_password" : "Mot de passe modifié",
-  "Esc_to" : "Esc pour",
+  "Error_changing_password" : "Erreur lors du changement de mot de \npasse",
+  "Esc_to" : "Échap pour",
  "False" : "Non",
  "Favorites" : "Favoris",
  "Follow_social_profiles" : "Suivez-nous sur les réseaux sociaux, clonez le projet sur GitHub et partagez vos idées à propos de rocket.chat sur notre tableau Trello.",
  "Forgot_password" : "Mot de passe oublié",
  "Fork_it_on_github" : "Cloner sur GitHub",
  "From_Email" : "De",
-  "General": "Général",
+  "General" : "Général",
  "Get_to_know_the_team" : "Venez nous rencontrer",
  "github_no_public_email" : "Vous n'avez pas d'adresse email public associé à votre compte GitHub",
+  "Give_a_unique_name_for_the_custom_oauth" : "Indiquez un nom unique pour l'OAuth personnalisé",
  "Have_your_own_chat" : "Disposez de votre propre salon de discussion en ligne. Développé à l'aide de Meteor.com, Rocket.Chat est une solution pour les développeurs désirant mettre en place et faire évoluer leur propre plate-forme de discussion.",
  "Has_more" : "a plus de",
  "Hide_room" : "Cacher le salon",
@ -138,7 +141,7 @@
  "Language_Version" : "Version anglaise",
  "Last_login" : "Dernière connexion",
  "Last_message" : "Dernier message",
-  "Layout" : "Contenu",
+  "Layout" : "Disposition",
  "Layout_Home_Body" : "Contenu de la page d'accueil",
  "Layout_Home_Title" : "Titre de la page d'accueil",
  "Layout_Login_Header" : "Entête de connexion",
@ -151,10 +154,10 @@
  "Leave_room" : "Quitter le salon",
  "line" : "ligne",
  "Load_more" : "Charger plus",
+  "Loading_more_from_history" : "Charger plus d'historique",
  "Loading..." : "Chargement...",
-  "Loading_more_from_history" : "Chargement plus d'historique",
  "Loading_suggestion" : "Chargement des suggestions ...",
-  "Login" : "Nom d'utilisateur",
+  "Login" : "Se connecter",
  "Login_with" : "Connectez-vous avec %s",
  "login_with" : "Ou connectez-vous avec",
  "Logout" : "Se déconnecter",
@ -166,11 +169,13 @@
  "Message" : "Message",
  "Message_AllowDeleting" : "Autoriser la suppression de messages",
  "Message_AllowEditing" : "Autoriser la modification de messages",
+  "Message_AllowEditing_BlockEditInMinutes" : "Bloquer la modification de messages après (en minutes, 0 pour désactiver)",
  "Message_AllowPinning" : "Autoriser l'épinglement de messages",
  "Message_deleting_not_allowed" : "Suppression d'un message non autorisée",
  "Message_editing_not_allowed" : "Modification d'un message non autorisée",
+  "Message_editing_blocked" : "Ce message ne peut plus être modifié",
  "Message_MaxAllowedSize" : "Taille maximum de message autorisée",
-  "Message_pinning_not_allowed" : "L'épinglement de messesage n'est pas autorisé",
+  "Message_pinning_not_allowed" : "L'épinglement de message n'est pas autorisé",
  "Message_KeepHistory" : "Conserver l'historique des messages",
  "Message_removed" : "Message supprimé",
  "Message_pinned" : "Message épinglé",
@ -191,10 +196,11 @@
  "My_Account" : "Mon compte",
  "n_messages" : "%s messages",
  "Name" : "Nom",
+  "Name_cant_be_empty" : "Le nom ne peut pas être vide",
  "New_messages" : "Nouveaux messages",
  "New_password" : "Nouveau mot de passe",
  "No_channels_yet" : "Vous ne faites partie d’aucun canal pour le moment.",
-  "No_direct_messages_yet" : "Vous n'avez pris part a aucune conversation pour le moment.",
+  "No_direct_messages_yet" : "Vous n'avez pris part à aucune conversation pour le moment.",
  "No_favorites_yet" : "Vous n'avez ajouté aucun favoris pour le moment.",
  "No_groups_yet" : "Vous n'avez pas encore de groupes privés.",
  "No_permission_to_view_room" : "Vous n'avez pas la permission de voir ce salon",
@ -242,6 +248,7 @@
  "Registration_Succeeded" : "Enregistrement réussi",
  "Remember_me" : "Se souvenir de moi",
  "Remove" : "Supprimer",
+  "Remove_custom_oauth" : "Supprimer OAuth personnalisé ",
  "Remove_Admin" : "Supprimer administrateur",
  "Reset_password" : "Réinitialiser le mot de passe",
  "Room" : "Salon",
@ -269,7 +276,7 @@
  "Send_invitation_email_error" : "Vous n'avez pas fourni une adresse email valide.",
  "Send_invitation_email_info" : "Vous pouvez envoyer plusieurs emails d'invitation à la fois.",
  "Send_invitation_email_success" : "Vous avez envoyé un email d'invitation aux adresses suivantes :",
-  "Send_invitation_email_warning" : "Afin d'envoyer des emails d'invitation, vous devez premièrement configurer le SMTP.",
+  "Send_invitation_email_warning" : "Afin d'envoyer des emails d'invitation, vous devez déjà configurer le SMTP.",
  "Send_Message" : "Envoyer un message",
  "Settings" : "Paramètres",
  "Settings_updated" : "Paramètres mis à jour",
@ -292,7 +299,7 @@
  "Stats_Avg_Private_Group_Users" : "Nombre moyen d'utilisateurs dans les groupes privés",
  "Stats_Max_Room_Users" : "Nombre d'utilisateur maximum par salon",
  "Stats_Non_Active_Users" : "Utilisateurs inactifs",
-  "Stats_Away_Users" : "Away Users",
+  "Stats_Away_Users" : "Utilisateurs indisponibles",
  "Stats_Offline_Users" : "Utilisateurs hors ligne",
  "Stats_Online_Users" : "Utilisateurs en ligne",
  "Stats_OS_Arch" : "Architecture",
@ -343,7 +350,7 @@
  "User_removed_by" : "L'utilisateur <em>__user_removed__</em> a été éjecté par <em>__user_by__</em>.",
  "User_Settings" : "Paramètres utilisateur",
  "User_updated_successfully" : "Utilisateur mis à jour avec succès",
-  "Users": "Utilisateurs",
+  "Users" : "Utilisateurs",
  "Username" : "Nom d'utilisateur",
  "Username_cant_be_empty" : "Le nom d'utilisateur doit être renseigné",
  "Username_description" : "Le nom d'utilisateur est utilisé pour permettre à d'autres personnes de vous mentionner dans leurs messages.",
--- a/i18n/hr.i18n.json
+++ b/i18n/hr.i18n.json
@ -1,6 +1,7 @@
 {
  "Access_online_demo" : "Pristupi online demonstraciji",
  "Access_Online_Demo" : "Pristupi Online demonstraciji",
+  "Accounts" : "Računi",
  "Accounts_denyUnverifiedEmail" : "Odbij neprovjereni e-mail",
  "Accounts_EmailVerification" : "E-mail Verifikacija",
  "Accounts_OAuth_Facebook" : "Facebook prijava",
@ -15,6 +16,7 @@
  "Accounts_OAuth_Custom_Enable" : "Omogući",
  "Accounts_OAuth_Custom_Button_Label_Text" : "Tekst Gumba",
  "Accounts_OAuth_Custom_Button_Color" : "Boja Gumba",
+  "Activate" : "Aktiviraj",
  "Add_Members" : "Dodaj Članove",
  "Add_users" : "Dodaj korisnike",
  "Administration" : "Administracija",
@ -57,7 +59,9 @@
  "Create_new_public_channel" : "Stvori novi javni kanal",
  "Created_at" : "Stvoreno u",
  "days" : "dana",
+  "Deactivate" : "Isključi",
  "Delete_User_Warning" : "Brisanje korisnika će izbrisati i sve poruke od tog korisnika. Ovo se ne može poništiti.",
+  "Delete" : "Obriši",
  "Deleted" : "Obrisano!",
  "Direct_Messages" : "Izravne Poruke",
  "Disable_New_Message_Notification" : "Onemogući obavijesti o novim porukama",
@ -66,6 +70,7 @@
  "Duplicate_channel_name" : "Kanal s nazivom '% s' postoji",
  "Duplicate_private_group_name" : "Privatna Grupa s nazivom '% s' postoji",
  "E-mail" : "E-mail",
+  "Edit" : "Uredi",
  "edited" : "uređeno",
  "Email_already_exists" : "Email već postoji",
  "Email_or_username" : "Email or username",
@ -83,6 +88,7 @@
  "Get_to_know_the_team" : "Upoznajte Rocket.Team",
  "github_no_public_email" : "Nemaš ni1 javni email u svom GitHub računu",
  "Have_your_own_chat" : "Imaj svoj vlastiti web chat. Razvijen sa Meteor.com, Rocket.Chat je sjajno rješenje za developere koji žele sagraditi i dalje razvijati svoju vlastitu chat platformu.",
+  "Has_more" : "Ima više",
  "Hide_room" : "Sakrij sobu",
  "History" : "Povijest",
  "hours" : "sati",
@ -113,6 +119,7 @@
  "Leave_room" : "Izađi iz sobe",
  "line" : "linija",
  "Load_more" : "Učitaj više",
+  "Loading_more_from_history" : "Učitavanje više iz povijesti",
  "Loading..." : "Učitavanje ...",
  "Loading_suggestion" : "Učitavam sugestije...",
  "Login" : "Prijava",
@ -120,6 +127,7 @@
  "login_with" : "Ili se prijavi izravno sa",
  "Logout" : "Odjava",
  "Make_Admin" : "Učini Administratorom",
+  "Mark_as_read" : "Označi kao pročitano",
  "Members" : "Članovi",
  "Members_List" : "Lista Članova",
  "Members_placeholder" : "Članovi",
@ -129,17 +137,21 @@
  "Message_AllowPinning" : "Dopusti pribadanje poruka ",
  "Message_deleting_not_allowed" : "Brisanje poruka nije dopušteno",
  "Message_editing_not_allowed" : "Uređivanje poruka nije dopušteno",
+  "Message_MaxAllowedSize" : "Maksimalna dopuštena veličina poruke",
  "Message_pinning_not_allowed" : "Pribadanje poruka nije dopušteno",
  "Message_KeepHistory" : "Zadrži Povijest Poruka",
  "Message_removed" : "Poruka je maknuta",
  "Message_pinned" : "Poruka je pribodena",
  "Message_ShowDeletedStatus" : "Pokaži Izbrisan status",
  "Message_ShowEditedStatus" : "Prikaži uređeni status",
+  "Meta" : "Meta",
  "Meta_fb_app_id" : "Facebook App-ID",
  "Meta_language" : "Jezik",
  "Meta_robots" : "Roboti",
  "minutes" : "minuta",
  "More_channels" : "Više kanala",
+  "More_groups" : "Više privatnih grupa",
+  "More_unreads" : "Više nepročitanih",
  "Msgs" : "Poruke",
  "multi" : "više",
  "My_Account" : "Moj Račun",
@ -159,6 +171,7 @@
  "Not_found_or_not_allowed" : "Nije Nađeno ili Nije Dozvoljeno",
  "Nothing_found" : "Ništa nije nađeno",
  "Notify_all_in_this_room" : "Obavijesti sve u ovoj sobi",
+  "Only_you_can_see_this_message" : "Samo ti možeš vidjeti ovu poruku",
  "Online" : "Online",
  "Oops!" : "Ups",
  "Opt_out_statistics" : "Ne šalji moje anonimne statistike Rocket.Chatu",
@ -173,6 +186,7 @@
  "Preferences_saved" : "Postavke sačuvane",
  "Privacy" : "Privatnost",
  "Private_Groups" : "Privatne Grupe",
+  "Private_Groups_list" : "Lista privatnih grupa",
  "Profile" : "Profil",
  "Profile_saved_successfully" : "Profil je uspješno sačuvan",
  "Proudly_developed" : "Proudly developed by Meteor",
@ -193,9 +207,11 @@
  "Room_name_changed_successfully" : "Ime sobe je uspješno izmijenjeno",
  "Room_not_found" : "Soba nije nađena",
  "room_user_count" : "% korisnika",
+  "Rooms" : "Sobe",
  "Save" : "Sačuvaj",
  "Save_changes" : "Spremi promjene",
  "Search" : "Traži",
+  "Search_Messages" : "Pretraži poruke",
  "Search_settings" : "Postavke pretraživanja",
  "seconds" : "se",
  "See_all" : "Vidi sve",
@ -218,6 +234,7 @@
  "SMTP_Username" : "SMTP korisničko ime",
  "Sound" : "Zvuk",
  "Start_of_conversation" : "Početak razgovora",
+  "Statistics" : "Statistike",
  "Stats_Active_Users" : "Aktivni korisnici",
  "Stats_Avg_Channel_Users" : "Prosječan broj korisnika kanala",
  "Stats_Max_Room_Users" : "Maksimalno Korisnika Sobe",
@ -237,6 +254,7 @@
  "Stats_Total_Users" : "Ukupno korisnika",
  "strike" : "precrtaj",
  "Submit" : "Pošalji",
+  "S_new_messages_since_s" : "novih poruka od",
  "The_field_is_required" : "Polje% s je traženo.",
  "True" : "Da",
  "Unnamed" : "Neimenovan",
@ -249,9 +267,11 @@
  "Use_uploaded_avatar" : "Koristi uploadani avatar",
  "User_added" : "Korisnik <em>__user_added__</em> je dodan.",
  "User_added_by" : "Korisnik <em>__user_added__</em> dodan od <em>__user_by__</em>.",
+  "User_Channels" : "Korisnički kanali",
  "User_has_been_activated" : "Korisnik je aktiviran",
  "User_has_been_deactivated" : "Korisnik je deaktiviran",
  "User_has_been_deleted" : "Korisnik je obrisan",
+  "User_Info" : "Podaci o korisniku",
  "User_is_no_longer_an_admin" : "Korisnik nije više admin",
  "User_is_not_activated" : "Korisnik nije aktiviran",
  "User_is_now_an_admin" : "Korisnik je sada admin",
@ -265,6 +285,7 @@
  "User_removed_by" : "Korisnik <em>__user_removed__</em> maknut od <em>__user_by__</em>.",
  "User_Settings" : "Korisničke postavke",
  "User_updated_successfully" : "Korisnik je uspješno ažuriran",
+  "Users" : "Korisnici",
  "Username" : "Korisničko ime",
  "Username_cant_be_empty" : "Korisničko ime ne može ostati prazno.",
  "Username_description" : "Korisničko ime se koristi kako bi te drugi mogli spomenuti u porukama.",
@ -282,6 +303,6 @@
  "you_are_in_preview_mode_of" : "Ti si u preglednom načinu kanala # <strong>__room_name__</strong>",
  "You_need_confirm_email" : "Trebaš potvrditi svoj email kako bi se prijavio!",
  "You_will_not_be_able_to_recover" : "Ovo nećeš moći promijeniti!",
-  "Your_entry_has_been_deleted" : "Vaš unos je obrisan.",
+  "Your_entry_has_been_deleted" : "Tvoj unos je obrisan.",
  "Your_Open_Source_solution" : "Vaše vlastito Open Source chat rješenje"
 }
--- a/i18n/km.i18n.json
+++ b/i18n/km.i18n.json
@ -1,6 +1,7 @@
 {
  "Access_online_demo" : "ចូលទៅសាកល្បងវាលើអ៊ីនធើណិតជាមុនសិន",
  "Access_Online_Demo" : "ចូលទៅសាកល្បងវាលើអ៊ីនធើណិតជាមុនសិន",
+  "Accounts" : "គណនី",
  "Accounts_denyUnverifiedEmail" : "រាំងខ្ទប់អ្នកមិនបានផ្ទៀតផ្ទាត់អ៊ីមែល",
  "Accounts_EmailVerification" : "ការផ្ទៀងផ្ទាត់តាមអ៊ីម៉ែល",
  "Accounts_OAuth_Facebook" : "ចូលតាមហ្វេសប៊ូក",
@ -23,6 +24,14 @@
  "Accounts_OAuth_Twitter" : "ចូលតាម Twitter",
  "Accounts_OAuth_Twitter_id" : "លេខសម្គាល់ Twitter",
  "Accounts_OAuth_Twitter_secret" : "Twitter សម្ងាត់",
+  "Accounts_OAuth_Custom_ID" : "លេខសម្គាល់",
+  "Accounts_OAuth_Custom_URL" : "URL",
+  "Accounts_OAuth_Custom_Secret" : "ការសម្ងាត់",
+  "Accounts_OAuth_Custom_Enable" : "អនុញ្ញាត",
+  "Accounts_OAuth_Custom_Button_Label_Text" : "អត្ថបទប៊ូតុង",
+  "Accounts_OAuth_Custom_Button_Label_Color" : "ពណ៌អត្ថបទប៊ូតុង",
+  "Accounts_OAuth_Custom_Button_Color" : "ពណ៌ប៊ូតុង",
+  "Activate" : "ធ្វើឱ្យសកម្ម",
  "Add_Members" : "ថែមសមាជិក",
  "Add_users" : "ថែមអ្នកប្រើប្រាស់",
  "Administration" : "រដ្ឋបាល",
@ -40,6 +49,7 @@
  "Away_female" : "ឆ្ងាយ",
  "away_male" : "ឆ្ងាយ",
  "Away_male" : "ឆ្ងាយ",
+  "Auto_Load_Images" : "ផ្ទុករូបភាពដោយស្វ័យប្រវត្តិ",
  "Back_to_login" : "ត្រឡប់មកឡុកចូល",
  "bold" : "ក្រាស់",
  "busy" : "រវល់",
@ -58,19 +68,25 @@
  "Confirm_password" : "បញ្ជាក់ពាក្យសម្ងាត់",
  "Contact" : "ទំនាក់ទំនង",
  "Conversation" : "កិច្ចពិភាក្សា",
+  "Convert_Ascii_Emojis" : "បម្លែង ASCII នេះទៅ Emoji",
  "Create_new" : "បង្កើតថ្មី",
  "Create_new_direct_message_room" : "បង្កើតបន្ទប់ពិភាក្សាដោយផ្ទាល់",
  "Create_new_private_group" : "បង្កើតក្រុមឯកជន",
  "Create_new_public_channel" : "បង្កើតប៉ុស្តិ៍សាធារណៈថ្មី",
  "Created_at" : "បានបង្កើតកាលពី",
  "days" : "ថ្ងៃ",
+  "Deactivate" : "ធ្វើឲ្យមិនសកម្ម",
  "Delete_User_Warning" : "ការលប់អ្នកប្រើប្រាស់ នឹងត្រូវលប់គ្រប់សាររបស់គាត់ផងដែរ។ ដូចនេះមិនអាចធ្វើបានទេ ។",
+  "Delete" : "លុប",
  "Deleted" : "បានលប់!",
  "Direct_Messages" : "សារផ្ទាល់",
+  "Disable_New_Message_Notification" : "បិទការជូនដំណឹងសារថ្មី",
+  "Disable_New_Room_Notification" : "បិទការជូនដំណឹងបន្ទប់ថ្មី",
  "Drop_to_upload_file" : "ទម្លាក់ឯកសារដើម្បីផ្ទុកឡើង",
  "Duplicate_channel_name" : "ប៉ុស្តិ៍ដែលមានឈ្មោះ, '%s', មានហើយ",
  "Duplicate_private_group_name" : "ក្រុមឯកជនដែលមានឈ្មោះ, '%s', មានហើយ",
  "E-mail" : "អ៊ីមែល",
+  "Edit" : "កែសម្រួល",
  "edited" : "បានកែ",
  "Email_already_exists" : "អ៊ីម៉ែលដែលមានរួចហើយ",
  "Email_or_username" : "អ៊ីមែល ឬឈ្មោះសម្ងាត់",
@ -78,11 +94,14 @@
  "Enter_info" : "បញ្ចូលព័ត៌មានរបស់អ្នក",
  "Enter_to" : "បញ្ចូល",
  "Error_changing_password" : "ពាក្យសម្ងាត់បានប្តូរ",
+  "Esc_to" : "Esc ដើម្បី",
  "False" : "មិនពិត",
  "Favorites" : "ពេញចិត្ត",
  "Follow_social_profiles" : "តាមដានបណ្តាគណនីបណ្តាញសង្គមរបស់យើង, មើលយើងលើ github និងចែករំលែកបទពិសោធន៍របស់អ្នកជាមួយ rocket.chat app នៅលើក្តារឃៀនរបស់យើង",
  "Forgot_password" : "ភ្លេចពាក្យសម្ងាត់",
  "Fork_it_on_github" : "ទៅមើលវាលើ github",
+  "From_Email" : "ពីអ៊ីម៉ែល",
+  "General" : "ទូទៅ",
  "Get_to_know_the_team" : "ទៅស្គាល់ Rocket.Team",
  "github_no_public_email" : "អ្នកមិនមានអ៊ីមែលសាធារណៈក្នុង GitHub នៅឡើយទេ",
  "Have_your_own_chat" : "អ្នកមាន Web Chat ផ្ទាល់ខ្លួនហើយឬ។ អភិវឌ្ឃន៍ជាមួយ Meteor.com, Rocket.Chat គឺជាដំណោះស្រាយដ៏ល្អបំផុតសម្រាប់អ្នកអភិវឌ្ឍន៍ ក្នុងការបង្កើត Web Chat Plateform។",
@ -110,11 +129,18 @@
  "Language_Version" : "ជំនាន់អង់គ្លេស",
  "Last_login" : "ចូលលើកមុន",
  "Last_message" : "សារចុងក្រោយ",
+  "Layout" : "ប្លង់",
  "Layout_Home_Body" : "តួរសេចក្តីទំព័រដើម",
  "Layout_Home_Title" : "ចំណងជើងទំព័រដើម",
+  "Layout_Login_Header" : "ក្បាលទំព័រចូល",
+  "Layout_Login_Terms" : "លក្ខ័ណចូល",
+  "Layout_Privacy_Policy" : "គោលការណ៍ឯកជនភាព",
+  "Layout_Sidenav_Footer_description" : "ទំហំបានគឺ 260x70",
+  "Layout_Terms_of_Service" : "ល័ក្ខខ័ណ្ឌនៃសេវាកម្ម",
  "Leave_room" : "ចេញពីបន្ទប់",
  "line" : "ជួរ",
  "Load_more" : "មើលទៀត",
+  "Loading_more_from_history" : "លោតច្រើនទៀតពីប្រវត្តិ",
  "Loading..." : "កំពុងដំណើរការ...",
  "Loading_suggestion" : "កំពុងមើលការសម្រេចចិត្ត...",
  "Login" : "ឡុកចូល",
@ -122,6 +148,7 @@
  "login_with" : "ឬ ឡុកចូលដោយផ្ទាល់ជាមួយ",
  "Logout" : "ចាកចេញ",
  "Make_Admin" : "ឲ្យធ្វើអ្នកគ្រប់គ្រង",
+  "Mark_as_read" : "សម្គាល់ថាបានអាន",
  "Members" : "សាមាជិក",
  "Members_List" : "បញ្ជីសមាជិក",
  "Members_placeholder" : "សាមាជិក",
@ -131,12 +158,15 @@
  "Message_AllowPinning" : "អនុញ្ញតិខ្ទស់សារ",
  "Message_deleting_not_allowed" : "ការលប់សារមិនត្រូវបានអនុញ្ញាតិ",
  "Message_editing_not_allowed" : "ការកែសម្រួលសារមិនត្រូវបានអនុញ្ញាតិ",
+  "Message_editing_blocked" : "សារនេះមិនអាចត្រូវបានកែប្រែទៀតទេ",
+  "Message_MaxAllowedSize" : "ទំហំអតិបរមាដែលត្រូវបានអនុញ្ញាតសារ",
  "Message_pinning_not_allowed" : "ការខ្ទាស់សារមិនអនុញ្ញាតិ",
  "Message_KeepHistory" : "រក្សាប្រវត្តិសារ",
  "Message_removed" : "សារបានលប់",
  "Message_pinned" : "សារ\n",
  "Message_ShowDeletedStatus" : "បង្ហាញស្ថានភាពដែលបានលុប",
  "Message_ShowEditedStatus" : "បង្ហាញស្ថានភាពអត្ថបទដែលបានកែសម្រួល",
+  "Meta" : "មេតា",
  "Meta_fb_app_id" : "លេខសម្គាល់ កម្មវិធីហ្វេសប៊ូក",
  "Meta_google-site-verification" : "ការផ្ទៀងផ្ទាត់ជាមួយ Google Site",
  "Meta_language" : "ភាសា",
@ -144,11 +174,14 @@
  "Meta_robots" : "មនុស្សយន្ត",
  "minutes" : "នាទី",
  "More_channels" : "ប៉ុស្តិ៍ច្រើនទៀត",
+  "More_groups" : "ក្រុមឯកជនច្រើនទៀត",
+  "More_unreads" : "មិនទាន់អានច្រើនទៀត",
  "Msgs" : "សារ",
  "multi" : "ច្រើន",
  "My_Account" : "គណនីរបស់ខ្ញុំ",
  "n_messages" : "%s សារ",
  "Name" : "Name",
+  "Name_cant_be_empty" : "ឈ្មោះមិនអាចទទេ",
  "New_messages" : "សារថ្មី",
  "New_password" : "ពាក្យសម្ងាត់ថ្មី",
  "No_channels_yet" : "អ្នកមិនមែនជាសមាជិកនៃប៉ុស្តិ៍ណាមួយឡើយ",
@ -156,12 +189,18 @@
  "No_favorites_yet" : "អ្នកមិនធ្លាប់បានកំណត់ត្រាពេញចិត្តណាមួយឡើយ",
  "No_groups_yet" : "អ្នកមិនទាន់មានក្រុមឯកជននៅឡើយ",
  "No_permission_to_view_room" : "អ្នកមិនមានសិទ្ធមើលបន្ទប់នេះឡើយ",
+  "No_channel_with_name_%s_was_found" : "មិនមានប៉ុស្តិ៍ឈ្មោះ <strong>\"%s\"</strong> ឡើយ",
+  "No_group_with_name_%s_was_found" : "មិនមានក្រុមឯកជនឈ្មោះ <strong>\"%s\"</strong> ឡើយ",
+  "No_user_with_username_%s_was_found" : "មិនមានអ្នកប្រើប្រាស់ឈ្មោះ <strong>\"%s\"</strong> ឡើយ",
  "Not_allowed" : "មិនបានអនុញ្ញាត្តិ",
  "Not_found_or_not_allowed" : "មិនប្រទះ ឬមិនអនុញ្ញាតិ",
  "Nothing_found" : "គ្មានអ្វីប្រទះ",
  "Notify_all_in_this_room" : "ជូនដំណឹងទាំងអស់នៅក្នុងបន្ទប់នេះ",
+  "Only_you_can_see_this_message" : "មានតែអ្នកដែលអាចឃើញសារនេះ",
  "Online" : "លើបណ្តាញ",
  "Oops!" : "អូ!",
+  "Opt_out_statistics" : "កុំផ្ញើស្ថិតិអនាមិករបស់អ្នកទៅ Rocket.Chat",
+  "Opt_out_statistics_warning" : "តាមការផ្ញើរស្ថិតិអនាមិនរបស់អ្នក, អ្នកនឹងជួយយើងដើម្បីសម្គាល់ចំនួនករណីនៃ Rocket.Chat ដែលត្រូវបានដាក់ប្រើ ដូចជាករណីចំនួនប្រព័ន្ធ ល្អកំពុងប្រើប្រាស់ ដូចនេះយើងអាចពង្រឹងវាបន្ថែមទៀត។ ប្រសិនបើអ្នកចង់បន្តការផ្ញើរស្ថិតិអនាមិនរបស់អ្នក សូមកុំធិចក្នុងប្រអប់ខាងលើ សូមអរគុណ!",
  "others" : "ផ្សេងៗ",
  "Password" : "ពាក្យសម្ងាត់",
  "Password_changed_successfully" : "ពាក្យសម្ងាត់បានប្តូរជោគជ័យ",
@ -169,11 +208,15 @@
  "Please_wait_activation" : "សូមមេត្តារង់ចាំ ការងារនេះត្រូវចំណាយពេលបន្តិច",
  "Please_wait_statistics" : "សូមមេត្តារង់ចាំ ស្ថិតិគឺកំពុងគណនា",
  "Powered_by" : "រក្សាសិទ្ធិដោយ",
+  "Preferences" : "ចំណង់ចំណូលចិត្ត",
+  "Preferences_saved" : "ចំណង់ចំណូលចិត្តដែលបានរក្សាទុក",
  "Privacy" : "ឯកជនភាព",
  "Private_Groups" : "ក្រុមឯកជន",
+  "Private_Groups_list" : "បញ្ជីនៃក្រុមឯកជន",
  "Profile" : "ពត៌មានផ្ទាល់ខ្លួន",
  "Profile_saved_successfully" : "ពត៌មានផ្ទាល់ខ្លួនបានរក្សាទុកដោយជោគជ័យ",
  "Proudly_developed" : "បានអភិវឌ្ឍដោយមោទនៈដោយមានរឿង Meteor",
+  "Push" : "រុញ",
  "Push_apn_cert" : "វិញ្ញាបនប័ត្រ APN",
  "Push_apn_dev_cert" : "វិញ្ញាបនប័ត្រអ្នកអភិវឌ្ឍន៍ APN",
  "Push_apn_dev_key" : "សោរអ្នកអភិវឌ្ឍន៍ APN",
@ -197,9 +240,12 @@
  "Room_name_changed_successfully" : "ឈ្មោះបន្ទប់បានប្តូរជោគជ័យ",
  "Room_not_found" : "រកមិនឃើញបន្ទប់",
  "room_user_count" : "%s អ្នកប្រើប្រាស់",
+  "Rooms" : "បន្ទប់",
  "Save" : "រក្សាទុក",
  "Save_changes" : "រក្សាទុកការផ្លាស់ប្តូរ",
+  "Save_Mobile_Bandwidth" : "រក្សាទុកកម្រិតបញ្ជូនតាមទូរស័ព្ទដៃ",
  "Search" : "ស្វែងរក",
+  "Search_Messages" : "ស្វែងរកសារ",
  "Search_settings" : "កំណត់ការស្វែងរក",
  "seconds" : "វិនាទ",
  "See_all" : "មើលទាំងអស់",
@ -208,7 +254,11 @@
  "Select_file" : "ជ្រើស ឯកសារ",
  "Select_service_to_login" : "ជ្រើសសេវាកម្មដើម្បីឡុកចូល ទាញរូបរបស់អ្នក ឬផ្ទុកឡើងផ្ទាល់ពីកុំព្យូទ័រ",
  "Selected_users" : "ជ្រើសសមាជិក",
+  "Send" : "ផ្ញើ",
  "Send_confirmation_email" : "ផ្ញើរអ៊ីម៉ែលបញ្ជាក់",
+  "Send_invitation_email" : "ផ្ញើការអញ្ជើញអ៊ីមែល",
+  "Send_invitation_email_error" : "អ្នកមិនបានផ្តល់អាស័យដ្ឋានអ៊ីមែលត្រឹមត្រូវទេ",
+  "Send_invitation_email_info" : "អ្នកអាចផ្ញើរច្រើនការអញ្ជើញអ៊ីមែលក្នុងពេលតែមួយ",
  "Send_Message" : "ផ្ញើរសារ",
  "Settings" : "ការកំណត់",
  "Settings_updated" : "ការកំណត់ការធ្វើឱ្យទាន់សម័យ",
@ -216,16 +266,20 @@
  "Showing_results" : "<p>កំពុងបង្ហាញ <b>%s</b> លទ្ធផល</p>",
  "Silence" : "ស្ងាត់",
  "since_creation" : "តាំងពី %s",
+  "Site_Name" : "គេហទំព័រឈ្មោះ",
  "SMTP_Host" : "ម៉ាស៊ីន SMTP",
  "SMTP_Password" : "ឃ្លាសម្ងាត់ SMTP",
  "SMTP_Port" : "ផែ SMTP",
  "SMTP_Username" : "ឈ្មោះសម្ងាត់ SMTP",
+  "Sound" : "សំឡេង",
  "Start_of_conversation" : "ចំនាប់ផ្តើការពិភាក្សា",
+  "Statistics" : "ស្ថិតិ",
  "Stats_Active_Users" : "អ្នកប្រើប្រាស់សកម្ម",
  "Stats_Avg_Channel_Users" : "ចំនួនអ្នកប្រើប្រាស់ជាមធ្យមក្នុងប៉ុស្តិ៍",
  "Stats_Avg_Private_Group_Users" : "ចំនួនអ្នកប្រើប្រាស់ជាមធ្យមក្នុងក្រុមឯកជន",
  "Stats_Max_Room_Users" : "អតិបរិមាអ្នកប្រើប្រាស់ក្នុងបន្ទប់",
  "Stats_Non_Active_Users" : "អ្នកប្រើអសកម្ម",
+  "Stats_Away_Users" : "អ្នកប្រើដែលបានចាកឆ្ងាយ",
  "Stats_Offline_Users" : "អ្នកប្រើក្រៅបណ្តាញ",
  "Stats_Online_Users" : "អ្នកប្រើលើបណ្ដាញ",
  "Stats_Total_Channels" : "ប៉ុស្តិ៍សរុប",
@ -235,10 +289,12 @@
  "Stats_Total_Users" : "អ្នកប្រើប្រាស់សរុប",
  "strike" : "strike",
  "Submit" : "បញ្ចូល",
+  "S_new_messages_since_s" : "%s សារថ្មីចាប់តាំងពី %s",
  "The_field_is_required" : "ចន្លោះ %s ត្រូវបំពេញ",
  "True" : "ពិត",
  "Unnamed" : "គ្មានឈ្មោះ",
  "Upload_file_question" : "ផ្ទុកឯកសារឡើងឬ?",
+  "Use_Emojis" : "ប្រើ Emoji",
  "Use_initials_avatar" : "ប្រើឈ្មោះអ្នកជាពិសេស",
  "use_menu" : "ប្រើប្រាស់ផ្ទាំងនៅសងខាងដើម្បីចូលទៅកាន់បន្ទប់ និងពិភាក្សា",
  "Use_service_avatar" : "ប្រើ %s រូប",
@ -246,9 +302,11 @@
  "Use_uploaded_avatar" : "ប្រើរូបបានផ្ទុកឡើង",
  "User_added" : "អ្នកប្រើ <em>__user_added__</em> បានបន្ថែម",
  "User_added_by" : "អ្នកប្រើ <em>__user_added__</em> បានថែមដោយ <em>__user_by__</em>.",
+  "User_Channels" : "ប៉ុស្តិ៍អ្នកប្រើប្រាស់",
  "User_has_been_activated" : "អ្នកប្រើដែលបានធ្វើឱ្យសកម្ម",
  "User_has_been_deactivated" : "អ្នកប្រើដែលត្រូវបានធ្វើឱ្យអសកម្ម",
  "User_has_been_deleted" : "អ្នកប្រើប្រាស់ដែលបានលប់",
+  "User_Info" : "ព័តមានរបស់អ្នកប្រើ",
  "User_is_no_longer_an_admin" : "អ្នកប្រើប្រាស់គឺមិនមែនជាអ្នកគ្រប់គ្រងទៀតទេ",
  "User_is_not_activated" : "អ្នកប្រើដែលមិនត្រូវបានធ្វើឱ្យសកម្ម",
  "User_is_now_an_admin" : "បច្ចុប្បន្នអ្នកប្រើប្រាស់គឺជាអ្នកគ្រប់គ្រង",
@ -262,6 +320,7 @@
  "User_removed_by" : "អ្នកប្រើ <em>__user_removed__</em> បានដកចេញដោយ <em>__user_by__</em>.",
  "User_Settings" : "ការកំណត់របស់អ្នកប្រើ",
  "User_updated_successfully" : "អ្នកប្រើប្រាស់បានកែសម្រួលដោយជោគជ័យ",
+  "Users" : "អ្នកប្រើប្រាស់",
  "Username" : "ឈ្មោះសម្ងាត់",
  "Username_cant_be_empty" : "ឈ្មោះសម្ងាត់មិនអាចទទេ",
  "Username_description" : "ឈ្មោះសម្ងាត់បានអនុញ្ញាត់ឲ្យអ្នកផ្សេងដាក់ស្លាកឈ្មោះអ្នក",
@ -269,6 +328,7 @@
  "Username_title" : "ចុះឈ្មោះសម្ងាត់",
  "Username_unavaliable" : "<strong>%s</strong> គឺបានប្រើហើយ :(",
  "View_All" : "មើលទាំងអស់",
+  "Wait_activation_warning" : "មុនពេលចូលប្រើប្រាស់គណនីអ្នកត្រូវតែទទួលបានការអនុញ្ញាតិពីអ្នកគ្រប់គ្រងជាមុនសិន",
  "We_have_sent_password_email" : "យើងបានផ្ញើរអ៊ីមែលជាមួយលំណែនាំក្នុងការប្តូរឃ្លាសម្ងាត់។ ប្រសិនបើអ្នកមិនបានទទួលអ៊ីមែលទេសូមរួសរាន់មកទីនេះ ដើម្បីធ្វើវាម្តងទៀត។",
  "We_have_sent_registration_email" : "យើងបានផ្ញើរអ៊ីមែលមួយទៅអ្នកដើម្បីបញ្ជាក់ការបានចុះឈ្មោះ។ ប្រសិនបើអ្នកមិនបានទទួលអ៊ីមែលទេសូមរួសរាន់មកទីនេះ ដើម្បីធ្វើវាម្តងទៀត។",
  "Welcome" : "ស្វាគមន៍ <em>%s</em>.",
--- a/i18n/ko.i18n.json
+++ b/i18n/ko.i18n.json
@ -1,6 +1,7 @@
 {
  "Access_online_demo" : "온라인 데모 접속",
  "Access_Online_Demo" : "온라인 데모 접속",
+  "Accounts" : "계정",
  "Accounts_denyUnverifiedEmail" : "확인되지 않은 이메일 거부",
  "Accounts_EmailVerification" : "이메일 확인",
  "Accounts_OAuth_Facebook" : "Facebook 로그인",
@ -23,11 +24,23 @@
  "Accounts_OAuth_Twitter" : "트위터 로그인",
  "Accounts_OAuth_Twitter_id" : "트위터 ID",
  "Accounts_OAuth_Twitter_secret" : "트위터 암호",
+  "Accounts_OAuth_Custom_ID" : "ID",
+  "Accounts_OAuth_Custom_URL" : "URL",
+  "Accounts_OAuth_Custom_Token_Path" : "Token 경로",
+  "Accounts_OAuth_Custom_Identity_Path" : "Identity 경로",
+  "Accounts_OAuth_Custom_Authorize_Path" : "Authorize 경로",
+  "Accounts_OAuth_Custom_Secret" : "비밀",
+  "Accounts_OAuth_Custom_Enable" : "사용",
+  "Accounts_OAuth_Custom_Button_Label_Text" : "버튼 텍스트",
+  "Accounts_OAuth_Custom_Button_Label_Color" : "버튼 텍스트 색",
+  "Accounts_OAuth_Custom_Button_Color" : "버튼 색",
+  "Activate" : "활성화",
  "Add_Members" : "멤버 추가",
  "Add_users" : "사용자 추가",
  "Administration" : "관리",
  "All_channels" : "모든 채널",
  "and" : "그리고",
+  "API" : "API",
  "API_Analytics" : "분석",
  "API_Embed" : "포함",
  "are_also_typing" : "또한 입력중",
@ -40,6 +53,7 @@
  "Away_female" : "자리비움",
  "away_male" : "자리비움",
  "Away_male" : "자리비움",
+  "Auto_Load_Images" : "이미지 자동 로드",
  "Back_to_login" : "로그인으로 돌아가기",
  "bold" : "굵게",
  "busy" : "바쁨",
@ -65,7 +79,9 @@
  "Create_new_public_channel" : "새 공용 채널 생성",
  "Created_at" : "제작",
  "days" : "일",
+  "Deactivate" : "비활성화",
  "Delete_User_Warning" : "사용자 삭제시 사용자의 모든 메시지를 삭제합니다. 취소할 수 없습니다.",
+  "Delete" : "삭제",
  "Deleted" : "삭제!",
  "Direct_Messages" : "귓속말",
  "Disable_New_Message_Notification" : "새 메시지 알림 비활성화",
@ -74,6 +90,7 @@
  "Duplicate_channel_name" : "'%s' 채널 이름은 이미 존재합니다.",
  "Duplicate_private_group_name" : "'%s'는 이미 존재하는 개인 그룹입니다.",
  "E-mail" : "이메일",
+  "Edit" : "수정",
  "edited" : "수정됨",
  "Email_already_exists" : "이메일이 이미 존재합니다",
  "Email_or_username" : "이메일 또는 사용자 이름",
@ -88,9 +105,11 @@
  "Forgot_password" : "암호를 잊었습니다",
  "Fork_it_on_github" : "Github에서 포크",
  "From_Email" : "이메일로부터",
+  "General" : "일반",
  "Get_to_know_the_team" : "Rocket.Team 알아보기",
  "github_no_public_email" : "Github 계정에 공개된 이메일이 없습니다.",
  "Have_your_own_chat" : "당신만의 웹 채팅을 만드세요. Meteor.com으로 개발한 Rocket.Chat은 자신만의 채팅 플랫폼을 만들고 개선해 나아갈 개발자들을 위한 훌륭한 솔루션입니다.",
+  "Has_more" : "더 많이",
  "Hide_room" : "방 숨김",
  "History" : "이력",
  "hours" : "시간",
@ -102,6 +121,9 @@
  "Invalid_room_name" : "<strong>%s</strong>은 사용 가능한 방 이름이 아닙니다.<br/>소문자, 숫자, 대시만 사용할 수 있습니다",
  "invisible" : "보지 않음",
  "Invisible" : "보지 않음",
+  "Invitation HTML" : "HTML 초대 페이지",
+  "Invitation_Subject" : "초대 제목",
+  "Invite_Users" : "사용자 초대",
  "is_also_typing" : "또한 입력중",
  "is_also_typing_female" : "또한 입력중",
  "is_also_typing_male" : "또한 입력중",
@ -115,6 +137,7 @@
  "Language_Version" : "한국어 버전",
  "Last_login" : "마지막 로그인",
  "Last_message" : "마지막 메시지",
+  "Layout" : "레이아웃",
  "Layout_Home_Body" : "홈 본문 내용",
  "Layout_Home_Title" : "홈 제목",
  "Layout_Login_Header" : "로그인 헤더",
@ -123,9 +146,11 @@
  "Layout_Sidenav_Footer" : "옆 네비 바닥글",
  "Layout_Sidenav_Footer_description" : "바닥글 크기는 260x70입니다.",
  "Layout_Terms_of_Service" : "이용약관",
+  "LDAP" : "LDAP",
  "Leave_room" : "방 나가기",
  "line" : "밑줄",
  "Load_more" : "더 보기",
+  "Loading_more_from_history" : "이전 내용에서 가져오기",
  "Loading..." : "로딩 중 ...",
  "Loading_suggestion" : "제안 로딩중...",
  "Login" : "로그인",
@ -133,6 +158,7 @@
  "login_with" : "아니면 직접 로그인",
  "Logout" : "로그아웃",
  "Make_Admin" : "관리자 권한 생성",
+  "Mark_as_read" : "읽었음",
  "Members" : "멤버",
  "Members_List" : "멤버 리스트",
  "Members_placeholder" : "멤버",
@ -142,12 +168,14 @@
  "Message_AllowPinning" : "허용 메시지 고정",
  "Message_deleting_not_allowed" : "메시지 삭제를 할 수 없습니다.",
  "Message_editing_not_allowed" : "메시지 수정을 할 수 없습니다.",
+  "Message_MaxAllowedSize" : "메시지 최대 허용 크기",
  "Message_pinning_not_allowed" : "메시지를 고정할 수 없습니다.",
  "Message_KeepHistory" : "메시지 기록을 유지",
  "Message_removed" : "메시지 제거",
  "Message_pinned" : "메시지가 고정되었습니다.",
  "Message_ShowDeletedStatus" : "삭제된 상태 확인",
  "Message_ShowEditedStatus" : "수정 상태 확인",
+  "Meta" : "메타",
  "Meta_fb_app_id" : "페이스북 APP ID",
  "Meta_google-site-verification" : "Google 사이트 확인",
  "Meta_language" : "언어",
@ -155,6 +183,8 @@
  "Meta_robots" : "검색 로봇",
  "minutes" : "분",
  "More_channels" : "추가 채널",
+  "More_groups" : "비밀 그룹 더보기",
+  "More_unreads" : "읽지 않은 메시지 더보기",
  "Msgs" : "Msgs",
  "multi" : "다중 밑줄",
  "My_Account" : "내 계정",
@ -174,6 +204,7 @@
  "Not_found_or_not_allowed" : "찾을 수 없거나 허용되지 않았습니다",
  "Nothing_found" : "찾을 수 없습니다",
  "Notify_all_in_this_room" : "이 방에 있는 모든이에게 알림",
+  "Only_you_can_see_this_message" : "이 메시지는 당신만 볼 수 있습니다",
  "Online" : "온라인",
  "Oops!" : "아차",
  "Opt_out_statistics" : "나의 어떤 무기명 통계도 Rocket.chat으로 보내지 마십시오.",
@ -189,9 +220,11 @@
  "Preferences_saved" : "설정 저장함.",
  "Privacy" : "개인정보보호",
  "Private_Groups" : "개인 그룹",
+  "Private_Groups_list" : "비밀 그룹 목록",
  "Profile" : "프로필",
  "Profile_saved_successfully" : "프로필을 성공적으로 저장",
  "Proudly_developed" : "Meteor로 개발됨",
+  "Push" : "푸시",
  "Push_apn_cert" : "APN Cert",
  "Push_apn_dev_cert" : "APN 개발 Cert",
  "Push_apn_dev_key" : "APN 개발 키",
@ -215,9 +248,12 @@
  "Room_name_changed_successfully" : "방 이름 변경 완료",
  "Room_not_found" : "방을 찾을 수 없습니다.",
  "room_user_count" : "%s 사용자",
+  "Rooms" : "방",
  "Save" : "저장",
  "Save_changes" : "변경사항 저장",
+  "Save_Mobile_Bandwidth" : "모바일 대역폭 저장",
  "Search" : "검색",
+  "Search_Messages" : "메시지 찾기",
  "Search_settings" : "검색 설정",
  "seconds" : "초",
  "See_all" : "모두 보기",
@ -226,7 +262,9 @@
  "Select_file" : "파일 선택",
  "Select_service_to_login" : "서비스 로그인시 불러온 사진이나 컴퓨터에서 직접 올린 사진을 선택합니다.",
  "Selected_users" : "선택된 멤버",
+  "Send" : "보내기",
  "Send_confirmation_email" : "확인 메일 보냄",
+  "Send_invitation_email" : "초대 메일 보내기",
  "Send_Message" : "메시지 보내기",
  "Settings" : "설정",
  "Settings_updated" : "설정 업데이트",
@ -235,12 +273,15 @@
  "Silence" : "무언",
  "since_creation" : "%s 이후",
  "Site_Name" : "사이트 이름:",
+  "SAML" : "SAML",
+  "SMTP" : "SMTP",
  "SMTP_Host" : "SMTP 호스트",
  "SMTP_Password" : "SMTP 암호",
  "SMTP_Port" : "SMTP 포트",
  "SMTP_Username" : "SMTP 사용자 이름",
  "Sound" : "소리",
  "Start_of_conversation" : "대화 시작",
+  "Statistics" : "통계",
  "Stats_Active_Users" : "활성 사용자",
  "Stats_Avg_Channel_Users" : "채널 사용자 평균",
  "Stats_Avg_Private_Group_Users" : "비밀 그룹 사용자 평균",
@ -278,9 +319,11 @@
  "Use_uploaded_avatar" : "업로드된 아바타 사용",
  "User_added" : "사용자 <em>__user_added__</em> 추가함.",
  "User_added_by" : "사용자 <em>__user_added__</em>을/를 <em>__user_by__</em>에 추가함.",
+  "User_Channels" : "사용자 채널",
  "User_has_been_activated" : "사용자가 활성화되었습니다",
  "User_has_been_deactivated" : "사용자가 비활성화되었습니다",
  "User_has_been_deleted" : "사용자 삭제되었습니다",
+  "User_Info" : "사용자 정보",
  "User_is_no_longer_an_admin" : "사용자는 더 이상 관리자가 아닙니다",
  "User_is_not_activated" : "사용자는 더 이상 활동하지 않습니다.",
  "User_is_now_an_admin" : "사용자는 관리자입니다.",
@ -294,6 +337,7 @@
  "User_removed_by" : "사용자 <em>__user_removed__</em>을/를 <em>__user_by__</em>에서 삭제됨.",
  "User_Settings" : "사용자 설정",
  "User_updated_successfully" : "사용자를 성공적으로 업데이트하였습니다.",
+  "Users" : "사용자",
  "Username" : "사용자 이름",
  "Username_cant_be_empty" : "사용자 이름을 비워둘 수 없습니다",
  "Username_description" : "사용자 이름은 다른 사람이 메시지에서 언급할 수 있도록 하는데 사용됩니다.",
--- a/i18n/pl.i18n.json
+++ b/i18n/pl.i18n.json
@ -5,12 +5,23 @@
  "Accounts_OAuth_Facebook" : "Facebook Login",
  "Accounts_OAuth_Facebook_id" : "Facebook App Id",
  "Accounts_OAuth_Facebook_secret" : "Facebook Secret",
+  "Accounts_OAuth_Github" : "GitHub Login",
+  "Accounts_OAuth_Github_id" : "GitHub Id",
+  "Accounts_OAuth_Github_secret" : "GitHub Secret",
+  "Accounts_OAuth_Google" : "Google Login",
+  "Accounts_OAuth_Google_id" : "Google Id",
+  "Accounts_OAuth_Google_secret" : "Google Secret",
+  "Accounts_OAuth_Linkedin" : "LinkedIn Login",
+  "Accounts_OAuth_Linkedin_id" : "LinkedIn Id",
+  "Accounts_OAuth_Linkedin_secret" : "LinkedIn Secret",
  "Accounts_OAuth_RegistrationRequired" : "Wymagana rejestracja",
+  "Activate" : "Aktywować",
  "Add_Members" : "Dodaj członków",
  "Add_users" : "Dodaj użytkowników",
  "Administration" : "Administracja",
  "All_channels" : "Wszystkie kanały",
  "and" : "i",
+  "API" : "API",
  "API_Analytics" : "Analityka",
  "API_Embed" : "Osadź",
  "are_also_typing" : "również piszą",
@ -46,17 +57,20 @@
  "Create_new_private_group" : "Utwórz prywatną grupę",
  "Create_new_public_channel" : "Utwórz kanał publiczny",
  "Created_at" : "Utworzono",
+  "Deactivate" : "Dezaktywować",
+  "Delete" : "Usuń",
  "Deleted" : "Usunięte!",
  "Direct_Messages" : "Bezpośrednie wiadomości",
  "Drop_to_upload_file" : "Przeciągnij, aby przesłać plik",
  "Duplicate_channel_name" : "Kanał o nazwie \"% s\" istnieje",
  "Duplicate_private_group_name" : "Grupa Prywatna o nazwie '% s' istnieje",
+  "Edit" : "Edycja",
  "edited" : "zmieniono",
  "Email_already_exists" : "Email już istnieje",
  "Email_or_username" : "Email lub nazwa użytkownika",
  "Email_verified" : "E-mail zweryfikowany",
-  "Enter_info" : "Wpisz dane logowania",
-  "Error_changing_password" : "Hasło zostało zmienione",
+  "Enter_info" : "Podaj swoje dane",
+  "Error_changing_password" : "Błąd zmiany hasła",
  "False" : "Fałsz",
  "Favorites" : "Ulubione",
  "Follow_social_profiles" : "Śledź nasze profile społeczne, widelec do nas na github i podziel się swoimi przemyśleniami na temat rocket.chat aplikacji na naszej trello pokładzie.",
@ -75,6 +89,8 @@
  "Invalid_room_name" : "<strong>% s</strong>nie jest poprawną nazwą pokoju, <br / >użyj tylko liter, cyfr i myślników",
  "invisible" : "niewidoczny",
  "Invisible" : "Niewidoczny",
+  "Invitation_Subject" : "Temat zaproszenia",
+  "Invite_Users" : "Zaproś użytkowników",
  "is_also_typing" : "również pisze",
  "is_also_typing_female" : "pisze",
  "is_also_typing_male" : "również pisze",
@ -131,6 +147,7 @@
  "Not_found_or_not_allowed" : "Nie znaleziono lub nie dozwolone",
  "Nothing_found" : "Nic nie znaleziono",
  "Notify_all_in_this_room" : "Powiadom wszystkich w pokoju",
+  "Only_you_can_see_this_message" : "Tylko Ty widzisz tę wiadomość",
  "Online" : "Online",
  "Oops!" : "Ups",
  "others" : "inni",
@ -151,7 +168,7 @@
  "Push_apn_passphrase" : "APN Passphrase",
  "Push_debug" : "Debug",
  "Push_enable" : "Włącz",
-  "Push_production" : "Produkcja",
+  "Push_production" : "Serwer produkcyjny",
  "Quick_Search" : "Szybkie wyszukiwanie",
  "quote" : "cytat",
  "Recents" : "Najnowsze",
@ -163,9 +180,11 @@
  "Room_name_changed" : "Nazwa pokoju zmieniona na: <em>__room_name__</em>przez <em>__user_by__</em>",
  "Room_name_changed_successfully" : "Nazwa pokoju zmieniona",
  "room_user_count" : "%s użytkowników",
+  "Rooms" : "Pokoje",
  "Save" : "Zapisz",
  "Save_changes" : "Zapisz zmiany",
  "Search" : "Szukaj",
+  "Search_Messages" : "Przeszukaj wiadomości",
  "Search_settings" : "Wyszukaj w ustawieniach",
  "See_all" : "Zobacz wszystko",
  "See_only_online" : "Wyłącznie w trybie online",
@ -173,6 +192,7 @@
  "Select_file" : "Wybierz plik",
  "Select_service_to_login" : "Wybierz usługę, aby zalogować się, celem dodania zdjęcia lub prześlij je bezpośrednio z komputera",
  "Selected_users" : "Wybrani członkowie",
+  "Send" : "Wyślij",
  "Send_confirmation_email" : "Wyślij e-mail z potwierdzeniem",
  "Send_Message" : "Wyślij wiadomość",
  "Settings" : "Ustawienia",
@ -181,11 +201,14 @@
  "Showing_results" : "<p>Wyświetlono <b>% s</b>wyników</p>",
  "Silence" : "Cisza",
  "since_creation" : "od %s",
+  "SAML" : "SAML",
+  "SMTP" : "SMTP",
  "SMTP_Host" : "SMTP Host",
  "SMTP_Password" : "Hasło SMTP",
  "SMTP_Port" : "Port SMTP",
  "SMTP_Username" : "Nazwa użytkownika SMTP",
  "Start_of_conversation" : "Rozpocznij rozmowę",
+  "Statistics" : "Statystyka",
  "strike" : "przekreślenie",
  "Submit" : "Prześlij",
  "The_field_is_required" : "Pole %s jest wymagane.",
@ -210,6 +233,7 @@
  "User_logged_out" : "Użytkownik jest wylogowany",
  "User_removed_by" : "Użytkownik <em>__user_removed__</em>usunięty przez <em>__user_by__</em>.",
  "User_Settings" : "Ustawienia użytkownika",
+  "Users" : "Użytkownicy",
  "Username" : "Nazwa użytkownika",
  "Username_cant_be_empty" : "Nazwa użytkownika nie może być pusta",
  "Username_description" : "Nazwa użytkownika jest używana, by inni mogli Cię wspomnieć w wiadomości.",
--- a/i18n/pt.i18n.json
+++ b/i18n/pt.i18n.json
@ -1,6 +1,7 @@
 {
  "Access_online_demo" : "Acesse o demo online",
  "Access_Online_Demo" : "Acesse o Demo Online",
+  "Accounts" : "Contas",
  "Accounts_denyUnverifiedEmail" : "Proibir e-mail não verificado",
  "Accounts_EmailVerification" : "Verificação de E-mail",
  "Accounts_OAuth_Facebook" : "Login do Facebook",
@ -38,7 +39,9 @@
  "Add_users" : "Adicionar usuários",
  "Administration" : "Administração",
  "All_channels" : "Todos os canais",
+  "Allow_Invalid_SelfSigned_Certs" : "Permitir certificados inválidos e auto-assinados para validação de links e previews",
  "and" : "e",
+  "API" : "API",
  "API_Analytics" : "Analytics",
  "API_Embed" : "Embed",
  "are_also_typing" : "também estão digitando",
@ -51,6 +54,7 @@
  "Away_female" : "Ausente",
  "away_male" : "ausente",
  "Away_male" : "ausente",
+  "Auto_Load_Images" : "Auto Carregar Imagens",
  "Back_to_login" : "Voltar para o login",
  "bold" : "negrito",
  "busy" : "ocupado",
@ -81,6 +85,7 @@
  "Delete" : "Deletar",
  "Deleted" : "Deletado!",
  "Direct_Messages" : "Mensagens Diretas",
+  "Disable_Favorite_Rooms" : "Desabilitar Favoritos",
  "Disable_New_Message_Notification" : "Desativar notificações de nova mensagem",
  "Disable_New_Room_Notification" : "Desativar notificações de nova sala",
  "Drop_to_upload_file" : "Largue para enviar arquivos",
@ -101,9 +106,12 @@
  "Follow_social_profiles" : "Siga-nos nas redes sociais, faça fork no github e compartilhe suas ideias sobre o app rocket.chat em nosso trello.",
  "Forgot_password" : "Esqueceu sua senha",
  "Fork_it_on_github" : "Fork it on github",
+  "From_Email" : "Email De",
+  "General" : "Geral",
  "Get_to_know_the_team" : "Conheça o Rocket.Team",
  "github_no_public_email" : "Você não possui um e-mail público em sua conta do GitHub",
  "Have_your_own_chat" : "Tenha seu próprio web chat. Desenvolvido com Meteor.com, o Rocket.Chat é uma excelente solução para desenvolvedores que querem construir e desenvolver sua própria plataforma de chat.",
+  "Has_more" : "Há mais",
  "Hide_room" : "Esconder sala",
  "History" : "Histórico",
  "hours" : "horas",
@ -115,6 +123,9 @@
  "Invalid_room_name" : "<strong>%s</strong> não é um nome válido,<br/> utilizar apenas letras, números e hífens",
  "invisible" : "invisível",
  "Invisible" : "Invisível",
+  "Invitation HTML" : "HTML do Convite",
+  "Invitation_Subject" : "Assunto do Convite",
+  "Invite_Users" : "Convidar Usuários",
  "is_also_typing" : "também está digitando",
  "is_also_typing_female" : "também está digitando",
  "is_also_typing_male" : "também está digitando",
@ -128,6 +139,7 @@
  "Language_Version" : "Versão em Português",
  "Last_login" : "Último login",
  "Last_message" : "Última mensagem",
+  "Layout" : "Layout",
  "Layout_Home_Body" : "Corpo da Home",
  "Layout_Home_Title" : "Título da Home",
  "Layout_Login_Header" : "Header do Login",
@ -136,9 +148,11 @@
  "Layout_Sidenav_Footer" : "Rodapé da Navegação Lateral",
  "Layout_Sidenav_Footer_description" : "Tamanho do rodapé é 260x70",
  "Layout_Terms_of_Service" : "Termos de Serviço",
+  "LDAP" : "LDAP",
  "Leave_room" : "Sair da sala",
  "line" : "linha",
  "Load_more" : "Carregar mais",
+  "Loading_more_from_history" : "Carregando mais a partir do histórico",
  "Loading..." : "Carregando...",
  "Loading_suggestion" : "Buscando sugestões...",
  "Login" : "Entrar",
@ -146,6 +160,7 @@
  "login_with" : "Ou faça seu login com",
  "Logout" : "Sair",
  "Make_Admin" : "Tornar Administrador",
+  "Mark_as_read" : "Marcar como lido",
  "Members" : "Membros",
  "Members_List" : "Lista de Membros",
  "Members_placeholder" : "Membros",
@ -157,12 +172,14 @@
  "Message_deleting_not_allowed" : "Exclusão de mensagem não permitido",
  "Message_editing_not_allowed" : "Edição de mensagem não permitido",
  "Message_editing_blocked" : "Esta mensagem não pode mais ser editada",
+  "Message_MaxAllowedSize" : "Tamanho máximo de mensagem permitido ",
  "Message_pinning_not_allowed" : "Não Permitir Fixar Mensagem",
  "Message_KeepHistory" : "Manter Histórico de Mensagens",
  "Message_removed" : "Mensagem removida",
  "Message_pinned" : "Mensagem fixada",
  "Message_ShowDeletedStatus" : "Mostrar Status Excluído",
  "Message_ShowEditedStatus" : "Mostrar Status Editado",
+  "Meta" : "Meta",
  "Meta_fb_app_id" : "Facebook APP ID",
  "Meta_google-site-verification" : "Verificação de Site do Google",
  "Meta_language" : "Idioma",
@ -171,6 +188,7 @@
  "minutes" : "minutos",
  "More_channels" : "Mais canais",
  "More_groups" : "Mais grupos privados",
+  "More_unreads" : "Mais não lidos",
  "Msgs" : "Msgs",
  "multi" : "multi",
  "My_Account" : "Minha Conta",
@ -210,6 +228,7 @@
  "Profile" : "Perfil",
  "Profile_saved_successfully" : "Perfil salvo com sucesso",
  "Proudly_developed" : "Orgulhosamente desenvolvido com Meteor",
+  "Push" : "Push",
  "Push_apn_cert" : "APN Cert",
  "Push_apn_dev_cert" : "APN Dev Cert",
  "Push_apn_dev_key" : "APN Dev Key",
@ -229,14 +248,16 @@
  "Remove_Admin" : "Remover Administrador",
  "Reset_password" : "Resetar senha",
  "Room" : "Sala",
-  "Rooms" : "Salas",
  "Room_name_changed" : "Nome da sala alterado para: <em>__room_name__</em> por <em>__user_by__</em>",
  "Room_name_changed_successfully" : "Nome da sala alterado com sucesso",
  "Room_not_found" : "Sala não encontrada",
  "room_user_count" : "%s usuários",
+  "Rooms" : "Salas",
  "Save" : "Salvar",
  "Save_changes" : "Salvar alterações",
+  "Save_Mobile_Bandwidth" : "Economizar Banda Móvel",
  "Search" : "Pesquisar",
+  "Search_Messages" : "Pesquisar Mensagens",
  "Search_settings" : "Pesquisar configurações",
  "seconds" : "segundos",
  "See_all" : "Ver todos",
@ -245,7 +266,13 @@
  "Select_file" : "Selecione um arquivo",
  "Select_service_to_login" : "Selecione um serviço para iniciar sessão e carregar sua imagem ou faça upload de um arquivo de seu computador",
  "Selected_users" : "Membros selecionados",
+  "Send" : "Enviar",
  "Send_confirmation_email" : "Enviar email de confirmação",
+  "Send_invitation_email" : "Enviar convite por e-mail",
+  "Send_invitation_email_error" : "Você não forneceu qualquer e-mail válido.",
+  "Send_invitation_email_info" : "Você pode enviar vários convites por e-mail de uma vez.",
+  "Send_invitation_email_success" : "Você enviou com sucesso um convite por e-mail para os seguintes endereços:",
+  "Send_invitation_email_warning" : "Para enviar convites por e-mails, você deve primeiro definir as configurações de SMTP.",
  "Send_Message" : "Enviar Mensagem",
  "Settings" : "Configurações",
  "Settings_updated" : "Configurações atualizadas",
@ -254,6 +281,8 @@
  "Silence" : "Silenciar",
  "since_creation" : "desde %s",
  "Site_Name" : "Nome do Site:",
+  "SAML" : "SAML",
+  "SMTP" : "SMTP",
  "SMTP_Host" : "Host SMTP",
  "SMTP_Password" : "Senha SMTP",
  "SMTP_Port" : "Porta SMTP",
@ -286,6 +315,7 @@
  "Stats_Total_Users" : "Quantidade de Usuários",
  "strike" : "tachado",
  "Submit" : "Enviar",
+  "S_new_messages_since_s" : "%s novas mensagens desde %s",
  "The_field_is_required" : "O campo %s é obrigatório.",
  "True" : "Verdadeiro",
  "Unnamed" : "Sem nome",
@ -298,9 +328,11 @@
  "Use_uploaded_avatar" : "Use o avatar de upload",
  "User_added" : "Usuário <em>__user_added__</em> adicionado à conversa.",
  "User_added_by" : "Usuário <em>__user_added__</em> adicionado à conversa por <em>__user_by__</em>.",
+  "User_Channels" : "Canais do Usuário",
  "User_has_been_activated" : "Usuário foi ativado",
  "User_has_been_deactivated" : "Usuário foi desativado",
  "User_has_been_deleted" : "O usuário foi excluído",
+  "User_Info" : "Informações do usuário",
  "User_is_no_longer_an_admin" : "O usuário já não é um administrador",
  "User_is_not_activated" : "O usuário não está ativo",
  "User_is_now_an_admin" : "O usuário tornou-se um administrador",
@ -314,13 +346,13 @@
  "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_updated_successfully" : "Usuário atualizado com sucesso",
+  "Users" : "Usuários",
  "Username" : "Nome de usuário",
  "Username_cant_be_empty" : "O nome de usuário não pode ser vazio",
  "Username_description" : "O nome de usuário serve para que outras pessoas possam mencionar você em mensagens",
  "Username_invalid" : "<strong>%s</strong> não é um nome de usuário válido, <br/> usar somente letras, números, pontos e traços",
  "Username_title" : "Cadastre um nome de usuário",
  "Username_unavaliable" : "<strong>%s</strong> já está sendo usado :(",
-  "Users" : "Usuários",
  "View_All" : "Ver Todos",
  "Wait_activation_warning" : "Antes que você possa fazer o login, sua conta deve ser manualmente ativada por um administrador.",
  "We_have_sent_password_email" : "Nós lhe enviamos um e-mail com instruções para redefinir sua senha. Se você não receber um e-mail em breve, por favor retorne e tente novamente.",
@ -334,4 +366,4 @@
  "You_will_not_be_able_to_recover" : "Você não será capaz de desfazer!",
  "Your_entry_has_been_deleted" : "Sua mensagem foi excluída.",
  "Your_Open_Source_solution" : "Sua própria solução Open Source"
-}
+}
--- a/packages/rocketchat-custom-oauth/custom_oauth_client.coffee
+++ b/packages/rocketchat-custom-oauth/custom_oauth_client.coffee
@ -8,6 +8,13 @@ class CustomOAuth
 		if not Match.test @name, String
 			return throw new Meteor.Error 'CustomOAuth: Name is required and must be String'

+		@configure options
+
+		Accounts.oauth.registerService @name
+
+		@configureLogin()
+
+	configure: (options) ->
 		if not Match.test options, Object
 			return throw new Meteor.Error 'CustomOAuth: Options is required and must be Object'

@ -18,15 +25,10 @@ class CustomOAuth
 			options.authorizePath = '/oauth/authorize'

 		@serverURL = options.serverURL
-
-		if not /^https?:\/\/.+/.test options.authorizePath
-			options.authorizePath = @serverURL + options.authorizePath
-
 		@authorizePath = options.authorizePath

-		Accounts.oauth.registerService @name
-
-		@configureLogin()
+		if not /^https?:\/\/.+/.test @authorizePath
+			@authorizePath = @serverURL + @authorizePath

 	configureLogin: ->
 		self = @
--- a/packages/rocketchat-custom-oauth/custom_oauth_server.coffee
+++ b/packages/rocketchat-custom-oauth/custom_oauth_server.coffee
@ -34,16 +34,15 @@ class CustomOAuth
 			options.identityPath = '/me'

 		@serverURL = options.serverURL
-
-		if not /^https?:\/\/.+/.test options.tokenPath
-			options.tokenPath = @serverURL + options.tokenPath
-
-		if not /^https?:\/\/.+/.test options.identityPath
-			options.identityPath = @serverURL + options.identityPath
-
 		@tokenPath = options.tokenPath
 		@identityPath = options.identityPath

+		if not /^https?:\/\/.+/.test @tokenPath
+			@tokenPath = @serverURL + @tokenPath
+
+		if not /^https?:\/\/.+/.test @identityPath
+			@identityPath = @serverURL + @identityPath
+
 		if Match.test options.addAutopublishFields, Object
 			Accounts.addAutopublishFields options.addAutopublishFields

@ -96,6 +95,11 @@ class CustomOAuth
 			console.log 'at:', accessToken

 			identity = self.getIdentity accessToken
+
+			# Fix WordPress-like identities having 'ID' instead of 'id'
+			if identity?.ID and not identity.id
+				identity.id = identity.ID
+
 			console.log 'id:', JSON.stringify identity, null, '  '

 			serviceData =
--- a/packages/rocketchat-gitlab/common.coffee
+++ b/packages/rocketchat-gitlab/common.coffee
@ -1,11 +1,24 @@
-Gitlab = new CustomOAuth 'gitlab',
+config =
 	serverURL: 'https://gitlab.com'
 	identityPath: '/api/v3/user'
 	addAutopublishFields:
 		forLoggedInUser: ['services.gitlab']
 		forOtherUsers: ['services.gitlab.username']

-Meteor.startup ->
-	Tracker.autorun ->
-		if RocketChat.settings.get 'API_Gitlab_URL'
-			Gitlab.serverURL = RocketChat.settings.get 'API_Gitlab_URL'
+Gitlab = new CustomOAuth 'gitlab', config
+
+if Meteor.isServer
+	Meteor.startup ->
+		RocketChat.models.Settings.find({ _id: 'API_Gitlab_URL' }).observe
+			added: (record) ->
+				config.serverURL = RocketChat.settings.get 'API_Gitlab_URL'
+				Gitlab.configure config
+			changed: (record) ->
+				config.serverURL = RocketChat.settings.get 'API_Gitlab_URL'
+				Gitlab.configure config
+else
+	Meteor.startup ->
+		Tracker.autorun ->
+			if RocketChat.settings.get 'API_Gitlab_URL'
+				config.serverURL = RocketChat.settings.get 'API_Gitlab_URL'
+				Gitlab.configure config
--- a/packages/rocketchat-gitlab/i18n/km.i18n.json
+++ b/packages/rocketchat-gitlab/i18n/km.i18n.json
@ -1 +1,3 @@
-{ }
+{
+  "API_Gitlab_URL" : "URL របស់ GitLab"
+}
--- a/packages/rocketchat-hubot/hubot.coffee
+++ b/packages/rocketchat-hubot/hubot.coffee
@ -135,11 +135,15 @@ class RocketChatAdapter extends Hubot.Adapter

 class RocketBotReceiver
 	constructor: (message) ->
-		console.log message
+		#console.log message
 		if message.u.username isnt RocketBot.name
-			RocketBotUser = new Hubot.User(message.u.username, room: message.rid)
-			RocketBotTextMessage = new Hubot.TextMessage(RocketBotUser, message.msg, message._id)
-			RocketBot.adapter.receive RocketBotTextMessage
+			room = RocketChat.models.Rooms.findOneById message.rid
+
+			if room.t is 'c'
+				console.log message
+				RocketBotUser = new Hubot.User(message.u.username, room: message.rid)
+				RocketBotTextMessage = new Hubot.TextMessage(RocketBotUser, message.msg, message._id)
+				RocketBot.adapter.receive RocketBotTextMessage
 		return message

 class HubotScripts
@ -169,7 +173,6 @@ class HubotScripts
 			'applause.coffee'
 			'beerme.coffee'
 			'botsnack.coffee'
-			'calm-down.coffee'
 			'carlton.coffee'
 			'chuck-norris.coffee'
 			'commandlinefu.coffee'
@ -202,7 +205,6 @@ class HubotScripts
 			'sealab.coffee'
 			'sheits.coffee'
 			'shipit.coffee'
-			'talklikewarrenellis.coffee'
 			'url.coffee'
 			'wits.coffee'
 			'wordnik.coffee'
@ -274,59 +276,73 @@ sendHelper = Meteor.bindEnvironment (robot, envelope, strings, map) ->
 				console.error "Hubot error: #{err}" if DEBUG
 				robot.logger.error "RocketChat send error: #{err}"

-RocketBot = new Robot null, null, false, 'rocketbot'
-RocketBot.alias = 'bot'
-RocketBot.adapter = new RocketChatAdapter RocketBot
-HubotScripts(RocketBot)
-RocketBot.run()
-
-# RocketBot.hear /^test/i, (res) ->
-#	res.send "Test? TESTING? WE DON'T NEED NO TEST, EVERYTHING WORKS!"
-
-RocketChat.callbacks.add 'afterSaveMessage', RocketBotReceiver, RocketChat.callbacks.priority.LOW
-
-# Meteor.startup ->
-	# console.log RocketBot;
-	# # what's (the regexp for) my name?
-	# robot.respond /(?:)/, -> false
-	# mynameRE = robot.listeners.pop().regex
-	# # register scripts
-	# HubotScripts(robot)
-	# Object.keys(share.hubot).forEach (scriptName) ->
-	# 	console.log "Loading hubot script: #{scriptName}"
-	# 	share.hubot[scriptName](robot)
-	# # register our nick
-	# n = Meteor.call 'newNick', {name: 'rocketbot'}
-	# Meteor.call 'setTag', {type:'nicks', object:n._id, name:'Gravatar', value:'rocket@printf.net', who:n.canon}
-	# # register our presence in general chat
-	# keepalive = -> Meteor.call 'setPresence',
-	# 	u:
-	# 		username: 'rocketbot'
-	# 	rid: 'GENERAL'
-	# 	present: true
-	# 	foreground: true
-	# keepalive()
-	# Meteor.setInterval keepalive, 30*1000 # every 30s refresh presence
-	# # listen to the chat room, ignoring messages sent before we startup
-	# startup = true
-	# ChatMessage.find({}).observe
-	# 	added: (message) ->
-	# 		return if startup
-	# 		return if message.u.username is "rocketbot" or message.u.username is ""
-	# 		return if message.system or message.action or message.oplog or message.bodyIsHtml
-	# 		console.log "Received from #{message.u.username} in #{message.rid}: #{message.body}"\
-	# 			if DEBUG
-	# 		user = new Hubot.User(message.u.username, room: message.rid)
-	# 		tm = new Hubot.TextMessage(user, message.body, message._id)
-	# 		tm.private = message.to?
-	# 		# if private, ensure it's treated as a direct address
-	# 		if tm.private and not mynameRE.test(tm.text)
-	# 			tm.text = "#{robot.name} #{tm.text}"
-	# 		adapter.receive tm
-	# startup = false
-	# Meteor.call "sendMessage",
-	# 	rid: 'GENERAL'
-	# 	msg: 'wakes up'
-	# 	u:
-	# 		username: "rocketbot"
-	# 	action: true
+RocketBot = {}
+
+init = =>
+	RocketBot = new Robot null, null, false, RocketChat.settings.get 'RocketBot_Name'
+	RocketBot.alias = 'bot'
+	RocketBot.adapter = new RocketChatAdapter RocketBot
+	HubotScripts(RocketBot)
+	RocketBot.run()
+
+	# RocketBot.hear /^test/i, (res) ->
+	#	res.send "Test? TESTING? WE DON'T NEED NO TEST, EVERYTHING WORKS!"
+
+	if RocketChat.settings.get 'RocketBot_Enabled'
+		RocketChat.callbacks.add 'afterSaveMessage', RocketBotReceiver, RocketChat.callbacks.priority.LOW, 'rocketbot-parser'
+	else
+		RocketChat.callbacks.remove 'afterSaveMessage', 'rocketbot-parser'
+
+	# Meteor.startup ->
+		# console.log RocketBot;
+		# # what's (the regexp for) my name?
+		# robot.respond /(?:)/, -> false
+		# mynameRE = robot.listeners.pop().regex
+		# # register scripts
+		# HubotScripts(robot)
+		# Object.keys(share.hubot).forEach (scriptName) ->
+		# 	console.log "Loading hubot script: #{scriptName}"
+		# 	share.hubot[scriptName](robot)
+		# # register our nick
+		# n = Meteor.call 'newNick', {name: 'rocketbot'}
+		# Meteor.call 'setTag', {type:'nicks', object:n._id, name:'Gravatar', value:'rocket@printf.net', who:n.canon}
+		# # register our presence in general chat
+		# keepalive = -> Meteor.call 'setPresence',
+		# 	u:
+		# 		username: 'rocketbot'
+		# 	rid: 'GENERAL'
+		# 	present: true
+		# 	foreground: true
+		# keepalive()
+		# Meteor.setInterval keepalive, 30*1000 # every 30s refresh presence
+		# # listen to the chat room, ignoring messages sent before we startup
+		# startup = true
+		# ChatMessage.find({}).observe
+		# 	added: (message) ->
+		# 		return if startup
+		# 		return if message.u.username is "rocketbot" or message.u.username is ""
+		# 		return if message.system or message.action or message.oplog or message.bodyIsHtml
+		# 		console.log "Received from #{message.u.username} in #{message.rid}: #{message.body}"\
+		# 			if DEBUG
+		# 		user = new Hubot.User(message.u.username, room: message.rid)
+		# 		tm = new Hubot.TextMessage(user, message.body, message._id)
+		# 		tm.private = message.to?
+		# 		# if private, ensure it's treated as a direct address
+		# 		if tm.private and not mynameRE.test(tm.text)
+		# 			tm.text = "#{robot.name} #{tm.text}"
+		# 		adapter.receive tm
+		# startup = false
+		# Meteor.call "sendMessage",
+		# 	rid: 'GENERAL'
+		# 	msg: 'wakes up'
+		# 	u:
+		# 		username: "rocketbot"
+		# 	action: true
+
+RocketChat.models.Settings.find({ _id: { $in: [ 'RocketBot_Name', 'RocketBot_Enabled'] } }).observe
+	added: ->
+		init()
+	changed: ->
+		init()
+	removed: ->
+		init()
--- a/packages/rocketchat-hubot/i18n/en.i18n.json
+++ b/packages/rocketchat-hubot/i18n/en.i18n.json
@ -0,0 +1,5 @@
+{
+	"RocketBot_Enabled": "RocketBot Enabled",
+	"RocketBot_Name": "RocketBot Name",
+	"RocketBot_Name_Description": "RocketBot name must be a valid username registered on your server."
+}
--- a/packages/rocketchat-hubot/i18n/pt.i18n.json
+++ b/packages/rocketchat-hubot/i18n/pt.i18n.json
@ -0,0 +1,5 @@
+{
+	"RocketBot_Enabled": "RocketBot Habilitado",
+	"RocketBot_Name": "Nome do RocketBot",
+	"RocketBot_Name_Description": "O nome deve ser um username registrado."
+}
--- a/packages/rocketchat-hubot/package-tap.i18n
+++ b/packages/rocketchat-hubot/package-tap.i18n
--- a/packages/rocketchat-hubot/package.js
+++ b/packages/rocketchat-hubot/package.js
@ -10,10 +10,30 @@ Package.onUse(function(api) {

 	api.use([
 		'coffeescript',
+		'tracker',
 		'rocketchat:lib@0.0.1'
 	]);

-	api.addFiles('hubot.coffee', ['server']);
+	// TAPi18n
+	api.use('templating', 'client');
+	var _ = Npm.require('underscore');
+	var fs = Npm.require('fs');
+	tapi18nFiles = _.compact(_.map(fs.readdirSync('packages/rocketchat-hubot/i18n'), function(filename) {
+		if (fs.statSync('packages/rocketchat-hubot/i18n/' + filename).size > 16) {
+			return 'i18n/' + filename;
+		}
+	}));
+	api.use(["tap:i18n@1.5.1"], ["client", "server"]);
+	api.imply('tap:i18n');
+	api.addFiles("package-tap.i18n", ["client", "server"]);
+
+	api.addFiles([
+		'hubot.coffee',
+		'settings.coffee',
+	], ['server']);
+
+	// TAPi18n -- needs to be added last
+	api.addFiles(tapi18nFiles, ["client", "server"]);

 	api.export('Hubot', ['server']);
 	api.export('HubotScripts', ['server']);
--- a/packages/rocketchat-hubot/settings.coffee
+++ b/packages/rocketchat-hubot/settings.coffee
@ -0,0 +1,3 @@
+RocketChat.settings.addGroup 'RocketBot'
+RocketChat.settings.add 'RocketBot_Enabled', true, { type: 'boolean', group: 'RocketBot', i18nLabel: 'rocketchat-hubot:RocketBot_Enabled' }
+RocketChat.settings.add 'RocketBot_Name', 'Rocket.Cat', { type: 'string', group: 'RocketBot', i18nLabel: 'rocketchat-hubot:RocketBot_Name', i18nDescription: 'rocketchat-hubot:RocketBot_Name_Description' }
--- a/packages/rocketchat-ldap/i18n/zh.i18n.json
+++ b/packages/rocketchat-ldap/i18n/zh.i18n.json
@ -1 +1,5 @@
-{ }
+{
+  "LDAP_Url" : "LDAP URL",
+  "LDAP_Port" : "LDAP端口",
+  "LDAP_Dn" : "LDAP DN"
+}
--- a/packages/rocketchat-lib/settings/lib/rocketchat.coffee
+++ b/packages/rocketchat-lib/settings/lib/rocketchat.coffee
@ -4,6 +4,8 @@
 ###
 RocketChat.settings = {}

+RocketChat.settings.ts = new Date
+
 RocketChat.settings.get = (_id) ->
 	return Meteor.settings?[_id]

@ -20,4 +22,4 @@ RocketChat.settings.batchSet = (settings, callback) ->
 			Meteor.call 'saveSetting', setting._id, setting.value, callback

 	actions = _.map settings, (setting) -> save(setting)
-	_(actions).reduceRight(_.wrap, (err, success) -> return callback err, success)()
+	_(actions).reduceRight(_.wrap, (err, success) -> return callback err, success)()
--- a/packages/rocketchat-lib/settings/server/addOAuthService.coffee
+++ b/packages/rocketchat-lib/settings/server/addOAuthService.coffee
@ -8,6 +8,7 @@ Meteor.methods
 		unless RocketChat.authz.hasPermission( Meteor.userId(), 'add-oauth-service') is true
 			throw new Meteor.Error 'not-authorized', '[methods] addOAuthService -> Not authorized'

+		name = name.toLowerCase().replace(/[^a-z0-9]/g, '')
 		name = s.capitalize(name)
 		RocketChat.settings.add "Accounts_OAuth_Custom_#{name}"                   , false             , { type: 'boolean', group: 'Accounts', section: "Custom OAuth: #{name}", i18nLabel: 'Accounts_OAuth_Custom_Enable'}
 		RocketChat.settings.add "Accounts_OAuth_Custom_#{name}_url"               , ''                , { type: 'string' , group: 'Accounts', section: "Custom OAuth: #{name}", i18nLabel: 'Accounts_OAuth_Custom_URL'}
@ -29,6 +30,7 @@ Meteor.methods
 		unless RocketChat.authz.hasPermission( Meteor.userId(), 'add-oauth-service') is true
 			throw new Meteor.Error 'not-authorized', '[methods] addOAuthService -> Not authorized'

+		name = name.toLowerCase().replace(/[^a-z0-9]/g, '')
 		name = s.capitalize(name)
 		RocketChat.settings.removeById "Accounts_OAuth_Custom_#{name}"
 		RocketChat.settings.removeById "Accounts_OAuth_Custom_#{name}_url"
--- a/packages/rocketchat-lib/settings/server/methods.coffee
+++ b/packages/rocketchat-lib/settings/server/methods.coffee
@ -16,15 +16,22 @@ RocketChat.settings.add = (_id, value, options = {}) ->

 	updateSettings =
 		i18nLabel: options.i18nLabel or _id
-		i18nDescription: options.i18nDescription if options.i18nDescription?

+	updateSettings.i18nDescription = options.i18nDescription if options.i18nDescription?
 	updateSettings.type = options.type if options.type
 	updateSettings.multiline = options.multiline if options.multiline
 	updateSettings.group = options.group if options.group
 	updateSettings.section = options.section if options.section
 	updateSettings.public = options.public if options.public

-	return RocketChat.models.Settings.upsert { _id: _id }, { $setOnInsert: { value: value }, $set: updateSettings }
+	upsertChanges = { $setOnInsert: { value: value }, $set: updateSettings }
+
+	if options.persistent is true
+		upsertChanges.$unset = { ts: true }
+	else
+		upsertChanges.$set.ts = new Date
+
+	return RocketChat.models.Settings.upsert { _id: _id }, upsertChanges

 ###
 # Add a setting group
@ -38,12 +45,18 @@ RocketChat.settings.addGroup = (_id, options = {}) ->
 	# console.log '[functions] RocketChat.settings.addGroup -> '.green, 'arguments:', arguments

 	updateSettings =
-		i18nLabel: options.i18nLabel or _id
-		i18nDescription: options.i18nDescription if options.i18nDescription?
 		type: 'group'
+		i18nLabel: options.i18nLabel or _id
+
+	updateSettings.i18nDescription = options.i18nDescription if options.i18nDescription?

-	return RocketChat.models.Settings.upsert { _id: _id }, { $set: updateSettings }
+	upsertChanges = { $set: updateSettings }
+	if options.persistent is true
+		upsertChanges.$unset = { ts: true }
+	else
+		upsertChanges.$set.ts = new Date

+	return RocketChat.models.Settings.upsert { _id: _id }, upsertChanges

 ###
 # Remove a setting by id
--- a/packages/rocketchat-lib/settings/server/publication.coffee
+++ b/packages/rocketchat-lib/settings/server/publication.coffee
@ -2,6 +2,7 @@ Meteor.publish 'settings', (ids = []) ->
 	console.log '[publish] settings'.green

 	filter =
+		hidden: { $ne: true }
 		public: true

 	if ids.length > 0
--- a/packages/rocketchat-lib/settings/server/startup.coffee
+++ b/packages/rocketchat-lib/settings/server/startup.coffee
@ -1,100 +1,101 @@
-Meteor.startup ->
-	# Insert server unique id if it doesn't exist
-	if not RocketChat.models.Settings.findOneById 'uniqueID'
-		RocketChat.models.Settings.createWithIdAndValue 'uniqueID', Random.id()
+# Insert server unique id if it doesn't exist
+if not RocketChat.models.Settings.findOneById 'uniqueID'
+	RocketChat.models.Settings.createWithIdAndValue 'uniqueID', Random.id()

-	RocketChat.settings.addGroup 'Accounts'
-	RocketChat.settings.add 'Accounts_RegistrationRequired', true, { type: 'boolean', group: 'Accounts', public: true, section: 'Registration' }
-	RocketChat.settings.add 'Accounts_EmailVerification', false, { type: 'boolean', group: 'Accounts', public: true, section: 'Registration' }
-	RocketChat.settings.add 'Accounts_ManuallyApproveNewUsers', false, { type: 'boolean', group: 'Accounts', section: 'Registration' }
+RocketChat.settings.addGroup 'Accounts'
+RocketChat.settings.add 'Accounts_RegistrationRequired', true, { type: 'boolean', group: 'Accounts', public: true, section: 'Registration' }
+RocketChat.settings.add 'Accounts_EmailVerification', false, { type: 'boolean', group: 'Accounts', public: true, section: 'Registration' }
+RocketChat.settings.add 'Accounts_ManuallyApproveNewUsers', false, { type: 'boolean', group: 'Accounts', section: 'Registration' }

-	RocketChat.settings.add 'Accounts_AvatarStoreType', 'GridFS', { type: 'string', group: 'Accounts', section: 'Avatar' }
-	RocketChat.settings.add 'Accounts_AvatarStorePath', '/var/www/rocket.chat/uploads/avatar/', { type: 'string', group: 'Accounts', section: 'Avatar' }
-	RocketChat.settings.add 'Accounts_AvatarResize', false, { type: 'boolean', group: 'Accounts', section: 'Avatar' }
-	RocketChat.settings.add 'Accounts_AvatarSize', 200, { type: 'int', group: 'Accounts', section: 'Avatar' }
+RocketChat.settings.add 'Accounts_AvatarStoreType', 'GridFS', { type: 'string', group: 'Accounts', section: 'Avatar' }
+RocketChat.settings.add 'Accounts_AvatarStorePath', '/var/www/rocket.chat/uploads/avatar/', { type: 'string', group: 'Accounts', section: 'Avatar' }
+RocketChat.settings.add 'Accounts_AvatarResize', false, { type: 'boolean', group: 'Accounts', section: 'Avatar' }
+RocketChat.settings.add 'Accounts_AvatarSize', 200, { type: 'int', group: 'Accounts', section: 'Avatar' }

-	RocketChat.settings.add 'Accounts_OAuth_Facebook', false, { type: 'boolean', group: 'Accounts', section: 'Facebook' }
-	RocketChat.settings.add 'Accounts_OAuth_Facebook_id', '', { type: 'string', group: 'Accounts', section: 'Facebook' }
-	RocketChat.settings.add 'Accounts_OAuth_Facebook_secret', '', { type: 'string', group: 'Accounts', section: 'Facebook' }
-	RocketChat.settings.add 'Accounts_OAuth_Google', false, { type: 'boolean', group: 'Accounts', section: 'Google' }
-	RocketChat.settings.add 'Accounts_OAuth_Google_id', '', { type: 'string', group: 'Accounts', section: 'Google' }
-	RocketChat.settings.add 'Accounts_OAuth_Google_secret', '', { type: 'string', group: 'Accounts', section: 'Google' }
-	RocketChat.settings.add 'Accounts_OAuth_Github', false, { type: 'boolean', group: 'Accounts', section: 'Github' }
-	RocketChat.settings.add 'Accounts_OAuth_Github_id', '', { type: 'string', group: 'Accounts', section: 'Github' }
-	RocketChat.settings.add 'Accounts_OAuth_Github_secret', '', { type: 'string', group: 'Accounts', section: 'Github' }
-	RocketChat.settings.add 'Accounts_OAuth_Gitlab', false, { type: 'boolean', group: 'Accounts', section: 'Gitlab' }
-	RocketChat.settings.add 'Accounts_OAuth_Gitlab_id', '', { type: 'string', group: 'Accounts', section: 'Gitlab' }
-	RocketChat.settings.add 'Accounts_OAuth_Gitlab_secret', '', { type: 'string', group: 'Accounts', section: 'Gitlab' }
-	RocketChat.settings.add 'Accounts_OAuth_Linkedin', false, { type: 'boolean', group: 'Accounts', section: 'Linkedin' }
-	RocketChat.settings.add 'Accounts_OAuth_Linkedin_id', '', { type: 'string', group: 'Accounts', section: 'Linkedin' }
-	RocketChat.settings.add 'Accounts_OAuth_Linkedin_secret', '', { type: 'string', group: 'Accounts', section: 'Linkedin' }
-	RocketChat.settings.add 'Accounts_OAuth_Meteor', false, { type: 'boolean', group: 'Accounts', section: 'Meteor' }
-	RocketChat.settings.add 'Accounts_OAuth_Meteor_id', '', { type: 'string', group: 'Accounts', section: 'Meteor' }
-	RocketChat.settings.add 'Accounts_OAuth_Meteor_secret', '', { type: 'string', group: 'Accounts', section: 'Meteor' }
-	RocketChat.settings.add 'Accounts_OAuth_Twitter', false, { type: 'boolean', group: 'Accounts', section: 'Twitter' }
-	RocketChat.settings.add 'Accounts_OAuth_Twitter_id', '', { type: 'string', group: 'Accounts', section: 'Twitter' }
-	RocketChat.settings.add 'Accounts_OAuth_Twitter_secret', '', { type: 'string', group: 'Accounts', section: 'Twitter' }
+RocketChat.settings.add 'Accounts_OAuth_Facebook', false, { type: 'boolean', group: 'Accounts', section: 'Facebook' }
+RocketChat.settings.add 'Accounts_OAuth_Facebook_id', '', { type: 'string', group: 'Accounts', section: 'Facebook' }
+RocketChat.settings.add 'Accounts_OAuth_Facebook_secret', '', { type: 'string', group: 'Accounts', section: 'Facebook' }
+RocketChat.settings.add 'Accounts_OAuth_Google', false, { type: 'boolean', group: 'Accounts', section: 'Google' }
+RocketChat.settings.add 'Accounts_OAuth_Google_id', '', { type: 'string', group: 'Accounts', section: 'Google' }
+RocketChat.settings.add 'Accounts_OAuth_Google_secret', '', { type: 'string', group: 'Accounts', section: 'Google' }
+RocketChat.settings.add 'Accounts_OAuth_Github', false, { type: 'boolean', group: 'Accounts', section: 'Github' }
+RocketChat.settings.add 'Accounts_OAuth_Github_id', '', { type: 'string', group: 'Accounts', section: 'Github' }
+RocketChat.settings.add 'Accounts_OAuth_Github_secret', '', { type: 'string', group: 'Accounts', section: 'Github' }
+RocketChat.settings.add 'Accounts_OAuth_Gitlab', false, { type: 'boolean', group: 'Accounts', section: 'Gitlab' }
+RocketChat.settings.add 'Accounts_OAuth_Gitlab_id', '', { type: 'string', group: 'Accounts', section: 'Gitlab' }
+RocketChat.settings.add 'Accounts_OAuth_Gitlab_secret', '', { type: 'string', group: 'Accounts', section: 'Gitlab' }
+RocketChat.settings.add 'Accounts_OAuth_Linkedin', false, { type: 'boolean', group: 'Accounts', section: 'Linkedin' }
+RocketChat.settings.add 'Accounts_OAuth_Linkedin_id', '', { type: 'string', group: 'Accounts', section: 'Linkedin' }
+RocketChat.settings.add 'Accounts_OAuth_Linkedin_secret', '', { type: 'string', group: 'Accounts', section: 'Linkedin' }
+RocketChat.settings.add 'Accounts_OAuth_Meteor', false, { type: 'boolean', group: 'Accounts', section: 'Meteor' }
+RocketChat.settings.add 'Accounts_OAuth_Meteor_id', '', { type: 'string', group: 'Accounts', section: 'Meteor' }
+RocketChat.settings.add 'Accounts_OAuth_Meteor_secret', '', { type: 'string', group: 'Accounts', section: 'Meteor' }
+RocketChat.settings.add 'Accounts_OAuth_Twitter', false, { type: 'boolean', group: 'Accounts', section: 'Twitter' }
+RocketChat.settings.add 'Accounts_OAuth_Twitter_id', '', { type: 'string', group: 'Accounts', section: 'Twitter' }
+RocketChat.settings.add 'Accounts_OAuth_Twitter_secret', '', { type: 'string', group: 'Accounts', section: 'Twitter' }

-	RocketChat.settings.addGroup 'General'
-	RocketChat.settings.add 'Site_Name', 'Rocket.Chat', { type: 'string', group: 'General', public: true }
-	RocketChat.settings.add 'Allow_Invalid_SelfSigned_Certs', false, { type: 'boolean', group: 'General' }
+RocketChat.settings.addGroup 'General'
+RocketChat.settings.add 'Site_Name', 'Rocket.Chat', { type: 'string', group: 'General', public: true }
+RocketChat.settings.add 'Allow_Invalid_SelfSigned_Certs', false, { type: 'boolean', group: 'General' }
+RocketChat.settings.add 'Disable_Favorite_Rooms', false, { type: 'boolean', group: 'General' }

-	RocketChat.settings.addGroup 'API'
-	RocketChat.settings.add 'API_Analytics', '', { type: 'string', group: 'API', public: true }
-	RocketChat.settings.add 'API_Embed', true, { type: 'boolean', group: 'API', public: true }
+RocketChat.settings.addGroup 'API'
+RocketChat.settings.add 'API_Analytics', '', { type: 'string', group: 'API', public: true }
+RocketChat.settings.add 'API_Embed', true, { type: 'boolean', group: 'API', public: true }

-	RocketChat.settings.addGroup 'SMTP'
-	RocketChat.settings.add 'SMTP_Host', '', { type: 'string', group: 'SMTP' }
-	RocketChat.settings.add 'SMTP_Port', '', { type: 'string', group: 'SMTP' }
-	RocketChat.settings.add 'SMTP_Username', '', { type: 'string', group: 'SMTP' }
-	RocketChat.settings.add 'SMTP_Password', '', { type: 'string', group: 'SMTP' }
-	RocketChat.settings.add 'From_Email', 'no-reply@rocket.chat', { type: 'string', group: 'SMTP' }
+RocketChat.settings.addGroup 'SMTP'
+RocketChat.settings.add 'SMTP_Host', '', { type: 'string', group: 'SMTP' }
+RocketChat.settings.add 'SMTP_Port', '', { type: 'string', group: 'SMTP' }
+RocketChat.settings.add 'SMTP_Username', '', { type: 'string', group: 'SMTP' }
+RocketChat.settings.add 'SMTP_Password', '', { type: 'string', group: 'SMTP' }
+RocketChat.settings.add 'From_Email', 'no-reply@rocket.chat', { type: 'string', group: 'SMTP' }

-	RocketChat.settings.add 'Invitation_Subject', 'You have been invited to Rocket.Chat', { type: 'string', group: 'SMTP', section: 'Invitation' }
-	RocketChat.settings.add 'Invitation_HTML', '<h2>You have been invited to <h1>Rocket.Chat</h1></h2><p>Go to https://demo.rocket.chat and try the best open source chat solution available today!</p>', { type: 'string', multiline: true, group: 'SMTP', section: 'Invitation' }
+RocketChat.settings.add 'Invitation_Subject', 'You have been invited to Rocket.Chat', { type: 'string', group: 'SMTP', section: 'Invitation' }
+RocketChat.settings.add 'Invitation_HTML', '<h2>You have been invited to <h1>Rocket.Chat</h1></h2><p>Go to https://demo.rocket.chat and try the best open source chat solution available today!</p>', { type: 'string', multiline: true, group: 'SMTP', section: 'Invitation' }

-	RocketChat.settings.addGroup 'Message'
-	RocketChat.settings.add 'Message_AllowEditing', true, { type: 'boolean', group: 'Message', public: true }
-	RocketChat.settings.add 'Message_AllowEditing_BlockEditInMinutes', 0, { type: 'int', group: 'Message', public: true }
-	RocketChat.settings.add 'Message_AllowDeleting', true, { type: 'boolean', group: 'Message', public: true }
-	RocketChat.settings.add 'Message_AllowPinning', true, { type: 'boolean', group: 'Message', public: true }
-	RocketChat.settings.add 'Message_ShowEditedStatus', true, { type: 'boolean', group: 'Message', public: true }
-	RocketChat.settings.add 'Message_ShowDeletedStatus', false, { type: 'boolean', group: 'Message', public: true }
-	RocketChat.settings.add 'Message_KeepHistory', false, { type: 'boolean', group: 'Message', public: true }
-	RocketChat.settings.add 'Message_MaxAllowedSize', 5000, { type: 'int', group: 'Message', public: true }
+RocketChat.settings.addGroup 'Message'
+RocketChat.settings.add 'Message_AllowEditing', true, { type: 'boolean', group: 'Message', public: true }
+RocketChat.settings.add 'Message_AllowEditing_BlockEditInMinutes', 0, { type: 'int', group: 'Message', public: true }
+RocketChat.settings.add 'Message_AllowDeleting', true, { type: 'boolean', group: 'Message', public: true }
+RocketChat.settings.add 'Message_AllowPinning', true, { type: 'boolean', group: 'Message', public: true }
+RocketChat.settings.add 'Message_ShowEditedStatus', true, { type: 'boolean', group: 'Message', public: true }
+RocketChat.settings.add 'Message_ShowDeletedStatus', false, { type: 'boolean', group: 'Message', public: true }
+RocketChat.settings.add 'Message_KeepHistory', false, { type: 'boolean', group: 'Message', public: true }
+RocketChat.settings.add 'Message_MaxAllowedSize', 5000, { type: 'int', group: 'Message', public: true }

-	RocketChat.settings.addGroup 'Meta'
-	RocketChat.settings.add 'Meta_language', '', { type: 'string', group: 'Meta' }
-	RocketChat.settings.add 'Meta_fb_app_id', '', { type: 'string', group: 'Meta' }
-	RocketChat.settings.add 'Meta_robots', '', { type: 'string', group: 'Meta' }
-	RocketChat.settings.add 'Meta_google-site-verification', '', { type: 'string', group: 'Meta' }
-	RocketChat.settings.add 'Meta_msvalidate01', '', { type: 'string', group: 'Meta' }
+RocketChat.settings.addGroup 'Meta'
+RocketChat.settings.add 'Meta_language', '', { type: 'string', group: 'Meta' }
+RocketChat.settings.add 'Meta_fb_app_id', '', { type: 'string', group: 'Meta' }
+RocketChat.settings.add 'Meta_robots', '', { type: 'string', group: 'Meta' }
+RocketChat.settings.add 'Meta_google-site-verification', '', { type: 'string', group: 'Meta' }
+RocketChat.settings.add 'Meta_msvalidate01', '', { type: 'string', group: 'Meta' }

-	RocketChat.settings.addGroup 'Push'
-	RocketChat.settings.add 'Push_debug', false, { type: 'boolean', group: 'Push', public: true }
-	RocketChat.settings.add 'Push_enable', false, { type: 'boolean', group: 'Push', public: true }
-	RocketChat.settings.add 'Push_production', false, { type: 'boolean', group: 'Push', public: true }
-	RocketChat.settings.add 'Push_apn_passphrase', '', { type: 'string', group: 'Push' }
-	RocketChat.settings.add 'Push_apn_key', '', { type: 'string', multiline: true, group: 'Push' }
-	RocketChat.settings.add 'Push_apn_cert', '', { type: 'string', multiline: true, group: 'Push' }
-	RocketChat.settings.add 'Push_apn_dev_passphrase', '', { type: 'string', group: 'Push' }
-	RocketChat.settings.add 'Push_apn_dev_key', '', { type: 'string', multiline: true, group: 'Push' }
-	RocketChat.settings.add 'Push_apn_dev_cert', '', { type: 'string', multiline: true, group: 'Push' }
-	RocketChat.settings.add 'Push_gcm_api_key', '', { type: 'string', group: 'Push' }
-	RocketChat.settings.add 'Push_gcm_project_number', '', { type: 'string', group: 'Push', public: true }
+RocketChat.settings.addGroup 'Push'
+RocketChat.settings.add 'Push_debug', false, { type: 'boolean', group: 'Push', public: true }
+RocketChat.settings.add 'Push_enable', false, { type: 'boolean', group: 'Push', public: true }
+RocketChat.settings.add 'Push_production', false, { type: 'boolean', group: 'Push', public: true }
+RocketChat.settings.add 'Push_apn_passphrase', '', { type: 'string', group: 'Push' }
+RocketChat.settings.add 'Push_apn_key', '', { type: 'string', multiline: true, group: 'Push' }
+RocketChat.settings.add 'Push_apn_cert', '', { type: 'string', multiline: true, group: 'Push' }
+RocketChat.settings.add 'Push_apn_dev_passphrase', '', { type: 'string', group: 'Push' }
+RocketChat.settings.add 'Push_apn_dev_key', '', { type: 'string', multiline: true, group: 'Push' }
+RocketChat.settings.add 'Push_apn_dev_cert', '', { type: 'string', multiline: true, group: 'Push' }
+RocketChat.settings.add 'Push_gcm_api_key', '', { type: 'string', group: 'Push' }
+RocketChat.settings.add 'Push_gcm_project_number', '', { type: 'string', group: 'Push', public: true }

-	RocketChat.settings.addGroup 'Layout'
-	RocketChat.settings.add 'Layout_Home_Title', 'Home', { type: 'string', group: 'Layout', public: true, section: 'Content' }
-	RocketChat.settings.add 'Layout_Home_Body', 'Welcome to Rocket.Chat <br> Go to APP SETTINGS -> Layout to customize this intro.', { type: 'string', multiline: true, group: 'Layout', public: true, section: 'Content' }
-	RocketChat.settings.add 'Layout_Terms_of_Service', 'Terms of Service <br> Go to APP SETTINGS -> Layout to customize this page.', { type: 'string', multiline: true, group: 'Layout', public: true, section: 'Content' }
-	RocketChat.settings.add 'Layout_Privacy_Policy', 'Privacy Policy <br> Go to APP SETTINGS -> Layout to customize this page.', { type: 'string', multiline: true, group: 'Layout', public: true, section: 'Content' }
-	RocketChat.settings.add 'Layout_Sidenav_Footer', '<a href="https://github.com/RocketChat/Rocket.Chat" class="logo" target="_blank"> <img src="/images/logo/logo.svg?v=3" /> <small><i class="icon-github-circled"></i> Fork it on github</small> </a>', { type: 'string', group: 'Layout', public: true, i18nDescription: 'Layout_Sidenav_Footer_description' }
-	RocketChat.settings.add 'Layout_Login_Header', '<a class="logo" href="/"><img src="/images/logo/logo.svg?v=3" /></a>', { type: 'string', multiline: true, group: 'Layout', public: true, section: 'Login' }
-	RocketChat.settings.add 'Layout_Login_Terms', 'By proceeding to create your account and use Rocket.Chat, you are agreeing to our <a href="/terms-of-service">Terms of Service</a> and <a href="/privacy-policy">Privacy Policy</a>. If you do not agree, you cannot use Rocket.Chat.', { type: 'string', multiline: true, group: 'Layout', public: true, section: 'Login' }
+RocketChat.settings.addGroup 'Layout'
+RocketChat.settings.add 'Layout_Home_Title', 'Home', { type: 'string', group: 'Layout', public: true, section: 'Content' }
+RocketChat.settings.add 'Layout_Home_Body', 'Welcome to Rocket.Chat <br> Go to APP SETTINGS -> Layout to customize this intro.', { type: 'string', multiline: true, group: 'Layout', public: true, section: 'Content' }
+RocketChat.settings.add 'Layout_Terms_of_Service', 'Terms of Service <br> Go to APP SETTINGS -> Layout to customize this page.', { type: 'string', multiline: true, group: 'Layout', public: true, section: 'Content' }
+RocketChat.settings.add 'Layout_Privacy_Policy', 'Privacy Policy <br> Go to APP SETTINGS -> Layout to customize this page.', { type: 'string', multiline: true, group: 'Layout', public: true, section: 'Content' }
+RocketChat.settings.add 'Layout_Sidenav_Footer', '<a href="https://github.com/RocketChat/Rocket.Chat" class="logo" target="_blank"> <img src="/images/logo/logo.svg?v=3" /> <small><i class="icon-github-circled"></i> Fork it on github</small> </a>', { type: 'string', group: 'Layout', public: true, i18nDescription: 'Layout_Sidenav_Footer_description' }
+RocketChat.settings.add 'Layout_Login_Header', '<a class="logo" href="/"><img src="/images/logo/logo.svg?v=3" /></a>', { type: 'string', multiline: true, group: 'Layout', public: true, section: 'Login' }
+RocketChat.settings.add 'Layout_Login_Terms', 'By proceeding to create your account and use Rocket.Chat, you are agreeing to our <a href="/terms-of-service">Terms of Service</a> and <a href="/privacy-policy">Privacy Policy</a>. If you do not agree, you cannot use Rocket.Chat.', { type: 'string', multiline: true, group: 'Layout', public: true, section: 'Login' }

-	RocketChat.settings.add 'Statistics_opt_out', false, { type: 'boolean', group: false }
+RocketChat.settings.add 'Statistics_opt_out', false, { type: 'boolean', group: false }

+Meteor.startup ->
 	if process?.env? and not process.env['MAIL_URL']? and RocketChat.settings.get('SMTP_Host') and RocketChat.settings.get('SMTP_Username') and RocketChat.settings.get('SMTP_Password')
 		process.env['MAIL_URL'] = "smtp://" + encodeURIComponent(RocketChat.settings.get('SMTP_Username')) + ':' + encodeURIComponent(RocketChat.settings.get('SMTP_Password')) + '@' + encodeURIComponent(RocketChat.settings.get('SMTP_Host'))
 		if RocketChat.settings.get('SMTP_Port')
-			process.env['MAIL_URL'] += ':' + parseInt(RocketChat.settings.get('SMTP_Port'))
+			process.env['MAIL_URL'] += ':' + parseInt(RocketChat.settings.get('SMTP_Port'))
--- a/packages/rocketchat-livechat/i18n/ar.i18n.json
+++ b/packages/rocketchat-livechat/i18n/ar.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-livechat/i18n/de.i18n.json
+++ b/packages/rocketchat-livechat/i18n/de.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-livechat/i18n/el.i18n.json
+++ b/packages/rocketchat-livechat/i18n/el.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-livechat/i18n/en.i18n.json
+++ b/packages/rocketchat-livechat/i18n/en.i18n.json
@ -1,4 +1,4 @@
 {
-	"Livechat_title": "Livechat title",
-	"Livechat_title_color": "Livechat title background color"
-}
+  "Livechat_title" : "Livechat title",
+  "Livechat_title_color" : "Livechat title background color"
+}
--- a/packages/rocketchat-livechat/i18n/es.i18n.json
+++ b/packages/rocketchat-livechat/i18n/es.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-livechat/i18n/fi.i18n.json
+++ b/packages/rocketchat-livechat/i18n/fi.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-livechat/i18n/fr.i18n.json
+++ b/packages/rocketchat-livechat/i18n/fr.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-livechat/i18n/he.i18n.json
+++ b/packages/rocketchat-livechat/i18n/he.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-livechat/i18n/hr.i18n.json
+++ b/packages/rocketchat-livechat/i18n/hr.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-livechat/i18n/hu.i18n.json
+++ b/packages/rocketchat-livechat/i18n/hu.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-livechat/i18n/it.i18n.json
+++ b/packages/rocketchat-livechat/i18n/it.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-livechat/i18n/ja.i18n.json
+++ b/packages/rocketchat-livechat/i18n/ja.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-livechat/i18n/km.i18n.json
+++ b/packages/rocketchat-livechat/i18n/km.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-livechat/i18n/ko.i18n.json
+++ b/packages/rocketchat-livechat/i18n/ko.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-livechat/i18n/pl.i18n.json
+++ b/packages/rocketchat-livechat/i18n/pl.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-livechat/i18n/pt.i18n.json
+++ b/packages/rocketchat-livechat/i18n/pt.i18n.json
@ -1,4 +1,4 @@
 {
-	"Livechat_title": "Título Livechat",
-	"Livechat_title_color": "Cor de fundo do título do Livechat"
-}
+  "Livechat_title" : "Título Livechat",
+  "Livechat_title_color" : "Cor de fundo do título do Livechat"
+}
--- a/packages/rocketchat-livechat/i18n/ru.i18n.json
+++ b/packages/rocketchat-livechat/i18n/ru.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-livechat/i18n/ta-IN.i18n.json
+++ b/packages/rocketchat-livechat/i18n/ta-IN.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-livechat/i18n/tr.i18n.json
+++ b/packages/rocketchat-livechat/i18n/tr.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-livechat/i18n/ug.i18n.json
+++ b/packages/rocketchat-livechat/i18n/ug.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-livechat/i18n/uk.i18n.json
+++ b/packages/rocketchat-livechat/i18n/uk.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-livechat/i18n/zh.i18n.json
+++ b/packages/rocketchat-livechat/i18n/zh.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-oembed/client/baseWidget.coffee
+++ b/packages/rocketchat-oembed/client/baseWidget.coffee
@ -1,6 +1,9 @@
 Template.oembedBaseWidget.helpers
 	template: ->
-		# console.log this
+	# console.log this
+		if this._overrideTemplate
+			return this._overrideTemplate
+
 		if this.headers?.contentType?.match(/image\/.*/)?
 			return 'oembedImageWidget'

@ -10,4 +13,4 @@ Template.oembedBaseWidget.helpers
 		if this.parsedUrl?.host is 'www.youtube.com' and this.meta?.twitterPlayer?
 			return 'oembedYoutubeWidget'

-		return 'oembedUrlWidget'
+		return 'oembedUrlWidget'
--- a/packages/rocketchat-spotify/client/oembedSpotifyWidget.html
+++ b/packages/rocketchat-spotify/client/oembedSpotifyWidget.html
@ -0,0 +1,13 @@
+<template name="oembedSpotifyWidget">
+	{{#if parsedUrl}}
+		<blockquote>
+			<a href="https://www.spotify.com" style="color: #9e9ea6">Spotify</a><br/>
+			{{#if match meta.ogAudio "spotify:artist:\\S+"}}
+				<a href="{{url}}">{{{meta.ogTitle}}}</a><br/>
+			{{else}}
+				<a href="{{url}}">{{{replace meta.ogDescription ", an? (?:song|album) by (.+?) on Spotify" " - $1" regex=true}}}</a><br/>
+			{{/if}}
+			<iframe width="300" height="380" src="https://embed.spotify.com/?uri={{meta.ogAudio}}" frameborder="0"></iframe><br/>
+		</blockquote>
+	{{/if}}
+</template>
--- a/packages/rocketchat-spotify/client/widget.coffee
+++ b/packages/rocketchat-spotify/client/widget.coffee
@ -0,0 +1,11 @@
+Template.registerHelper 'replace', (source, find, replace, option) ->
+	if option.hash.regex is true
+		find = new RegExp(find)
+	return source.replace(find, replace)
+
+Template.registerHelper 'match', (source, regex) ->
+	return new RegExp(regex).test(source)
+
+Template.oembedBaseWidget.onCreated () ->
+	if this.data?.parsedUrl?.host is 'open.spotify.com' and this.data?.meta?.ogAudio?
+		this.data._overrideTemplate = 'oembedSpotifyWidget'
--- a/packages/rocketchat-spotify/package.js
+++ b/packages/rocketchat-spotify/package.js
@ -0,0 +1,27 @@
+Package.describe({
+	name: 'rocketchat:spotify',
+	version: '0.0.1',
+	summary: 'Message pre-processor that will translate spotify on messages',
+	git: ''
+});
+
+Package.onUse(function(api) {
+	api.versionsFrom('1.0');
+
+	api.use([
+		'coffeescript',
+		'templating',
+		'underscore',
+		'rocketchat:oembed@0.0.1',
+		'rocketchat:lib@0.0.1'
+	]);
+
+	api.addFiles('client/widget.coffee', 'client');
+	api.addFiles('client/oembedSpotifyWidget.html', 'client');
+
+	api.addFiles('spotify.coffee', ['server','client']);
+});
+
+Package.onTest(function(api) {
+
+});
--- a/packages/rocketchat-spotify/spotify.coffee
+++ b/packages/rocketchat-spotify/spotify.coffee
@ -0,0 +1,56 @@
+###
+# Spotify a named function that will process Spotify links or syntaxes (ex: spotify:track:1q6IK1l4qpYykOaWaLJkWG)
+# @param {Object} message - The message object
+###
+
+class Spotify
+	process = (message, source, callback) ->
+		if _.trim source
+			# Separate text in code blocks and non code blocks
+			msgParts = source.split(/(```\w*[\n\ ]?[\s\S]*?```+?)/)
+
+			for part, index in msgParts
+				# Verify if this part is code
+				codeMatch = part.match(/```(\w*)[\n\ ]?([\s\S]*?)```+?/)
+				if not codeMatch?
+					callback message, msgParts, index, part
+
+	@transform: (message) ->
+		urls = []
+		if Array.isArray message.urls
+			urls = urls.concat message.urls
+
+		changed = false
+
+		process message, message.msg, (message, msgParts, index, part) ->
+			re = /(?:^|\s)spotify:([^:]+):([^:]+)(?::([^:]+))?(?::(\S+))?(?:\s|$)/g
+			while match = re.exec(part)
+				data = match.slice(1)
+				path = _.map data, (value) ->
+					return _.escape(value)
+				.join '/'
+				url = 'https://open.spotify.com/' + path
+				urls.push {'url': url, 'source': 'spotify:' + data.join ':'}
+				changed = true
+
+		# Re-mount message
+		if changed
+			message.urls = urls
+
+		return message
+
+	@render: (message) ->
+		process message, message.html, (message, msgParts, index, part) ->
+			if Array.isArray message.urls
+				for item in message.urls
+					if item.source
+						quotedSource = item.source.replace /[\\^$.*+?()[\]{}|]/g, '\\$&'
+						re = new RegExp '(^|\\s)' + quotedSource + '(\\s|$)', 'g'
+						part = part.replace re, '$1<a href="' + item.url + '" target="_blank">' + item.source + '</a>$2'
+				msgParts[index] = part
+				message.html = msgParts.join ''
+
+		return message
+
+RocketChat.callbacks.add 'beforeSaveMessage', Spotify.transform, RocketChat.callbacks.priority.LOW
+RocketChat.callbacks.add 'renderMessage', Spotify.render
--- a/packages/rocketchat-webrtc-ib/i18n/zh.i18n.json
+++ b/packages/rocketchat-webrtc-ib/i18n/zh.i18n.json
@ -1 +1,6 @@
-{ }
+{
+  "Video_Chat" : "视频",
+  "Remote" : "远程",
+  "Setup" : "设置",
+  "Stop_Video" : "停止视频"
+}
--- a/packages/rocketchat-wordpress/common.coffee
+++ b/packages/rocketchat-wordpress/common.coffee
@ -0,0 +1,24 @@
+config =
+	serverURL: ''
+	identityPath: '/oauth/me'
+	addAutopublishFields:
+		forLoggedInUser: ['services.wordpress']
+		forOtherUsers: ['services.wordpress.user_login']
+
+WordPress = new CustomOAuth 'wordpress', config
+
+if Meteor.isServer
+	Meteor.startup ->
+		RocketChat.models.Settings.find({ _id: 'API_Wordpress_URL' }).observe
+			added: (record) ->
+				config.serverURL = RocketChat.settings.get 'API_Wordpress_URL'
+				WordPress.configure config
+			changed: (record) ->
+				config.serverURL = RocketChat.settings.get 'API_Wordpress_URL'
+				WordPress.configure config
+else
+	Meteor.startup ->
+		Tracker.autorun ->
+			if RocketChat.settings.get 'API_Wordpress_URL'
+				config.serverURL = RocketChat.settings.get 'API_Wordpress_URL'
+				WordPress.configure config
--- a/packages/rocketchat-wordpress/i18n/ar.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/ar.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-wordpress/i18n/de.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/de.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-wordpress/i18n/el.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/el.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-wordpress/i18n/en.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/en.i18n.json
@ -0,0 +1,6 @@
+{
+  "API_Wordpress_URL" : "WordPress URL",
+  "Accounts_OAuth_Wordpress" : "WordPress Login",
+  "Accounts_OAuth_Wordpress_id" : "WordPress ID",
+  "Accounts_OAuth_Wordpress_secret" : "WordPress Secret"
+}
--- a/packages/rocketchat-wordpress/i18n/es.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/es.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-wordpress/i18n/fi.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/fi.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-wordpress/i18n/fr.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/fr.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-wordpress/i18n/he.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/he.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-wordpress/i18n/hr.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/hr.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-wordpress/i18n/hu.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/hu.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-wordpress/i18n/it.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/it.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-wordpress/i18n/ja.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/ja.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-wordpress/i18n/km.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/km.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-wordpress/i18n/ko.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/ko.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-wordpress/i18n/pl.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/pl.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-wordpress/i18n/pt.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/pt.i18n.json
@ -0,0 +1,3 @@
+{
+  "API_Wordpress_URL" : "URL do WordPress"
+}
--- a/packages/rocketchat-wordpress/i18n/ru.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/ru.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-wordpress/i18n/ta-IN.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/ta-IN.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-wordpress/i18n/tr.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/tr.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-wordpress/i18n/ug.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/ug.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-wordpress/i18n/uk.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/uk.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-wordpress/i18n/zh.i18n.json
+++ b/packages/rocketchat-wordpress/i18n/zh.i18n.json
@ -0,0 +1 @@
+{ }
--- a/packages/rocketchat-wordpress/package-tap.i18n
+++ b/packages/rocketchat-wordpress/package-tap.i18n
--- a/packages/rocketchat-wordpress/package.js
+++ b/packages/rocketchat-wordpress/package.js
@ -0,0 +1,32 @@
+Package.describe({
+    name: 'rocketchat:wordpress',
+    version: '0.0.1',
+    summary: 'RocketChat settings for WordPress Oauth Flow'
+});
+
+// Loads all i18n.json files into tapi18nFiles
+var _ = Npm.require('underscore');
+var fs = Npm.require('fs');
+tapi18nFiles = fs.readdirSync('packages/rocketchat-wordpress/i18n').forEach(function(filename) {
+    if (fs.statSync('packages/rocketchat-wordpress/i18n/' + filename).size > 16) {
+        return 'i18n/' + filename;
+    }
+});
+
+Package.onUse(function(api) {
+    api.versionsFrom('1.0');
+    api.use("tap:i18n@1.5.1");
+    api.use('coffeescript');
+    api.use('rocketchat:lib@0.0.1');
+    api.use('rocketchat:custom-oauth');
+    api.use('templating', 'client');
+    api.addFiles("package-tap.i18n");
+    api.addFiles("common.coffee");
+    api.addFiles('wordpress-login-button.css', 'client');
+    api.addFiles('startup.coffee', 'server');
+    api.addFiles(tapi18nFiles);
+});
+
+Package.onTest(function(api) {
+
+});
--- a/packages/rocketchat-wordpress/startup.coffee
+++ b/packages/rocketchat-wordpress/startup.coffee
@ -0,0 +1,5 @@
+RocketChat.settings.add 'API_Wordpress_URL', '', { type: 'string', group: 'Accounts', public: true, i18nLabel: 'rocketchat-wordpress:API_Wordpress_URL', section: 'WordPress' }
+RocketChat.settings.add 'Accounts_OAuth_Wordpress', false, { type: 'boolean', group: 'Accounts', section: 'WordPress', i18nLabel: 'rocketchat-wordpress:Accounts_OAuth_Wordpress' }
+RocketChat.settings.add 'Accounts_OAuth_Wordpress_id', '', { type: 'string', group: 'Accounts', section: 'WordPress', i18nLabel: 'rocketchat-wordpress:Accounts_OAuth_Wordpress_id' }
+RocketChat.settings.add 'Accounts_OAuth_Wordpress_secret', '', { type: 'string', group: 'Accounts', section: 'WordPress', i18nLabel: 'rocketchat-wordpress:Accounts_OAuth_Wordpress_secret' }
+
--- a/packages/rocketchat-wordpress/wordpress-login-button.css
+++ b/packages/rocketchat-wordpress/wordpress-login-button.css
@ -0,0 +1,3 @@
+#login-buttons-image-wordpress {
+    background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiP…A3LDI3LjUsMjUuOTQsMjMuMjE1LDI4LjQzNHoiLz4NCgk8L2c+DQo8L2c+DQo8L3N2Zz4NCg==);
+}
--- a/server/methods/addUserToRoom.coffee
+++ b/server/methods/addUserToRoom.coffee
@ -1,7 +1,13 @@
 Meteor.methods
 	addUserToRoom: (data) ->
 		fromId = Meteor.userId()
-		# console.log '[methods] addUserToRoom -> '.green, 'fromId:', fromId, 'data:', data
+		console.log '[methods] addUserToRoom -> '.green, 'data:', data
+
+		unless Match.test data?.rid, String
+			throw new Meteor.Error 'invalid-rid'
+
+		unless Match.test data?.username, String
+			throw new Meteor.Error 'invalid-username'

 		room = RocketChat.models.Rooms.findOneById data.rid

@ -13,7 +19,7 @@ Meteor.methods
 		if room.usernames.indexOf(data.username) isnt -1
 			return

-		newUser = RocketChat.models.Users.findOneByUsername username: data.username
+		newUser = RocketChat.models.Users.findOneByUsername data.username

 		RocketChat.models.Rooms.addUsernameById data.rid, data.username

--- a/server/methods/getUsernameSuggestion.coffee
+++ b/server/methods/getUsernameSuggestion.coffee
@ -17,7 +17,7 @@ usernameIsAvaliable = (username) ->

 	usernames.push slug user.name

-	nameParts = user.name.split()
+	nameParts = user?.name?.split()
 	if nameParts.length > 1
 		first = nameParts[0]
 		last = nameParts[nameParts.length - 1]
--- a/server/methods/joinRoom.coffee
+++ b/server/methods/joinRoom.coffee
@ -3,15 +3,21 @@ Meteor.methods

 		room = RocketChat.models.Rooms.findOneById rid

+		console.log '[methods] joinRoom -> '.green, 'userId:', Meteor.userId(), 'arguments:', arguments
+
+		if not room?
+			throw new Meteor.Error 500, 'No channel with this id'
+
 		if room.t isnt 'c'
 			throw new Meteor.Error 403, '[methods] joinRoom -> Not allowed'

-		# verify if user is already in room
-		# if room.usernames.indexOf(user.username) is -1
-		console.log '[methods] joinRoom -> '.green, 'userId:', Meteor.userId(), 'arguments:', arguments
-
 		now = new Date()

+		# Check if user is already in room
+		subscription = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId rid, Meteor.userId()
+		if subscription?
+			return
+
 		user = RocketChat.models.Users.findOneById Meteor.userId()

 		RocketChat.callbacks.run 'beforeJoinRoom', user, room
--- a/server/methods/toogleFavorite.coffee
+++ b/server/methods/toogleFavorite.coffee
@ -5,4 +5,4 @@ Meteor.methods

 		console.log '[methods] toogleFavorite -> '.green, 'userId:', Meteor.userId(), 'arguments:', arguments

-		RocketChat.models.Subscriptions.setFavoriteByRoomIdAndUserId rid, Meteor.userId()
+		RocketChat.models.Subscriptions.setFavoriteByRoomIdAndUserId rid, Meteor.userId(), f
--- a/server/startup/cron.coffee
+++ b/server/startup/cron.coffee
@ -12,6 +12,7 @@ Meteor.startup ->
 				return parser.text 'every 1 hour'
 			job: ->
 				statistics = RocketChat.statistics.save()
+				statistics.host = Meteor.absoluteUrl()
 				unless RocketChat.settings.get 'Statistics_opt_out'
 					console.log 'Sending statistics data to Rocket.Chat'
 					HTTP.post 'https://rocket.chat/stats', 
--- a/Show More
+++ b/Show More