Merge remote-tracking branch 'origin/master' into 0.5.1

public/language/nl/language.json

@@ -1,5 +1,5 @@
 {
     "name": "Nederlands",
-    "code": "nl",
+    "code": "nl_NL",
     "dir": "ltr"
 }

public/language/pt_BR/email.json

@@ -7,14 +7,14 @@
     "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.",
     "welcome.cta": "Clique aqui para confirmar seu endereço de email",
     "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
-    "reset.text2": "To continue with the password reset, please click on the following link:",
+    "reset.text2": "Para continuar com a redefinição de senha, por favor clique no link:\n",
     "reset.cta": "Clique aqui para recuperar sua senha",
-    "digest.notifications": "You have some unread notifications from %1:",
+    "digest.notifications": "Você tem algumas notificações não lidas de %1:",
     "digest.latest_topics": "Últimos tópicos de %1",
     "digest.cta": "Clique aqui para visitar %1",
-    "digest.unsub.info": "This digest was sent to you due to your subscription settings.",
+    "digest.unsub.info": "Este resumo foi enviado para você devido a configuração de assinatura",
     "digest.unsub.cta": "Clique aqui para alterar suas configurações",
-    "digest.daily.no_topics": "There have been no active topics in the past day",
-    "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+    "digest.daily.no_topics": "Não houve nenhum tópico ativo atualmente",
+    "test.text1": "Este é um e-mail de teste, para verificar que o email está corretamente configurado no seu NodeBB.\n",
     "closing": "Obrigado!"
 }

public/language/ro/email.json

@@ -1,8 +1,8 @@
 {
     "password-reset-requested": "Password Reset Requested - %1!",
-    "welcome-to": "Welcome to %1",
-    "greeting_no_name": "Hello",
-    "greeting_with_name": "Hello %1",
+    "welcome-to": "Salutare lui %1",
+    "greeting_no_name": "Salut",
+    "greeting_with_name": "Salut %1",
     "welcome.text1": "Thank you for registering with %1!",
     "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.",
     "welcome.cta": "Click here to confirm your email address",
@@ -11,10 +11,10 @@
     "reset.cta": "Click here to reset your password",
     "digest.notifications": "You have some unread notifications from %1:",
     "digest.latest_topics": "Latest topics from %1",
-    "digest.cta": "Click here to visit %1",
+    "digest.cta": "Apasă aici pentru a vizita %1",
     "digest.unsub.info": "This digest was sent to you due to your subscription settings.",
     "digest.unsub.cta": "Click here to alter those settings",
     "digest.daily.no_topics": "There have been no active topics in the past day",
     "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
-    "closing": "Thanks!"
+    "closing": "Mulțumesc!"
 }

public/language/ro/global.json

@@ -13,7 +13,7 @@
     "please_log_in": "Autentifică-te",
     "logout": "Ieşire",
     "posting_restriction_info": "Pentru a posta trebuie să fi înregistrat. Apasă aici pentru a te atentifica.",
-    "welcome_back": "Welcome Back",
+    "welcome_back": "Bine ai revenit",
     "you_have_successfully_logged_in": "Te-ai conectat cu succes",
     "save_changes": "Salvează Modificări",
     "close": "Închide",

public/language/ro/groups.json

@@ -1,7 +1,7 @@
 {
-    "view_group": "View Group",
-    "details.title": "Group Details",
-    "details.members": "Member List",
-    "details.has_no_posts": "This group's members have not made any posts.",
-    "details.latest_posts": "Latest Posts"
+    "view_group": "Vezi Grup",
+    "details.title": "Detalii Grup",
+    "details.members": "Listă Membrii",
+    "details.has_no_posts": "Membrii acestui grup nu au facut nici o postare.",
+    "details.latest_posts": "Ultimele Mesaje"
 }

public/language/ro/modules.json

@@ -1,18 +1,18 @@
 {
     "chat.chatting_with": "Conversează cu <span id=\"chat-with-name\"></span>",
-    "chat.placeholder": "Type chat message here, press enter to send",
+    "chat.placeholder": "introdu mesajul conversației aici, apasă enter pentru a trimite",
     "chat.send": "Trimite",
     "chat.no_active": "Nu ai nici o conversație activă",
     "chat.user_typing": "%1 scrie ...",
     "chat.user_has_messaged_you": "%1 ți-a trimis un mesaj.",
     "chat.see_all": "Vezi toate conversațiile",
     "chat.no-messages": "Please select a recipient to view chat message history",
-    "chat.recent-chats": "Recent Chats",
-    "chat.contacts": "Contacts",
-    "chat.message-history": "Message History",
+    "chat.recent-chats": "Conversații Recente",
+    "chat.contacts": "Contacte",
+    "chat.message-history": "Istorie Mesaje",
     "chat.pop-out": "Pop out chat",
-    "chat.maximize": "Maximize",
-    "composer.user_said_in": "%1 said in %2:",
-    "composer.user_said": "%1 said:",
+    "chat.maximize": "Maximizează",
+    "composer.user_said_in": "%1 a spus în %2:",
+    "composer.user_said": "%1 a spus:",
     "composer.discard": "Ești sigur că vrei să renunți la acest mesaj?"
 }

public/language/ro/recent.json

@@ -3,6 +3,6 @@
     "day": "Zi",
     "week": "Săptămână",
     "month": "Lună",
-    "year": "Year",
+    "year": "An",
     "no_recent_topics": "Nu există subiecte recente."
 }

public/language/ro/user.json

@@ -3,7 +3,7 @@
     "offline": "Deconectat",
     "username": "Nume utilizator",
     "email": "Adresă Email",
-    "confirm_email": "Confirm Email",
+    "confirm_email": "Confirmă Email",
     "fullname": "Nume Întreg",
     "website": "Pagină Web",
     "location": "Locație",

public/src/forum/register.js

@@ -106,7 +106,7 @@ define('forum/register', function() {
 		if (password.length < config.minimumPasswordLength) {
 			showError(password_notify, '[[user:change_password_error_length]]');
 		} else if (!utils.isPasswordValid(password)) {
-			showError(password_notify, '[[user:change_password_error_]]');
+			showError(password_notify, '[[user:change_password_error]]');
 		} else {
 			showSuccess(password_notify, successIcon);
 		}

public/src/utils.js

@@ -139,7 +139,7 @@
 		},
 
 		isPasswordValid: function(password) {
-			return typeof password === 'string' && password.length && password.indexOf(' ') === -1;
+			return typeof password === 'string' && password.length;
 		},
 
 		isNumber: function(n) {

src/emitter.js

@@ -1,7 +1,6 @@
 "use strict";
 
-var events = require('events'),
-	eventEmitter = new events.EventEmitter();
+var eventEmitter = new (require('events')).EventEmitter();
 
 
 eventEmitter.all = function(events, callback) {