Merge pull request #6 from NodeBB/master

merge latest

bcrypt.js

@@ -9,11 +9,10 @@ process.on('message', function(msg) {
 	if (msg.type === 'hash') {
 		hashPassword(msg.password, msg.rounds);
 	} else if (msg.type === 'compare') {
-		compare(msg.password, msg.hash);
+		bcrypt.compare(msg.password, msg.hash, done);
 	}
 });
 
-
 function hashPassword(password, rounds) {
 	async.waterfall([
 		function(next) {
@@ -22,23 +21,14 @@ function hashPassword(password, rounds) {
 		function(salt, next) {
 			bcrypt.hash(password, salt, next);
 		}
-	], function(err, hash) {
+	], done);
-		if (err) {
-			process.send({err: err.message});
-			return process.disconnect();
-		}
-		process.send({result: hash});
-		process.disconnect();
-	});
 }
 
-function compare(password, hash) {
+function done(err, result) {
-	bcrypt.compare(password, hash, function(err, res) {
+	if (err) {
-		if (err) {
+		process.send({err: err.message});
-			process.send({err: err.message});
+		return process.disconnect();
-			return process.disconnect();
+	}
-		}
+	process.send({result: result});
-		process.send({result: res});
+	process.disconnect();
-		process.disconnect();
- 	});
 }

package.json

@@ -39,15 +39,15 @@
     "mmmagic": "^0.3.13",
     "morgan": "^1.3.2",
     "nconf": "~0.7.1",
-    "nodebb-plugin-dbsearch": "^0.1.0",
+    "nodebb-plugin-dbsearch": "^0.2.1",
     "nodebb-plugin-emoji-extended": "^0.4.1-4",
-    "nodebb-plugin-markdown": "^1.0.0",
+    "nodebb-plugin-markdown": "^2.1.0",
-    "nodebb-plugin-mentions": "^0.10.0",
+    "nodebb-plugin-mentions": "^0.11.0",
     "nodebb-plugin-soundpack-default": "~0.1.1",
     "nodebb-plugin-spam-be-gone": "^0.4.0",
-    "nodebb-theme-lavender": "^1.0.6",
+    "nodebb-theme-lavender": "^1.0.22",
-    "nodebb-theme-vanilla": "^1.0.28",
+    "nodebb-theme-vanilla": "^1.0.80",
-    "nodebb-widget-essentials": "~0.2.12",
+    "nodebb-widget-essentials": "^1.0.0",
     "nodebb-rewards-essentials": "^0.0.1",
     "npm": "^2.1.4",
     "passport": "^0.2.1",
@@ -64,7 +64,7 @@
     "socket.io-redis": "^0.1.3",
     "socketio-wildcard": "~0.1.1",
     "string": "^3.0.0",
-    "templates.js": "^0.1.28",
+    "templates.js": "^0.1.30",
     "uglify-js": "git+https://github.com/julianlam/UglifyJS2.git",
     "underscore": "~1.7.0",
     "validator": "^3.30.0",

public/language/ar/error.json

@@ -18,7 +18,7 @@
     "username-taken": "اسم المستخدم مأخوذ",
     "email-taken": "البريد الالكتروني مأخوذ",
     "email-not-confirmed": "عنوان بريدك الإلكتروني غير مفعل بعد. انقر هنا لتفعيله من فضلك.",
-    "email-not-confirmed-chat": "لايمكنك الدردشة إلا بعد تفعيل بريدك الإلكتروني",
+    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
     "no-email-to-confirm": "هذا المنتدى يستلزم تفعيل بريدك الإلكتروني، انقر هنا من فضلك لإدخاله.",
     "email-confirm-failed": "لم نستطع تفعيل بريدك الإلكتروني، المرجو المحاولة لاحقًا.",
     "username-too-short": "اسم المستخدم قصير.",

public/language/ar/modules.json

@@ -17,5 +17,6 @@
     "chat.three_months": "3 أشهر",
     "composer.user_said_in": "%1 كتب في  %2",
     "composer.user_said": "%1 كتب:",
-    "composer.discard": "هل أنت متأكد أنك تريد التخلي عن التغييرات؟"
+    "composer.discard": "هل أنت متأكد أنك تريد التخلي عن التغييرات؟",
+    "composer.submit_and_lock": "Submit and Lock"
 }

public/language/ar/pages.json

@@ -14,6 +14,7 @@
     "user.groups": "%1's Groups",
     "user.favourites": "مفضلات %1",
     "user.settings": "خيارات المستخدم",
+    "user.watched": "Topics watched by %1",
     "maintenance.text": "جاري صيانة %1. المرجو العودة لاحقًا.",
     "maintenance.messageIntro": "بالإضافة إلى ذلك، قام مدبر النظام بترك هذه الرسالة:"
 }

public/language/ar/tags.json

@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "لاوجود لمواضيع تحمل هذا الوسم.",
     "tags": "بطاقات",
-    "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "أدخل البطاقات...",
     "no_tags": "لاتوجد هناك بطاقات بعد."
 }

public/language/ar/user.json

@@ -60,6 +60,7 @@
     "digest_monthly": "شهريًّا",
     "send_chat_notifications": "استلام رسالة إلكترونية عند ورود محادثة وأنا غير متصل.",
     "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
+    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
     "has_no_follower": "هذا المستخدم ليس لديه أي متابع :(",
     "follows_no_one": "هذا المستخدم لا يتابع أحد :(",
     "has_no_posts": "هذا المستخدم لم يكتب أي شيء بعد.",
@@ -76,5 +77,6 @@
     "enable_topic_searching": "تفعيل خاصية البحث داخل المواضيع",
     "topic_search_help": "في حالة تفعيلها، ستعوض خاصيةُ البحث داخل المواضيع خاصيةَ البحث الخاصة بالمتصفح، فتمكنك بالتالي بالبحث في الموضوع بأكمله دون الاقتصار على مايظهر في الشاشة فحسب.",
     "follow_topics_you_reply_to": "متابعة المشاركات التي ترد عليها",
-    "follow_topics_you_create": "متابعة المشاركات التي تكتبها"
+    "follow_topics_you_create": "متابعة المشاركات التي تكتبها",
+    "grouptitle": "Select the group title you would like to display"
 }

public/language/bn/error.json

@@ -18,7 +18,7 @@
     "username-taken": "ইউজারনেম আগেই ব্যবহৃত",
     "email-taken": "ইমেইল আগেই ব্যবহৃত",
     "email-not-confirmed": "আপনার ইমেইল এড্রেস নিশ্চিত করা হয় নি, নিশ্চিত করতে এখানে ক্লিক করুন।",
-    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed",
+    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your 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.",
     "username-too-short": "খুব ছোট ইউজারনেম",

public/language/bn/modules.json

@@ -17,5 +17,6 @@
     "chat.three_months": "৩ মাস",
     "composer.user_said_in": "%1 বলেছেন %2:",
     "composer.user_said": "%1 বলেছেনঃ",
-    "composer.discard": "আপনি কি নিশ্চিত যে আপনি এই পোস্ট বাতিল করতে ইচ্ছুক?"
+    "composer.discard": "আপনি কি নিশ্চিত যে আপনি এই পোস্ট বাতিল করতে ইচ্ছুক?",
+    "composer.submit_and_lock": "Submit and Lock"
 }

public/language/bn/pages.json

@@ -14,6 +14,7 @@
     "user.groups": "%1's Groups",
     "user.favourites": "%1'র প্রিয় পোস্টগুলো",
     "user.settings": "সদস্য সেটিংস",
+    "user.watched": "Topics watched by %1",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
     "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }

public/language/bn/tags.json

@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "এই ট্যাগ সম্বলিত কোন টপিক নেই",
     "tags": "ট্যাগসমূহ",
-    "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "ট্যাগ বসান",
     "no_tags": "এখন পর্যন্ত কোন ট্যাগ নেই"
 }

public/language/bn/user.json

@@ -60,6 +60,7 @@
     "digest_monthly": "মাসিক",
     "send_chat_notifications": "যদি আমি অনলাইনে না থাকি, সেক্ষেত্রে নতুন চ্যাট মেসেজ আসলে আমাকে ইমেইল করুন",
     "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
+    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
     "has_no_follower": "এই সদস্যের কোন ফলোয়ার নেই :(",
     "follows_no_one": "এই সদস্য কাউকে ফলো করছেন না :(",
     "has_no_posts": "এই সদস্য এখনো কোন পোষ্ট করেন নি",
@@ -76,5 +77,6 @@
     "enable_topic_searching": "In-Topic সার্চ সক্রীয় করো",
     "topic_search_help": "যদি এনাবল করা হয়ে থাকে,  In-topic সার্চিং ব্রাউজারের ডিফল্ট সার্চের বদলে পুরো টপিকজুড়ে সার্চ করার সুবিধা দিবে, যা কেবলমাত্র বর্তমান স্কৃণে দেখানো অংশের মধ্যে সীমাবদ্ধ থাকবে না। ",
     "follow_topics_you_reply_to": "আপনার উত্তর দেয়া টপিকগুলো ফলো করুন",
-    "follow_topics_you_create": "আপনার তৈরীকরা টপিকসমূহ ফলো করুন"
+    "follow_topics_you_create": "আপনার তৈরীকরা টপিকসমূহ ফলো করুন",
+    "grouptitle": "Select the group title you would like to display"
 }

public/language/cs/error.json

@@ -18,7 +18,7 @@
     "username-taken": "Uživatelské jméno je již použito",
     "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",
+    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your 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.",
     "username-too-short": "Uživatelské jméno je příliš krátké",

public/language/cs/modules.json

@@ -17,5 +17,6 @@
     "chat.three_months": "3 měsíce",
     "composer.user_said_in": "%1 said in %2:",
     "composer.user_said": "%1 said:",
-    "composer.discard": "Are you sure you wish to discard this post?"
+    "composer.discard": "Are you sure you wish to discard this post?",
+    "composer.submit_and_lock": "Submit and Lock"
 }

public/language/cs/pages.json

@@ -14,6 +14,7 @@
     "user.groups": "%1's Groups",
     "user.favourites": "%1's Favourite Posts",
     "user.settings": "User Settings",
+    "user.watched": "Topics watched by %1",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
     "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }

public/language/cs/tags.json

@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "Není zde žádné téma s tímto tagem.",
     "tags": "Tagy",
-    "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "Vložte tagy ...",
     "no_tags": "Zatím tu není žádný tag."
 }

public/language/cs/user.json

@@ -60,6 +60,7 @@
     "digest_monthly": "Monthly",
     "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
     "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
+    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
     "has_no_follower": "Tohoto uživatele nikdo nesleduje :(",
     "follows_no_one": "Tento uživatel nikoho nesleduje :(",
     "has_no_posts": "This user didn't post anything yet.",
@@ -76,5 +77,6 @@
     "enable_topic_searching": "Enable In-Topic Searching",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.",
     "follow_topics_you_reply_to": "Follow topics that you reply to.",
-    "follow_topics_you_create": "Follow topics you create."
+    "follow_topics_you_create": "Follow topics you create.",
+    "grouptitle": "Select the group title you would like to display"
 }

public/language/de/email.json

@@ -1,9 +1,9 @@
 {
     "password-reset-requested": "Zurücksetzung des Passworts beantragt - %1!",
-    "welcome-to": "Willkommen zu %1",
+    "welcome-to": "Willkommen bei %1",
     "greeting_no_name": "Hallo",
     "greeting_with_name": "Hallo %1",
-    "welcome.text1": "Vielen Dank für die Registrierung mit %1!",
+    "welcome.text1": "Vielen Dank für die Registrierung bei %1!",
     "welcome.text2": "Um dein Konto vollständig zu aktivieren, müssen wir überprüfen, ob du Besitzer der E-Mail-Adresse bist, mit der du dich registriert hast.",
     "welcome.cta": "Klicke hier, um deine E-Mail-Adresse zu bestätigen.",
     "reset.text1": "Wir haben eine Anfrage auf Zurücksetzung deines Passworts erhalten, wahrscheinlich, weil du es vergessen hast. Falls dies nicht der Fall ist, ignoriere bitte diese E-Mail.",
@@ -13,7 +13,7 @@
     "reset.notify.text1": "Wir benachrichtigen dich das am %1, dein Passwort erfolgreich geändert wurde.",
     "reset.notify.text2": "Wenn du das nicht autorisiert hast, bitte benachrichtige umgehend einen Administrator.",
     "digest.notifications": "Du hast ungelesene Benachrichtigungen von %1:",
-    "digest.latest_topics": "Aktuellste Themen vom %1",
+    "digest.latest_topics": "Neueste Themen vom %1",
     "digest.cta": "Klicke hier, um %1 zu besuchen",
     "digest.unsub.info": "Diese Zusammenfassung wurde dir aufgrund deiner Abonnement-Einstellungen gesendet.",
     "digest.no_topics": "Es gab keine aktiven Themen in den letzten %1",

public/language/de/error.json

@@ -18,7 +18,7 @@
     "username-taken": "Der Benutzername ist bereits vergeben",
     "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": "Der Chat ist deaktiviert bis Du deine E-Mail bestätigt hast",
+    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
     "no-email-to-confirm": "Dieses Forum setzt E-Mail-Bestätigung voraus, bitte klick 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",
     "username-too-short": "Benutzername ist zu kurz",

public/language/de/modules.json

@@ -17,5 +17,6 @@
     "chat.three_months": "3 Monate",
     "composer.user_said_in": "%1 sagte in %2:",
     "composer.user_said": "%1 sagte:",
-    "composer.discard": "Bist du sicher, dass du diesen Post verwerfen möchtest?"
+    "composer.discard": "Bist du sicher, dass du diesen Post verwerfen möchtest?",
+    "composer.submit_and_lock": "Submit and Lock"
 }

public/language/de/pages.json

@@ -14,6 +14,7 @@
     "user.groups": "%1's Gruppen",
     "user.favourites": "Von %1 favorisierte Beiträge",
     "user.settings": "Benutzer-Einstellungen",
+    "user.watched": "Topics watched by %1",
     "maintenance.text": "%1 befindet sich derzeit in der Wartung. Bitte komm später wieder.",
     "maintenance.messageIntro": "Zusätzlich hat der Administrator diese Nachricht hinterlassen:"
 }

public/language/de/tags.json

@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "Es gibt keine Themen mit diesem Stichwort.",
     "tags": "Stichwörter",
-    "enter_tags_here": "Gib hier Stichwörter ein. %1-%2 Zeichen. Drücke Enter nach jedem Stichwort.",
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "Gib Stichwörter ein...",
     "no_tags": "Es gibt bisher keine Stichwörter."
 }

public/language/de/user.json

@@ -60,6 +60,7 @@
     "digest_monthly": "Monatlich",
     "send_chat_notifications": "Sende eine E-Mail, wenn eine neue Chat-Nachricht eingeht und ich nicht online bin",
     "send_post_notifications": "Sende eine E-Mail wenn auf Themen die ich abonniert habe geantwortet wird",
+    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
     "has_no_follower": "Dieser User hat noch keine Follower.",
     "follows_no_one": "Dieser User folgt noch niemandem :(",
     "has_no_posts": "Dieser Nutzer hat noch nichts gepostet.",
@@ -76,5 +77,6 @@
     "enable_topic_searching": "Suchen innerhalb von Themen aktivieren",
     "topic_search_help": "Falls aktiviert, wird die Suche im Thema das Standardsuchverhalten des Browsers überschreiben und es Ihnen erlauben, das ganze Thema statt dessen, was sich auf dem Bildschirm befindet, zu durchsuchen.",
     "follow_topics_you_reply_to": "Folge Themen, auf die du antwortest.",
-    "follow_topics_you_create": "Folge Themen, die du erstellst."
+    "follow_topics_you_create": "Folge Themen, die du erstellst.",
+    "grouptitle": "Select the group title you would like to display"
 }

public/language/el/error.json

@@ -18,7 +18,7 @@
     "username-taken": "Το όνομα χρήστη είναι πιασμένο",
     "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",
+    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your 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.",
     "username-too-short": "Το όνομα χρήστη είναι πολύ μικρό",

public/language/el/modules.json

@@ -17,5 +17,6 @@
     "chat.three_months": "3 Μήνες",
     "composer.user_said_in": "Ο/Η %1 είπε στο %2:",
     "composer.user_said": "Ο/Η %1 είπε:",
-    "composer.discard": "Είσαι σίγουρος/η πως θέλεις να πετάξεις αυτή την δημοσίευση;"
+    "composer.discard": "Είσαι σίγουρος/η πως θέλεις να πετάξεις αυτή την δημοσίευση;",
+    "composer.submit_and_lock": "Submit and Lock"
 }

public/language/el/pages.json

@@ -14,6 +14,7 @@
     "user.groups": "%1's Groups",
     "user.favourites": "Οι αγαπημένες δημοσιεύσεις του/της %1",
     "user.settings": "Επιλογές Χρήστη",
+    "user.watched": "Topics watched by %1",
     "maintenance.text": "Το %1 αυτή την στιγμή συντηρείται. Παρακαλώ έλα αργότερα.",
     "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }

public/language/el/tags.json

@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "Δεν υπάρχουν θέματα με αυτή την ετικέτα.",
     "tags": "Ετικέτες",
-    "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "Εισαγωγή ετικετών...",
     "no_tags": "Δεν υπάρχουν ακόμα ετικέτες."
 }

public/language/el/user.json

@@ -60,6 +60,7 @@
     "digest_monthly": "Μηνιαία",
     "send_chat_notifications": "Αποστολή email αν μου έρθει μήνυμα συνομιλίας και δεν είμαι συνδεδεμένος",
     "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
+    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
     "has_no_follower": "Αυτός ο χρήστης δεν έχει κανέναν ακόλουθο :(",
     "follows_no_one": "Αυτός ο χρήστης δεν ακολουθεί κανέναν :(",
     "has_no_posts": "Αυτός ο χρήστης δεν έχει δημοσιεύσει τίποτα ακόμη.",
@@ -76,5 +77,6 @@
     "enable_topic_searching": "Enable In-Topic Searching",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.",
     "follow_topics_you_reply_to": "Ακολούθα τα θέματα στα οποία απαντάς.",
-    "follow_topics_you_create": "Ακολούθα τα θέματα που δημιουργείς."
+    "follow_topics_you_create": "Ακολούθα τα θέματα που δημιουργείς.",
+    "grouptitle": "Select the group title you would like to display"
 }

public/language/en@pirate/error.json

@@ -18,7 +18,7 @@
     "username-taken": "Username taken",
     "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",
+    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your 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.",
     "username-too-short": "Username too short",

public/language/en@pirate/modules.json

@@ -17,5 +17,6 @@
     "chat.three_months": "3 Months",
     "composer.user_said_in": "%1 said in %2:",
     "composer.user_said": "%1 said:",
-    "composer.discard": "Are you sure you wish to discard this post?"
+    "composer.discard": "Are you sure you wish to discard this post?",
+    "composer.submit_and_lock": "Submit and Lock"
 }

public/language/en@pirate/pages.json

@@ -14,6 +14,7 @@
     "user.groups": "%1's Groups",
     "user.favourites": "%1's Favourite Posts",
     "user.settings": "User Settings",
+    "user.watched": "Topics watched by %1",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
     "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }

public/language/en@pirate/tags.json

@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "There are no topics with this tag.",
     "tags": "Tags",
-    "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "Enter tags...",
     "no_tags": "There are no tags yet."
 }

public/language/en@pirate/user.json

@@ -60,6 +60,7 @@
     "digest_monthly": "Monthly",
     "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
     "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
+    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
     "has_no_follower": "This user doesn't have any followers :(",
     "follows_no_one": "This user isn't following anyone :(",
     "has_no_posts": "This user didn't post anything yet.",
@@ -76,5 +77,6 @@
     "enable_topic_searching": "Enable In-Topic Searching",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.",
     "follow_topics_you_reply_to": "Follow topics that you reply to.",
-    "follow_topics_you_create": "Follow topics you create."
+    "follow_topics_you_create": "Follow topics you create.",
+    "grouptitle": "Select the group title you would like to display"
 }

public/language/en_GB/modules.json

@@ -18,5 +18,6 @@
 
 	"composer.user_said_in": "%1 said in %2:",
 	"composer.user_said": "%1 said:",
-	"composer.discard": "Are you sure you wish to discard this post?"
+	"composer.discard": "Are you sure you wish to discard this post?",
+	"composer.submit_and_lock": "Submit and Lock"
 }

public/language/en_GB/pages.json

@@ -14,6 +14,7 @@
 	"user.groups": "%1's Groups",
 	"user.favourites": "%1's Favourite Posts",
 	"user.settings": "User Settings",
+	"user.watched": "Topics watched by %1",
 
 	"maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
 	"maintenance.messageIntro": "Additionally, the administrator has left this message:"

public/language/en_US/error.json

@@ -18,7 +18,7 @@
     "username-taken": "Username taken",
     "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",
+    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your 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.",
     "username-too-short": "Username too short",

public/language/en_US/modules.json

@@ -17,5 +17,6 @@
     "chat.three_months": "3 Months",
     "composer.user_said_in": "%1 said in %2:",
     "composer.user_said": "%1 said:",
-    "composer.discard": "Are you sure you wish to discard this post?"
+    "composer.discard": "Are you sure you wish to discard this post?",
+    "composer.submit_and_lock": "Submit and Lock"
 }

public/language/en_US/pages.json

@@ -14,6 +14,7 @@
     "user.groups": "%1's Groups",
     "user.favourites": "%1's Favorite Posts",
     "user.settings": "User Settings",
+    "user.watched": "Topics watched by %1",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
     "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }

public/language/en_US/tags.json

@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "There are no topics with this tag.",
     "tags": "Tags",
-    "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "Enter tags...",
     "no_tags": "There are no tags yet."
 }

public/language/en_US/user.json

@@ -60,6 +60,7 @@
     "digest_monthly": "Monthly",
     "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
     "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
+    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
     "has_no_follower": "This user doesn't have any followers :(",
     "follows_no_one": "This user isn't following anyone :(",
     "has_no_posts": "This user didn't post anything yet.",
@@ -76,5 +77,6 @@
     "enable_topic_searching": "Enable In-Topic Searching",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.",
     "follow_topics_you_reply_to": "Follow topics that you reply to.",
-    "follow_topics_you_create": "Follow topics you create."
+    "follow_topics_you_create": "Follow topics you create.",
+    "grouptitle": "Select the group title you would like to display"
 }

public/language/es/error.json

@@ -18,7 +18,7 @@
     "username-taken": "Nombre de usuario ocupado",
     "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 hacer uso del chat hasta que confirmes tu email",
+    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
     "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.",
     "username-too-short": "Nombre de usuario es demasiado corto",

public/language/es/modules.json

@@ -17,5 +17,6 @@
     "chat.three_months": "3 meses",
     "composer.user_said_in": "%1 dijo en %2:",
     "composer.user_said": "%1 dijo:",
-    "composer.discard": "¿Estás seguro de que deseas descartar este mensaje?"
+    "composer.discard": "¿Estás seguro de que deseas descartar este mensaje?",
+    "composer.submit_and_lock": "Submit and Lock"
 }

public/language/es/pages.json

@@ -14,6 +14,7 @@
     "user.groups": "%1's Grupos",
     "user.favourites": "Publicaciones favoritas de %1 ",
     "user.settings": "Preferencias de usuario",
+    "user.watched": "Topics watched by %1",
     "maintenance.text": "%1 está en mantenimiento actualmente. Por favor vuelva en otro momento.",
     "maintenance.messageIntro": "Adicionalmente, la administración ha dejado este mensaje:"
 }

public/language/es/tags.json

@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "No hay temas con esta etiqueta.",
     "tags": "Etiquetas",
-    "enter_tags_here": "Introduce las etiquetas aquí. %1-%2 caracteres. Presiona enter después de cada etiqueta.",
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "Introduzca las etiquetas...",
     "no_tags": "Aún no hay etiquetas."
 }

public/language/es/user.json

@@ -60,6 +60,7 @@
     "digest_monthly": "Mensualmente",
     "send_chat_notifications": "Enviar un email si recibo un mensaje de chat cuando no esté en línea.",
     "send_post_notifications": "Enviarme un email cuando se realicen contestaciones en los temas en los que estoy subscrito",
+    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
     "has_no_follower": "Este usuario no tiene seguidores :(",
     "follows_no_one": "Este miembro no sigue a nadie :(",
     "has_no_posts": "Este usuario aún no ha publicado nada.",
@@ -76,5 +77,6 @@
     "enable_topic_searching": "Activar la búsqueda \"in-topic\"",
     "topic_search_help": "Si está activada, la búsqueda 'in-topic' invalidará el comportamiento por defecto del navegador de buscar sólo en la página mostrada y le permitirá entonces buscar en el tema al completo, en vez de hacer una búsqueda únicamente sobre el contenido de la pantalla.",
     "follow_topics_you_reply_to": "Seguir los temas en las que respondes.",
-    "follow_topics_you_create": "Seguir publicaciones que creas."
+    "follow_topics_you_create": "Seguir publicaciones que creas.",
+    "grouptitle": "Select the group title you would like to display"
 }

public/language/et/error.json

@@ -18,7 +18,7 @@
     "username-taken": "Kasutajanimi on juba võetud",
     "email-taken": "Email on võetud",
     "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",
+    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your 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.",
     "username-too-short": "Kasutajanimi on liiga lühike",

public/language/et/modules.json

@@ -17,5 +17,6 @@
     "chat.three_months": "3 Months",
     "composer.user_said_in": "%1 ütles %2:",
     "composer.user_said": "%1 ütles:",
-    "composer.discard": "Oled kindel, et soovid selle postituse tühistada?"
+    "composer.discard": "Oled kindel, et soovid selle postituse tühistada?",
+    "composer.submit_and_lock": "Submit and Lock"
 }

public/language/et/pages.json

@@ -14,6 +14,7 @@
     "user.groups": "%1's Groups",
     "user.favourites": "%1's lemmikud postitused",
     "user.settings": "Kasutaja sätted",
+    "user.watched": "Topics watched by %1",
     "maintenance.text": "%1 foorumil on käimas hooldustööd. Palun külastage meid mõne aja pärast uuesti.",
     "maintenance.messageIntro": "Administraator on jätnud ka omaltpoolt sõnumi:"
 }

public/language/et/tags.json

@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "Teemasid, mis sisaldaksid seda märksõna, ei eksisteeri.",
     "tags": "Märksõnad",
-    "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "Sisesta märksõnu...",
     "no_tags": "Siin ei ole veel ühtegi märksõna."
 }

public/language/et/user.json

@@ -60,6 +60,7 @@
     "digest_monthly": "Iga kuu",
     "send_chat_notifications": "Saada mulle email kui mulle saabub uus sõnum ja ma ei ole antud hetkel online",
     "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
+    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
     "has_no_follower": "Sellel kasutajal pole ühtegi jälgijat :(",
     "follows_no_one": "See kasutaja ei jälgi kedagi :(",
     "has_no_posts": "See kasutaja pole midagi postitanud veel.",
@@ -76,5 +77,6 @@
     "enable_topic_searching": "Enable In-Topic Searching",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.",
     "follow_topics_you_reply_to": "Järgi teemasid millele vastuse kirjutad.",
-    "follow_topics_you_create": "Järgi teemasid, mis on sinu loodud."
+    "follow_topics_you_create": "Järgi teemasid, mis on sinu loodud.",
+    "grouptitle": "Select the group title you would like to display"
 }

public/language/fa_IR/error.json

@@ -18,7 +18,7 @@
     "username-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",
+    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your 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.",
     "username-too-short": "نام کاربری خیلی کوتاه است.",

public/language/fa_IR/modules.json

@@ -17,5 +17,6 @@
     "chat.three_months": "3 Months",
     "composer.user_said_in": "%1 در %2 گفته است:",
     "composer.user_said": "%1 گفته است:",
-    "composer.discard": "آیا از دور انداختن این دیدگاه اطمینان دارید؟"
+    "composer.discard": "آیا از دور انداختن این دیدگاه اطمینان دارید؟",
+    "composer.submit_and_lock": "Submit and Lock"
 }

public/language/fa_IR/pages.json

@@ -14,6 +14,7 @@
     "user.groups": "%1's Groups",
     "user.favourites": "دیدگاه‌های پسندیدهٔ %1",
     "user.settings": "تنظیمات کاربر",
+    "user.watched": "Topics watched by %1",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
     "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }

public/language/fa_IR/tags.json

@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "جُستاری با این برچسب وجود ندارد.",
     "tags": "برچسب‌ها",
-    "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "Enter tags...",
     "no_tags": "هنوز برچسبی وجود ندارد."
 }

public/language/fa_IR/user.json

@@ -60,6 +60,7 @@
     "digest_monthly": "ماهانه",
     "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
     "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
+    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
     "has_no_follower": "این کاربر هیچ دنبال‌کننده‌ای ندارد :(",
     "follows_no_one": "این کاربر هیچ کسی را دنبال نمی‌کند :(",
     "has_no_posts": "این کاربر هنوز هیچ دیدگاهی نگذاشته است.",
@@ -76,5 +77,6 @@
     "enable_topic_searching": "Enable In-Topic Searching",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.",
     "follow_topics_you_reply_to": "Follow topics that you reply to.",
-    "follow_topics_you_create": "Follow topics you create."
+    "follow_topics_you_create": "Follow topics you create.",
+    "grouptitle": "Select the group title you would like to display"
 }

public/language/fi/error.json

@@ -18,7 +18,7 @@
     "username-taken": "Käyttäjänimi varattu",
     "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 käyttää chattia ennen kuin sähköpostisi on vahvistettu",
+    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your 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.",
     "username-too-short": "Käyttäjänimi on liian lyhyt",

public/language/fi/modules.json

@@ -17,5 +17,6 @@
     "chat.three_months": "3 kuukautta",
     "composer.user_said_in": "%1 said in %2:",
     "composer.user_said": "%1 sanoi:",
-    "composer.discard": "Oletko varma, että haluat hylätä viestin?"
+    "composer.discard": "Oletko varma, että haluat hylätä viestin?",
+    "composer.submit_and_lock": "Submit and Lock"
 }

public/language/fi/pages.json

@@ -14,6 +14,7 @@
     "user.groups": "%1's Groups",
     "user.favourites": "Käyttäjän %1 suosikkiviestit",
     "user.settings": "Käyttäjän asetukset",
+    "user.watched": "Topics watched by %1",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
     "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }

public/language/fi/tags.json

@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "Ei viimeisimpiä aiheita tällä tagilla.",
     "tags": "Tagit",
-    "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "Syötä tagit...",
     "no_tags": "Ei vielä yhtään tagia."
 }

public/language/fi/user.json

@@ -60,6 +60,7 @@
     "digest_monthly": "Kuukausittain",
     "send_chat_notifications": "Lähetä minulle sähköposti, jos uusi pikaviesti saapuu, kun en ole paikalla",
     "send_post_notifications": "Lähetä minulle sähköposti, kun tilaamiini aiheisiin tulee vastauksia",
+    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
     "has_no_follower": "Kukaan ei seuraa tätä käyttäjää :(",
     "follows_no_one": "Tämä käyttäjä ei seuraa ketään :(",
     "has_no_posts": "Tämä käyttäjä ei ole kirjoittanut vielä mitään.",
@@ -76,5 +77,6 @@
     "enable_topic_searching": "Salli aiheen sisäiset haut",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.",
     "follow_topics_you_reply_to": "Seuraa aiheita, joihin olen vastannut.",
-    "follow_topics_you_create": "Seuraa aloittamiani aiheita."
+    "follow_topics_you_create": "Seuraa aloittamiani aiheita.",
+    "grouptitle": "Select the group title you would like to display"
 }

public/language/fr/error.json

@@ -18,7 +18,7 @@
     "username-taken": "Nom d’utilisateur déjà utilisé",
     "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": "Vous ne pouver discuter tant que votre email n'est pas confirmé",
+    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
     "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.",
     "username-too-short": "Nom d'utilisateur trop court",

public/language/fr/modules.json

@@ -17,5 +17,6 @@
     "chat.three_months": "3 Mois",
     "composer.user_said_in": "%1 a dit dans %2 :",
     "composer.user_said": "%1 a dit :",
-    "composer.discard": "Êtes-vous sûr de bien vouloir supprimer ce message ?"
+    "composer.discard": "Êtes-vous sûr de bien vouloir supprimer ce message ?",
+    "composer.submit_and_lock": "Submit and Lock"
 }

public/language/fr/pages.json

@@ -14,6 +14,7 @@
     "user.groups": "Les Groupes de %1",
     "user.favourites": "Messages favoris de %1",
     "user.settings": "Préférences utilisateur",
+    "user.watched": "Topics watched by %1",
     "maintenance.text": "%1 est en maintenance. Veuillez revenir un peu plus tard.",
     "maintenance.messageIntro": "De plus, l'administrateur a laissé ce message:"
 }

public/language/fr/tags.json

@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "Il n'y a aucun sujet ayant ce mot-clé",
     "tags": "Mots-clés",
-    "enter_tags_here": "Entrez les mots-clés ici. %1-%2 caractères. Tapez sur \"Entrée\" après chaque mot-clé.",
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "Entrez des mots-clés...",
     "no_tags": "Il n'y a pas encore de mots-clés."
 }

public/language/fr/user.json

@@ -60,6 +60,7 @@
     "digest_monthly": "Mensuel",
     "send_chat_notifications": "Envoyer un e-mail si un nouveau message de chat arrive lorsque je ne suis pas en ligne",
     "send_post_notifications": "Envoyer un email lors de réponses envoyées aux sujets auxquels je suis abonné.",
+    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
     "has_no_follower": "Cet utilisateur n'est suivi par personne :(",
     "follows_no_one": "Cet utilisateur ne suit personne :(",
     "has_no_posts": "Ce membre n'a rien posté pour le moment",
@@ -76,5 +77,6 @@
     "enable_topic_searching": "Activer la recherche dans les sujets",
     "topic_search_help": "Une fois activé, la recherche dans les sujets va remplacer la recherche de page du navigateur et vous permettra de rechercher dans l'intégralité d'un sujet au lieu des seuls posts chargés.",
     "follow_topics_you_reply_to": "Suivre les sujets auxquels vous répondez.",
-    "follow_topics_you_create": "Suivre les sujets que vous créez."
+    "follow_topics_you_create": "Suivre les sujets que vous créez.",
+    "grouptitle": "Select the group title you would like to display"
 }

public/language/he/error.json

@@ -18,7 +18,7 @@
     "username-taken": "שם משתמש תפוס",
     "email-taken": "כתובת אימייל תפוסה",
     "email-not-confirmed": "כתובת המייל שלך עוד לא אושרה, לחץ כאן על-מנת לאשר את המייל שלך.",
-    "email-not-confirmed-chat": "לא תוכל לדבר בצ'אט עד שלא תאשר את כתובת המייל שלך",
+    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your 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.",
     "username-too-short": "שם משתמש קצר מדי",

public/language/he/modules.json

@@ -17,5 +17,6 @@
     "chat.three_months": "3 חודשים",
     "composer.user_said_in": "%1 אמר ב%2:",
     "composer.user_said": "%1 אמר:",
-    "composer.discard": "האם למחוק פוסט זה?"
+    "composer.discard": "האם למחוק פוסט זה?",
+    "composer.submit_and_lock": "Submit and Lock"
 }

public/language/he/pages.json

@@ -14,6 +14,7 @@
     "user.groups": "הקבוצות של %1",
     "user.favourites": "הפוסטים המועדפים על %1",
     "user.settings": "הגדרות משתמש",
+    "user.watched": "Topics watched by %1",
     "maintenance.text": "%1 כרגע תחת עבודות תחזוקה. אנא חזור בזמן מאוחר יותר.",
     "maintenance.messageIntro": "בנוסף, המנהל השאיר את ההודעה הזו:"
 }

public/language/he/tags.json

@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "אין פוסטים עם תגית זו.",
     "tags": "תגיות",
-    "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "הכנס תגיות",
     "no_tags": "אין עדיין תגיות."
 }

public/language/he/user.json

@@ -60,6 +60,7 @@
     "digest_monthly": "חודשי",
     "send_chat_notifications": "שלח לי הודעה למייל כאשר הודעת צ'אט נשלחה אלי בזמן שאיני מחובר",
     "send_post_notifications": "שלח לי הודעה למייל כאשר תגובות חדשות פורסמו לנושאים שאני עוקב אחריהם",
+    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
     "has_no_follower": "למשתמש זה אין עוקבים :(",
     "follows_no_one": "משתמש זה אינו עוקב אחרי אחרים :(",
     "has_no_posts": "המשתמש הזה עוד לא פרסם כלום.",
@@ -76,5 +77,6 @@
     "enable_topic_searching": "הפעל חיפוש בתוך נושא",
     "topic_search_help": "אם מופעל, חיפוש בתוך נושא יעקוף את מנגנון החיפוש הרגיל של הדפדפן שלך על מנת לאפשר לך לחפש בתוך כל הנושא ולא רק מה שמוצג כרגע בעמוד.",
     "follow_topics_you_reply_to": "עקוב אחר נושאים שהגבת עליהם.",
-    "follow_topics_you_create": "עקוב אחר נושאים שיצרת."
+    "follow_topics_you_create": "עקוב אחר נושאים שיצרת.",
+    "grouptitle": "Select the group title you would like to display"
 }

public/language/hu/category.json

@@ -1,9 +1,9 @@
 {
     "new_topic_button": "Új témakör",
-    "guest-login-post": "Log in to post",
+    "guest-login-post": "A hozzászóláshoz be kell lépni",
     "no_topics": "<strong>Nincs nyitva egy téma sem ebben a kategóriában.</strong>Hozzunk létre egyet.",
     "browsing": "böngészés",
     "no_replies": "Nem érkezett válasz",
     "share_this_category": "Kategória megosztása",
-    "ignore": "Figyelmen kívül hagyás"
+    "ignore": "Ignorálás"
 }

public/language/hu/email.json

@@ -9,20 +9,20 @@
     "reset.text1": "Kaptunk egy kérést jelszava visszaállításához, valószínűleg azért, mert elfelejtette azt. Ha ez nem így van, hagyja figyelmen kívül ezt a levelet.",
     "reset.text2": "Ha szeretné, hogy továbbra alaphelyzetbe a jelszavát, kérjük kattintson az alábbi linkre:",
     "reset.cta": "Kattints ide a jelszavad visszaállításához",
-    "reset.notify.subject": "Password successfully changed",
+    "reset.notify.subject": "Jelszó sikeresen megváltoztatva",
-    "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.",
+    "reset.notify.text1": "Értesítünk, hogy %1 névhez tartozó jelszavad sikeresen megváltozott.",
-    "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.",
+    "reset.notify.text2": "Ha nem te voltál az, kérlek értesíts egy adminisztrátort azonnal.",
     "digest.notifications": "Olvasatlan értesítéseid vannak a következőtől: %1",
     "digest.latest_topics": "Legutóbbi témák a következőből: %1",
     "digest.cta": "Kattints ide, hogy meglátogasd a következőt: %1",
-    "digest.unsub.info": "This digest was sent to you due to your subscription settings.",
+    "digest.unsub.info": "Ez a hírlevél a feliratkozási beállításaid miatt lett kiküldve.",
     "digest.no_topics": "Nem volt aktív témakör az elmúlt %1",
     "notif.chat.subject": "Új chat üzenet érkezett a következőtől: %1",
     "notif.chat.cta": "Kattints ide a beszélgetés folytatásához",
-    "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",
+    "notif.chat.unsub.info": "Ez a chat-értesítés a feliratkozási beállításaid miatt lett kiküldve.",
-    "notif.post.cta": "Click here to read the full topic",
+    "notif.post.cta": "Kattints ide a teljes téma olvasásához",
-    "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.",
+    "notif.post.unsub.info": "Ez a hozzászólás-értesítés a feliratkozási beállításaid miatt lett kiküldve.",
-    "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.",
+    "test.text1": "Ez egy teszt levél, ami által ellenőrizzük, hogy a levelező helyesen lett beállítva a fórumodon.",
     "unsub.cta": "Kattintson ide megváltoztatni ezeket a beállításokat",
     "closing": "Köszönjük!"
 }

public/language/hu/error.json

@@ -1,7 +1,7 @@
 {
     "invalid-data": "Érvénytelen adat",
     "not-logged-in": "Úgy tűnik, nem vagy bejelentkezve.",
-    "account-locked": "A fiókod ideiglenesen le lett zárva.",
+    "account-locked": "A fiókod ideiglenesen zárolva lett.",
     "search-requires-login": "A kereső használatához szükséges egy fiók! Kérlek jelenltkezz be vagy regisztrálj!",
     "invalid-cid": "Érvénytelen kategória azonosító",
     "invalid-tid": "Érvénytelen téma azonosító",
@@ -18,9 +18,9 @@
     "username-taken": "Foglalt felhasználónév",
     "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",
+    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
-    "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an 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": "We could not confirm your email, please try again later.",
+    "email-confirm-failed": "Nem tudtuk ellenőrizni az e-mail címedet, kérlek próbálkozz később.",
     "username-too-short": "Túl rövid felhasználónév",
     "username-too-long": "Túl hosszú felhasználónév",
     "user-banned": "Kitiltott felhasználó",
@@ -32,32 +32,32 @@
     "no-user": "Nem létező felhasználó",
     "no-teaser": "Teaser does not exist",
     "no-privileges": "Nincs elég jogod ehhez a művelethez.",
-    "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent",
+    "no-emailers-configured": "Nincs levelező beállítva, ezért a teszt e-mail nem került kiküldésre.",
     "category-disabled": "Kategória kikapcsolva",
     "topic-locked": "Téma lezárva",
-    "post-edit-duration-expired": "You are only allowed to edit posts for %1 seconds after posting",
+    "post-edit-duration-expired": "A hozzászólásaidat %1 másodpercig szerkesztheted, miután beküldted azt",
-    "still-uploading": "Please wait for uploads to complete.",
+    "still-uploading": "Kérlek várj, amíg a feltöltés befejeződik.",
-    "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+    "content-too-short": "Kérlek hosszabb hozzászólást írj be. Legalább %1 karakternek kell lennie.",
-    "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.",
+    "content-too-long": "Kérlek rövidebb hozzászólást írj be. Legfeljebb %1 karakter lehet.",
-    "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
+    "title-too-short": "Kérlek hosszabb címet válassz. Legalább %1 karakternek kell lennie.",
-    "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.",
+    "title-too-long": "Kérlek rövidebb címet válassz. Legfeljebb %1 karakter lehet.",
-    "too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
+    "too-many-posts": "%1 másodpercenként csak egy hozzászólást írhatsz - kérlek várj mielőtt újból hozzászólnál",
-    "too-many-posts-newbie": "As a new user, you can only post once every %1 seconds until you have earned %2 reputation - please wait before posting again",
+    "too-many-posts-newbie": "Mint friss tag, csak egy hozzászólást küldhetsz be %1 másodpercenként, míg nem kapsz %2 jó hírnevet - kérlek várj mielőtt újból hozzászólnál",
-    "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters",
+    "tag-too-short": "Kérlek hosszabb címkét válassz. Legalább %1 karakter hosszúnak kell lennie",
-    "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters",
+    "tag-too-long": "Kérlek rövidebb címkét válassz. Legfeljebb %1 karakter lehet",
-    "file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file",
+    "file-too-big": "Maximális engedélyezett fájlméret %1 kbs - kérlek kisebb fájlt tölts fel",
-    "cant-vote-self-post": "You cannot vote for your own post",
+    "cant-vote-self-post": "Nem szavazhatsz a saját hozzászólásodra",
-    "already-favourited": "You have already favourited this post",
+    "already-favourited": "Már bejelölted Kedvencnek ezt a hozzászólást",
-    "already-unfavourited": "You have already unfavourited this post",
+    "already-unfavourited": "Már kivetted a Kedvenceid közül ezt a hozzászólást",
-    "cant-ban-other-admins": "You can't ban other admins!",
+    "cant-ban-other-admins": "Nem tilthatsz ki másik adminisztrátort!",
-    "invalid-image-type": "Invalid image type. Allowed types are: %1",
+    "invalid-image-type": "Érvénytelen a kép típusa. Engedett kiterjesztések: %1",
-    "invalid-image-extension": "Invalid image extension",
+    "invalid-image-extension": "Érvénytelen a kép kiterjesztése",
-    "invalid-file-type": "Invalid file type. Allowed types are: %1",
+    "invalid-file-type": "Érvénytelen a fájl típusa. Engedélyezett kiterjesztések: %1",
     "group-name-too-short": "A csoport név túl rövid",
     "group-already-exists": "A csoport nem létezik",
     "group-name-change-not-allowed": "A csoport névváltoztatás nem engedélyezett",
-    "group-already-member": "You are already part of this group",
+    "group-already-member": "Már a tagja vagy ennek a csoportnak",
-    "group-needs-owner": "This group requires at least one owner",
+    "group-needs-owner": "Ennek a csoportnak lennie kell legalább egy tulajdonosnak.",
     "post-already-deleted": "Ez a bejegyzés mát törlésre került",
     "post-already-restored": "Ez a bejegyzés már visszaállításra került",
     "topic-already-deleted": "Ezt a témakör már törlésre került",
@@ -66,16 +66,16 @@
     "invalid-file": "Érvénytelen fájl",
     "uploads-are-disabled": "A feltöltés nem engedélyezett",
     "signature-too-long": "Sajnáljuk, az aláírás nem lehet hosszabb %1 karakternél.",
-    "cant-chat-with-yourself": "You can't chat with yourself!",
+    "cant-chat-with-yourself": "Nem cseveghetsz magaddal!",
-    "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
+    "chat-restricted": "Ez a felhasználó korlátozta a chat beállításait. Csak akkor cseveghetsz vele, miután felvett a követettek közé téged",
-    "too-many-messages": "You have sent too many messages, please wait awhile.",
+    "too-many-messages": "Túl sok üzenetet küldtél, kérlek várj egy picit.",
-    "reputation-system-disabled": "Reputation system is disabled.",
+    "reputation-system-disabled": "Hírnév funkció kikapcsolva.",
-    "downvoting-disabled": "Downvoting is disabled",
+    "downvoting-disabled": "Leszavazás funkció kikapcsolva",
-    "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",
+    "not-enough-reputation-to-downvote": "Nem rendelkezel elég Hírnév ponttal, hogy leszavazhasd ezt a hozzászólást",
-    "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post",
+    "not-enough-reputation-to-flag": "Nem rendelkezel elég Hírnév ponttal, hogy jelentsd ezt a hozzászólást",
-    "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.",
+    "reload-failed": "NodeBB egy hibát észlelt újratöltés közben: \"% 1\". A fórum továbbra is kiszolgálja a kliens-oldali eszközöket, bár vissza kellene csinálnod amit az újratöltés előtt elállítottál.",
     "registration-error": "Regisztrációs hiba",
-    "parse-error": "Something went wrong while parsing server response",
+    "parse-error": "Hiba történt a szerver válaszának feldolgozása közben",
-    "wrong-login-type-email": "Please use your email to login",
+    "wrong-login-type-email": "Kérlek az e-mail címedet használd a belépéshez",
-    "wrong-login-type-username": "Please use your username to login"
+    "wrong-login-type-username": "Kérlek a felhasználónevedet használd a belépéshez"
 }

public/language/hu/global.json

@@ -3,53 +3,53 @@
     "search": "Keresés",
     "buttons.close": "Mégsem",
     "403.title": "Hozzáférés megtagadva",
-    "403.message": "You seem to have stumbled upon a page that you do not have access to.",
+    "403.message": "Úgy tűnik, hogy rábukkantál egy olyan oldalra, amihez nincs hozzáférésed.",
-    "403.login": "Perhaps you should <a href='%1/login'>try logging in</a>?",
+    "403.login": "Talán meg kellene próbálnod <a href='%1/login'>belépni</a>?",
     "404.title": "Nincs találat",
-    "404.message": "You seem to have stumbled upon a page that does not exist. Return to the <a href='%1/'>home page</a>.",
+    "404.message": "Úgy tűnik, hogy rábukkantál egy olyan oldalra ami nem létezik. Visszatérés a <a href='%1/'>kezdőlapra</a>",
     "500.title": "Belső hiba.",
     "500.message": "Hoppá! Úgy tűnik valami hiba történt!",
     "register": "Regisztráció",
     "login": "Belépés",
     "please_log_in": "Jelentkezzünk be",
     "logout": "Kijelentkezés",
-    "posting_restriction_info": "Posting is currently restricted to registered members only, click here to log in.",
+    "posting_restriction_info": "A hozzászólás regisztrációhoz kötött, kérlek kattints ide a bejelentkezéshez.",
     "welcome_back": "Üdvözlet",
     "you_have_successfully_logged_in": "Sikeres bejelentkezés",
     "save_changes": "Változások mentése",
     "close": "Bezárás",
     "pagination": "Lapozás",
     "pagination.out_of": "%1 - %2",
-    "pagination.enter_index": "Enter index",
+    "pagination.enter_index": "Írj be egy számot",
     "header.admin": "Admin",
     "header.recent": "Friss",
     "header.unread": "Olvasatlan",
-    "header.tags": "Tags",
+    "header.tags": "Címkék",
     "header.popular": "Népszerű",
     "header.users": "Felhasználók",
-    "header.groups": "Groups",
+    "header.groups": "Csoportok",
     "header.chats": "Chat",
     "header.notifications": "Értesítések",
     "header.search": "Keresés",
     "header.profile": "Profil",
     "notifications.loading": "Értesítések Betöltése",
-    "chats.loading": "Chat-ek Betöltése",
+    "chats.loading": "Chat Betöltése",
     "motd.welcome": "Üdvözlet a NodeBB-n, a jövő fórum platformján.",
     "previouspage": "Előző Oldal",
     "nextpage": "Következő Oldal",
     "alert.success": "Sikeres",
     "alert.error": "Hiba",
     "alert.banned": "Tiltva",
-    "alert.banned.message": "You have just been banned, you will now be logged out.",
+    "alert.banned.message": "Kitiltottak, ezért most ki leszel léptetve.",
     "alert.unfollow": "Nem követed tovább: %1!",
     "alert.follow": "Mostantól követed: %1!",
     "online": "Online",
-    "users": "Users",
+    "users": "Felhasználók",
-    "topics": "Topics",
+    "topics": "Témák",
-    "posts": "Hozzászólás",
+    "posts": "Hozzászólások",
-    "views": "Megtekintés",
+    "views": "Megtekintések",
-    "reputation": "Reputation",
+    "reputation": "Hírnév",
-    "read_more": "read more",
+    "read_more": "tovább olvas",
     "posted_ago_by_guest": "posted %1 by Guest",
     "posted_ago_by": "posted %1 by %2",
     "posted_ago": "posted %1",
@@ -63,19 +63,19 @@
     "norecentposts": "Nincs legutóbbi hozzászólás",
     "norecenttopics": "Nincs friss téma",
     "recentposts": "Friss hozzászólások",
-    "recentips": "Utoljára bejelentkezett IP",
+    "recentips": "Utoljára bejelentkezett IP címek",
     "away": "Távol van",
     "dnd": "Elfoglalt",
     "invisible": "Láthatatlan",
     "offline": "Offline",
     "email": "Email",
-    "language": "Language",
+    "language": "Nyelv",
-    "guest": "Guest",
+    "guest": "Vendég",
-    "guests": "Guests",
+    "guests": "Vendég",
-    "updated.title": "Forum Updated",
+    "updated.title": "Fórum frissítve",
-    "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page.",
+    "updated.message": "A fórum frissítve lett a legutolsó verzióra. Kattints ide az oldal újratöltéséhez.",
-    "privacy": "Privacy",
+    "privacy": "Titoktartás",
-    "follow": "Follow",
+    "follow": "Követés",
-    "unfollow": "Unfollow",
+    "unfollow": "Nem követem",
-    "delete_all": "Delete All"
+    "delete_all": "Összes törlése"
 }

public/language/hu/modules.json

@@ -17,5 +17,6 @@
     "chat.three_months": "3 hónap",
     "composer.user_said_in": "%1 válasza erre %2:",
     "composer.user_said": "%1 válasza:",
-    "composer.discard": "Biztosan elvetjük ezt a hozzászólást?"
+    "composer.discard": "Biztosan elvetjük ezt a hozzászólást?",
+    "composer.submit_and_lock": "Submit and Lock"
 }

public/language/hu/pages.json

@@ -14,6 +14,7 @@
     "user.groups": "%1's csoport",
     "user.favourites": "%1 Kedvenc Hozzászólásai",
     "user.settings": "Felhasználói Beállítások",
+    "user.watched": "Topics watched by %1",
     "maintenance.text": "%1 jelenleg karbantartás alatt van. Kérlek nézz vissza késöbb!",
     "maintenance.messageIntro": "Ezenkívúl, az adminisztrátor ezt az üzenetet hagyta:"
 }

public/language/hu/tags.json

@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "Nem létezik témakör ezzel a címkével.",
     "tags": "Címkék",
-    "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "Címke megadása...",
     "no_tags": "Nincs címke."
 }

public/language/hu/user.json

@@ -18,7 +18,7 @@
     "profile_views": "Megtekintések",
     "reputation": "Hírnév",
     "favourites": "Kedvencek",
-    "watched": "Megtekintve",
+    "watched": "Megfigyeli",
     "followers": "Követők",
     "following": "Követve",
     "signature": "Aláírás",
@@ -33,17 +33,17 @@
     "uploaded_picture": "Feltöltött kép",
     "upload_new_picture": "Új kép feltöltése",
     "upload_new_picture_from_url": "Új kép feltöltése adott URL-ről",
-    "current_password": "Current Password",
+    "current_password": "Jelenlegi jelszó",
     "change_password": "Jelszó megváltoztatása",
     "change_password_error": "Helytelen jelszó!",
-    "change_password_error_wrong_current": "Your current password is not correct!",
+    "change_password_error_wrong_current": "A jelenlegi jelszavad nem megfelelő!",
     "change_password_error_length": "A jelszó túl rövid!",
     "change_password_error_match": "A jelszavak nem egyeznek!",
-    "change_password_error_privileges": "You do not have the rights to change this password.",
+    "change_password_error_privileges": "Nincs jogod megváltoztatni ezt a jelszót.",
     "change_password_success": "A jelszavad frissítve!",
     "confirm_password": "Jelszó megerősítése",
     "password": "Jelszó",
-    "username_taken_workaround": "The username you requested was already taken, so we have altered it slightly. You are now known as <strong>%1</strong>",
+    "username_taken_workaround": "A kívánt felhasználónév már foglalt, így változtatnunk kellett rajta egy kicsit. Mostantól <strong>%1</strong> nicknév alatt vagy ismert.",
     "upload_picture": "Kép feltöltése",
     "upload_a_picture": "Egy kép feltöltése",
     "image_spec": "Csak PNG, JPG vagy GIF kiterjesztésű fájlokat tölthetsz fel",
@@ -52,19 +52,20 @@
     "show_email": "E-mail címem mutatása",
     "show_fullname": "A teljes nevem mutatása",
     "restrict_chats": "Csak olyanok tudjanak chat üzeneteket írni nekem, akiket követek",
-    "digest_label": "Subscribe to Digest",
+    "digest_label": "Feliratkozás a hírlevélre",
-    "digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule",
+    "digest_description": "E-mailben kapott frissítésekre (új értesítések, témák esetében) való feliratkozás, a beállított időintervallum szerint",
-    "digest_off": "Off",
+    "digest_off": "Kikapcsolva",
-    "digest_daily": "Daily",
+    "digest_daily": "Napi",
-    "digest_weekly": "Weekly",
+    "digest_weekly": "Heti",
-    "digest_monthly": "Monthly",
+    "digest_monthly": "Havi",
     "send_chat_notifications": "E-mail küldése, amennyiben chat üzenetem érkezett és nem vagyok aktív",
-    "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
+    "send_post_notifications": "E-mail küldése, amikor válasz érkezik azokhoz a témákhoz, amelyekre feliratkoztam",
+    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
     "has_no_follower": "Ezt a felhasználót nem követi senki :(",
     "follows_no_one": "Ez a felhasználó nem követ senkit :(",
     "has_no_posts": "Ennek a felhasználónak még nincsen hozzászólása.",
-    "has_no_topics": "This user didn't post any topics yet.",
+    "has_no_topics": "Ez a felhasználó nem nyitott egyetlen témát sem még.",
-    "has_no_watched_topics": "This user didn't watch any topics yet.",
+    "has_no_watched_topics": "Ez a felhasználó nem figyel egyetlen témát sem még.",
     "email_hidden": "E-mail rejtett",
     "hidden": "rejtett",
     "paginate_description": "Oldalszámok használata a témáknál és hozzászólásoknál a végtelen görgetés helyett.",
@@ -72,9 +73,10 @@
     "posts_per_page": "Hozzászólás oldalanként",
     "notification_sounds": "Hang lejátszása ha értesítés érkezett.",
     "browsing": "Browsing Settings",
-    "open_links_in_new_tab": "Open outgoing links in new tab?",
+    "open_links_in_new_tab": "Kívülre mutató linkek megnyitása új fülön?",
     "enable_topic_searching": "Témán belüli keresés bekapcsolása",
-    "topic_search_help": "Amennyiben be van kapcsolva, a témán belüli keresés fellül fogja írni a böngésző alapértelmezett oldalon belüli keresőjét és engedélyezni fogja neked, hogy a teljes témában kereshess, ne csak abban, ami jelenleg is megjelenik a képernyőn.",
+    "topic_search_help": "Amennyiben be van kapcsolva, a témán belüli keresés felül fogja írni a böngésző alapértelmezett oldalon belüli keresőjét és engedélyezni fogja neked, hogy a teljes témában kereshess, ne csak abban, ami jelenleg is megjelenik a képernyőn.",
-    "follow_topics_you_reply_to": "Minden olyan téma követése, amire válaszolsz.",
+    "follow_topics_you_reply_to": "Minden olyan téma követése, amihez hozzászóltál.",
-    "follow_topics_you_create": "Minden általad létrehozott téma követése."
+    "follow_topics_you_create": "Minden általad létrehozott téma követése.",
+    "grouptitle": "Select the group title you would like to display"
 }

public/language/id/error.json

@@ -18,7 +18,7 @@
     "username-taken": "Username sudah terdaftar",
     "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",
+    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your 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.",
     "username-too-short": "Username terlalu pendek",

public/language/id/modules.json

@@ -17,5 +17,6 @@
     "chat.three_months": "3 Bulan",
     "composer.user_said_in": "%1 berkata di %2: ",
     "composer.user_said": "%1 berkata:",
-    "composer.discard": "Kamu yakin akan membuang posting ini?"
+    "composer.discard": "Kamu yakin akan membuang posting ini?",
+    "composer.submit_and_lock": "Submit and Lock"
 }

public/language/id/pages.json

@@ -14,6 +14,7 @@
     "user.groups": "%1's Groups",
     "user.favourites": "Posting Favorit %1",
     "user.settings": "Pengaturan Pengguna",
+    "user.watched": "Topics watched by %1",
     "maintenance.text": "%1 saat ini sedang dalam masa pemeliharaan. Silahkan kembali lain waktu.",
     "maintenance.messageIntro": "Tambahan, Administrator meninggalkan pesan ini:"
 }

public/language/id/tags.json

@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "Tidak ada topik dengan tag ini.",
     "tags": "Tag",
-    "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "Masukkan tag...",
     "no_tags": "Belum ada tag."
 }

public/language/id/user.json

@@ -60,6 +60,7 @@
     "digest_monthly": "Bulanan",
     "send_chat_notifications": "Kirimkan email jika menerima pesan percakapan dan saya sedang tidak online",
     "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
+    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
     "has_no_follower": "User ini tidak memiliki pengikut :(",
     "follows_no_one": "User ini tidak mengikuti seorangpun  :(",
     "has_no_posts": "User ini belum pernah membuat posting.",
@@ -76,5 +77,6 @@
     "enable_topic_searching": "Gunakan Pencarian Di dalam Topik",
     "topic_search_help": "Jika digunakan, pencarian di dalam topik akan mengambil alih tindakan pencarian default browser dan mengijinkan kamu untuk mencari keseluruhan topik sebagai pengganti pencarian hanya yang tampil pada layar saja.",
     "follow_topics_you_reply_to": "Ikuti topik yang kamu balas.",
-    "follow_topics_you_create": "Ikuti topik yang kamu buat."
+    "follow_topics_you_create": "Ikuti topik yang kamu buat.",
+    "grouptitle": "Select the group title you would like to display"
 }

public/language/it/email.json

@@ -11,7 +11,7 @@
     "reset.cta": "Clicca qui per resettare la tua password",
     "reset.notify.subject": "Possword modificata con successo.",
     "reset.notify.text1": "Ti informiamo che in data %1, la password è stata cambiata con successo.",
-    "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.",
+    "reset.notify.text2": "Se non hai autorizzato questo, per favore notifica immediatamente un amministratore.",
     "digest.notifications": "Hai una notifica non letta da %1:",
     "digest.latest_topics": "Ultimi argomenti su %1",
     "digest.cta": "Clicca qui per visitare %1",
@@ -21,7 +21,7 @@
     "notif.chat.cta": "Clicca qui per continuare la conversazione",
     "notif.chat.unsub.info": "Questa notifica di chat ti è stata inviata perché l'hai scelta nelle impostazioni.",
     "notif.post.cta": "Clicca qui per leggere il topic completo.",
-    "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.",
+    "notif.post.unsub.info": "Questo post ti è stato notificato in base alle tue impostazioni di sottoscrizione.",
     "test.text1": "Questa è una email di test per verificare che il servizio di invio email è configurato correttamente sul tuo NodeBB.",
     "unsub.cta": "Clicca qui per modificare queste impostazioni",
     "closing": "Grazie!"

public/language/it/error.json

@@ -18,9 +18,9 @@
     "username-taken": "Nome utente già preso",
     "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",
+    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
-    "no-email-to-confirm": "This forum requires email confirmation, please click here to enter an email",
+    "no-email-to-confirm": "Questo forum richiede la conferma dell'indirizzo email, per favore clicca qui per inserirne uno",
-    "email-confirm-failed": "We could not confirm your email, please try again later.",
+    "email-confirm-failed": "Non possiamo confermare la tua email, per favore prova ancora più tardi.",
     "username-too-short": "Nome utente troppo corto",
     "username-too-long": "Nome utente troppo lungo",
     "user-banned": "Utente bannato",
@@ -77,5 +77,5 @@
     "registration-error": "Errore nella registrazione",
     "parse-error": "Qualcosa è andato storto durante l'analisi della risposta proveniente dal server",
     "wrong-login-type-email": "Please use your email to login",
-    "wrong-login-type-username": "Please use your username to login"
+    "wrong-login-type-username": "Per favore usa il tuo nome utente per accedere"
 }

public/language/it/modules.json

@@ -17,5 +17,6 @@
     "chat.three_months": "3 Mesi",
     "composer.user_said_in": "%1 ha detto in %2:",
     "composer.user_said": "%1 ha detto:",
-    "composer.discard": "Sei sicuro di voler scartare questo post?"
+    "composer.discard": "Sei sicuro di voler scartare questo post?",
+    "composer.submit_and_lock": "Submit and Lock"
 }

public/language/it/notifications.json

@@ -2,7 +2,7 @@
     "title": "Notifiche",
     "no_notifs": "Non hai nuove notifiche",
     "see_all": "Vedi tutte le Notifiche",
-    "mark_all_read": "Mark all notifications read",
+    "mark_all_read": "Segna tutte le notifiche come già lette",
     "back_to_home": "Indietro a %1",
     "outgoing_link": "Link in uscita",
     "outgoing_link_message": "Stai lasciando %1.",

public/language/it/pages.json

@@ -11,9 +11,10 @@
     "user.followers": "Persone che seguono %1",
     "user.posts": "Post creati da %1",
     "user.topics": "Discussioni create da %1",
-    "user.groups": "%1's Groups",
+    "user.groups": "%1's Gruppi",
     "user.favourites": "Post Favoriti da %1",
     "user.settings": "Impostazioni Utente",
+    "user.watched": "Topics watched by %1",
     "maintenance.text": "%1 è attualmente in manutenzione. Per favore ritorna più tardi.",
     "maintenance.messageIntro": "Inoltre, l'amministratore ha lasciato questo messaggio:"
 }

public/language/it/tags.json

@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "Non ci sono discussioni con questo tag.",
     "tags": "Tags",
-    "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "Inserisci i tags...",
     "no_tags": "Non ci sono ancora tags."
 }

public/language/it/user.json

@@ -60,6 +60,7 @@
     "digest_monthly": "Mensile",
     "send_chat_notifications": "Invia una email se arriva un nuovo messaggio di chat e non sono online",
     "send_post_notifications": "Invia una email quando le risposte sono fatte a discussioni a cui sono sottoscritto",
+    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
     "has_no_follower": "Questo utente non è seguito da nessuno :(",
     "follows_no_one": "Questo utente non segue nessuno :(",
     "has_no_posts": "Questo utente non ha ancora postato nulla.",
@@ -76,5 +77,6 @@
     "enable_topic_searching": "Abilita la ricerca negli argomenti",
     "topic_search_help": "Se abilitata, la ricerca negli argomenti sovrascriverà la pagina di ricerca preimpostata del browser per consentirti di cercare all'interno delle discussioni, anziché soltanto nel contenuto visibile a schermo.",
     "follow_topics_you_reply_to": "Segui le discussioni in cui rispondi.",
-    "follow_topics_you_create": "Segui le discussioni che crei."
+    "follow_topics_you_create": "Segui le discussioni che crei.",
+    "grouptitle": "Select the group title you would like to display"
 }

public/language/ja/error.json

@@ -18,7 +18,7 @@
     "username-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",
+    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your 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.",
     "username-too-short": "Username too short",

public/language/ja/modules.json

@@ -17,5 +17,6 @@
     "chat.three_months": "3 Months",
     "composer.user_said_in": "%1 said in %2:",
     "composer.user_said": "%1 said:",
-    "composer.discard": "Are you sure you wish to discard this post?"
+    "composer.discard": "Are you sure you wish to discard this post?",
+    "composer.submit_and_lock": "Submit and Lock"
 }

public/language/ja/pages.json

@@ -14,6 +14,7 @@
     "user.groups": "%1's Groups",
     "user.favourites": "%1のお気に入りポスト",
     "user.settings": "ユーザー設定",
+    "user.watched": "Topics watched by %1",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
     "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }

public/language/ja/tags.json

@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "There are no topics with this tag.",
     "tags": "Tags",
-    "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "Enter tags...",
     "no_tags": "There are no tags yet."
 }

public/language/ja/user.json

@@ -60,6 +60,7 @@
     "digest_monthly": "マンスリー",
     "send_chat_notifications": "Send an email if a new chat message arrives and I am not online",
     "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
+    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
     "has_no_follower": "フォロワーはまだいません :(",
     "follows_no_one": "フォロー中のユーザーはまだいません :(",
     "has_no_posts": "まだポストを投稿したことありません。",
@@ -76,5 +77,6 @@
     "enable_topic_searching": "Enable In-Topic Searching",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.",
     "follow_topics_you_reply_to": "Follow topics that you reply to.",
-    "follow_topics_you_create": "Follow topics you create."
+    "follow_topics_you_create": "Follow topics you create.",
+    "grouptitle": "Select the group title you would like to display"
 }

public/language/ko/error.json

@@ -18,7 +18,7 @@
     "username-taken": "이미 사용 중인 사용자 이름입니다.",
     "email-taken": "이미 사용 중인 이메일입니다.",
     "email-not-confirmed": "아직 이메일이 인증되지 않았습니다. 여기를 누르면 인증 메일을 발송할 수 있습니다.",
-    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed",
+    "email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your 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.",
     "username-too-short": "사용자 이름이 너무 짧습니다.",

public/language/ko/modules.json

@@ -17,5 +17,6 @@
     "chat.three_months": "3개월",
     "composer.user_said_in": "%1님이 %2에서 한 말:",
     "composer.user_said": "%1님의 말:",
-    "composer.discard": "이 게시물을 지우겠습니까?"
+    "composer.discard": "이 게시물을 지우겠습니까?",
+    "composer.submit_and_lock": "Submit and Lock"
 }

public/language/ko/pages.json

@@ -14,6 +14,7 @@
     "user.groups": "%1's Groups",
     "user.favourites": "%1님이 좋아하는 게시물",
     "user.settings": "설정",
+    "user.watched": "Topics watched by %1",
     "maintenance.text": "%1 사이트는 현재 점검 중입니다. 나중에 다시 방문해주세요.",
     "maintenance.messageIntro": "다음은 관리자가 전하는 메시지입니다."
 }

public/language/ko/tags.json

@@ -1,7 +1,7 @@
 {
     "no_tag_topics": "이 태그에 해당하는 주제가 없습니다.",
     "tags": "태그",
-    "enter_tags_here": "Enter tags here. %1-%2 characters. Press enter after each tag.",
+    "enter_tags_here": "Enter tags here, between %1 and %2 characters each.",
     "enter_tags_here_short": "태그 입력...",
     "no_tags": "아직 아무런 태그도 없습니다."
 }

public/language/ko/user.json

@@ -60,6 +60,7 @@
     "digest_monthly": "매월",
     "send_chat_notifications": "오프라인일 때 채팅 메시지가 도착하면 알림 메일을 보냅니다.",
     "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
+    "settings-require-reload": "Some setting changes require a reload. Click here to reload the page.",
     "has_no_follower": "아무도 이 사용자를 팔로우하지 않습니다.",
     "follows_no_one": "이 사용자는 아무도 팔로우하지 않습니다.",
     "has_no_posts": "이 사용자는 게시물을 작성하지 않았습니다.",
@@ -76,5 +77,6 @@
     "enable_topic_searching": "Enable In-Topic Searching",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen.",
     "follow_topics_you_reply_to": "답글을 작성한 주제를 팔로우합니다.",
-    "follow_topics_you_create": "직접 작성한 주제를 팔로우합니다."
+    "follow_topics_you_create": "직접 작성한 주제를 팔로우합니다.",
+    "grouptitle": "Select the group title you would like to display"
 }