Merge pull request #1 from RocketChat/master

Updating to more current version

packages/rocketchat-chatops/i18n/fi.i18n.json

 {
   "Chatops_Enabled" : "Ota käyttöön Chatops",
-  "Chatops_Title" : "Chatops paneeli"
+  "Chatops_Title" : "Chatops paneeli",
+  "Chatops_Username" : "Chatops käyttäjätunnus"
 }
\ No newline at end of file

packages/rocketchat-chatops/i18n/sv.i18n.json

+{ }
\ No newline at end of file

packages/rocketchat-emojione/package.js

@@ -10,7 +10,7 @@ Package.onUse(function(api) {
 
 	api.use([
 		'coffeescript',
-		'qnub:emojione',
+		'emojione:emojione',
 		'rocketchat:lib@0.0.1'
 	]);
 

packages/rocketchat-github-enterprise/i18n/en.i18n.json

 {
   "Accounts_OAuth_GitHub_Enterprise" : "OAuth Enabled",
+  "Accounts_OAuth_GitHub_Enterprise_Description": "",
   "API_GitHub_Enterprise_URL" : "Server URL",
   "Accounts_OAuth_GitHub_Enterprise_id" : "Client Id",
+  "Accounts_OAuth_GitHub_Enterprise_id_Description" : "",
   "Accounts_OAuth_GitHub_Enterprise_secret" : "Client Secret",
-  "Github_Enterprise_Url_No_Trail" : "Note: Please exclude trailing slash"
-}
\ No newline at end of file
+  "Accounts_OAuth_GitHub_Enterprise_secret_Description" : "",
+  "Github_Enterprise_Url_No_Trail" : "Example: http://domain.com (excluding trailing slash)"
+}

packages/rocketchat-github-enterprise/i18n/fa.i18n.json

+{ }
\ No newline at end of file

packages/rocketchat-github-enterprise/i18n/fi.i18n.json

 {
-  "API_GitHub_Enterprise_URL" : "GitHub Enterprise"
+  "Accounts_OAuth_GitHub_Enterprise" : "OAuth Käytössä",
+  "API_GitHub_Enterprise_URL" : "Server URL",
+  "Accounts_OAuth_GitHub_Enterprise_id" : "Client ID",
+  "Accounts_OAuth_GitHub_Enterprise_secret" : "Client Secret",
+  "Github_Enterprise_Url_No_Trail" : "Huom: Älä syötä viimeistä kenoviivaa"
 }
\ No newline at end of file

packages/rocketchat-github-enterprise/i18n/sv.i18n.json

+{ }
\ No newline at end of file

packages/rocketchat-gitlab/i18n/fa.i18n.json

+{ }
\ No newline at end of file

packages/rocketchat-gitlab/i18n/fi.i18n.json

 {
-  "API_Gitlab_URL" : "Git"
+  "API_Gitlab_URL" : "GitLab URL"
 }
\ No newline at end of file

packages/rocketchat-gitlab/i18n/sv.i18n.json

+{ }
\ No newline at end of file

packages/rocketchat-hubot/i18n/fa.i18n.json

+{ }
\ No newline at end of file

packages/rocketchat-hubot/i18n/sv.i18n.json

+{ }
\ No newline at end of file

packages/rocketchat-ldap/config_server.coffee

@@ -5,7 +5,7 @@ Meteor.startup ->
 	RocketChat.settings.add 'LDAP_Enable', false, { type: 'boolean', group: 'LDAP', public: true }
 	RocketChat.settings.add 'LDAP_Url', 'ldap://', { type: 'string' , group: 'LDAP' }
 	RocketChat.settings.add 'LDAP_Port', '389', { type: 'string' , group: 'LDAP' }
-	RocketChat.settings.add 'LDAP_DN', '', { type: 'string' , group: 'LDAP', i18nLabel: 'LDAP_Dn', public: true }
+	RocketChat.settings.add 'LDAP_DN', '', { type: 'string' , group: 'LDAP', public: true }
 	RocketChat.settings.add 'LDAP_Bind_Search', '', { type: 'string' , group: 'LDAP' }
 	RocketChat.settings.add 'LDAP_Sync_User_Data', false, { type: 'boolean' , group: 'LDAP' }
 	RocketChat.settings.add 'LDAP_Sync_User_Data_FieldMap', '{"cn":"name", "mail":"email"}', { type: 'string' , group: 'LDAP' }

packages/rocketchat-ldap/i18n/de.i18n.json

 {
-  "LDAP_Url" : "LDAP URL",
-  "LDAP_Port" : "LDAP Port",
   "LDAP_Dn" : "LDAP DN"
 }
\ No newline at end of file

packages/rocketchat-ldap/i18n/el.i18n.json

 {
-  "LDAP_Url" : "LDAP URL",
-  "LDAP_Port" : "LDAP Θύρα",
   "LDAP_Dn" : "LDAP DN"
 }
\ No newline at end of file

packages/rocketchat-ldap/i18n/en.i18n.json

 {
-  "LDAP_Url" : "LDAP URL",
-  "LDAP_Port" : "LDAP Port",
   "LDAP_Dn" : "LDAP DN"
 }
\ No newline at end of file

packages/rocketchat-ldap/i18n/fa.i18n.json

+{ }
\ No newline at end of file

packages/rocketchat-ldap/i18n/fi.i18n.json

 {
-  "LDAP_Url" : "LDAP URL",
-  "LDAP_Port" : "LDAP portti",
   "LDAP_Dn" : "LDAP DN"
 }
\ No newline at end of file

packages/rocketchat-ldap/i18n/fr.i18n.json

 {
-  "LDAP_Url" : "Adresse LDAP",
-  "LDAP_Port" : "Port LDAP",
   "LDAP_Dn" : "DN LDAP"
 }
\ No newline at end of file