Merge remote-tracking branch 'origin/master' into grunt-dev

app.js

@@ -46,11 +46,6 @@ winston.add(winston.transports.Console, {
 	level: global.env === 'production' ? 'info' : 'verbose'
 });
 
-// TODO: remove once https://github.com/flatiron/winston/issues/280 is fixed
-winston.err = function (err) {
-	winston.error(err.stack);
-};
-
 if(os.platform() === 'linux') {
 	require('child_process').exec('/usr/bin/which convert', function(err, stdout, stderr) {
 		if(err || !stdout) {
@@ -121,7 +116,7 @@ function start() {
 	nconf.set('use_port', !!urlObject.port);
 	nconf.set('relative_path', relativePath);
 	nconf.set('port', urlObject.port || nconf.get('port') || nconf.get('PORT') || 4567);
-	nconf.set('upload_url', relativePath + '/uploads/');
+	nconf.set('upload_url', '/uploads/');
 
 	if (nconf.get('isPrimary') === 'true') {
 		winston.info('Time: %s', (new Date()).toString());

install/data/defaults.json

@@ -27,6 +27,10 @@
         "field": "minimumPostLength",
         "value": 8
     },
+    {
+        "field": "maximumPostLength",
+        "value": 32767
+    },
     {
         "field": "allowGuestSearching",
         "value": 0

install/data/footer.json

@@ -0,0 +1,10 @@
+[
+	{
+		"widget": "html",
+		"data" : {
+			"html": "<footer id=\"footer\" class=\"container footer\">\r\n\t<div class=\"copyright\">\r\n\t\tCopyright © 2014 <a target=\"_blank\" href=\"https://nodebb.org\">NodeBB Forums</a> | <a target=\"_blank\" href=\"//github.com/NodeBB/NodeBB/graphs/contributors\">Contributors</a>\r\n\t</div>\r\n</footer>",
+			"title":"",
+			"container":""
+		}
+	}
+]

install/data/welcome.md

@@ -0,0 +1,10 @@
+# Welcome to your brand new NodeBB forum!
+
+This is what a topic and post looks like. As an administator, you can edit the post\'s title and content.
+To customise your forum, go to the [Administrator Control Panel](../../admin). You can modify all aspects of your forum there, including installation of third-party plugins.
+
+## Additional Resources
+
+* [NodeBB Documentation](https://docs.nodebb.org)
+* [Community Support Forum](https://community.nodebb.org)
+* [Project repository](https://github.com/nodebb/nodebb)

package.json

@@ -2,7 +2,7 @@
   "name": "nodebb",
   "license": "GPLv3 or later",
   "description": "NodeBB Forum",
-  "version": "0.6.1-dev",
+  "version": "0.7.0-dev",
   "homepage": "http://www.nodebb.org",
   "repository": {
     "type": "git",
@@ -37,13 +37,14 @@
     "morgan": "^1.3.2",
     "nconf": "~0.7.1",
     "nodebb-plugin-dbsearch": "^0.1.0",
+    "nodebb-plugin-emoji-extended": "^0.4.1-4",
     "nodebb-plugin-markdown": "^0.8.0",
     "nodebb-plugin-mentions": "^0.9.0",
     "nodebb-plugin-soundpack-default": "~0.1.1",
     "nodebb-plugin-spam-be-gone": "^0.4.0",
-    "nodebb-theme-lavender": "^0.2.0",
-    "nodebb-theme-vanilla": "^0.2.0",
-    "nodebb-widget-essentials": "~0.2.0",
+    "nodebb-theme-lavender": "^1.0.4",
+    "nodebb-theme-vanilla": "^1.0.5",
+    "nodebb-widget-essentials": "~0.2.11",
     "npm": "^2.1.4",
     "passport": "^0.2.1",
     "passport-local": "1.0.0",
@@ -59,11 +60,11 @@
     "socket.io-redis": "^0.1.3",
     "socketio-wildcard": "~0.1.1",
     "string": "^3.0.0",
-    "templates.js": "0.1.10",
+    "templates.js": "^0.1.15",
     "uglify-js": "git+https://github.com/julianlam/UglifyJS2.git",
     "underscore": "~1.7.0",
-    "validator": "~3.26.0",
-    "winston": "^0.8.1",
+    "validator": "^3.30.0",
+    "winston": "^0.9.0",
     "xregexp": "~2.0.0"
   },
   "devDependencies": {

public/language/ar/email.json

@@ -9,6 +9,9 @@
     "reset.text1": "لقد توصلنا بطلب إعادة تعيين كلمة السرالخاصة بك، ربما لكونك قد نسيتها, إن لم يكن الأمر كذلك، المرجو تجاهل هذه الرسالة.",
     "reset.text2": "لمواصلة طلب إعاة تعيين كلمة السر، المرجو تتبع هذا الرابط.",
     "reset.cta": "انقر هنا لإعادة تعيين كلمة السر الخاصة بك.",
+    "reset.notify.subject": "Password successfully changed",
+    "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.",
+    "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.",
     "digest.notifications": "لديك تنبيهات غير مقروءة من طرف %1:",
     "digest.latest_topics": "آخر المستجدات من %1",
     "digest.cta": "انقر هنا لمشاهدة %1",

public/language/ar/error.json

@@ -35,6 +35,7 @@
     "topic-locked": "الموضوع مقفول",
     "still-uploading": "الرجاء انتظار الرفع",
     "content-too-short": "المرجو إدخال موضوع أطول من هذا. يجب أن تتوفر المواضيع على %1 حروف على الأقل.",
+    "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.",
     "title-too-short": "المرجو إدخال عنوان أطول من هذا. يجب أن تتوفر العناوين على %1 حروف على الأقل.",
     "title-too-long": "المرجو إدخال عنوان أقصر من هذا. يجب ألا تتجاوز العناوين %1 حرفًا.",
     "too-many-posts": "يمكنك إنشاء المواضيع بمعدل موضوع واحد كل %1 ثانية - المرجو الانتظار قليلا.",
@@ -62,6 +63,7 @@
     "signature-too-long": "عذرا، توقيعك يجب ألا يتجاوز %1 حرفًا",
     "cant-chat-with-yourself": "لايمكنك فتح محادثة مع نفسك",
     "chat-restricted": "هذا المستخدم عطل المحادثات الواردة عليه. يجب أن يتبعك حتى تتمكن من فتح محادثة معه.",
+    "too-many-messages": "You have sent too many messages, please wait awhile.",
     "reputation-system-disabled": "نظام السمعة معطل",
     "downvoting-disabled": "التصويتات السلبية معطلة",
     "not-enough-reputation-to-downvote": "ليس لديك سمعة تكفي لإضافة صوت سلبي لهذا الموضوع",

public/language/ar/groups.json

@@ -15,6 +15,8 @@
     "details.latest_posts": "آخر المشاركات",
     "details.private": "Private Group",
     "details.public": "Public Group",
+    "details.grant": "Grant/Rescind Ownership",
+    "details.kick": "Kick",
     "details.owner_options": "Group Administration",
     "event.updated": "Group details have been updated",
     "event.deleted": "The group \"%1\" has been deleted"

public/language/ar/pages.json

@@ -11,6 +11,7 @@
     "user.followers": "المستخدمون الذين يتبعون %1",
     "user.posts": "ردود  %1",
     "user.topics": "مواضيع %1",
+    "user.groups": "%1's Groups",
     "user.favourites": "مفضلات %1",
     "user.settings": "خيارات المستخدم",
     "maintenance.text": "جاري صيانة %1. المرجو العودة لاحقًا.",

public/language/ar/reset_password.json

@@ -10,5 +10,7 @@
     "enter_email": "يرجى إدخال <strong>عنوان البريد الإلكتروني</strong> الخاص بك وسوف نرسل لك رسالة بالبريد الالكتروني مع تعليمات حول كيفية إستعادة حسابك.",
     "enter_email_address": "ادخل عنوان البريد الإلكتروني",
     "password_reset_sent": "إعادة تعيين كلمة السر أرسلت",
-    "invalid_email": "بريد إلكتروني غير صالح أو غير موجود"
+    "invalid_email": "بريد إلكتروني غير صالح أو غير موجود",
+    "password_too_short": "The password entered is too short, please pick a different password.",
+    "passwords_do_not_match": "The two passwords you've entered do not match."
 }

public/language/ar/search.json

@@ -3,5 +3,33 @@
     "no-matches": "No matches found",
     "in": "In",
     "by": "By",
-    "posted-by": "Posted by"
+    "titles": "Titles",
+    "titles-posts": "Titles and Posts",
+    "posted-by": "Posted by",
+    "in-categories": "In Categories",
+    "search-child-categories": "Search child categories",
+    "reply-count": "Reply Count",
+    "at-least": "At least",
+    "at-most": "At most",
+    "post-time": "Post time",
+    "newer-than": "Newer than",
+    "older-than": "Older than",
+    "any-date": "Any date",
+    "yesterday": "Yesterday",
+    "one-week": "One week",
+    "two-weeks": "Two weeks",
+    "one-month": "One month",
+    "three-months": "Three months",
+    "six-months": "Six months",
+    "one-year": "One year",
+    "sort-by": "Sort by",
+    "last-reply-time": "Last reply time",
+    "topic-title": "Topic title",
+    "number-of-replies": "Number of replies",
+    "number-of-views": "Number of views",
+    "topic-start-date": "Topic start date",
+    "username": "Username",
+    "category": "Category",
+    "descending": "In descending order",
+    "ascending": "In ascending order"
 }

public/language/ar/users.json

@@ -5,7 +5,7 @@
     "search": "بحث",
     "enter_username": "أدخل اسم مستخدم للبحث",
     "load_more": "حمل المزيد",
-    "users-found-search-took": "تم إيجاد %1 مستخدمـ(ين)! استغرق البحث %2 ميليثانية.",
+    "users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
     "filter-by": "Filter By",
     "online-only": "Online only",
     "picture-only": "Picture only"

public/language/bn/email.json

@@ -9,6 +9,9 @@
     "reset.text1": "আমরা আপনার পাসওয়ার্ড রিসেট করার অনুরোধ পেয়েছি, সম্ভবত আপনি আপনার পাসওয়ার্ড ভুলে গিয়েছেন বলেই। তবে যদি তা না হয়ে থাকে, তাহলে এই মেইলকে উপেক্ষা করতে পারেন।",
     "reset.text2": "পাসওয়ার্ড রিসেট করতে নিচের লিংকে ক্লিক করুন",
     "reset.cta": "পাসওয়ার্ড রিসেট করতে এখানে ক্লিক করুন",
+    "reset.notify.subject": "Password successfully changed",
+    "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.",
+    "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.",
     "digest.notifications": "%1 থেকে আনরিড নোটিফিকেশন আছে।",
     "digest.latest_topics": "%1 এর সর্বশেষ টপিকসমূহ",
     "digest.cta": "%1 ভিজিট করতে এখানে ক্লিক করুন",

public/language/bn/error.json

@@ -35,6 +35,7 @@
     "topic-locked": "টপিক বন্ধ",
     "still-uploading": "আপলোড সম্পূর্ণ জন্য অনুগ্রহ করে অপেক্ষা করুন",
     "content-too-short": "অনুগ্রহকরে অপেক্ষকৃত বড় পোষ্ট করুন। একটি পোষ্টে নূন্যতম %1 অক্ষর থাকতে হবে।",
+    "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.",
     "title-too-short": "অনুগ্রহপূর্বক বড় শিরোনাম ব্যাবহার করুন। শিরোনামের জন্য নূন্যতম %1 অক্ষর ব্যাবহার করতে হবে।",
     "title-too-long": "অনুগ্রহ করে সংক্ষিপ্ত শিরোনাম লিখুন। শিরোনাম %1 অক্ষরের বেশি হতে পারবে না।",
     "too-many-posts": "আপনি প্রতি %1 সেকেন্ডে একবার পোষ্ট করতে পারবেন। পরবর্তী পোষ্ট করার জন্য অপেক্ষা করুন। ",
@@ -62,6 +63,7 @@
     "signature-too-long": "দুঃখিত, আপনার সাক্ষর %1 অক্ষরের বেশী হতে পারবে না। ",
     "cant-chat-with-yourself": "আপনি নিজের সাথে চ্যাট করতে পারবেন না!",
     "chat-restricted": "এই সদস্য তার বার্তালাপ সংরক্ষিত রেখেছেন। এই সদস্য আপনাকে ফলো করার পরই কেবলমাত্র আপনি তার সাথে চ্যাট করতে পারবেন",
+    "too-many-messages": "You have sent too many messages, please wait awhile.",
     "reputation-system-disabled": "সম্মাননা ব্যাবস্থা নিস্ক্রীয় রাখা হয়েছে",
     "downvoting-disabled": "ঋণাত্মক ভোট নিস্ক্রীয় রাখা হয়েছে।",
     "not-enough-reputation-to-downvote": "আপনার এই পোস্ট downvote করার জন্য পর্যাপ্ত সম্মাননা নেই",

public/language/bn/groups.json

@@ -15,6 +15,8 @@
     "details.latest_posts": "সর্বশেষ পোষ্টসমূহ",
     "details.private": "Private Group",
     "details.public": "Public Group",
+    "details.grant": "Grant/Rescind Ownership",
+    "details.kick": "Kick",
     "details.owner_options": "Group Administration",
     "event.updated": "Group details have been updated",
     "event.deleted": "The group \"%1\" has been deleted"

public/language/bn/pages.json

@@ -11,6 +11,7 @@
     "user.followers": "যারা %1 কে অনুসরণ করেন",
     "user.posts": "%1 এর পোস্ট সমুহ",
     "user.topics": "%1 এর টপিক সমুহ",
+    "user.groups": "%1's Groups",
     "user.favourites": "%1'র প্রিয় পোস্টগুলো",
     "user.settings": "সদস্য সেটিংস",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",

public/language/bn/reset_password.json

@@ -10,5 +10,7 @@
     "enter_email": "অনুগ্রহপূর্বক আপনার ইমেইল এড্রেস প্রদান করুন, আমরা আপনাকে আপনার পাসওয়ার্ড রিসেট সম্পর্কিত তথ্যাবলী ইমেইলে পাঠিয়ে দিবো। ",
     "enter_email_address": "আপনার ইমেইল এড্রেস",
     "password_reset_sent": "পাসওয়ার্ড রিসেট মেইল পাঠানো হয়েছে",
-    "invalid_email": "ভুল ইমেইল / ইমেইল ডেটাবেইজে নেই"
+    "invalid_email": "ভুল ইমেইল / ইমেইল ডেটাবেইজে নেই",
+    "password_too_short": "The password entered is too short, please pick a different password.",
+    "passwords_do_not_match": "The two passwords you've entered do not match."
 }

public/language/bn/search.json

@@ -3,5 +3,33 @@
     "no-matches": "No matches found",
     "in": "In",
     "by": "By",
-    "posted-by": "Posted by"
+    "titles": "Titles",
+    "titles-posts": "Titles and Posts",
+    "posted-by": "Posted by",
+    "in-categories": "In Categories",
+    "search-child-categories": "Search child categories",
+    "reply-count": "Reply Count",
+    "at-least": "At least",
+    "at-most": "At most",
+    "post-time": "Post time",
+    "newer-than": "Newer than",
+    "older-than": "Older than",
+    "any-date": "Any date",
+    "yesterday": "Yesterday",
+    "one-week": "One week",
+    "two-weeks": "Two weeks",
+    "one-month": "One month",
+    "three-months": "Three months",
+    "six-months": "Six months",
+    "one-year": "One year",
+    "sort-by": "Sort by",
+    "last-reply-time": "Last reply time",
+    "topic-title": "Topic title",
+    "number-of-replies": "Number of replies",
+    "number-of-views": "Number of views",
+    "topic-start-date": "Topic start date",
+    "username": "Username",
+    "category": "Category",
+    "descending": "In descending order",
+    "ascending": "In ascending order"
 }

public/language/bn/users.json

@@ -5,7 +5,7 @@
     "search": "খুঁজুন",
     "enter_username": "ইউজারনেম এর ভিত্তিতে সার্চ করুন",
     "load_more": "আরো লোড করুন",
-    "users-found-search-took": "%1 সদস্য(দের) খুঁজে পাওয়া গিয়েছে! সময় লেগেছে %2 ms.",
+    "users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
     "filter-by": "Filter By",
     "online-only": "Online only",
     "picture-only": "Picture only"

public/language/cs/email.json

@@ -9,6 +9,9 @@
     "reset.text1": "Obdrželi jsme požadavek na obnovu hesla, pravděpodobně kvůli tomu, že jste ho zapomněli. Pokud to není tento případ, ignorujte, prosím, tento email.",
     "reset.text2": "Přejete-li si pokračovat v obnově vašeho hesla, klikněte, prosím, na následující odkaz:",
     "reset.cta": "Klikněte zde, chcete-li obnovit vaše heslo",
+    "reset.notify.subject": "Password successfully changed",
+    "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.",
+    "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.",
     "digest.notifications": "Máte tu nepřečtená oznámení od %1:",
     "digest.latest_topics": "Nejnovější témata od %1",
     "digest.cta": "Kliknutím zde navštívíte %1",

public/language/cs/error.json

@@ -35,6 +35,7 @@
     "topic-locked": "Téma uzamčeno",
     "still-uploading": "Vyčkejte, prosím, nežli se vše kompletně nahraje.",
     "content-too-short": "Vložte, prosím, delší příspěvek. Příspěvky by měly obsahovat nejméně %1 znaků.",
+    "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.",
     "title-too-short": "Vložte, prosím, delší titulek. Titulky by měly obsahovat nejméně %1 znaků.",
     "title-too-long": "Vložte, prosím, kratší titulek. Titulky by neměly být delší, než-li %1 znaků.",
     "too-many-posts": "Své příspěvky můžete odesílat po %1 sekundách - vyčkejte, prosím, před dalším odesláním",
@@ -62,6 +63,7 @@
     "signature-too-long": "Pardon, ale váš podpis nemůže být delší, než-li %1 znaků.",
     "cant-chat-with-yourself": "Nemůžete chatovat sami se sebou!",
     "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
+    "too-many-messages": "You have sent too many messages, please wait awhile.",
     "reputation-system-disabled": "Systém reputací je zakázán.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",

public/language/cs/groups.json

@@ -15,6 +15,8 @@
     "details.latest_posts": "Nejnovější příspěvky",
     "details.private": "Private Group",
     "details.public": "Public Group",
+    "details.grant": "Grant/Rescind Ownership",
+    "details.kick": "Kick",
     "details.owner_options": "Group Administration",
     "event.updated": "Group details have been updated",
     "event.deleted": "The group \"%1\" has been deleted"

public/language/cs/pages.json

@@ -11,6 +11,7 @@
     "user.followers": "People who Follow %1",
     "user.posts": "Posts made by %1",
     "user.topics": "Topics created by %1",
+    "user.groups": "%1's Groups",
     "user.favourites": "%1's Favourite Posts",
     "user.settings": "User Settings",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",

public/language/cs/reset_password.json

@@ -10,5 +10,7 @@
     "enter_email": "Zadejte svou <strong>emailovou adresu</strong> a my Vám pošleme informace, jak můžete obnovit své heslo.",
     "enter_email_address": "Zadejte emailovou adresu",
     "password_reset_sent": "Obnova hesla odeslána",
-    "invalid_email": "Špatný email / Email neexistuje!"
+    "invalid_email": "Špatný email / Email neexistuje!",
+    "password_too_short": "The password entered is too short, please pick a different password.",
+    "passwords_do_not_match": "The two passwords you've entered do not match."
 }

public/language/cs/search.json

@@ -3,5 +3,33 @@
     "no-matches": "No matches found",
     "in": "In",
     "by": "By",
-    "posted-by": "Posted by"
+    "titles": "Titles",
+    "titles-posts": "Titles and Posts",
+    "posted-by": "Posted by",
+    "in-categories": "In Categories",
+    "search-child-categories": "Search child categories",
+    "reply-count": "Reply Count",
+    "at-least": "At least",
+    "at-most": "At most",
+    "post-time": "Post time",
+    "newer-than": "Newer than",
+    "older-than": "Older than",
+    "any-date": "Any date",
+    "yesterday": "Yesterday",
+    "one-week": "One week",
+    "two-weeks": "Two weeks",
+    "one-month": "One month",
+    "three-months": "Three months",
+    "six-months": "Six months",
+    "one-year": "One year",
+    "sort-by": "Sort by",
+    "last-reply-time": "Last reply time",
+    "topic-title": "Topic title",
+    "number-of-replies": "Number of replies",
+    "number-of-views": "Number of views",
+    "topic-start-date": "Topic start date",
+    "username": "Username",
+    "category": "Category",
+    "descending": "In descending order",
+    "ascending": "In ascending order"
 }

public/language/cs/users.json

@@ -5,7 +5,7 @@
     "search": "Vyhledávat",
     "enter_username": "Zadej uživatelské jméno k hledání",
     "load_more": "Načíst další",
-    "users-found-search-took": "Nazelezeno: %1 uživetel(ů)! Vyhledání trvalo %2 ms.",
+    "users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
     "filter-by": "Filter By",
     "online-only": "Online only",
     "picture-only": "Picture only"

public/language/de/category.json

@@ -1,6 +1,6 @@
 {
     "new_topic_button": "Neues Thema",
-    "no_topics": "<strong>Es gibt noch keine Themen in dieser Kategorie.</strong><br />Warum beginnst du nicht das erste?",
+    "no_topics": "<strong>Es gibt noch keine Themen in dieser Kategorie.</strong><br />Warum beginnst du nicht eins?",
     "browsing": "Aktiv",
     "no_replies": "Niemand hat geantwortet",
     "share_this_category": "Teile diese Kategorie",

public/language/de/email.json

@@ -9,6 +9,9 @@
     "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.",
     "reset.text2": "Klicke bitte auf den folgenden Link, um mit der Zurücksetzung deines Passworts fortzufahren:",
     "reset.cta": "Klicke hier, um dein Passwort zurückzusetzen",
+    "reset.notify.subject": "Passwort erfolgreich geändert",
+    "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.cta": "Klicke hier, um %1 zu besuchen",
@@ -17,8 +20,8 @@
     "notif.chat.subject": "Neue Chatnachricht von %1 erhalten",
     "notif.chat.cta": "Klicke hier, um die Unterhaltung fortzusetzen",
     "notif.chat.unsub.info": "Diese Chat-Benachrichtigung wurde dir aufgrund deiner Abonnement-Einstellungen gesendet.",
-    "notif.post.cta": "Click here to read the full topic",
-    "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.",
+    "notif.post.cta": "Hier klicken, um das gesamte Thema zu lesen",
+    "notif.post.unsub.info": "Diese Mitteilung wurde wegen ihrer Abonnement-Einstellung gesendet.",
     "test.text1": "Dies ist eine Test-E-Mail, um zu überprüfen, ob der E-Mailer deines NodeBB korrekt eingestellt wurde.",
     "unsub.cta": "Klicke hier, um diese Einstellungen zu ändern.",
     "closing": "Danke!"

public/language/de/error.json

@@ -2,7 +2,7 @@
     "invalid-data": "Daten ungültig",
     "not-logged-in": "Du bist nicht angemeldet.",
     "account-locked": "Dein Account wurde vorübergehend gesperrt.",
-    "search-requires-login": "Die Suche erfordert ein Konto! Bitte log dich ein oder registrieren dich!",
+    "search-requires-login": "Die Suche erfordert ein Konto! Bitte log dich ein oder registriere dich!",
     "invalid-cid": "Ungültige Kategorie-ID",
     "invalid-tid": "Ungültige Themen-ID",
     "invalid-pid": "Ungültige Beitrags-ID",
@@ -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": "You are unable to chat until your email is confirmed",
+    "email-not-confirmed-chat": "Der Chat ist deaktiviert bis Du deine E-Mail bestätigt hast",
     "username-too-short": "Benutzername ist zu kurz",
     "username-too-long": "Der Benutzername ist zu lang",
     "user-banned": "Der Benutzer ist gesperrt",
@@ -35,6 +35,7 @@
     "topic-locked": "Thema ist gesperrt",
     "still-uploading": "Bitte warte bis der Vorgang abgeschlossen ist.",
     "content-too-short": "Bitte gib einen längeren Beitrag ein. Beiträge sollten mindestens %1 Zeichen enthalten.",
+    "content-too-long": "Bitte schreibe einen kürzeren Beitrag. Beiträge können nicht mehr als %1 Zeichen enthalten.",
     "title-too-short": "Bitte gib einen längeren Titel ein. Titel sollten mindestens %1 Zeichen enthalten.",
     "title-too-long": "Der Titel darf maximal %1 Zeichen enthalten.",
     "too-many-posts": "Du kannst maximal alle %1 Sekunden einen Beitrag erstellen - bitte warte, bevor du einen neuen Beitrag erstellst",
@@ -44,13 +45,13 @@
     "already-favourited": "Dieser Beitrag ist bereits in deinen Favoriten enthalten",
     "already-unfavourited": "Du hast diesen Beitrag bereits aus deinen Favoriten entfernt",
     "cant-ban-other-admins": "Du kannst andere Administratoren nicht sperren!",
-    "invalid-image-type": "Invalid image type. Allowed types are: %1",
-    "invalid-image-extension": "Invalid image extension",
+    "invalid-image-type": "Falsche Bildart. Erlaubte Arten sind: %1",
+    "invalid-image-extension": "Ungültige Dateinamenerweiterung",
     "group-name-too-short": "Gruppenname zu kurz",
     "group-already-exists": "Gruppe existiert bereits",
     "group-name-change-not-allowed": "Du kannst den Namen der Gruppe nicht ändern",
-    "group-already-member": "You are already part of this group",
-    "group-needs-owner": "This group requires at least one owner",
+    "group-already-member": "Du bist bereits Teil dieser Gruppe",
+    "group-needs-owner": "Diese Gruppe muss mindestens einen Besitzer vorweisen",
     "post-already-deleted": "Dieser Beitrag ist bereits gelöscht worden",
     "post-already-restored": "Dieser Beitrag ist bereits wiederhergestellt worden",
     "topic-already-deleted": "Dieses Thema ist bereits gelöscht worden",
@@ -62,11 +63,12 @@
     "signature-too-long": "Entschuldigung, deine Signatur darf maximal %1 Zeichen enthalten.",
     "cant-chat-with-yourself": "Du kannst nicht mit dir selber chatten!",
     "chat-restricted": "Dieser Benutzer hat seine Chatfunktion eingeschränkt. Du kannst nur mit diesem Benutzer chatten, wenn er dir folgt.",
+    "too-many-messages": "Du hast zu viele Nachrichten versandt, bitte warte eine Weile.",
     "reputation-system-disabled": "Das Reputationssystem ist deaktiviert.",
     "downvoting-disabled": "Downvotes sind deaktiviert.",
     "not-enough-reputation-to-downvote": "Deine Reputation ist zu niedrig, um diesen Beitrag negativ zu bewerten.",
     "not-enough-reputation-to-flag": "Deine Reputation ist nicht gut genug, um diesen Beitrag zu melden",
     "reload-failed": "Es ist ein Problem während des Reloads von NodeBB aufgetreten: \"%1\". NodeBB wird weiterhin clientseitige Assets bereitstellen, allerdings solltest du das, was du vor dem Reload gemacht hast, rückgängig machen.",
     "registration-error": "Registrierungsfehler",
-    "parse-error": "Something went wrong while parsing server response"
+    "parse-error": "Ein Fehler ist beim Parsen der Server-Antwort aufgetreten"
 }

public/language/de/global.json

@@ -3,10 +3,10 @@
     "search": "Suche",
     "buttons.close": "Schließen",
     "403.title": "Zugriff verweigert",
-    "403.message": "You seem to have stumbled upon a page that you do not have access to.",
-    "403.login": "Perhaps you should <a href='%1/login'>try logging in</a>?",
+    "403.message": "Du hast keine Zugriffsberechtigung für diese Seite.",
+    "403.login": "Du solltest Dich <a href='%1/login'>einloggen</a>.",
     "404.title": " Nicht Gefunden",
-    "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": "Diese Seite existiert nicht. Zur <a href='%1/'>Homepage</a> zurückkehren.",
     "500.title": "Interner Fehler.",
     "500.message": "Ups! Scheint als wäre etwas schief gelaufen!",
     "register": "Registrieren",
@@ -27,7 +27,7 @@
     "header.tags": "Tags",
     "header.popular": "Beliebt",
     "header.users": "Benutzer",
-    "header.groups": "Groups",
+    "header.groups": "Gruppen",
     "header.chats": "Chats",
     "header.notifications": "Benachrichtigungen",
     "header.search": "Suche",
@@ -75,7 +75,7 @@
     "updated.title": "Forum aktualisiert",
     "updated.message": "Dieses Forum wurde gerade auf die neueste Version aktualisiert. Klicke hier, um die Seite  neuzuladen.",
     "privacy": "Privatsphäre",
-    "follow": "Follow",
-    "unfollow": "Unfollow",
+    "follow": "Folgen",
+    "unfollow": "Entfolgen",
     "delete_all": "Alles löschen"
 }

public/language/de/groups.json

@@ -1,21 +1,23 @@
 {
     "groups": "Gruppen",
     "view_group": "Gruppe betrachten",
-    "owner": "Group Owner",
-    "new_group": "Create New Group",
-    "no_groups_found": "There are no groups to see",
-    "cover-instructions": "Drag and Drop a photo, drag to position, and hit <strong>Save</strong>",
-    "cover-change": "Change",
-    "cover-save": "Save",
-    "cover-saving": "Saving",
+    "owner": "Gruppenbesitzer",
+    "new_group": "Neue Gruppe erstellen",
+    "no_groups_found": "Es sind keine Gruppen vorhanden",
+    "cover-instructions": "Drag and Drop ein Foto, bewege es in Position, dann drücke <strong>Speichern</strong>",
+    "cover-change": "Ändern",
+    "cover-save": "Speichern",
+    "cover-saving": "Am speichern",
     "details.title": "Gruppendetails",
     "details.members": "Mitgliederliste",
-    "details.pending": "Pending Members",
+    "details.pending": "Ausstehende Mitglieder",
     "details.has_no_posts": "Die Mitglieder dieser Gruppe haben keine Beiträge verfasst.",
     "details.latest_posts": "Aktuelle Beiträge",
-    "details.private": "Private Group",
-    "details.public": "Public Group",
-    "details.owner_options": "Group Administration",
-    "event.updated": "Group details have been updated",
-    "event.deleted": "The group \"%1\" has been deleted"
+    "details.private": "Private Gruppe",
+    "details.public": "Öffentliche Gruppe",
+    "details.grant": "Grant/Rescind Ownership",
+    "details.kick": "Kick",
+    "details.owner_options": "Gruppenadministration",
+    "event.updated": "Gruppendetails wurden aktualisiert",
+    "event.deleted": "Die Gruppe \"% 1\" wurde gelöscht"
 }

public/language/de/pages.json

@@ -11,6 +11,7 @@
     "user.followers": "Nutzer, die %1 folgen",
     "user.posts": "Beiträge von %1",
     "user.topics": "Themen von %1",
+    "user.groups": "%1's Gruppen",
     "user.favourites": "Von %1 favorisierte Beiträge",
     "user.settings": "Benutzer-Einstellungen",
     "maintenance.text": "%1 befindet sich derzeit in der Wartung. Bitte komm später wieder.",

public/language/de/recent.json

@@ -6,13 +6,13 @@
     "year": "Jahr",
     "alltime": "Gesamter Zeitraum",
     "no_recent_topics": "Es gibt keine aktuellen Themen.",
-    "there-is-a-new-topic": "There is a new topic.",
-    "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.",
-    "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.",
-    "there-are-new-topics": "There are %1 new topics.",
-    "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.",
-    "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.",
-    "there-is-a-new-post": "There is a new post.",
-    "there-are-new-posts": "There are %1 new posts.",
-    "click-here-to-reload": "Click here to reload."
+    "there-is-a-new-topic": "Es gibt ein neues Thema.",
+    "there-is-a-new-topic-and-a-new-post": "Es gibt ein neues Thema und einen neuen Beitrag.",
+    "there-is-a-new-topic-and-new-posts": "Es gibt ein neues Thema und %1 neue Beiträge.",
+    "there-are-new-topics": "Es gibt %1 neue Themen.",
+    "there-are-new-topics-and-a-new-post": "Es gibt %1 neue Themen und einen neuen Beitrag.",
+    "there-are-new-topics-and-new-posts": "Es gibt %1 neue Themen und %2 neue Beiträge.",
+    "there-is-a-new-post": "Es gibt einen neuen Beitrag.",
+    "there-are-new-posts": "Es gibt %1 neue Beiträge.",
+    "click-here-to-reload": "Hier klicken um neu zu laden."
 }

public/language/de/reset_password.json

@@ -10,5 +10,7 @@
     "enter_email": "Bitte gib Deine <strong>E-Mail Adresse</strong> ein und wir senden Dir eine Anleitung, wie Du Dein Passwort zurücksetzen kannst.",
     "enter_email_address": "E-Mail Adresse eingeben",
     "password_reset_sent": "Passwortzurücksetzung beantragt.",
-    "invalid_email": "Ungültige E-Mail / Adresse existiert nicht!"
+    "invalid_email": "Ungültige E-Mail / Adresse existiert nicht!",
+    "password_too_short": "Das eingegebene Passwort ist zu kurz, bitte wähle ein anderes Passwort.",
+    "passwords_do_not_match": "Die eingegebenen Passwörter stimmen nicht überein."
 }

public/language/de/search.json

@@ -1,7 +1,35 @@
 {
     "results_matching": "%1 Ergebniss(e) stimmen mit \"%2\" überein, (%3 Sekunden)",
-    "no-matches": "No matches found",
+    "no-matches": "Keine Ergebnisse gefunden",
     "in": "In",
-    "by": "By",
-    "posted-by": "Posted by"
+    "by": "Bei",
+    "titles": "Titel",
+    "titles-posts": "Titel und Beiträge",
+    "posted-by": "Geschrieben von",
+    "in-categories": "In Kategorien",
+    "search-child-categories": "Suche in Unterkategorien",
+    "reply-count": "Antwort Anzahl",
+    "at-least": "Mindestens",
+    "at-most": "Höchstens",
+    "post-time": "Beitrags Zeit",
+    "newer-than": "Neuer als",
+    "older-than": "Älter als",
+    "any-date": "Jeder Zeitpunkt",
+    "yesterday": "Gestern",
+    "one-week": "Eine Woche",
+    "two-weeks": "Zwei Wochen",
+    "one-month": "Ein Monat",
+    "three-months": "Drei Monate",
+    "six-months": "Sechs Monate",
+    "one-year": "Ein Jahr",
+    "sort-by": "Sortieren nach",
+    "last-reply-time": "Letzter Antwort Zeitpunkt",
+    "topic-title": "Thementitel",
+    "number-of-replies": "Anzahl von Antworten",
+    "number-of-views": "Anzahl der Aufrufe",
+    "topic-start-date": "Thema Startdatum",
+    "username": "Benutzername",
+    "category": "Kategorie",
+    "descending": "In absteigender Reihenfolge",
+    "ascending": "In aufsteigender Reihenfolge"
 }

public/language/de/topic.json

@@ -94,5 +94,5 @@
     "oldest_to_newest": "Älteste zuerst",
     "newest_to_oldest": "Neuster zuerst",
     "most_votes": "Die meisten Stimmen",
-    "most_posts": "Most posts"
+    "most_posts": "Die meisten Beiträge"
 }

public/language/de/user.json

@@ -2,8 +2,8 @@
     "banned": "Gebannt",
     "offline": "offline",
     "username": "Nutzername",
-    "joindate": "Join Date",
-    "postcount": "Post Count",
+    "joindate": "Registriert vor",
+    "postcount": "Beiträge",
     "email": "E-Mail",
     "confirm_email": "E-Mail bestätigen",
     "delete_account": "Konto löschen",
@@ -18,7 +18,7 @@
     "profile_views": "Profilaufrufe",
     "reputation": "Reputation",
     "favourites": "Favoriten",
-    "watched": "Watched",
+    "watched": "Beobachtet",
     "followers": "Folger",
     "following": "Folgt",
     "signature": "Signatur",
@@ -59,12 +59,12 @@
     "digest_weekly": "Wöchentlich",
     "digest_monthly": "Monatlich",
     "send_chat_notifications": "Sende eine E-Mail, wenn eine neue Chat-Nachricht eingeht und ich nicht online bin",
-    "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
+    "send_post_notifications": "Sende eine E-Mail wenn auf Themen die ich abonniert habe geantwortet wird",
     "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.",
     "has_no_topics": "Dieser Nutzer hat noch keine Themen gepostet.",
-    "has_no_watched_topics": "This user didn't watch any topics yet.",
+    "has_no_watched_topics": "Diese Person beobachtet keine Themen",
     "email_hidden": "E-Mail Adresse versteckt",
     "hidden": "versteckt",
     "paginate_description": "Themen und Beiträge auf Seiten aufteilen statt unendliches Scrollen verwenden.",

public/language/de/users.json

@@ -6,7 +6,7 @@
     "enter_username": "Benutzer durchsuchen",
     "load_more": "mehr laden",
     "users-found-search-took": "%1 Benutzer gefunden! Die Suche dauerte %2 ms.",
-    "filter-by": "Filter By",
-    "online-only": "Online only",
-    "picture-only": "Picture only"
+    "filter-by": "Filtern nach",
+    "online-only": "Nur Online",
+    "picture-only": "Nur mit Bildern"
 }

public/language/el/email.json

@@ -9,6 +9,9 @@
     "reset.text1": "Λάβαμε ένα αίτημα για επαναφορά του κωδικού σου, πιθανότατα γιατί τον ξέχασες. Αν δεν έκανες εσύ αυτό το αίτημα, αγνόησε αυτό το email.",
     "reset.text2": "Για να κάνεις την επαναφορά του κωδικού σου, παρακαλώ πάτα στο παρακάτω σύνδεσμο:",
     "reset.cta": "Κάνε κλικ εδώ για να επαναφέρεις τον κωδικό σου",
+    "reset.notify.subject": "Password successfully changed",
+    "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.",
+    "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.",
     "digest.notifications": "You have unread notifications from %1:",
     "digest.latest_topics": "Πρόσφατα θέματα στο %1",
     "digest.cta": "Κάνε κλικ εδώ για να επισκεφτείς το %1",

public/language/el/error.json

@@ -35,6 +35,7 @@
     "topic-locked": "Το θέμα έχει κλειδωθεί",
     "still-uploading": "Παρακαλώ περίμενε να τελειώσει το ανέβασμα των αρχείων.",
     "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+    "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
     "title-too-long": "Παρακαλώ γράψε έναν μικρότερο τίτλο. Δεν μπορεί να είναι μεγαλύτερος από %1 χαρακτήρες.",
     "too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
@@ -62,6 +63,7 @@
     "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.",
     "cant-chat-with-yourself": "Δεν μπορείς να συνομιλήσεις με τον εαυτό σου!",
     "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
+    "too-many-messages": "You have sent too many messages, please wait awhile.",
     "reputation-system-disabled": "Το σύστημα φήμης έχει απενεργοποιηθεί.",
     "downvoting-disabled": "Η καταψήφιση έχει απενεργοποιηθεί",
     "not-enough-reputation-to-downvote": "Δεν έχεις αρκετή φήμη για να καταψηφίσεις αυτή την δημοσίευση",

public/language/el/groups.json

@@ -15,6 +15,8 @@
     "details.latest_posts": "Τελευταίες δημοσιεύσεις.",
     "details.private": "Private Group",
     "details.public": "Public Group",
+    "details.grant": "Grant/Rescind Ownership",
+    "details.kick": "Kick",
     "details.owner_options": "Group Administration",
     "event.updated": "Group details have been updated",
     "event.deleted": "The group \"%1\" has been deleted"

public/language/el/pages.json

@@ -11,6 +11,7 @@
     "user.followers": "Άτομα που ακολουθούν τον/την %1",
     "user.posts": "Δημοσιεύσεις από τον/την %1",
     "user.topics": "Θέματα από τον/την %1",
+    "user.groups": "%1's Groups",
     "user.favourites": "Οι αγαπημένες δημοσιεύσεις του/της %1",
     "user.settings": "Επιλογές Χρήστη",
     "maintenance.text": "Το %1 αυτή την στιγμή συντηρείται. Παρακαλώ έλα αργότερα.",

public/language/el/reset_password.json

@@ -10,5 +10,7 @@
     "enter_email": "Παρακαλώ γράψε την <strong>διεύθυνση email σου</strong> και θα σου στείλουμε ένα email με οδηγίες για το πως να επαναφέρεις τον λογαριασμό σου.",
     "enter_email_address": "Εισαγωγή Διεύθυνσης Email",
     "password_reset_sent": "Η Επαναφορά Κωδικού Εστάλη",
-    "invalid_email": "Άκυρο Email / Το email δεν υπάρχει!"
+    "invalid_email": "Άκυρο Email / Το email δεν υπάρχει!",
+    "password_too_short": "The password entered is too short, please pick a different password.",
+    "passwords_do_not_match": "The two passwords you've entered do not match."
 }

public/language/el/search.json

@@ -3,5 +3,33 @@
     "no-matches": "No matches found",
     "in": "In",
     "by": "By",
-    "posted-by": "Posted by"
+    "titles": "Titles",
+    "titles-posts": "Titles and Posts",
+    "posted-by": "Posted by",
+    "in-categories": "In Categories",
+    "search-child-categories": "Search child categories",
+    "reply-count": "Reply Count",
+    "at-least": "At least",
+    "at-most": "At most",
+    "post-time": "Post time",
+    "newer-than": "Newer than",
+    "older-than": "Older than",
+    "any-date": "Any date",
+    "yesterday": "Yesterday",
+    "one-week": "One week",
+    "two-weeks": "Two weeks",
+    "one-month": "One month",
+    "three-months": "Three months",
+    "six-months": "Six months",
+    "one-year": "One year",
+    "sort-by": "Sort by",
+    "last-reply-time": "Last reply time",
+    "topic-title": "Topic title",
+    "number-of-replies": "Number of replies",
+    "number-of-views": "Number of views",
+    "topic-start-date": "Topic start date",
+    "username": "Username",
+    "category": "Category",
+    "descending": "In descending order",
+    "ascending": "In ascending order"
 }

public/language/el/users.json

@@ -5,7 +5,7 @@
     "search": "Αναζήτηση",
     "enter_username": "Γράψε ένα όνομα χρήστη προς αναζήτηση",
     "load_more": "Φόρτωση περισσότερων",
-    "users-found-search-took": "%1 χρήστης(ες) βρέθηκαν! Η αναζήτηση πήρε %2 ms.",
+    "users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
     "filter-by": "Filter By",
     "online-only": "Online only",
     "picture-only": "Picture only"

public/language/en@pirate/email.json

@@ -9,6 +9,9 @@
     "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
     "reset.text2": "To continue with the password reset, please click on the following link:",
     "reset.cta": "Click here to reset your password",
+    "reset.notify.subject": "Password successfully changed",
+    "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.",
+    "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.",
     "digest.notifications": "You have unread notifications from %1:",
     "digest.latest_topics": "Latest topics from %1",
     "digest.cta": "Click here to visit %1",

public/language/en@pirate/error.json

@@ -35,6 +35,7 @@
     "topic-locked": "Topic Locked",
     "still-uploading": "Please wait for uploads to complete.",
     "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+    "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
     "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.",
     "too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
@@ -62,6 +63,7 @@
     "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.",
     "cant-chat-with-yourself": "You can't chat with yourself!",
     "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
+    "too-many-messages": "You have sent too many messages, please wait awhile.",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",

public/language/en@pirate/groups.json

@@ -15,6 +15,8 @@
     "details.latest_posts": "Latest Posts",
     "details.private": "Private Group",
     "details.public": "Public Group",
+    "details.grant": "Grant/Rescind Ownership",
+    "details.kick": "Kick",
     "details.owner_options": "Group Administration",
     "event.updated": "Group details have been updated",
     "event.deleted": "The group \"%1\" has been deleted"

public/language/en@pirate/pages.json

@@ -11,6 +11,7 @@
     "user.followers": "People who Follow %1",
     "user.posts": "Posts made by %1",
     "user.topics": "Topics created by %1",
+    "user.groups": "%1's Groups",
     "user.favourites": "%1's Favourite Posts",
     "user.settings": "User Settings",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",

public/language/en@pirate/reset_password.json

@@ -10,5 +10,7 @@
     "enter_email": "Please enter your <strong>email address</strong> and we will send you an email with instructions on how to reset your account.",
     "enter_email_address": "Enter Email Address",
     "password_reset_sent": "Password Reset Sent",
-    "invalid_email": "Invalid Email / Email does not exist!"
+    "invalid_email": "Invalid Email / Email does not exist!",
+    "password_too_short": "The password entered is too short, please pick a different password.",
+    "passwords_do_not_match": "The two passwords you've entered do not match."
 }

public/language/en@pirate/search.json

@@ -3,5 +3,33 @@
     "no-matches": "No matches found",
     "in": "In",
     "by": "By",
-    "posted-by": "Posted by"
+    "titles": "Titles",
+    "titles-posts": "Titles and Posts",
+    "posted-by": "Posted by",
+    "in-categories": "In Categories",
+    "search-child-categories": "Search child categories",
+    "reply-count": "Reply Count",
+    "at-least": "At least",
+    "at-most": "At most",
+    "post-time": "Post time",
+    "newer-than": "Newer than",
+    "older-than": "Older than",
+    "any-date": "Any date",
+    "yesterday": "Yesterday",
+    "one-week": "One week",
+    "two-weeks": "Two weeks",
+    "one-month": "One month",
+    "three-months": "Three months",
+    "six-months": "Six months",
+    "one-year": "One year",
+    "sort-by": "Sort by",
+    "last-reply-time": "Last reply time",
+    "topic-title": "Topic title",
+    "number-of-replies": "Number of replies",
+    "number-of-views": "Number of views",
+    "topic-start-date": "Topic start date",
+    "username": "Username",
+    "category": "Category",
+    "descending": "In descending order",
+    "ascending": "In ascending order"
 }

public/language/en@pirate/users.json

@@ -5,7 +5,7 @@
     "search": "Search",
     "enter_username": "Gimme y'er handle",
     "load_more": "Load More",
-    "users-found-search-took": "%1 user(s) found! Search took %2 ms.",
+    "users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
     "filter-by": "Filter By",
     "online-only": "Online only",
     "picture-only": "Picture only"

public/language/en_GB/email.json

@@ -13,6 +13,10 @@
 	"reset.text2": "To continue with the password reset, please click on the following link:",
 	"reset.cta": "Click here to reset your password",
 
+	"reset.notify.subject": "Password successfully changed",
+	"reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.",
+	"reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.",
+
 	"digest.notifications": "You have unread notifications from %1:",
 	"digest.latest_topics": "Latest topics from %1",
 	"digest.cta": "Click here to visit %1",

public/language/en_GB/error.json

@@ -46,11 +46,14 @@
 
 	"still-uploading": "Please wait for uploads to complete.",
 	"content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+	"content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.",
 	"title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
 	"title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.",
 	"invalid-title": "Invalid title!",
 	"too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
 	"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",
+	"tag-too-short": "Please enter a longer tag. Tags should contain at least %1 characters",
+	"tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 characters",
 	"file-too-big": "Maximum allowed file size is %1 kbs - please upload a smaller file",
 
 	"cant-vote-self-post": "You cannot vote for your own post",
@@ -83,6 +86,7 @@
 
 	"cant-chat-with-yourself": "You can't chat with yourself!",
 	"chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
+	"too-many-messages": "You have sent too many messages, please wait awhile.",
 
 	"reputation-system-disabled": "Reputation system is disabled.",
 	"downvoting-disabled": "Downvoting is disabled",

public/language/en_GB/groups.json

@@ -17,6 +17,8 @@
 	"details.latest_posts": "Latest Posts",
 	"details.private": "Private Group",
 	"details.public": "Public Group",
+	"details.grant": "Grant/Rescind Ownership",
+	"details.kick": "Kick",
 
 	"details.owner_options": "Group Administration",
 

public/language/en_GB/notifications.json

@@ -2,6 +2,7 @@
 	"title": "Notifications",
 	"no_notifs": "You have no new notifications",
 	"see_all": "See all Notifications",
+	"mark_all_read": "Mark all notifications read",
 
 	"back_to_home": "Back to %1",
 	"outgoing_link": "Outgoing Link",

public/language/en_GB/pages.json

@@ -11,6 +11,7 @@
 	"user.followers": "People who Follow %1",
 	"user.posts": "Posts made by %1",
 	"user.topics": "Topics created by %1",
+	"user.groups": "%1's Groups",
 	"user.favourites": "%1's Favourite Posts",
 	"user.settings": "User Settings",
 

public/language/en_GB/reset_password.json

@@ -10,5 +10,7 @@
 	"enter_email": "Please enter your <strong>email address</strong> and we will send you an email with instructions on how to reset your account.",
 	"enter_email_address": "Enter Email Address",
 	"password_reset_sent": "Password Reset Sent",
-	"invalid_email": "Invalid Email / Email does not exist!"
+	"invalid_email": "Invalid Email / Email does not exist!",
+	"password_too_short": "The password entered is too short, please pick a different password.",
+	"passwords_do_not_match": "The two passwords you've entered do not match."
 }

public/language/en_GB/search.json

@@ -3,5 +3,39 @@
 	"no-matches": "No matches found",
 	"in": "In",
 	"by": "By",
-	"posted-by": "Posted by"
+	"titles": "Titles",
+	"titles-posts": "Titles and Posts",
+	"posted-by": "Posted by",
+	"in-categories": "In Categories",
+	"search-child-categories": "Search child categories",
+	"reply-count": "Reply Count",
+	"at-least": "At least",
+	"at-most": "At most",
+	"post-time": "Post time",
+	"newer-than": "Newer than",
+	"older-than": "Older than",
+	"any-date": "Any date",
+	"yesterday": "Yesterday",
+	"one-week": "One week",
+	"two-weeks": "Two weeks",
+	"one-month": "One month",
+	"three-months": "Three months",
+	"six-months": "Six months",
+	"one-year": "One year",
+	"sort-by": "Sort by",
+	"post-time": "Post time",
+	"last-reply-time": "Last reply time",
+	"topic-title": "Topic title",
+	"number-of-replies": "Number of replies",
+	"number-of-views": "Number of views",
+	"topic-start-date": "Topic start date",
+	"username": "Username",
+	"category": "Category",
+	"descending": "In descending order",
+	"ascending": "In ascending order",
+	"save-preferences": "Save preferences",
+	"clear-preferences": "Clear preferences",
+	"search-preferences-saved": "Search preferences saved",
+	"search-preferences-cleared": "Search preferences cleared",
+	"show-results-as": "Show results as"
 }

public/language/en_GB/tags.json

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

public/language/en_GB/users.json

@@ -5,7 +5,7 @@
 	"search": "Search",
 	"enter_username": "Enter a username to search",
 	"load_more": "Load More",
-	"users-found-search-took": "%1 user(s) found! Search took %2 ms.",
+	"users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
 	"filter-by": "Filter By",
 	"online-only": "Online only",
 	"picture-only": "Picture only"

public/language/en_US/email.json

@@ -9,6 +9,9 @@
     "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
     "reset.text2": "To continue with the password reset, please click on the following link:",
     "reset.cta": "Click here to reset your password",
+    "reset.notify.subject": "Password successfully changed",
+    "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.",
+    "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.",
     "digest.notifications": "You have unread notifications from %1:",
     "digest.latest_topics": "Latest topics from %1",
     "digest.cta": "Click here to visit %1",

public/language/en_US/error.json

@@ -35,6 +35,7 @@
     "topic-locked": "Topic Locked",
     "still-uploading": "Please wait for uploads to complete.",
     "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+    "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
     "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 characters.",
     "too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
@@ -62,6 +63,7 @@
     "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.",
     "cant-chat-with-yourself": "You can't chat with yourself!",
     "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
+    "too-many-messages": "You have sent too many messages, please wait awhile.",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",

public/language/en_US/groups.json

@@ -15,6 +15,8 @@
     "details.latest_posts": "Latest Posts",
     "details.private": "Private Group",
     "details.public": "Public Group",
+    "details.grant": "Grant/Rescind Ownership",
+    "details.kick": "Kick",
     "details.owner_options": "Group Administration",
     "event.updated": "Group details have been updated",
     "event.deleted": "The group \"%1\" has been deleted"

public/language/en_US/pages.json

@@ -11,6 +11,7 @@
     "user.followers": "People who Follow %1",
     "user.posts": "Posts made by %1",
     "user.topics": "Topics created by %1",
+    "user.groups": "%1's Groups",
     "user.favourites": "%1's Favorite Posts",
     "user.settings": "User Settings",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",

public/language/en_US/reset_password.json

@@ -10,5 +10,7 @@
     "enter_email": "Please enter your <strong>email address</strong> and we will send you an email with instructions on how to reset your account.",
     "enter_email_address": "Enter Email Address",
     "password_reset_sent": "Password Reset Sent",
-    "invalid_email": "Invalid Email / Email does not exist!"
+    "invalid_email": "Invalid Email / Email does not exist!",
+    "password_too_short": "The password entered is too short, please pick a different password.",
+    "passwords_do_not_match": "The two passwords you've entered do not match."
 }

public/language/en_US/search.json

@@ -3,5 +3,33 @@
     "no-matches": "No matches found",
     "in": "In",
     "by": "By",
-    "posted-by": "Posted by"
+    "titles": "Titles",
+    "titles-posts": "Titles and Posts",
+    "posted-by": "Posted by",
+    "in-categories": "In Categories",
+    "search-child-categories": "Search child categories",
+    "reply-count": "Reply Count",
+    "at-least": "At least",
+    "at-most": "At most",
+    "post-time": "Post time",
+    "newer-than": "Newer than",
+    "older-than": "Older than",
+    "any-date": "Any date",
+    "yesterday": "Yesterday",
+    "one-week": "One week",
+    "two-weeks": "Two weeks",
+    "one-month": "One month",
+    "three-months": "Three months",
+    "six-months": "Six months",
+    "one-year": "One year",
+    "sort-by": "Sort by",
+    "last-reply-time": "Last reply time",
+    "topic-title": "Topic title",
+    "number-of-replies": "Number of replies",
+    "number-of-views": "Number of views",
+    "topic-start-date": "Topic start date",
+    "username": "Username",
+    "category": "Category",
+    "descending": "In descending order",
+    "ascending": "In ascending order"
 }

public/language/en_US/users.json

@@ -5,7 +5,7 @@
     "search": "Search",
     "enter_username": "Enter a username to search",
     "load_more": "Load More",
-    "users-found-search-took": "%1 user(s) found! Search took %2 ms.",
+    "users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
     "filter-by": "Filter By",
     "online-only": "Online only",
     "picture-only": "Picture only"

public/language/es/email.json

@@ -9,6 +9,9 @@
     "reset.text1": "Recibimos una solicitud para reiniciar tu contraseña, posiblemente porque la olvidaste. Si no es así, por favor ignora este email.",
     "reset.text2": "Para continuar con el reinicio de contraseña, por favor cliquea en el siguiente vínculo:",
     "reset.cta": "Cliquea aquí para reiniciar tu contraseña",
+    "reset.notify.subject": "Se ha modificado correctamente la contraseña.",
+    "reset.notify.text1": "Te estamos notificando que a a %1, tu contraseña ha sido cambiado correctamente.",
+    "reset.notify.text2": "Si no has sido tu, por favor notifica al administrador inmediatamente.",
     "digest.notifications": "Tiene notificaciones sin leer de %1:",
     "digest.latest_topics": "Últimos temas de %1",
     "digest.cta": "Cliquea aquí para visitar %1",
@@ -17,8 +20,8 @@
     "notif.chat.subject": "Nuevo mensaje de chat recibido de %1",
     "notif.chat.cta": "Haz click aquí para continuar la conversación",
     "notif.chat.unsub.info": "Esta notificación de chat se te envió debido a tus ajustes de suscripción.",
-    "notif.post.cta": "Click here to read the full topic",
-    "notif.post.unsub.info": "This post notification was sent to you due to your subscription settings.",
+    "notif.post.cta": "Cliquea aquí para leer la publicación completa",
+    "notif.post.unsub.info": "La notificación de este mensaje se te ha enviado debido a tus ajustes de subscripción.",
     "test.text1": "Este es un email de prueba para verificar que el envío de email está ajustado correctamente para tu NodeBB",
     "unsub.cta": "Haz click aquí para modificar los ajustes.",
     "closing": "¡Gracias!"

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": "You are unable to chat until your email is confirmed",
+    "email-not-confirmed-chat": "No puedes hacer uso del chat hasta que confirmes tu email",
     "username-too-short": "Nombre de usuario es demasiado corto",
     "username-too-long": "Nombre de usuario demasiado largo",
     "user-banned": "Usuario baneado",
@@ -35,6 +35,7 @@
     "topic-locked": "Tema bloqueado",
     "still-uploading": "Por favor, espera a que terminen las subidas.",
     "content-too-short": "Por favor introduzca una publicación más larga. Las publicaciones deben contener al menos %1 caracteres.",
+    "content-too-long": "Por favor introduzca un mensaje más corto. Los mensajes no pueden exceder los %1 caracteres.",
     "title-too-short": "Por favor introduzca un título más largo. Los títulos deben contener al menos %1 caracteres.",
     "title-too-long": "Por favor, introduce un título más corto, que no sobrepase los %1 caracteres.",
     "too-many-posts": "Solo puedes publicar una vez cada %1 segundos - por favor espere antes de volver a publicar",
@@ -44,13 +45,13 @@
     "already-favourited": "Ya ha marcado esta publicación como favorita",
     "already-unfavourited": "Ya ha desmarcado esta publicación como favorita",
     "cant-ban-other-admins": "¡No puedes expulsar a otros administradores!",
-    "invalid-image-type": "Invalid image type. Allowed types are: %1",
-    "invalid-image-extension": "Invalid image extension",
+    "invalid-image-type": "Tipo de imagen inválido. Los tipos permitidos son: %1",
+    "invalid-image-extension": "Extensión de imagen inválida",
     "group-name-too-short": "Nombre del grupo es demasiado corto.",
     "group-already-exists": "El grupo ya existe.",
     "group-name-change-not-allowed": "El nombre del grupo deseado no está permitido.",
-    "group-already-member": "You are already part of this group",
-    "group-needs-owner": "This group requires at least one owner",
+    "group-already-member": "Ya formas parte de este grupo",
+    "group-needs-owner": "Este grupo requiere al menos un propietario",
     "post-already-deleted": "Este publicación ya ha sido borrada",
     "post-already-restored": "Esta publicación ya ha sido restaurada",
     "topic-already-deleted": "Este tema ya ha sido borrado",
@@ -62,11 +63,12 @@
     "signature-too-long": "Lo sentimos, pero tu firma no puede ser más larga de %1 caracteres.",
     "cant-chat-with-yourself": "¡No puedes conversar contigo mismo!",
     "chat-restricted": "Este usuario tiene restringidos los mensajes de chat. Los usuarios deben seguirte antes de que pueda charlar con ellos",
+    "too-many-messages": "Has enviado demasiados mensajes, por favor espera un poco.",
     "reputation-system-disabled": "El sistema de reputación está deshabilitado.",
     "downvoting-disabled": "La votación negativa está deshabilitada.",
     "not-enough-reputation-to-downvote": "No tienes suficiente reputación para votar negativo este post",
     "not-enough-reputation-to-flag": "No tiene suficiente reputación para poner reportar esta publicación",
     "reload-failed": "NodeBB encontró un problema al refrescar: \"%1\". NodeBB intentará cargar el resto de contenido, aunque deberías deshacer lo que hiciste justo antes.",
     "registration-error": "Error de registro",
-    "parse-error": "Something went wrong while parsing server response"
+    "parse-error": "Algo ha ido mal mientras se parseaba la respuesta del servidor"
 }

public/language/es/global.json

@@ -3,10 +3,10 @@
     "search": "Buscar",
     "buttons.close": "Cerrar",
     "403.title": "Acceso denegado",
-    "403.message": "You seem to have stumbled upon a page that you do not have access to.",
-    "403.login": "Perhaps you should <a href='%1/login'>try logging in</a>?",
+    "403.message": "Al parecer has llegado a una página a la cual no tienes permisos para acceder.",
+    "403.login": "¿Quizás deberías <a href='%1/login'> intentar acceder</a>?",
     "404.title": "No encontrado",
-    "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": "Al parecer has llegado a una página a la cual no tienes permisos para acceder. Volver a la <a href='%1/'> página de inicio </a>.",
     "500.title": "Error Interno.",
     "500.message": "¡Ooops! ¡Parece que algo salió mal! No te preocupes, ¡nuestros simios hiperinteligentes lo solucionarán!",
     "register": "Registrarse",
@@ -27,7 +27,7 @@
     "header.tags": "Etiquetas",
     "header.popular": "Popular",
     "header.users": "Usuarios",
-    "header.groups": "Groups",
+    "header.groups": "Grupos",
     "header.chats": "Chats",
     "header.notifications": "Notificaciones",
     "header.search": "Buscar",
@@ -75,7 +75,7 @@
     "updated.title": "Foro actualizado",
     "updated.message": "El foro acaba de ser actualizado a la última versión. Haz click aquí para refrescar la página.",
     "privacy": "Privacidad",
-    "follow": "Follow",
-    "unfollow": "Unfollow",
+    "follow": "Seguir",
+    "unfollow": "Dejar de Seguir",
     "delete_all": "Eliminar todo"
 }

public/language/es/groups.json

@@ -1,21 +1,23 @@
 {
     "groups": "Grupos",
     "view_group": "Ver Grupo",
-    "owner": "Group Owner",
-    "new_group": "Create New Group",
-    "no_groups_found": "There are no groups to see",
-    "cover-instructions": "Drag and Drop a photo, drag to position, and hit <strong>Save</strong>",
-    "cover-change": "Change",
-    "cover-save": "Save",
-    "cover-saving": "Saving",
+    "owner": "Propietario del Grupo",
+    "new_group": "Crear Nuevo Grupo",
+    "no_groups_found": "No hay grupos que ver",
+    "cover-instructions": "Arrastra y suelta una foto, arrastra a la posición, y pulsa <strong> Guardar </strong>",
+    "cover-change": "Cambiar",
+    "cover-save": "Guardar",
+    "cover-saving": "Guardando",
     "details.title": "Detalles de Grupo",
     "details.members": "Lista de Miembros",
-    "details.pending": "Pending Members",
+    "details.pending": "Miembros Pendientes",
     "details.has_no_posts": "Los miembros de este grupo no han hecho ninguna publicación.",
     "details.latest_posts": "Últimas Publicaciones",
-    "details.private": "Private Group",
-    "details.public": "Public Group",
-    "details.owner_options": "Group Administration",
-    "event.updated": "Group details have been updated",
-    "event.deleted": "The group \"%1\" has been deleted"
+    "details.private": "Grupo Privado",
+    "details.public": "Grupo Público",
+    "details.grant": "Grant/Rescind Ownership",
+    "details.kick": "Kick",
+    "details.owner_options": "Administración De Grupo",
+    "event.updated": "Los detalles del grupo han sido actualizados",
+    "event.deleted": "El grupo \"%1\" ha sido eliminado"
 }

public/language/es/pages.json

@@ -11,6 +11,7 @@
     "user.followers": "Seguidores de %1",
     "user.posts": "Mensajes de %1",
     "user.topics": "Temas creados por %1",
+    "user.groups": "%1's Grupos",
     "user.favourites": "Publicaciones favoritas de %1 ",
     "user.settings": "Preferencias de usuario",
     "maintenance.text": "%1 está en mantenimiento actualmente. Por favor vuelva en otro momento.",

public/language/es/recent.json

@@ -6,13 +6,13 @@
     "year": "Año",
     "alltime": "Siempre",
     "no_recent_topics": "No hay publicaciones recientes.",
-    "there-is-a-new-topic": "There is a new topic.",
-    "there-is-a-new-topic-and-a-new-post": "There is a new topic and a new post.",
-    "there-is-a-new-topic-and-new-posts": "There is a new topic and %1 new posts.",
-    "there-are-new-topics": "There are %1 new topics.",
-    "there-are-new-topics-and-a-new-post": "There are %1 new topics and a new post.",
-    "there-are-new-topics-and-new-posts": "There are %1 new topics and %2 new posts.",
-    "there-is-a-new-post": "There is a new post.",
-    "there-are-new-posts": "There are %1 new posts.",
-    "click-here-to-reload": "Click here to reload."
+    "there-is-a-new-topic": "Hay una nueva publicación.",
+    "there-is-a-new-topic-and-a-new-post": "hay una nueva publicación y un nuevo mensaje.",
+    "there-is-a-new-topic-and-new-posts": "Hay una nueva publicación y %1 nuevos mensajes.",
+    "there-are-new-topics": "Hay %1 nuevos mensajes.",
+    "there-are-new-topics-and-a-new-post": "Hay %1 nuevas publicaciones y un nuevo mensaje.",
+    "there-are-new-topics-and-new-posts": "Hay %1 nuevas publicaciones y %2 nuevos mensajes.",
+    "there-is-a-new-post": "Hay un nuevo mensaje.",
+    "there-are-new-posts": "Hay %1 nuevos mensajes.",
+    "click-here-to-reload": "Cliquea aquí para recargar."
 }

public/language/es/reset_password.json

@@ -10,5 +10,7 @@
     "enter_email": "Por favor ingresa tu <strong>correo electrónico</strong> y te enviaremos un mensaje con indicaciones para restablecer tu cuenta.",
     "enter_email_address": "Introduce tu correo electrónico",
     "password_reset_sent": "Restablecimiento de contraseña enviado",
-    "invalid_email": "¡Correo electrónico no válido o inexistente!"
+    "invalid_email": "¡Correo electrónico no válido o inexistente!",
+    "password_too_short": "La contraseña introducida es demasiado corta, por favor introduzca una contraseña diferente.",
+    "passwords_do_not_match": "Las dos contraseñas introducidas no concuerdan."
 }

public/language/es/search.json

@@ -1,7 +1,35 @@
 {
     "results_matching": "%1 resuldado(s) coinciden con \"%2\". (%3 segundos)",
-    "no-matches": "No matches found",
-    "in": "In",
-    "by": "By",
-    "posted-by": "Posted by"
+    "no-matches": "No se encontraron coincidencias",
+    "in": "En",
+    "by": "Por",
+    "titles": "Títulos",
+    "titles-posts": "Títulos y publicaciones",
+    "posted-by": "Publicado por",
+    "in-categories": "En categorías",
+    "search-child-categories": "Buscar categorías hijas",
+    "reply-count": "Número de Respuestas",
+    "at-least": "De mínimo",
+    "at-most": "De máximo",
+    "post-time": "Fecha de publicación",
+    "newer-than": "Más reciente que",
+    "older-than": "Más antiguo que",
+    "any-date": "Cualquier fecha",
+    "yesterday": "Ayer",
+    "one-week": "Una semana",
+    "two-weeks": "Dos semanas",
+    "one-month": "Un mes",
+    "three-months": "Tres meses",
+    "six-months": "Seis meses",
+    "one-year": "Un año",
+    "sort-by": "Ordenar por",
+    "last-reply-time": "Fecha de última respuesta",
+    "topic-title": "Título de tema",
+    "number-of-replies": "Número de respuestas",
+    "number-of-views": "Número de visualizaciones",
+    "topic-start-date": "Fecha de inicio del tema",
+    "username": "Usuario",
+    "category": "Categoría",
+    "descending": "En orden descendente",
+    "ascending": "En orden ascendente"
 }

public/language/es/topic.json

@@ -74,7 +74,7 @@
     "fork_no_pids": "¡No has seleccionado ningún mensaje!",
     "fork_success": "¡Se ha creado un nuevo tema a partir del original! Haz click aquí para ir al nuevo tema.",
     "composer.title_placeholder": "Ingresa el título de tu tema...",
-    "composer.handle_placeholder": "Name",
+    "composer.handle_placeholder": "Nombre",
     "composer.discard": "Descartar",
     "composer.submit": "Enviar",
     "composer.replying_to": "En respuesta a %1",
@@ -94,5 +94,5 @@
     "oldest_to_newest": "Más antiguo a más nuevo",
     "newest_to_oldest": "Más nuevo a más antiguo",
     "most_votes": "Mayor número de votos",
-    "most_posts": "Most posts"
+    "most_posts": "Mayor número de mensajes"
 }

public/language/es/user.json

@@ -2,8 +2,8 @@
     "banned": "Baneado",
     "offline": "Desconectado",
     "username": "Nombre de usuario",
-    "joindate": "Join Date",
-    "postcount": "Post Count",
+    "joindate": "Fecha de Registro",
+    "postcount": "Número De Publicaciones",
     "email": "Correo electrónico",
     "confirm_email": "Confirmar correo electrónico",
     "delete_account": "Eliminar cuenta",
@@ -18,7 +18,7 @@
     "profile_views": "Visitas",
     "reputation": "Reputación",
     "favourites": "Favoritos",
-    "watched": "Watched",
+    "watched": "Visto",
     "followers": "Seguidores",
     "following": "Siguiendo",
     "signature": "Firma",
@@ -59,12 +59,12 @@
     "digest_weekly": "Semanalmente",
     "digest_monthly": "Mensualmente",
     "send_chat_notifications": "Enviar un email si recibo un mensaje de chat cuando no esté en línea.",
-    "send_post_notifications": "Send an email when replies are made to topics I am subscribed to",
+    "send_post_notifications": "Enviarme un email cuando se realicen contestaciones en los temas en los que estoy subscrito",
     "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.",
     "has_no_topics": "Este usuario aún no ha publicado nada.",
-    "has_no_watched_topics": "This user didn't watch any topics yet.",
+    "has_no_watched_topics": "Este usuario todavía no ha visto ninguna publicación.",
     "email_hidden": "Correo electrónico oculto",
     "hidden": "oculto",
     "paginate_description": "Paginar hilos y mensajes en lugar de usar desplazamiento infinito.",

public/language/es/users.json

@@ -5,8 +5,8 @@
     "search": "Buscar",
     "enter_username": "Ingresa el nombre de usuario que quieres buscar",
     "load_more": "Cargar más",
-    "users-found-search-took": "¡%1 usuario(s) encontrados! La búsqueda tardó %2 ms.",
-    "filter-by": "Filter By",
-    "online-only": "Online only",
-    "picture-only": "Picture only"
+    "users-found-search-took": "¡%1 usuario(s) encontrado! La búsqueda ha llevado %2 segundos.",
+    "filter-by": "Filtrar Por",
+    "online-only": "Sólo en línea",
+    "picture-only": "Sólo imagen"
 }

public/language/et/email.json

@@ -9,6 +9,9 @@
     "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
     "reset.text2": "To continue with the password reset, please click on the following link:",
     "reset.cta": "Click here to reset your password",
+    "reset.notify.subject": "Password successfully changed",
+    "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.",
+    "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.",
     "digest.notifications": "You have unread notifications from %1:",
     "digest.latest_topics": "Latest topics from %1",
     "digest.cta": "Click here to visit %1",

public/language/et/error.json

@@ -35,6 +35,7 @@
     "topic-locked": "Teema lukustatud",
     "still-uploading": "Palun oota, kuni üleslaadimised on laetud.",
     "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+    "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
     "title-too-long": "Palun sisesta lühem pealkiri. Pealkirjad ei saa olla pikemad kui %1 tähemärki.",
     "too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
@@ -62,6 +63,7 @@
     "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.",
     "cant-chat-with-yourself": "Sa ei saa endaga vestelda!",
     "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
+    "too-many-messages": "You have sent too many messages, please wait awhile.",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "Sul ei ole piisavalt reputatsiooni, et anda negatiivset hinnangut sellele postitusele.",

public/language/et/groups.json

@@ -15,6 +15,8 @@
     "details.latest_posts": "Latest Posts",
     "details.private": "Private Group",
     "details.public": "Public Group",
+    "details.grant": "Grant/Rescind Ownership",
+    "details.kick": "Kick",
     "details.owner_options": "Group Administration",
     "event.updated": "Group details have been updated",
     "event.deleted": "The group \"%1\" has been deleted"

public/language/et/pages.json

@@ -11,6 +11,7 @@
     "user.followers": "Kasutajad, kes jälgivad %1",
     "user.posts": "Postitused, mis on tehtud kasutaja %1 poolt",
     "user.topics": "Teemad on kirjutanud %1",
+    "user.groups": "%1's Groups",
     "user.favourites": "%1's lemmikud postitused",
     "user.settings": "Kasutaja sätted",
     "maintenance.text": "%1 foorumil on käimas hooldustööd. Palun külastage meid mõne aja pärast uuesti.",

public/language/et/reset_password.json

@@ -10,5 +10,7 @@
     "enter_email": "Palun sisesta oma <strong>emaili aadress</strong> ja me saadame sulle emaili koos õpetusega, kuidas oma parooli vahetada.",
     "enter_email_address": "Sisesta emaili aadress",
     "password_reset_sent": "Saadetud",
-    "invalid_email": "Vigane emaili aadress / emaili aadressi ei ekisteeri!"
+    "invalid_email": "Vigane emaili aadress / emaili aadressi ei ekisteeri!",
+    "password_too_short": "The password entered is too short, please pick a different password.",
+    "passwords_do_not_match": "The two passwords you've entered do not match."
 }

public/language/et/search.json

@@ -3,5 +3,33 @@
     "no-matches": "No matches found",
     "in": "In",
     "by": "By",
-    "posted-by": "Posted by"
+    "titles": "Titles",
+    "titles-posts": "Titles and Posts",
+    "posted-by": "Posted by",
+    "in-categories": "In Categories",
+    "search-child-categories": "Search child categories",
+    "reply-count": "Reply Count",
+    "at-least": "At least",
+    "at-most": "At most",
+    "post-time": "Post time",
+    "newer-than": "Newer than",
+    "older-than": "Older than",
+    "any-date": "Any date",
+    "yesterday": "Yesterday",
+    "one-week": "One week",
+    "two-weeks": "Two weeks",
+    "one-month": "One month",
+    "three-months": "Three months",
+    "six-months": "Six months",
+    "one-year": "One year",
+    "sort-by": "Sort by",
+    "last-reply-time": "Last reply time",
+    "topic-title": "Topic title",
+    "number-of-replies": "Number of replies",
+    "number-of-views": "Number of views",
+    "topic-start-date": "Topic start date",
+    "username": "Username",
+    "category": "Category",
+    "descending": "In descending order",
+    "ascending": "In ascending order"
 }

public/language/et/users.json

@@ -5,7 +5,7 @@
     "search": "Otsi",
     "enter_username": "Sisesta kasutajanimi, keda soovid otsida",
     "load_more": "Lae veel",
-    "users-found-search-took": "%1kasutaja(t) leiti! Otsing kestis %2 ms.",
+    "users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
     "filter-by": "Filter By",
     "online-only": "Online only",
     "picture-only": "Picture only"

public/language/fa_IR/email.json

@@ -9,6 +9,9 @@
     "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
     "reset.text2": "To continue with the password reset, please click on the following link:",
     "reset.cta": "برای تنظیم مجدد گذرواژه‌ی خود اینجا کلیک کنید",
+    "reset.notify.subject": "Password successfully changed",
+    "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.",
+    "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.",
     "digest.notifications": "You have unread notifications from %1:",
     "digest.latest_topics": "Latest topics from %1",
     "digest.cta": "برای دیدن 1% اینجا کلیک کنید",

public/language/fa_IR/error.json

@@ -35,6 +35,7 @@
     "topic-locked": "جستار بسته شد.",
     "still-uploading": "خواهشمندیم تا پایان بارگذاری‌ها شکیبا باشید.",
     "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+    "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
     "title-too-long": "خواهشمندیم عنوان کوتاه‌تری بنویسید. عنوان‌ها نمی‌توانند بیش‌تر از %1 نویسه داشته باشند.",
     "too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
@@ -62,6 +63,7 @@
     "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.",
     "cant-chat-with-yourself": "شما نمی‌توانید با خودتان گفتگو کنید!",
     "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
+    "too-many-messages": "You have sent too many messages, please wait awhile.",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "شما اعتبار کافی برای دادن رای منفی به این دیدگاه را ندارید.",

public/language/fa_IR/groups.json

@@ -15,6 +15,8 @@
     "details.latest_posts": "Latest Posts",
     "details.private": "Private Group",
     "details.public": "Public Group",
+    "details.grant": "Grant/Rescind Ownership",
+    "details.kick": "Kick",
     "details.owner_options": "Group Administration",
     "event.updated": "Group details have been updated",
     "event.deleted": "The group \"%1\" has been deleted"

public/language/fa_IR/pages.json

@@ -11,6 +11,7 @@
     "user.followers": "کاربرانی که %1 را دنبال می‌کنند",
     "user.posts": "دیدگاه‌های %1",
     "user.topics": "%1 این جستار را ساخت.",
+    "user.groups": "%1's Groups",
     "user.favourites": "دیدگاه‌های پسندیدهٔ %1",
     "user.settings": "تنظیمات کاربر",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",

public/language/fa_IR/reset_password.json

@@ -10,5 +10,7 @@
     "enter_email": "لطفا <strong>نشانی رایانامهٔ</strong> خود را بنویسید و ما دستورکار بازیابی شناسه‌تان را به این رایانامه می‌فرستیم.",
     "enter_email_address": "نوشتن نشانی رایانامه",
     "password_reset_sent": "رایانامهٔ بازیابی گذرواژه فرستاده شد",
-    "invalid_email": "رایانامهٔ نامعتبر / رایانامه وجود ندارد!"
+    "invalid_email": "رایانامهٔ نامعتبر / رایانامه وجود ندارد!",
+    "password_too_short": "The password entered is too short, please pick a different password.",
+    "passwords_do_not_match": "The two passwords you've entered do not match."
 }

public/language/fa_IR/search.json

@@ -3,5 +3,33 @@
     "no-matches": "No matches found",
     "in": "In",
     "by": "By",
-    "posted-by": "Posted by"
+    "titles": "Titles",
+    "titles-posts": "Titles and Posts",
+    "posted-by": "Posted by",
+    "in-categories": "In Categories",
+    "search-child-categories": "Search child categories",
+    "reply-count": "Reply Count",
+    "at-least": "At least",
+    "at-most": "At most",
+    "post-time": "Post time",
+    "newer-than": "Newer than",
+    "older-than": "Older than",
+    "any-date": "Any date",
+    "yesterday": "Yesterday",
+    "one-week": "One week",
+    "two-weeks": "Two weeks",
+    "one-month": "One month",
+    "three-months": "Three months",
+    "six-months": "Six months",
+    "one-year": "One year",
+    "sort-by": "Sort by",
+    "last-reply-time": "Last reply time",
+    "topic-title": "Topic title",
+    "number-of-replies": "Number of replies",
+    "number-of-views": "Number of views",
+    "topic-start-date": "Topic start date",
+    "username": "Username",
+    "category": "Category",
+    "descending": "In descending order",
+    "ascending": "In ascending order"
 }

public/language/fa_IR/users.json

@@ -5,7 +5,7 @@
     "search": "جستجو",
     "enter_username": "یک نام کاربری برای جستجو وارد کنید",
     "load_more": "بارگذاری بیش‌تر",
-    "users-found-search-took": "%1 کاربر() در مدت زمان %2 میلی ثانیه یافت شد!",
+    "users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
     "filter-by": "Filter By",
     "online-only": "Online only",
     "picture-only": "Picture only"

public/language/fi/email.json

@@ -9,6 +9,9 @@
     "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.",
     "reset.text2": "To continue with the password reset, please click on the following link:",
     "reset.cta": "Click here to reset your password",
+    "reset.notify.subject": "Password successfully changed",
+    "reset.notify.text1": "We are notifying you that on %1, your password was changed successfully.",
+    "reset.notify.text2": "If you did not authorise this, please notify an administrator immediately.",
     "digest.notifications": "You have unread notifications from %1:",
     "digest.latest_topics": "Latest topics from %1",
     "digest.cta": "Click here to visit %1",

public/language/fi/error.json

@@ -35,6 +35,7 @@
     "topic-locked": "Aihe lukittu",
     "still-uploading": "Ole hyvä ja odota tiedostojen lähettämisen valmistumista.",
     "content-too-short": "Please enter a longer post. Posts should contain at least %1 characters.",
+    "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 characters.",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 characters.",
     "title-too-long": "Otsikkosi on liian pitkä. Otsikoiden pituuden tulee olla enintään %1 merkkiä.",
     "too-many-posts": "You can only post once every %1 seconds - please wait before posting again",
@@ -62,6 +63,7 @@
     "signature-too-long": "Sorry, your signature cannot be longer than %1 characters.",
     "cant-chat-with-yourself": "Et voi keskustella itsesi kanssa!",
     "chat-restricted": "This user has restricted their chat messages. They must follow you before you can chat with them",
+    "too-many-messages": "You have sent too many messages, please wait awhile.",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
     "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post",

public/language/fi/groups.json

@@ -15,6 +15,8 @@
     "details.latest_posts": "Latest Posts",
     "details.private": "Private Group",
     "details.public": "Public Group",
+    "details.grant": "Grant/Rescind Ownership",
+    "details.kick": "Kick",
     "details.owner_options": "Group Administration",
     "event.updated": "Group details have been updated",
     "event.deleted": "The group \"%1\" has been deleted"

public/language/fi/pages.json

@@ -11,6 +11,7 @@
     "user.followers": "Käyttäjät, jotka seuraavat käyttäjää %1",
     "user.posts": "Käyttäjän %1 kirjoittamat viestit",
     "user.topics": "Käyttäjän %1 aloittamat aiheet",
+    "user.groups": "%1's Groups",
     "user.favourites": "Käyttäjän %1 suosikkiviestit",
     "user.settings": "Käyttäjän asetukset",
     "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",

public/language/fi/reset_password.json

@@ -10,5 +10,7 @@
     "enter_email": "Syötä <strong>sähköpostiosoitteesi</strong>, niin me lähetämme sinulle sähköpostilla ohjeet käyttäjätilisi palauttamiseksi.",
     "enter_email_address": "Syötä sähköpostiosoite",
     "password_reset_sent": "Salasanan palautuskoodi lähetetty",
-    "invalid_email": "Virheellinen sähköpostiosoite / Sähköpostiosoitetta ei ole olemassa!"
+    "invalid_email": "Virheellinen sähköpostiosoite / Sähköpostiosoitetta ei ole olemassa!",
+    "password_too_short": "The password entered is too short, please pick a different password.",
+    "passwords_do_not_match": "The two passwords you've entered do not match."
 }

public/language/fi/search.json

@@ -3,5 +3,33 @@
     "no-matches": "No matches found",
     "in": "In",
     "by": "By",
-    "posted-by": "Posted by"
+    "titles": "Titles",
+    "titles-posts": "Titles and Posts",
+    "posted-by": "Posted by",
+    "in-categories": "In Categories",
+    "search-child-categories": "Search child categories",
+    "reply-count": "Reply Count",
+    "at-least": "At least",
+    "at-most": "At most",
+    "post-time": "Post time",
+    "newer-than": "Newer than",
+    "older-than": "Older than",
+    "any-date": "Any date",
+    "yesterday": "Yesterday",
+    "one-week": "One week",
+    "two-weeks": "Two weeks",
+    "one-month": "One month",
+    "three-months": "Three months",
+    "six-months": "Six months",
+    "one-year": "One year",
+    "sort-by": "Sort by",
+    "last-reply-time": "Last reply time",
+    "topic-title": "Topic title",
+    "number-of-replies": "Number of replies",
+    "number-of-views": "Number of views",
+    "topic-start-date": "Topic start date",
+    "username": "Username",
+    "category": "Category",
+    "descending": "In descending order",
+    "ascending": "In ascending order"
 }

public/language/fi/users.json

@@ -5,7 +5,7 @@
     "search": "Hae",
     "enter_username": "Syötä käyttäjätunnus hakeaksesi",
     "load_more": "Lataa lisää",
-    "users-found-search-took": "%1 user(s) found! Search took %2 ms.",
+    "users-found-search-took": "%1 user(s) found! Search took %2 seconds.",
     "filter-by": "Filter By",
     "online-only": "Online only",
     "picture-only": "Picture only"