Merge branch 'master' of https://github.com/NodeBB/NodeBB

public/language/ar/error.json

@@ -20,6 +20,7 @@
     "email-taken": "البريد الالكتروني مأخوذ",
     "email-not-confirmed": "عنوان بريدك الإلكتروني غير مفعل بعد. انقر هنا لتفعيله من فضلك.",
     "email-not-confirmed-chat": "لا يمكنك الدردشة حتى تقوم بتأكيد بريدك الإلكتروني، الرجاء إضغط هنا لتأكيد بريدك اﻹلكتروني.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "هذا المنتدى يستلزم تفعيل بريدك الإلكتروني، انقر هنا من فضلك لإدخاله.",
     "email-confirm-failed": "لم نستطع تفعيل بريدك الإلكتروني، المرجو المحاولة لاحقًا.",
     "confirm-email-already-sent": "لقد تم ارسال بريد التأكيد، الرجاء اﻹنتظار 1% دقائق لإعادة اﻹرسال",

public/language/ar/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "إلغاء",
     "bootbox.confirm": "تأكيد",

public/language/bg/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Е-пощата е заета",
     "email-not-confirmed": "Вашата е-поща все още не е потвърдена. Моля, натиснете тук, за да потвърдите е-пощата си.",
     "email-not-confirmed-chat": "Няма да можете да пишете в разговори, докато е-пощата Ви не бъде потвърдена. Моля, натиснете тук, за да потвърдите е-пощата си.",
+    "email-not-confirmed-email-sent": "Вашата е-поща все още не е потвърдена. Моля, проверете входящата си кутия за писмото за потвърждение.",
     "no-email-to-confirm": "Този форум изисква потвърдена е-поща. Моля, натиснете тук, за да въведете е-поща",
     "email-confirm-failed": "Не успяхме да потвърдим е-пощата Ви. Моля, опитайте отново по-късно.",
     "confirm-email-already-sent": "Е-писмото за потвърждение вече е изпратено. Моля, почакайте още %1 минута/и, преди да изпратите ново.",

public/language/bg/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Снимка",
     "composer.upload-picture": "Качване на изображение",
     "composer.upload-file": "Качване на файл",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "Добре",
     "bootbox.cancel": "Отказ",
     "bootbox.confirm": "Потвърждаване",

public/language/bn/error.json

@@ -20,6 +20,7 @@
     "email-taken": "ইমেইল আগেই ব্যবহৃত",
     "email-not-confirmed": "আপনার ইমেইল এড্রেস নিশ্চিত করা হয় নি, নিশ্চিত করতে এখানে ক্লিক করুন।",
     "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
     "email-confirm-failed": "We could not confirm your email, please try again later.",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",

public/language/bn/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",

public/language/cs/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Email je již použit",
     "email-not-confirmed": "Vaše emailová adresa zatím nebyla potvrzena. Kliknutím zde svůj email potvrdíte.",
     "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
     "email-confirm-failed": "We could not confirm your email, please try again later.",
     "confirm-email-already-sent": "Potvrzovací email již byl odeslán. Vyčkejte %1 minut pokud chcete odeslat další.",

public/language/cs/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Obrázek",
     "composer.upload-picture": "Nahrát obrázek",
     "composer.upload-file": "Nahrát soubor",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Zrušit",
     "bootbox.confirm": "Potvrdit",

public/language/da/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Emailadresse allerede i brug",
     "email-not-confirmed": "Din email adresse er ikke blevet bekræftet endnu, venligst klik her for at bekrætige den.",
     "email-not-confirmed-chat": "Du kan ikke chatte før din email er bekræftet, klik her for at bekræfte din email.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "Dette forum kræver bekræftelse af din email, klik her for at indtaste en email",
     "email-confirm-failed": "Vi kunne ikke bekræfte din email, prøv igen senere.",
     "confirm-email-already-sent": "Bekræftelses email er allerede afsendt, vent venligt %1 minut(ter) for at sende endnu en.",

public/language/da/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Annuller",
     "bootbox.confirm": "Bekræft",

public/language/de/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Die E-Mail-Adresse ist bereits vergeben",
     "email-not-confirmed": "Deine E-Mail wurde noch nicht bestätigt, bitte klicke hier, um deine E-Mail zu bestätigen.",
     "email-not-confirmed-chat": "Du kannst denn Chat erst nutzen wenn deine E-Mail bestätigt wurde, bitte klicke hier, um deine E-Mail zu bestätigen.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "Dieses Forum setzt eine E-Mail-Bestätigung voraus, bitte klicke hier um eine E-Mail-Adresse einzugeben.",
     "email-confirm-failed": "Wir konnten deine E-Mail-Adresse nicht bestätigen, bitte versuch es später noch einmal",
     "confirm-email-already-sent": "Die Bestätigungsmail wurde verschickt, bitte warte %1 Minute(n) um eine Weitere zu verschicken.",

public/language/de/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Bild",
     "composer.upload-picture": "Bild hochladen",
     "composer.upload-file": "Datei hochladen",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Abbrechen",
     "bootbox.confirm": "Bestätigen",

public/language/el/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Το email είναι πιασμένο",
     "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.",
     "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
     "email-confirm-failed": "We could not confirm your email, please try again later.",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",

public/language/el/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",

public/language/en@pirate/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Email taken",
     "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.",
     "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
     "email-confirm-failed": "We could not confirm your email, please try again later.",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",

public/language/en@pirate/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",

public/language/en_US/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Email taken",
     "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.",
     "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
     "email-confirm-failed": "We could not confirm your email, please try again later.",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",

public/language/en_US/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",

public/language/es/category.json

@@ -2,7 +2,7 @@
     "category": "Categoría",
     "subcategories": "Subcategorías",
     "new_topic_button": "Nuevo tema",
-    "guest-login-post": "Accede para poder escribir un mensaje",
+    "guest-login-post": "Accede para escribir un mensaje",
     "no_topics": "<strong>No hay temas en esta categoría.</strong><br />¿Por qué no te animas y publicas uno?",
     "browsing": "viendo ahora",
     "no_replies": "Nadie ha respondido aún",

public/language/es/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Correo electrónico ocupado",
     "email-not-confirmed": "Su cuenta de correo electrónico no ha sido confirmada aún, por favor haga click aquí para confirmarla.",
     "email-not-confirmed-chat": "No puedes usar el chat hasta que confirmes tu dirección de correo electrónico, por favor haz click aquí para confirmar tu correo.",
+    "email-not-confirmed-email-sent": "Tu correo electrónico está sin confirmar, por favor busca el correo de confirmación en tu bandeja de entrada.",
     "no-email-to-confirm": "Este foro requiere confirmación de su email, por favor pulse aquí para introducir un email",
     "email-confirm-failed": "No se ha podido confirmar su email, por favor inténtelo de nuevo más tarde.",
     "confirm-email-already-sent": "El email de confirmación ya ha sido enviado, por favor espera %1 minuto(s) para enviar otro.",

public/language/es/global.json

@@ -48,7 +48,7 @@
     "online": "Conectado",
     "users": "Usuarios",
     "topics": "Temas",
-    "posts": "Posts",
+    "posts": "Mensajes",
     "best": "Mejor valorados",
     "upvoters": "Positivos",
     "upvoted": "Votado positivamente",

public/language/es/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Foto",
     "composer.upload-picture": "Subir foto",
     "composer.upload-file": "Subir archivo",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancelar",
     "bootbox.confirm": "Confirmar",

public/language/es/topic.json

@@ -80,13 +80,13 @@
     "loading_more_posts": "Cargando más publicaciones",
     "move_topic": "Mover tema",
     "move_topics": "Mover temas",
-    "move_post": "Mover publicación",
+    "move_post": "Mover mensaje",
     "post_moved": "¡Publicación movida correctamente!",
     "fork_topic": "Dividir tema",
     "topic_will_be_moved_to": "Este tema será movido a la categoría",
     "fork_topic_instruction": "Pulsa en los mensajes que quieres dividir",
     "fork_no_pids": "¡No has seleccionado ningún mensaje!",
-    "fork_pid_count": "%1 post(s) selected",
+    "fork_pid_count": "%1 mensaje(s) seleccionados",
     "fork_success": "¡Se ha creado un nuevo tema a partir del original! Haz click aquí para ir al nuevo tema.",
     "delete_posts_instruction": "Haz click en los mensajes que quieres eliminar/limpiar",
     "composer.title_placeholder": "Ingresa el título de tu tema...",

public/language/et/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Email on võetud",
     "email-not-confirmed": "Su emaili aadress ei ole kinnitatud, vajuta siia et kinnitada.",
     "email-not-confirmed-chat": "Sõnumeid ei ole võimalik enne saata kui sinu email on kinnitatud. Kinnitamiseks vajuta siia.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "See foorum nõuab emaili kinnitust, palun vajuta siia, et sisestada email",
     "email-confirm-failed": "Meil ei õnnestunud sinu emaili kinnitada, proovi hiljem uuesti.",
     "confirm-email-already-sent": "Kinnituskiri on juba saadetud, palun oota %1 minut(it) uue kirja saatmiseks.",

public/language/et/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Pilt",
     "composer.upload-picture": "Lae pilt üles",
     "composer.upload-file": "Lae fail üles",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "Olgu",
     "bootbox.cancel": "Katkesta",
     "bootbox.confirm": "Kinnita",

public/language/fa_IR/error.json

@@ -20,6 +20,7 @@
     "email-taken": "این ایمیل گرفته شده است.",
     "email-not-confirmed": "ایمیل شما تاکنون تایید نشده است، برای تایید ایمیل خود را اینجا را کلیک کنید.",
     "email-not-confirmed-chat": "شما تا قبل از تایید ایمیل قادر به چت نیستید، لطفا برای تایید ایمیل خود اینجا کلیک کنید",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "ایمیل شما تایید نشده است ، لطفا برای وارد کردن ایمیل اینجا کلیک کنید",
     "email-confirm-failed": "سیستم موفق به تایید ایمیل شما نشد، لطفا بعدا دوباره سعی کنید",
     "confirm-email-already-sent": "ایمیل فعال‌سازی قبلا فرستاده شده، لطفا %1 دقیقه صبر کنید تا ایمیل دیگری بفرستید.",

public/language/fa_IR/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "عکس",
     "composer.upload-picture": "بارگذاری عکس",
     "composer.upload-file": "بارگذاری فایل",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "باشه",
     "bootbox.cancel": "انصراف",
     "bootbox.confirm": "تایید",

public/language/fi/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Sähköpostiosoite varattu",
     "email-not-confirmed": "Sähköpostiasi ei ole vielä vahvistettu, ole hyvä ja napsauta tätä vahvistaaksesi sen.",
     "email-not-confirmed-chat": "Et voi keskustella ennen kuin sähköpostiosoitteesi on vahvistettu, ole hyvä ja paina tästä vahvistaaksesi sen.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
     "email-confirm-failed": "We could not confirm your email, please try again later.",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",

public/language/fi/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",

public/language/fr/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Email déjà utilisé",
     "email-not-confirmed": "Votre adresse email n'est pas confirmée, cliquez ici pour la valider.",
     "email-not-confirmed-chat": "Il ne vous est pas possible d'utiliser le chat tant que votre adresse email n'a pas été vérifiée. Veuillez cliquer ici pour confirmer votre adresse email.",
+    "email-not-confirmed-email-sent": "Votre adresse email n'a pas encore été confirmée. Merci de vérifier l'email de confirmation dans votre boîte de reception.",
     "no-email-to-confirm": "Ce forum requiert une vérification de votre adresse email. Veuillez cliquer ici pour entrer une adresse.",
     "email-confirm-failed": "Votre adresse email n'a pas pu être vérifiée. Veuillez ré-essayer plus tard.",
     "confirm-email-already-sent": "L'email de confirmation a déjà été envoyé. Veuillez attendre %1 minute(s) avant de redemander un nouvel envoi.",

public/language/fr/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Image",
     "composer.upload-picture": "Envoyer une image",
     "composer.upload-file": "Envoyer un fichier",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Annuler",
     "bootbox.confirm": "Confirmer",

public/language/fr/topic.json

@@ -86,7 +86,7 @@
     "topic_will_be_moved_to": "Ce sujet sera déplacé vers la catégorie",
     "fork_topic_instruction": "Cliquez sur les postes à scinder",
     "fork_no_pids": "Aucun post sélectionné !",
-    "fork_pid_count": "%1 post(s) selected",
+    "fork_pid_count": "%1 message(s) sélectionné(s)",
     "fork_success": "Sujet copié avec succès ! Cliquez ici pour aller au sujet copié.",
     "delete_posts_instruction": "Sélectionnez les messages que vous souhaitez supprimer/vider",
     "composer.title_placeholder": "Entrer le titre du sujet ici…",

public/language/gl/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Correo en uso",
     "email-not-confirmed": "O teu correo aínda non está confirmado, por favor pica aquí para confirmalo.",
     "email-not-confirmed-chat": "Non podes charlar ata que confirmes o teu correo, por favor pica aquí para confirmalo.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "Este foro require confirmación de correo, por favor pica aquí para introducir un correo.",
     "email-confirm-failed": "Non podemos confirmar o teu correo, por favor téntao de novo máis tarde.",
     "confirm-email-already-sent": "O correo de confirmación foi enviado, agarda %1 minute(s) para enviar outro.",

public/language/gl/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Foto",
     "composer.upload-picture": "Subir foto",
     "composer.upload-file": "Subir arquivo",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "De acordo",
     "bootbox.cancel": "Cancelar",
     "bootbox.confirm": "Confirmar",

public/language/he/error.json

@@ -20,6 +20,7 @@
     "email-taken": "כתובת אימייל תפוסה",
     "email-not-confirmed": "כתובת המייל שלך עוד לא אושרה, לחץ כאן על-מנת לאשר את המייל שלך.",
     "email-not-confirmed-chat": "אין באפשרותך לשוחח עד שהדוא\"ל שלך יאושר, אנא לחץ כאן כדי לאשר את הדוא\"ל שלך.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "פורום זה דורש אישור בדוא\"ל, אנא לחץ כאן כדי להכניס לדואר אלקטרוני",
     "email-confirm-failed": "לא הצלחנו לאשר את הדוא\"ל שלך, תנסה שוב אחר כך",
     "confirm-email-already-sent": "מייל האישור כבר נשלח, אנא המתן %1 דקות כדי לשלוח מייל נוסף.",

public/language/he/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "בסדר",
     "bootbox.cancel": "בטל",
     "bootbox.confirm": "אשר",

public/language/hu/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Foglalt e-mail",
     "email-not-confirmed": "Az e-mail címed még nem lett ellenőrizve, kérlek kattints ide az e-mail címed ellenőrzéséhez!",
     "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "Ez a fórum e-mail megerősítést kíván, kérlek kattints ide egy cím beírásához",
     "email-confirm-failed": "Nem tudtuk ellenőrizni az e-mail címedet, kérlek próbálkozz később.",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",

public/language/hu/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",

public/language/id/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Email sudah terdaftar",
     "email-not-confirmed": "Email kamu belum dikonfirmasi, klik disini untuk mengkonfirmasi email.",
     "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
     "email-confirm-failed": "We could not confirm your email, please try again later.",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",

public/language/id/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",

public/language/it/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Email già esistente",
     "email-not-confirmed": "La tua Email deve essere ancora confermata, per favore clicca qui per confermare la tua Email.",
     "email-not-confirmed-chat": "Non potrai chattare finchè non avrai confermato la tua email, per favore clicca qui per farlo ora.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "Questo forum richiede la conferma dell'indirizzo email, per favore clicca qui per inserirne uno",
     "email-confirm-failed": "Non possiamo confermare la tua email, per favore prova ancora più tardi.",
     "confirm-email-already-sent": "Email di conferma già inviata, per favore attendere %1 minuti per richiederne un'altra.",

public/language/it/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Annulla",
     "bootbox.confirm": "Conferma",

public/language/ja/error.json

@@ -20,6 +20,7 @@
     "email-taken": "メールアドレスは既に使われています",
     "email-not-confirmed": "あなたのメールアドレスはまだ確認されていません。メールアドレスを確認するためにはここをクリックしてください。",
     "email-not-confirmed-chat": "チャットを行うにはメールアドレスの確認を行う必要があります。メールアドレスを確認するためにはここをクリックしてください。",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "このフォーラムを利用するにはメールアドレスの確認を行う必要があります。メールアドレスを確認するためにはここをクリックしてください。",
     "email-confirm-failed": "メールアドレスの確認が出来ませんでした。再度お試しください。",
     "confirm-email-already-sent": "確認のメールは既に送信されています。再度送信するには、%1分後に再度お試しください。",

public/language/ja/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",

public/language/ko/error.json

@@ -20,6 +20,7 @@
     "email-taken": "이미 사용 중인 이메일입니다.",
     "email-not-confirmed": "아직 이메일이 인증되지 않았습니다. 여기를 누르면 인증 메일을 발송할 수 있습니다.",
     "email-not-confirmed-chat": "아직 이메일이 인증되지 않았습니다. 대화기능은 인증 후에 사용이 가능합니다.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "이메일 인증이 필요합니다. 이곳을 클릭하여 이메일 입력하세요.",
     "email-confirm-failed": "이메일 인증이 실패하였습니다. 잠시 후에 다시 시도하세요.",
     "confirm-email-already-sent": "인증 메일이 이미 발송되었습니다. %1 분 이후에 재 발송이 가능합니다.",

public/language/ko/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "확인",
     "bootbox.cancel": "취소",
     "bootbox.confirm": "확인",

public/language/lt/error.json

@@ -20,6 +20,7 @@
     "email-taken": "El. pašto adresas jau užimtas",
     "email-not-confirmed": "Jūsų el. paštas nepatvirtintas, prašome paspausti čia norint jį patvirtinti.",
     "email-not-confirmed-chat": "Jūs negalite bendrauti, kol jūsų el.paštas nėra patvirtintas, prašome spausti čia kad aktyvuoti jūsų el.paštą",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "Šis forumas reikalauja patvirtinimo el. paštu prašome spausti čia el. adreso įrašymui",
     "email-confirm-failed": "Negalime patvirtinti jūsų el. adreso, prašom bandyti vėliau.",
     "confirm-email-already-sent": "Patvirtinimo laiškas išsiųstas, prašome palaukti %1 minute(s) kad išsiųstume kita",

public/language/lt/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",

public/language/ms/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Emel telah digunakan",
     "email-not-confirmed": "Emel anda belum disahkan lagi, sila klik sini untuk mengesahkan emel anda.",
     "email-not-confirmed-chat": "Anda tidak dibenarkan sembang sehingga emel disahkan, sila sahkan emel anda.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "Forum ini memerlukan pengesahan emel, sila klik sini untuk memasukkan emel",
     "email-confirm-failed": "Kami tidak dapat memastikan emel anda, sila cuba lagi nanti",
     "confirm-email-already-sent": "Pengesahan emel telah dihantar, sila tunggu %1 minit() untuk menghantar yang baru.",

public/language/ms/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "Ok",
     "bootbox.cancel": "Batal",
     "bootbox.confirm": "Pasti",

public/language/nb/error.json

@@ -20,6 +20,7 @@
     "email-taken": "E-post opptatt",
     "email-not-confirmed": "E-posten din har ikke blitt bekreftet enda, vennligst klikk for å bekrefte din e-post.",
     "email-not-confirmed-chat": "Du kan ikke chatte før e-posten din er bekreftet, vennligst klikk her for å bekrefte e-postadressen.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "Dette forumet krever e-postbekreftelse, vennligst klikk her for å skrive inn en e-post",
     "email-confirm-failed": "Vi kunne ikke bekrefte e-posten din, vennligst prøv igjen senere.",
     "confirm-email-already-sent": "E-post for bekreftelse er allerede sendt, vennligst vent %1 minutt(er) for å sende en til.",

public/language/nb/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Avbryt",
     "bootbox.confirm": "Bekreft",

public/language/nl/error.json

@@ -20,6 +20,7 @@
     "email-taken": "E-mailadres is al in gebruik",
     "email-not-confirmed": "Het e-mailadres van dit account is nog niet bevestigd, klik hier om je e-mailadres te bevestigen.",
     "email-not-confirmed-chat": "Het gebruik van chatfunctionaliteit is pas toegestaan na validatie van het e-mailadres.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "Dit berichtenforum vereist bevestiging per e-mail, klik hier om een e-mailadres te registreren",
     "email-confirm-failed": "Helaas kon het e-mailadres niet bevestigd worden, probeer het later nog eens.",
     "confirm-email-already-sent": "Bevestigingsmail is zojuist al verzonden, wacht alsjeblieft %1 minuut (minuten) voordat je opnieuw een bevestigingsmail aanvraagt.",

public/language/nl/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Afbeelding",
     "composer.upload-picture": "Upload afbeelding",
     "composer.upload-file": "Upload bestand",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Annuleren",
     "bootbox.confirm": "Bevestig",

public/language/pl/category.json

@@ -10,10 +10,10 @@
     "share_this_category": "Udostępnij tę kategorię",
     "watch": "Obserwuj",
     "ignore": "Ignoruj",
-    "watching": "Watching",
+    "watching": "Obserwowanie",
-    "ignoring": "Ignoring",
+    "ignoring": "Ignorowanie",
-    "watching.description": "Show topics in unread",
+    "watching.description": "Pokaż tematy jako nieprzeczytane",
-    "ignoring.description": "Do not show topics in unread",
+    "ignoring.description": "Nie pokazuj tematów jako nieprzeczytane",
     "watch.message": "Obserwujesz teraz uaktualnienia z tej kategorii",
     "ignore.message": "Ignorujesz teraz uaktualnienia z tej kategorii",
     "watched-categories": "Obserwowane kategorie"

public/language/pl/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Email zajęty",
     "email-not-confirmed": "Twój email nie został jeszcze potwierdzony. Proszę kliknąć tutaj by go potwierdzić.",
     "email-not-confirmed-chat": "Nie możesz prowadzić rozmów dopóki twój email nie zostanie potwierdzony, kliknij tutaj, aby potwierdzić swój email.",
+    "email-not-confirmed-email-sent": "Twój e-mail jeszcze nie został potwierdzony, proszę sprawdź swoją skrzynkę odbiorczą.",
     "no-email-to-confirm": "To forum wymaga weryfikacji przez email. Proszę kliknąć tutaj, aby wprowadzić adres.",
     "email-confirm-failed": "Nie byliśmy w stanie potwierdzić twojego email-a. Proszę spróbować później.",
     "confirm-email-already-sent": "Email potwierdzający został już wysłany, proszę odczekaj jeszcze %1 minut(y), aby wysłać kolejny.",
@@ -30,7 +31,7 @@
     "user-banned": "Użytkownik zbanowany",
     "user-too-new": "Przepraszamy, musisz odczekać %1 sekund(y) przed utworzeniem pierwszego posta",
     "blacklisted-ip": "Twój adres IP został zablokowany na tej społeczności. Jeśli uważasz to za błąd, zgłoś to administratorowi",
-    "ban-expiry-missing": "Please provide an end date for this ban",
+    "ban-expiry-missing": "Wprowadź datę końca blokady",
     "no-category": "Kategoria nie istnieje",
     "no-topic": "Temat nie istnieje",
     "no-post": "Post nie istnieje",
@@ -47,13 +48,13 @@
     "post-edit-duration-expired-hours-minutes": "Możesz edytować posty tylko przez %1 godzin(y) i %2 minut(y) po ich napisaniu",
     "post-edit-duration-expired-days": "Możesz edytować posty tylko przez %1 dzień (dni) po ich napisaniu",
     "post-edit-duration-expired-days-hours": "Możesz edytować posty tylko przez %1 dzień (dni) i %2 godzin(y) po ich napisaniu",
-    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired": "Możesz kasować posty przez %1 sekund(-y) po napisaniu",
-    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes": "Możesz kasować posty przez %1 minut(-y) po napisaniu",
-    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "Możesz kasować posty przez %1 minut(-y) i %2 sekund(-y) po napisaniu",
-    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours": "Możesz kasować posty przez %1 godzin(-y) po napisaniu",
-    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "Możesz kasować posty przez %1 godzin(-y) i %2 minut(-y) po napisaniu",
-    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days": "Możesz kasować posty przez %1 dni po napisaniu",
-    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired-days-hours": "Możesz kasować posty przez %1 dni i %2 godzin(-y) po napisaniu",
     "content-too-short": "Prosimy wpisać dłuższy post. Posty powinny zawierać co najmniej %1 znaków.",
     "content-too-long": "Prosimy wpisać krótszy post. Posty nie mogą zawierać więcej niż %1 znaków.",
     "title-too-short": "Prosimy podać dłuższy tytuł. Tytuły powinny zawierać co najmniej %1 znaków.",
@@ -76,7 +77,7 @@
     "invalid-image-extension": "Błędne rozszerzenie pliku",
     "invalid-file-type": "Błędny typ pliku. Dozwolone typy to: %1",
     "group-name-too-short": "Nazwa grupy za krótka",
-    "group-name-too-long": "Group name too long",
+    "group-name-too-long": "Nazwa grupy jest za długa",
     "group-already-exists": "Grupa już istnieje",
     "group-name-change-not-allowed": "Nie można zmieniać nazwy tej grupy.",
     "group-already-member": "Już jesteś członkiem tej grupy",
@@ -119,6 +120,6 @@
     "not-in-room": "Użytkownik nie jest w pokoju",
     "no-users-in-room": "Brak użytkowników w pokoju",
     "cant-kick-self": "Nie możesz wyrzucić samego siebie z grupy",
-    "no-users-selected": "No user(s) selected",
+    "no-users-selected": "Nie wybrano żadnych użytkowników",
     "invalid-home-page-route": "Invalid home page route"
 }

public/language/pl/global.json

@@ -50,10 +50,10 @@
     "topics": "Tematy",
     "posts": "Posty",
     "best": "Najlepsze",
-    "upvoters": "Upvoters",
+    "upvoters": "Głosujący za",
-    "upvoted": "Upvoted",
+    "upvoted": "Oddane głosy za",
-    "downvoters": "Downvoters",
+    "downvoters": "Głosujący przeciw",
-    "downvoted": "Downvoted",
+    "downvoted": "Oddane głosy przeciw",
     "views": "wyświetleń",
     "reputation": "Punkty reputacji",
     "read_more": "czytaj więcej",

public/language/pl/login.json

@@ -8,5 +8,5 @@
     "failed_login_attempt": "Nie udało się zalogować. Spróbuj ponownie.",
     "login_successful": "Zostałeś pomyślnie zalogowany.",
     "dont_have_account": "Nie masz konta?",
-    "logged-out-due-to-inactivity": "You have been logged out of the Admin Control Panel due to inactivity"
+    "logged-out-due-to-inactivity": "Zostałeś wylogowany z Panelu Administratora z powodu braku aktywności."
 }

public/language/pl/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Obraz",
     "composer.upload-picture": "Wyślij obraz",
     "composer.upload-file": "Wyślij plik",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Anuluj",
     "bootbox.confirm": "Potwierdź",

public/language/pl/pages.json

@@ -12,7 +12,7 @@
     "users/sort-posts": "Użytkownicy z największą liczbą postów",
     "users/sort-reputation": "Użytkownicy z najwyższą reputacją",
     "users/banned": "Banned Users",
-    "users/most-flags": "Most flagged users",
+    "users/most-flags": "Najczęściej oznaczani użytkownicy",
     "users/search": "Wyszukiwanie Użytkownków",
     "notifications": "Powiadomienia",
     "tags": "Tagi",
@@ -29,7 +29,7 @@
     "account/edit/password": "Editing password of \"%1\"",
     "account/edit/username": "Editing username of \"%1\"",
     "account/edit/email": "Editing email of \"%1\"",
-    "account/info": "Account Info",
+    "account/info": "Informacje o koncie",
     "account/following": "Obserwowani przez %1",
     "account/followers": "Obserwujący %1",
     "account/posts": "Posty napisane przez %1",

public/language/pl/register.json

@@ -1,6 +1,6 @@
 {
     "register": "Rejestracja",
-    "cancel_registration": "Cancel Registration",
+    "cancel_registration": "Anuluj rejestrację",
     "help.email": "Domyślnie twój adres e-mail będzie ukryty.",
     "help.username_restrictions": "Unikalna nazwa użytkownika z min. %1 i maks. %2 znaków. Inni użytkownicy mogą ciebie zawołać pisząc @<span id='yourUsername'>nazwa użytkownika</span>.",
     "help.minimum_password_length": "Hasło musi mieć co najmniej %1 znaków.",
@@ -16,8 +16,8 @@
     "alternative_registration": "Alternatywna rejestracja",
     "terms_of_use": "Warunki korzystania z serwisu",
     "agree_to_terms_of_use": "Zgadzam się na powyższe warunki",
-    "terms_of_use_error": "You must agree to the Terms of Use",
+    "terms_of_use_error": "Musisz zaakceptować Terms of Use",
     "registration-added-to-queue": "Twoja rejestracja została dodana do kolejki oczekujących na akceptację. Otrzymasz email, kiedy zostanie zatwierdzona przez administratora.",
-    "interstitial.intro": "We require some additional information before we can create your account.",
+    "interstitial.intro": "Potrzebujemy dodatkowych informacji zanim przejdziemy dalej do utworzenia Twojego konta.",
-    "interstitial.errors-found": "We could not complete your registration:"
+    "interstitial.errors-found": "Nie mogliśmy ukończyć procesu rejestracji:"
 }

public/language/pl/topic.json

@@ -26,14 +26,14 @@
     "tools": "Narzędzia",
     "flag": "Zgłoś",
     "locked": "Zablokowany",
-    "pinned": "Pinned",
+    "pinned": "Przypięte",
-    "moved": "Moved",
+    "moved": "Przeniesione",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Zgłoś post do moderacji",
     "flag_success": "Ten post został oznaczony do moderacji.",
     "deleted_message": "Ten temat został skasowany. Tylko użytkownicy z uprawnieniami do zarządzania mogą go zobaczyć.",
     "following_topic.message": "Będziesz od teraz otrzymywał powiadomienia, gdy ktoś odpowie w tym temacie.",
-    "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
+    "not_following_topic.message": "Zobaczysz ten temat na liście nieprzeczytanych, ale nie otrzymasz żadnego powiadomienia dotyczącego tego tematu.",
     "ignoring_topic.message": "Nie zobaczysz już tego tematu na liście nieprzeczytanych. Otrzymasz powiadomienie, kiedy zostaniesz wspomniany lub ktoś odda głos na twój post.",
     "login_to_subscribe": "Zaloguj się, aby subskrybować ten temat.",
     "markAsUnreadForAll.success": "Temat oznaczony jako nieprzeczytany dla wszystkich.",
@@ -60,7 +60,7 @@
     "thread_tools.move_all": "Przenieś wszystko",
     "thread_tools.fork": "Skopiuj Temat",
     "thread_tools.delete": "Usuń Temat",
-    "thread_tools.delete-posts": "Delete Posts",
+    "thread_tools.delete-posts": "Usuń posty",
     "thread_tools.delete_confirm": "Na pewno chcesz skasować ten temat?",
     "thread_tools.restore": "Przywróć Temat",
     "thread_tools.restore_confirm": "Na pewno chcesz przywrócić ten temat?",
@@ -86,7 +86,7 @@
     "topic_will_be_moved_to": "Ten temat zostanie przeniesiony do kategorii",
     "fork_topic_instruction": "Zaznacz posty, które chcesz sklonować",
     "fork_no_pids": "Nie zaznaczyłeś żadnych postów!",
-    "fork_pid_count": "%1 post(s) selected",
+    "fork_pid_count": "wybrano %1 post(-ów)",
     "fork_success": "Udało się skopiować temat. Kliknij tutaj, aby do niego przejść.",
     "delete_posts_instruction": "Kliknij na posty, które chcesz usunąć",
     "composer.title_placeholder": "Wpisz tutaj tytuł tematu...",
@@ -118,5 +118,5 @@
     "link_back": "Re: [%1](%2)",
     "spam": "Spam",
     "offensive": "Obrażliwy",
-    "custom-flag-reason": "Enter a flagging reason"
+    "custom-flag-reason": "Wprowadź powód oznaczenia"
 }

public/language/pl/user.json

@@ -6,7 +6,7 @@
     "postcount": "Liczba postów",
     "email": "Adres e-mail",
     "confirm_email": "Potwierdź e-mail",
-    "account_info": "Account Info",
+    "account_info": "Informacje o koncie",
     "ban_account": "Zbanuj Konto",
     "ban_account_confirm": "Na pewno chcesz zbanować tego użytkownika?",
     "unban_account": "Odbanuj Konto",
@@ -96,8 +96,8 @@
     "delay_image_loading": "Opóźnienie ładowania zdjęcia",
     "image_load_delay_help": "Jeśli włączone, zdjęcia w temacie nie załadują się dopóki nie najedzie się",
     "scroll_to_my_post": "Po napisaniu odpowiedzi, wyświetl najnowsze posty",
-    "follow_topics_you_reply_to": "Watch topics that you reply to",
+    "follow_topics_you_reply_to": "Obserwuj tematy w których uczestniczysz",
-    "follow_topics_you_create": "Watch topics you create",
+    "follow_topics_you_create": "Obserwuj tematy które utworzyłeś",
     "grouptitle": "Tytuł grupy",
     "no-group-title": "Brak tytułu grupy",
     "select-skin": "Wybierz Skórkę",

public/language/pt_BR/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Email já cadastrado",
     "email-not-confirmed": "O seu email ainda não foi confirmado, por favor clique aqui para confirmar seu email.",
     "email-not-confirmed-chat": "Você não está habilitado a conversar até que seu email seja confirmado, por favor clique aqui para confirmar seu email.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "Este fórum exige confirmação de email, por gentileza clique aqui para digitar um email",
     "email-confirm-failed": "Nós não pudemos confirmar seu email, por gentileza tente novamente mais tarde.",
     "confirm-email-already-sent": "O email de confirmação já foi enviado, por favor aguarde %1 minuto(s) para enviar outro.",

public/language/pt_BR/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Imagem",
     "composer.upload-picture": "Fazer upload de Imagem",
     "composer.upload-file": "Fazer upload de Arquivo",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancelar",
     "bootbox.confirm": "Confirmar",

public/language/ro/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Adresa de email este deja folostă",
     "email-not-confirmed": "Adresa ta de email nu a fost inca confirmata, click aici ca sa o confirmi.",
     "email-not-confirmed-chat": "Nu vei putea trimite mesaje daca email-ul tau nu e confirmat, click aici sa il confirmi.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "Ca sa accesezi forumul trebuie sa iti confirmi email-ul, click aici ca sa intri in mail.",
     "email-confirm-failed": "Mail-ul tau nu a putut fi confirmat, te rog incearca mai tarziu.",
     "confirm-email-already-sent": "Email-ul de confirmare ti-a fost trimis, asteapta te rog %1 minut(e) ca sa trimiti inca unul.",

public/language/ro/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",

public/language/ru/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Email занят",
     "email-not-confirmed": "Ваш email не подтвержден, нажмите для подтверждения.",
     "email-not-confirmed-chat": "Вы не можете оставлять сообщения, пока Ваш email не подтверждён. Нажмите на это сообщение чтобы получить письмо повторно.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "Этот форум требует подтверждения по E-mail. Нажмите здесь для ввода E-mail.",
     "email-confirm-failed": "Мы не можем подтвердить Ваш E-mail, попробуйте позже.",
     "confirm-email-already-sent": "Сообщение для подтверждения уже выслано на E-mail. Повторная отправка возможна через %1 мин.",

public/language/ru/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Изображение",
     "composer.upload-picture": "Загрузить изображение",
     "composer.upload-file": "Загрузить файл",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "ОК",
     "bootbox.cancel": "Отмена",
     "bootbox.confirm": "Подтвердить",

public/language/rw/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Email yarafashwe mbere",
     "email-not-confirmed": "Email yawe ntabwo iremezwa. Kanda hano kugirango wemeze email yawe.",
     "email-not-confirmed-chat": "Ntabwo uremererwa kuganirira mu gikari kuko email yawe itari yemezwa. Kanda hano kugirango wemeze email yawe. ",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "Uru rubuga rusaba ko wemeza ko utunze email. Kanda hano kugirango utange email yawe",
     "email-confirm-failed": "Ntabwo email yawe yabashije kwemezwa. Ongera ugerageze mu bundi buryo. ",
     "confirm-email-already-sent": "Email yo kwemeza yamaze koherezwa. Tegereza iminota (umunota) %1 mbere yo kohereza indi. ",

public/language/rw/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "Sawa",
     "bootbox.cancel": "Isubire",
     "bootbox.confirm": "Emeza",

public/language/sc/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Email taken",
     "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.",
     "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
     "email-confirm-failed": "We could not confirm your email, please try again later.",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",

public/language/sc/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",

public/language/sk/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Email je obsadený",
     "email-not-confirmed": "Your email has not been confirmed yet, please click here to confirm your email.",
     "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
     "email-confirm-failed": "We could not confirm your email, please try again later.",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",

public/language/sk/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",

public/language/sl/error.json

@@ -20,6 +20,7 @@
     "email-taken": "E-mail naslov je že zaseden",
     "email-not-confirmed": "Vaš e-mail naslov še ni bil potrjen. Prosimo kliknite tu za potrditev vašega e-mail naslova.",
     "email-not-confirmed-chat": "Ne morete klepetati dokler ne potrdite vašega e-mail naslova. Prosimo kliknite tu za potrditev vašega e-mail naslova.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "Ta forum zahteva potrjen e-mail naslov. Prosim kliknite tu za vnos e-mail naslova.",
     "email-confirm-failed": "Nismo mogli potrditi vašega e-mail naslova. Prosimo poskusite ponovno.",
     "confirm-email-already-sent": "Potrditveni e-mail naslov je že poslan. Prosimo počakajte %1 minut(o) za ponovno pošiljanje.",

public/language/sl/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "Vredu",
     "bootbox.cancel": "Prekliči",
     "bootbox.confirm": "Potrdi",

public/language/sr/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Адреса е-поште је заусета",
     "email-not-confirmed": "Ваша адреса е-поште жоуш увек није оверена, кликните овде да би сте то учинили.",
     "email-not-confirmed-chat": "Није вам дозвољено да ћаскате док не оверите вашу е-пошту, клкните овде да то учините.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "Форум захтева потврду е-поште, кликните овде да бисте отворили е-пошту",
     "email-confirm-failed": "Потврда е-поште није успела, молимо вас да покушате касније.",
     "confirm-email-already-sent": "Конфирмациони имејл је већ послат, молимо вас да сачекате %1 минут(а) да бисте послали други.",

public/language/sr/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "ОК",
     "bootbox.cancel": "Откажи",
     "bootbox.confirm": "Потврди",

public/language/sv/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Epostadress upptagen",
     "email-not-confirmed": "Din epostadress är ännu inte bekräftad. Klicka här för att bekräfta din epostadress.",
     "email-not-confirmed-chat": "Du kan ej använda chatten förrän din epostadress har blivit bekräftad, var god klicka här för att bekräfta din epostadress.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "Detta forum kräver bekräftning av epostadresser, var god klicka här för att fylla i en epostadress",
     "email-confirm-failed": "Vi kunde ej bekräfta din epostadress, var god försök igen senare.",
     "confirm-email-already-sent": "Bekräftningsbrev redan skickat, var god vänta %1 minut(er) innan du skickar ett nytt.",

public/language/sv/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Bild",
     "composer.upload-picture": "Ladda upp bild",
     "composer.upload-file": "Ladda upp fil",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Avbryt",
     "bootbox.confirm": "Bekräfta",

public/language/th/error.json

@@ -20,6 +20,7 @@
     "email-taken": "อีเมลนี้มีการใช้แล้ว",
     "email-not-confirmed": "ยังไม่มีการยืนยันอีเมลของคุณ, โปรดกดยืนยันอีเมลของคุณตรงนี้",
     "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "Forum นี้ต้องการการยืนยันอีเมล กรุณากดที่นี่เพื่อระบุอีเมล",
     "email-confirm-failed": "เราไม่สามารถยืนยันอีเมลของคุณ ณ ขณะนี้ กรุณาลองใหม่อีกครั้งภายหลัง",
     "confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",

public/language/th/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Picture",
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",

public/language/tr/error.json

@@ -20,6 +20,7 @@
     "email-taken": "E-posta Alınmış",
     "email-not-confirmed": "E-postanız onaylanmamış, onaylamak için lütfen buraya tıklayın.",
     "email-not-confirmed-chat": "E-postanız onaylanana kadar sohbet edemezsiniz, onaylamak için lütfen buraya tıklayın.",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "Bu forum e-posta doğrulaması gerektirir, lütfen buraya bir e-posta adresi girin",
     "email-confirm-failed": "E-posta adresinizi doğrulayamıyoruz. Lütfen daha sonra tekrar deneyin.",
     "confirm-email-already-sent": "E-mail onayı zaten gönderilmiş, yeni bir onay göndermek için lütfen 1 dakika bekleyin.",

public/language/tr/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Görsel",
     "composer.upload-picture": "Görsel Yükle",
     "composer.upload-file": "Dosya Yükle",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "Tamam",
     "bootbox.cancel": "İptal",
     "bootbox.confirm": "Onayla",

public/language/vi/error.json

@@ -20,6 +20,7 @@
     "email-taken": "Email đã được đăng kí",
     "email-not-confirmed": "Email của bạn chưa được xác nhận, xin hãy nhấn vào đây để xác nhận địa chỉ này là của bạn",
     "email-not-confirmed-chat": "Bạn không được quyền chat nếu email của bạn chưa được xác nhận, vui lòng click vào đây để xác nhận email của bạn.",
+    "email-not-confirmed-email-sent": "Email của bạn chưa được xác nhận, xin hãy nhấn vào đây để xác nhận địa chỉ này là của bạn",
     "no-email-to-confirm": "Diễn đàn này yêu cầu xác nhận email, vui lòng nhấn vào đây để nhập email.",
     "email-confirm-failed": "Chúng tôi không thể xác nhận email của bạn, vui lòng thử lại sau.",
     "confirm-email-already-sent": "Email xác nhận đã được gửi, vui lòng chờ %1 phút để yêu cầu gửi lại.",
@@ -29,8 +30,8 @@
     "password-too-long": "Mật khẩu quá dài",
     "user-banned": "Tài khoản bị ban",
     "user-too-new": "Rất tiếc, bạn phải chờ %1 giây để đăng bài viết đầu tiên.",
-    "blacklisted-ip": "Rất tiếc, địa chỉ IP của bạn đã bị ban khỏi cộng đồng. Nếu bạn cảm thấy có gì không đúng, hãy liên lạc với người quản trị.",
+    "blacklisted-ip": "Rất tiếc, địa chỉ IP của bạn đã bị cấm khỏi cộng đồng. Nếu bạn cảm thấy có gì không đúng, hãy liên lạc với người quản trị.",
-    "ban-expiry-missing": "Please provide an end date for this ban",
+    "ban-expiry-missing": "Vui lòng cung cấp ngày hết hạn của lệnh cấm",
     "no-category": "Danh mục không tồn tại",
     "no-topic": "Chủ đề không tồn tại",
     "no-post": "Bài viết không tồn tại",
@@ -47,13 +48,13 @@
     "post-edit-duration-expired-hours-minutes": "Bạn chỉ được phép sửa các bài viết sau khi đăng %1 giờ(s) %2 phút(s)",
     "post-edit-duration-expired-days": "Bạn chỉ được phép sửa các bài viết sau khi đăng %1 ngày(s)",
     "post-edit-duration-expired-days-hours": "Bạn chỉ được phép sửa các bài viết sau khi đăng %1 ngày(s) %2 giờ(s)",
-    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
+    "post-delete-duration-expired": "Bạn chỉ được phép xóa bài viết sau khi đăng %1 giây(s)",
-    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
+    "post-delete-duration-expired-minutes": "Bạn chỉ được phép xóa bài viết sau khi đăng %1 phút(s)",
-    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
+    "post-delete-duration-expired-minutes-seconds": "Bạn chỉ được phép xóa các bài viết sau khi đăng %1 phút(s) %2 giây(s)",
-    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
+    "post-delete-duration-expired-hours": "Bạn chỉ được phép xóa bài viết sau khi đăng %1 giờ(s)",
-    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
+    "post-delete-duration-expired-hours-minutes": "Bạn chỉ được phép xóa bài viết sau khi đăng %1 giờ(s) 2 phút(s)",
-    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
+    "post-delete-duration-expired-days": "Bạn chỉ được phép xóa các bài viết sau khi đăng %1 ngày(s)",
-    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
+    "post-delete-duration-expired-days-hours": "Bạn chỉ được phép xóa các bài viết sau khi đăng %1 ngày(s) %2 giờ(s)",
     "content-too-short": "Vui lòng nhập một bài viết dài hơn. Bài viết phải có tối thiểu %1 ký tự.",
     "content-too-long": "Vui lòng nhập một bài viết ngắn hơn. Bài viết chỉ có thể có tối đa %1 ký tự.",
     "title-too-short": "Vui lòng nhập tiêu đề dài hơn. Tiêu đề phải có tối thiểu %1 ký tự.",
@@ -69,14 +70,14 @@
     "guest-upload-disabled": "Khách (chưa có tài khoản) không có quyền tải lên file.",
     "already-favourited": "Bạn đã đánh dấu bài viết này",
     "already-unfavourited": "Bạn đã bỏ đánh dấu bài viết này",
-    "cant-ban-other-admins": "Bạn không thể ban được các admin khác",
+    "cant-ban-other-admins": "Bạn không thể cấm được các quản trị viên khác",
     "cant-remove-last-admin": "Bạn là quản trị viên duy nhất. Hãy cho thành viên khác làm quản trị viên trước khi huỷ bỏ quyền quản trị của bạn.",
-    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
+    "cant-delete-admin": "Hủy quyền quản trị của tài khoản này trước khi xóa",
     "invalid-image-type": "Định dạng ảnh không hợp lệ. Những định dạng được cho phép là: %1",
     "invalid-image-extension": "Định dạng ảnh không hợp lệ",
     "invalid-file-type": "Định dạng file không hợp lệ. Những định dạng được cho phép là: %1",
     "group-name-too-short": "Tên nhóm quá ngắn",
-    "group-name-too-long": "Group name too long",
+    "group-name-too-long": "Tên nhóm quá dài",
     "group-already-exists": "Nhóm đã tồn tại",
     "group-name-change-not-allowed": "Không cho phép đổi tên nhóm",
     "group-already-member": "Bạn đã là thành viên của nhóm này.",
@@ -119,6 +120,6 @@
     "not-in-room": "Thành viên không có trong phòng",
     "no-users-in-room": "Không có ai trong phòng này",
     "cant-kick-self": "Bạn không thể kick chính bạn ra khỏi nhóm",
-    "no-users-selected": "No user(s) selected",
+    "no-users-selected": "Chưa có người dùng(s) nào",
-    "invalid-home-page-route": "Invalid home page route"
+    "invalid-home-page-route": "Đường dẫn trang chủ không hợp lệ"
 }

public/language/vi/global.json

@@ -50,9 +50,9 @@
     "topics": "Số Chủ đề",
     "posts": "Số bài viết",
     "best": "Hay nhất",
-    "upvoters": "Upvoters",
+    "upvoters": "Tán thành",
     "upvoted": "Tán thành",
-    "downvoters": "Downvoters",
+    "downvoters": "Phản đối",
     "downvoted": "Phản đối",
     "views": "Lượt xem",
     "reputation": "Điểm tín nhiệm",

public/language/vi/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "Hình ảnh",
     "composer.upload-picture": "Tải ảnh lên",
     "composer.upload-file": "Tải file lên",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Huỷ bỏ",
     "bootbox.confirm": "Xác nhận",

public/language/vi/topic.json

@@ -26,14 +26,14 @@
     "tools": "Công cụ",
     "flag": "Gắn cờ",
     "locked": "Khóa",
-    "pinned": "Pinned",
+    "pinned": "Đã ghim",
-    "moved": "Moved",
+    "moved": "Chuyển đi",
     "bookmark_instructions": "Bấm vào đây để quay về đọc bài viết mới nhất trong chủ đề này.",
     "flag_title": "Flag bài viết này để chỉnh sửa",
     "flag_success": "Chủ đề này đã được flag để chỉnh sửa",
     "deleted_message": "Chủ đề này đã bị xóa. Chỉ ban quản trị mới xem được.",
     "following_topic.message": "Từ giờ bạn sẽ nhận được thông báo khi có ai đó gửi bài viết trong chủ đề này",
-    "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
+    "not_following_topic.message": "Bạn có thể xem chủ đề này trong danh sách chủ đề chưa xem, nhưng bạn sẽ không nhận thông báo khi có ai đó đăng bài viết trong chủ đề này",
     "ignoring_topic.message": "Bạn sẽ không còn xem được chủ đề này trong danh sách các chủ đề chưa đọc nữa. Bạn sẽ nhận được thông báo khi bạn được đề cập tới hoặc bài viết của bạn được bỏ phiếu.",
     "login_to_subscribe": "Xin hãy đăng ký hoặc đăng nhập để theo dõi topic này",
     "markAsUnreadForAll.success": "Chủ đề đã được đánh dấu là chưa đọc toàn bộ",
@@ -86,7 +86,7 @@
     "topic_will_be_moved_to": "Chủ đề này sẽ được chuyển tới phần mục",
     "fork_topic_instruction": "Chọn vào bài gửi mà bạn muốn fork",
     "fork_no_pids": "Chưa chọn bài gửi nào!",
-    "fork_pid_count": "%1 post(s) selected",
+    "fork_pid_count": "%1 bài viết(s) đã được gửi",
     "fork_success": "Tạo bản sao thành công! Nhấn vào đây để chuyển tới chủ đề vừa tạo.",
     "delete_posts_instruction": "Chọn những bài viết bạn muốn xoá",
     "composer.title_placeholder": "Nhập tiêu đề cho chủ đề của bạn tại đây...",

public/language/zh_CN/error.json

@@ -20,6 +20,7 @@
     "email-taken": "此电子邮箱已被占用",
     "email-not-confirmed": "您的电子邮箱尚未确认，请点击这里确认您的电子邮箱。",
     "email-not-confirmed-chat": "您的电子邮箱尚未确认，无法聊天，请点击这里确认您的电子邮箱。",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "本论坛需要电子邮箱确认，请点击这里输入电子邮箱地址",
     "email-confirm-failed": "我们无法确认您的电子邮箱，请重试",
     "confirm-email-already-sent": "确认邮件已发出，如需重新发送请等待 %1 分钟后再试。",

public/language/zh_CN/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "图片",
     "composer.upload-picture": "上传图片",
     "composer.upload-file": "上传文件",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "确认",
     "bootbox.cancel": "取消",
     "bootbox.confirm": "确认",

public/language/zh_TW/error.json

@@ -20,6 +20,7 @@
     "email-taken": "該信箱已被使用",
     "email-not-confirmed": "你的電子郵件尚未確認，請點擊此處確認你的電子郵件。",
     "email-not-confirmed-chat": "你需要先確認電子郵件後才能進行聊天，請點擊這裡來確認你的電子郵件。",
+    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
     "no-email-to-confirm": "討論區要求電子郵件確認，請點擊這裡輸入一個電子郵件。",
     "email-confirm-failed": "我們無法確認你的Email，請之後再重試。",
     "confirm-email-already-sent": "確認電子郵件已經寄送，請等待 %1 分鐘才能再寄送另一封。",

public/language/zh_TW/modules.json

@@ -37,6 +37,7 @@
     "composer.formatting.picture": "圖片",
     "composer.upload-picture": "上傳圖片",
     "composer.upload-file": "上傳檔案",
+    "composer.zen_mode": "Zen Mode",
     "bootbox.ok": "好",
     "bootbox.cancel": "取消",
     "bootbox.confirm": "確認",

src/controllers/admin/dashboard.js

@@ -19,8 +19,8 @@ dashboardController.get = function(req, res, next) {
 			var notices = [
 				{
 					done: !meta.reloadRequired,
-					doneText: 'Reload not required',
+					doneText: 'Restart not required',
-					notDoneText:'Reload required'
+					notDoneText:'Restart required'
 				},
 				{
 					done: plugins.hasListeners('filter:search.query'),

src/meta.js

@@ -41,50 +41,14 @@ var async = require('async'),
 		});
 	};
 
+	/**
+	 * Reload deprecated as of v1.1.2+, remove in v2.x
+	 */
 	Meta.reload = function(callback) {
-		pubsub.publish('meta:reload', {hostname: os.hostname()});
+		restart();
-		reload(callback);
+		callback();
 	};
 
-	pubsub.on('meta:reload', function(data) {
-		if (data.hostname !== os.hostname()) {
-			reload();
-		}
-	});
-
-	function reload(callback) {
-		callback = callback || function() {};
-
-		var	plugins = require('./plugins');
-		async.series([
-			function (next) {
-				plugins.fireHook('static:app.reload', {}, next);
-			},
-			async.apply(plugins.clearRequireCache),
-			async.apply(Meta.css.minify),
-			async.apply(Meta.js.minify, 'nodebb.min.js'),
-			async.apply(Meta.js.minify, 'acp.min.js'),
-			async.apply(Meta.sounds.init),
-			async.apply(languages.init),
-			async.apply(Meta.templates.compile),
-			async.apply(plugins.reload),
-			async.apply(plugins.reloadRoutes),
-			async.apply(auth.reloadRoutes),
-			function(next) {
-				Meta.config['cache-buster'] = utils.generateUUID();
-				templates.flush();
-				next();
-			}
-		], function(err) {
-			if (!err) {
-				emitter.emit('nodebb:ready');
-			}
-			Meta.reloadRequired = false;
-
-			callback(err);
-		});
-	}
-
 	Meta.restart = function() {
 		pubsub.publish('meta:restart', {hostname: os.hostname()});
 		restart();

src/meta/themes.js

@@ -161,6 +161,4 @@ module.exports = function(Meta) {
 		nconf.set('theme_templates_path', themePath);
 		nconf.set('theme_config', path.join(nconf.get('themes_path'), themeObj.id, 'theme.json'));
 	};
-
-
 };

src/socket.io/admin.js

@@ -49,21 +49,10 @@ SocketAdmin.before = function(socket, method, data, next) {
 	});
 };
 
-SocketAdmin.reload = function(socket, data, callback) {
+/**
-	events.log({
+ * Reload deprecated as of v1.1.2+, remove in v2.x
-		type: 'reload',
+ */
-		uid: socket.uid,
+SocketAdmin.reload = SocketAdmin.restart;
-		ip: socket.ip
-	});
-	if (process.send) {
-		process.send({
-			action: 'reload'
-		});
-		callback();
-	} else {
-		meta.reload(callback);
-	}
-};
 
 SocketAdmin.restart = function(socket, data, callback) {
 	events.log({

src/socket.io/groups.js

@@ -5,6 +5,7 @@ var	async = require('async'),
 	groups = require('../groups'),
 	meta = require('../meta'),
 	user = require('../user'),
+	utils = require('../../public/src/utils'),
 	groupsController = require('../controllers/groups'),
 
 	SocketGroups = {};
@@ -232,7 +233,7 @@ SocketGroups.searchMembers = function(socket, data, callback) {
 };
 
 SocketGroups.loadMoreMembers = function(socket, data, callback) {
-	if (!data.groupName || !parseInt(data.after, 10)) {
+	if (!data.groupName || !utils.isNumber(data.after) || parseInt(data.after, 10) < 0) {
 		return callback(new Error('[[error:invalid-data]]'));
 	}
 	data.after = parseInt(data.after, 10);

src/views/admin/general/dashboard.tpl

@@ -95,11 +95,10 @@
 			<div class="panel-heading">System Control</div>
 			<div class="panel-body text-center">
 				<p>
-					<button class="btn btn-warning reload" data-placement="bottom" data-toggle="tooltip" title="Reload NodeBB to activate new plugins">Reload</button>
+					<button class="btn btn-danger btn-block restart" data-placement="bottom" data-toggle="tooltip" title="Restarting NodeBB will drop all existing connections for a few seconds">Restart</button>
-					<button class="btn btn-danger restart" data-placement="bottom" data-toggle="tooltip" title="Restarting NodeBB will drop all existing connections for a few seconds">Restart</button>
 				</p>
 				<p>
-					<a href="{config.relative_path}/admin/settings/advanced" class="btn btn-info" data-placement="bottom" data-toggle="tooltip" title="Click here to set up maintenance mode for NodeBB">Maintenance Mode</a>
+					<a href="{config.relative_path}/admin/settings/advanced" class="btn btn-info btn-block" data-placement="bottom" data-toggle="tooltip" title="Click here to set up maintenance mode for NodeBB">Maintenance Mode</a>
 				</p>
 
 				<hr />

src/views/admin/partials/menu.tpl

@@ -121,11 +121,6 @@
 					<i class="fa fa-fw fa-ellipsis-v"></i>
 				</a>
 				<ul id="user-control-list" class="dropdown-menu" aria-labelledby="user_dropdown">
-					<li>
-						<a href="#" class="reload" title="Reload Forum">
-							Reload Forum
-						</a>
-					</li>
 					<li>
 						<a href="#" class="restart" title="Restart Forum">
 							Restart Forum