Fix ./nodebb upgrade process to not use programmatic npm

- Closes #3451
- Apparently, programmatically invoking npm is like opening Pandora's
box. No thanks.

.tx/config

@@ -485,7 +485,7 @@ trans.zh_CN = public/language/zh_CN/users.json
 trans.zh_TW = public/language/zh_TW/users.json
 type = KEYVALUEJSON
 
-[nodebb.language-1]
+[nodebb.language]
 file_filter = public/language/<lang>/language.json
 source_file = public/language/en_GB/language.json
 source_lang = en_GB

Dockerfile

@@ -1,8 +0,0 @@
-FROM node:0.10-onbuild
-
-ENV NODE_ENV=production \
-    daemon=false \
-    silent=false
-
-CMD node app --setup && npm start
-EXPOSE 4567

README.md

@@ -6,7 +6,7 @@
 [![Code Climate](https://codeclimate.com/github/NodeBB/NodeBB/badges/gpa.svg)](https://codeclimate.com/github/NodeBB/NodeBB)
 [![Documentation Status](https://readthedocs.org/projects/nodebb/badge/?version=latest)](https://readthedocs.org/projects/nodebb/?badge=latest)
 
-[**NodeBB Forum Software**](https://nodebb.org) is powered by Node.js and built on either a Redis or MongoDB database. It utilizes web sockets for instant interactions and real-time notifications. NodeBB has many modern features out of the box such as social network integration and streaming discussions, while still making sure to be compatible with older browsers.
+**NodeBB Forum Software** is powered by Node.js and built on either a Redis or MongoDB database. It utilizes web sockets for instant interactions and real-time notifications. NodeBB is compatible down to IE8 and has many modern features out of the box such as social network integration and streaming discussions.
 
 Additional functionality is enabled through the use of third-party plugins.
 

app.js

@@ -95,7 +95,7 @@ function loadConfig() {
 	// Ensure themes_path is a full filepath
 	nconf.set('themes_path', path.resolve(__dirname, nconf.get('themes_path')));
 	nconf.set('core_templates_path', path.join(__dirname, 'src/views'));
-	nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-persona/templates'));
+	nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-vanilla/templates'));
 
 	if (!process.send) {
 		// If run using `node app`, log GNU copyright info along with server info
@@ -152,12 +152,14 @@ function start() {
 			case 'js-propagate':
 				meta.js.cache = message.cache;
 				meta.js.map = message.map;
+				meta.js.hash = message.hash;
 				emitter.emit('meta:js.compiled');
 				winston.verbose('[cluster] Client-side javascript and mapping propagated to worker %s', process.pid);
 			break;
 			case 'css-propagate':
 				meta.css.cache = message.cache;
 				meta.css.acpCache = message.acpCache;
+				meta.css.hash = message.hash;
 				emitter.emit('meta:css.compiled');
 				winston.verbose('[cluster] Stylesheets propagated to worker %s', process.pid);
 			break;
@@ -346,7 +348,7 @@ function resetThemes(callback) {
 		type: 'local',
 		id: 'nodebb-theme-persona'
 	}, function(err) {
-		winston.info('[reset] Theme reset to Persona');
+		winston.info('[reset] Theme reset to Vanilla');
 		if (typeof callback === 'function') {
 			callback(err);
 		} else {

install/web.js

@@ -12,16 +12,6 @@ var winston = require('winston'),
 	app = express(),
 	server;
 
-winston.add(winston.transports.File, {
-	filename: 'logs/webinstall.log',
-	colorize: true,
-	timestamp: function() {
-		var date = new Date();
-		return date.getDate() + '/' + (date.getMonth() + 1) + ' ' + date.toTimeString().substr(0,5) + ' [' + global.process.pid + ']';
-	},
-	level: 'verbose'
-});
-
 var web = {},
 	scripts = [
 		'public/vendor/xregexp/xregexp.js',

loader.js

@@ -90,7 +90,8 @@ Loader.addWorkerEvents = function(worker) {
 						worker.send({
 							action: 'js-propagate',
 							cache: Loader.js.cache,
-							map: Loader.js.map
+							map: Loader.js.map,
+							hash: Loader.js.hash
 						});
 					}
 
@@ -98,7 +99,8 @@ Loader.addWorkerEvents = function(worker) {
 						worker.send({
 							action: 'css-propagate',
 							cache: Loader.css.cache,
-							acpCache: Loader.css.acpCache
+							acpCache: Loader.css.acpCache,
+							hash: Loader.css.hash
 						});
 					}
 
@@ -115,21 +117,25 @@ Loader.addWorkerEvents = function(worker) {
 				case 'js-propagate':
 					Loader.js.cache = message.cache;
 					Loader.js.map = message.map;
+					Loader.js.hash = message.hash;
 
 					Loader.notifyWorkers({
 						action: 'js-propagate',
 						cache: message.cache,
-						map: message.map
+						map: message.map,
+						hash: message.hash
 					}, worker.pid);
 				break;
 				case 'css-propagate':
 					Loader.css.cache = message.cache;
 					Loader.css.acpCache = message.acpCache;
+					Loader.css.hash = message.hash;
 
 					Loader.notifyWorkers({
 						action: 'css-propagate',
 						cache: message.cache,
-						acpCache: message.acpCache
+						acpCache: message.acpCache,
+						hash: message.hash
 					}, worker.pid);
 				break;
 				case 'templates:compiled':

minifier.js

@@ -47,7 +47,17 @@ function minifyScripts(scripts, callback) {
 		var minified = uglifyjs.minify(scripts, {
 				// outSourceMap: "nodebb.min.js.map",
 				compress: false
-			});
+			}),
+			hasher = crypto.createHash('md5'),
+			hash;
+
+		// Calculate js hash
+		hasher.update(minified.code, 'utf-8');
+		hash = hasher.digest('hex');
+		process.send({
+			type: 'hash',
+			payload: hash.slice(0, 8)
+		});
 
 		callback(minified.code/*, minified.map*/);
 	} catch(err) {

package.json

@@ -2,7 +2,7 @@
   "name": "nodebb",
   "license": "GPL-3.0",
   "description": "NodeBB Forum",
-  "version": "0.8.2",
+  "version": "0.7.3",
   "homepage": "http://www.nodebb.org",
   "repository": {
     "type": "git",
@@ -14,14 +14,14 @@
     "test": "mocha ./tests -t 10000"
   },
   "dependencies": {
-    "async": "~1.4.2",
+    "async": "~0.9.0",
-    "bcryptjs": "~2.2.1",
+    "bcryptjs": "~2.1.0",
     "body-parser": "^1.9.0",
     "colors": "^1.1.0",
     "compression": "^1.1.0",
     "connect-ensure-login": "^0.1.1",
     "connect-flash": "^0.1.1",
-    "connect-multiparty": "^2.0.0",
+    "connect-multiparty": "^1.2.4",
     "cookie-parser": "^1.3.3",
     "cron": "^1.0.5",
     "csurf": "^1.6.1",
@@ -37,43 +37,43 @@
     "mime": "^1.3.4",
     "minimist": "^1.1.1",
     "mkdirp": "~0.5.0",
-    "mmmagic": "^0.4.0",
+    "mmmagic": "^0.3.13",
     "morgan": "^1.3.2",
     "nconf": "~0.7.1",
-    "nodebb-plugin-composer-default": "1.0.14",
+    "nodebb-plugin-composer-default": "1.0.9",
-    "nodebb-plugin-dbsearch": "0.2.16",
+    "nodebb-plugin-dbsearch": "0.2.15",
-    "nodebb-plugin-emoji-extended": "0.4.13",
+    "nodebb-plugin-emoji-extended": "0.4.9",
-    "nodebb-plugin-markdown": "4.0.5",
+    "nodebb-plugin-markdown": "4.0.2",
-    "nodebb-plugin-mentions": "1.0.2",
+    "nodebb-plugin-mentions": "1.0.0",
-    "nodebb-plugin-soundpack-default": "0.1.4",
+    "nodebb-plugin-soundpack-default": "0.1.2",
-    "nodebb-plugin-spam-be-gone": "0.4.2",
+    "nodebb-plugin-spam-be-gone": "0.4.1",
-    "nodebb-rewards-essentials": "0.0.5",
+    "nodebb-rewards-essentials": "0.0.3",
-    "nodebb-theme-lavender": "2.0.1",
+    "nodebb-theme-lavender": "1.0.49",
-    "nodebb-theme-persona": "3.0.12",
+    "nodebb-theme-persona": "2.0.13",
-    "nodebb-theme-vanilla": "4.0.7",
+    "nodebb-theme-vanilla": "3.0.7",
-    "nodebb-widget-essentials": "2.0.1",
+    "nodebb-widget-essentials": "1.0.4",
     "npm": "^2.1.4",
-    "passport": "^0.3.0",
+    "passport": "^0.2.1",
     "passport-local": "1.0.0",
     "prompt": "^0.2.14",
     "request": "^2.44.0",
-    "rimraf": "~2.4.2",
+    "rimraf": "~2.3.2",
     "rss": "^1.0.0",
-    "semver": "^5.0.1",
+    "semver": "^4.3.3",
     "serve-favicon": "^2.1.5",
-    "sitemap": "^1.0.0",
+    "sitemap": "^0.8.1",
     "socket.io": "^1.2.1",
     "socket.io-client": "^1.2.1",
     "socket.io-redis": "^0.1.3",
     "socketio-wildcard": "~0.1.1",
     "string": "^3.0.0",
-    "templates.js": "0.2.10",
+    "templates.js": "0.2.8",
-    "touch": "1.0.0",
+    "touch": "0.0.3",
-    "uglify-js": "^2.4.24",
+    "uglify-js": "^2.4.23",
     "underscore": "~1.8.3",
     "underscore.deep": "^0.5.1",
-    "validator": "^4.0.5",
+    "validator": "^3.30.0",
-    "winston": "^1.0.1",
+    "winston": "^0.9.0",
     "xregexp": "~2.0.0"
   },
   "devDependencies": {

public/language/ar/category.json

@@ -1,12 +1,12 @@
 {
-    "category": "فئة",
+    "category": "Category",
-    "subcategories": "فئة فرعية",
+    "subcategories": "Subcategories",
     "new_topic_button": "موضوع جديد",
     "guest-login-post": "يجب عليك تسجيل الدخول للرد",
     "no_topics": "<strong>لا توجد مواضيع في هذه الفئة</strong>لم لا تحاول إنشاء موضوع؟<br />",
     "browsing": "تصفح",
     "no_replies": "لا توجد ردود.",
-    "no_new_posts": "لا يوجد مشاركات جديدة.",
+    "no_new_posts": "No new posts.",
     "share_this_category": "انشر هذه الفئة",
     "watch": "متابعة",
     "ignore": "تجاهل",

public/language/ar/email.json

@@ -6,7 +6,7 @@
     "greeting_with_name": "مرحبًا بك يا %1",
     "welcome.text1": "شكرًا على تسجيلك في %1!",
     "welcome.text2": "لتفعيل حسابك، نحتاج إلى التأكد من صحة عنوان البريد الإلكتروني الذي سجلت به.",
-    "welcome.text3": "تم قبول نتسجيلك ، يمكنك الدخول باتسخدام اسم المستخدم و كلمة المرور.",
+    "welcome.text3": "An administrator has accepted your registration application. You can login with your username/password now.",
     "welcome.cta": "انقر هنا لتفعيل عنوان بريدك الإلكتروني",
     "invitation.text1": "%1 قام بدعوتك للانضمام لـ %2",
     "invitation.ctr": "إضغط هنا لإنشاء حسابك",

public/language/ar/error.json

@@ -77,8 +77,6 @@
     "cant-chat-with-yourself": "لايمكنك فتح محادثة مع نفسك",
     "chat-restricted": "هذا المستخدم عطل المحادثات الواردة عليه. يجب أن يتبعك حتى تتمكن من فتح محادثة معه.",
     "too-many-messages": "لقد أرسلت الكثير من الرسائل، الرجاء اﻹنتظار قليلاً",
-    "invalid-chat-message": "Invalid chat message",
-    "chat-message-too-long": "Chat message is too long",
     "reputation-system-disabled": "نظام السمعة معطل",
     "downvoting-disabled": "التصويتات السلبية معطلة",
     "not-enough-reputation-to-downvote": "ليس لديك سمعة تكفي لإضافة صوت سلبي لهذا الموضوع",

public/language/ar/global.json

@@ -33,7 +33,6 @@
     "header.notifications": "التنبيهات",
     "header.search": "بحث",
     "header.profile": "ملف",
-    "header.navigation": "Navigation",
     "notifications.loading": "تحميل التبليغات",
     "chats.loading": "تحميل الدردشات",
     "motd.welcome": "مرحبا بكم  NodeBB، منصة مناقشة المستقبل",
@@ -68,7 +67,7 @@
     "recentposts": "آخر المشاركات",
     "recentips": "آخر عناوين ال IP التي سجلت الدخول",
     "away": "غير متواجد",
-    "dnd": "Do not disturb",
+    "dnd": "المرجو عدم الإزعاج",
     "invisible": "مخفي",
     "offline": "غير متصل",
     "email": "عنوان البريد الإلكتروني",

public/language/ar/groups.json

@@ -6,15 +6,12 @@
     "no_groups_found": "لاوجدود لمجموعات يمكن معاينتها",
     "pending.accept": "موافق",
     "pending.reject": "رفض",
-    "pending.accept_all": "قبول الكل",
+    "pending.accept_all": "Accept All",
-    "pending.reject_all": "رفض الكل",
+    "pending.reject_all": "Reject All",
-    "pending.none": "لايوجد أعضاء ينتظرون التفعيل حالياً",
+    "pending.none": "There are no pending members at this time",
-    "invited.none": "لايوجد أعضاء مدعوون في  حالياً",
+    "invited.none": "There are no invited members at this time",
-    "invited.uninvite": "إلغ الدعوة",
+    "invited.uninvite": "Rescind Invitation",
-    "invited.search": "ابحث عن أعضاء لدعوتهم للمجموعة",
+    "invited.search": "Search for a user to invite to this group",
-    "invited.notification_title": "You have been invited to join <strong>%1</strong>",
-    "request.notification_title": "Group Membership Request from <strong>%1</strong>",
-    "request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
     "cover-instructions": "اسحب وأسقِط صورة، اسحبها للموضع المرغوب، وانقر على <strong>حفظ</strong>",
     "cover-change": "تغيير",
     "cover-save": "حفظ",
@@ -22,7 +19,7 @@
     "details.title": "تفاصيل المجموعة",
     "details.members": "لائحة الأعضاء",
     "details.pending": "المستخدمون في الانتظار",
-    "details.invited": "اﻷعضار المدعوون",
+    "details.invited": "Invited Members",
     "details.has_no_posts": "أعضاء هذه المجموعة لم يضيفوا أية مشاركة",
     "details.latest_posts": "آخر المشاركات",
     "details.private": "خاص",
@@ -40,14 +37,14 @@
     "details.userTitleEnabled": "إظهار الوسام",
     "details.private_help": "في حالة تفعيل الخيار، الانضمام إلى المجموعة يستلزم قبول مالكها",
     "details.hidden": "مخفي",
-    "details.hidden_help": "في حالة تفعيل الخيار، لن تظهر المجموعة للعموم والإنضمام إليها سيتلزم دعوة.",
+    "details.hidden_help": "في حالة تفعيل الخيار، لن تظهر المجموعة للعموم والإنضمام إليها سيتلزم دعوة يدوية.",
     "details.delete_group": "حذف المجموعة",
     "event.updated": "تم تحديث بيانات المجموعة",
     "event.deleted": "تم حذف المجموعة %1",
-    "membership.accept-invitation": "اقبل الدعوة",
+    "membership.accept-invitation": "Accept Invitation",
-    "membership.invitation-pending": "الدعوة بانتظار القبول",
+    "membership.invitation-pending": "Invitation Pending",
-    "membership.join-group": "انظم للمجموعة",
+    "membership.join-group": "Join Group",
-    "membership.leave-group": "غادر المجموعة",
+    "membership.leave-group": "Leave Group",
-    "membership.reject": "رفض",
+    "membership.reject": "Reject",
-    "new-group.group_name": "اسم المجموعة"
+    "new-group.group_name": "Group Name:"
 }

public/language/ar/modules.json

@@ -5,7 +5,7 @@
     "chat.no_active": "لا يوجد لديك دردشات نشطة.",
     "chat.user_typing": "%1 يكتب رسالة...",
     "chat.user_has_messaged_you": "%1 أرسل لك رسالة.",
-    "chat.see_all": "See all chats",
+    "chat.see_all": "معاينة كل الدردشات",
     "chat.no-messages": "المرجو اختيار مرسل إليه لمعاينة تاريخ الدردشات",
     "chat.recent-chats": "آخر الدردشات",
     "chat.contacts": "الأصدقاء",
@@ -22,8 +22,5 @@
     "composer.user_said": "%1 كتب:",
     "composer.discard": "هل أنت متأكد أنك تريد التخلي عن التغييرات؟",
     "composer.submit_and_lock": "Submit and Lock",
-    "composer.toggle_dropdown": "Toggle Dropdown",
+    "composer.toggle_dropdown": "Toggle Dropdown"
-    "bootbox.ok": "OK",
-    "bootbox.cancel": "Cancel",
-    "bootbox.confirm": "Confirm"
 }

public/language/ar/notifications.json

@@ -1,7 +1,7 @@
 {
     "title": "التنبيهات",
     "no_notifs": "ليس لديك أية تنبيهات جديدة",
-    "see_all": "See all notifications",
+    "see_all": "معاينة كل التنبيهات",
     "mark_all_read": "اجعل كل التنبيهات مقروءة",
     "back_to_home": "عودة إلى %1",
     "outgoing_link": "رابط خارجي",

public/language/ar/pages.json

@@ -1,37 +1,21 @@
 {
     "home": "الصفحة الرئيسية",
     "unread": "المواضيع الغير مقروءة",
-    "popular-day": "Popular topics today",
+    "popular": "المواضيع الأكثر شهرة",
-    "popular-week": "Popular topics this week",
-    "popular-month": "Popular topics this month",
-    "popular-alltime": "All time popular topics",
     "recent": "المواضيع الحديثة",
-    "users/online": "Online Users",
+    "users": "اﻷعضاء المسجلون",
-    "users/latest": "Latest Users",
-    "users/sort-posts": "Users with the most posts",
-    "users/sort-reputation": "Users with the most reputation",
-    "users/map": "User Map",
-    "users/search": "User Search",
     "notifications": "التنبيهات",
     "tags": "الكلمات الدلالية",
     "tag": "Topics tagged under \"%1\"",
-    "register": "Register an account",
+    "user.edit": "تعديل \"%1\"",
-    "login": "Login to your account",
+    "user.following": "المستخدمون الذين يتبعهم %1",
-    "reset": "Reset your account password",
+    "user.followers": "المستخدمون الذين يتبعون %1",
-    "categories": "Categories",
+    "user.posts": "ردود  %1",
-    "groups": "Groups",
+    "user.topics": "مواضيع %1",
-    "group": "%1 group",
+    "user.groups": "مجموعات %1",
-    "chats": "Chats",
+    "user.favourites": "مفضلات %1",
-    "chat": "Chatting with %1",
+    "user.settings": "خيارات المستخدم",
-    "account/edit": "Editing \"%1\"",
+    "user.watched": "المواضيع المتابعة من قبل %1 ",
-    "account/following": "People %1 follows",
-    "account/followers": "People who follow %1",
-    "account/posts": "Posts made by %1",
-    "account/topics": "Topics created by %1",
-    "account/groups": "%1's Groups",
-    "account/favourites": "%1's Favourite Posts",
-    "account/settings": "User Settings",
-    "account/watched": "Topics watched by %1",
     "maintenance.text": "جاري صيانة %1. المرجو العودة لاحقًا.",
     "maintenance.messageIntro": "بالإضافة إلى ذلك، قام مدبر النظام بترك هذه الرسالة:"
 }

public/language/ar/user.json

@@ -7,12 +7,11 @@
     "email": "البريد الإلكتروني",
     "confirm_email": "تأكيد عنوان البريد الإلكتروني",
     "ban_account": "Ban Account",
-    "ban_account_confirm": "هل تريد حقاً حظر هاذا العضو؟",
+    "ban_account_confirm": "Do you really want to ban this user?",
     "unban_account": "Unban Account",
     "delete_account": "حذف الحساب",
     "delete_account_confirm": "هل أن متأكد أنك تريد حذف حسابك؟<br /><strong> هذه العملية غير قابلة للإلغاء ولن يكون بالإمكان استعادة بياناتك</strong><br /><br />أدخل اسم المستخدم الخاص بك لتأكيد عملية الحذف",
     "delete_this_account_confirm": "Are you sure you want to delete this account? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
-    "account-deleted": "Account deleted",
     "fullname": "الاسم الكامل",
     "website": "الموقع الإلكتروني",
     "location": "الموقع",
@@ -53,7 +52,6 @@
     "username_taken_workaround": "اسم المستخدم الذي اخترته سبق أخذه، لذا تم تغييره قليلا. أن الآن مسجل تحت الاسم <strong>%1</strong>",
     "upload_picture": "ارفع الصورة",
     "upload_a_picture": "رفع صورة",
-    "remove_uploaded_picture": "Remove Uploaded Picture",
     "image_spec": "لايمكنك رفع إلا الصور ذات الصيغ PNG أو JPG أو GIF.",
     "settings": "خيارات",
     "show_email": "أظهر بريدي الإلكتروني",
@@ -86,6 +84,5 @@
     "follow_topics_you_reply_to": "متابعة المواضيع التي تقوم بالرد فيها",
     "follow_topics_you_create": "متابعة المواضيع التي تنشئها",
     "grouptitle": "حدد عنوان المجموعة الذي تريد عرضه",
-    "no-group-title": "لا يوجد عنوان للمجموعة",
+    "no-group-title": "لا يوجد عنوان للمجموعة"
-    "select-skin": "Select a Skin"
 }

public/language/bg/email.json

@@ -21,9 +21,9 @@
     "digest.cta": "Натиснете тук, за да посетите %1",
     "digest.unsub.info": "Това резюме беше изпратено до Вас поради настройките Ви за абонаментите.",
     "digest.no_topics": "Не е имало дейност по темите в последните %1",
-    "notif.chat.subject": "Получено е ново съобщение от %1",
+    "notif.chat.subject": "Получено е ново чат съобщение от %1",
     "notif.chat.cta": "Натиснете тук, за да продължите разговора",
-    "notif.chat.unsub.info": "Това известие за разговор беше изпратено до Вас поради настройките Ви за абонаментите.",
+    "notif.chat.unsub.info": "Това известие за чата беше изпратено до Вас поради настройките Ви за абонаментите.",
     "notif.post.cta": "Натиснете тук, за да прочетете цялата тема",
     "notif.post.unsub.info": "Това известие за публикация беше изпратено до Вас поради настройките Ви за абонаментите.",
     "test.text1": "Това е пробно е-писмо, за да потвърдим, че изпращачът на е-поща е правилно настроен за Вашия NodeBB.",

public/language/bg/error.json

@@ -18,7 +18,7 @@
     "username-taken": "Потребителското име е заето",
     "email-taken": "Е-пощата е заета",
     "email-not-confirmed": "Вашата е-поща все още не е потвърдена. Моля, натиснете тук, за да потвърдите е-пощата си.",
-    "email-not-confirmed-chat": "Няма да можете да пишете в разговори, докато е-пощата Ви не бъде потвърдена. Моля, натиснете тук, за да потвърдите е-пощата си.",
+    "email-not-confirmed-chat": "Няма да можете да пишете в чата, докато е-пощата Ви не бъде потвърдена. Моля, натиснете тук, за да потвърдите е-пощата си.",
     "no-email-to-confirm": "Този форум изисква потвърдена е-поща. Моля, натиснете тук, за да въведете е-поща",
     "email-confirm-failed": "Не успяхме да потвърдим е-пощата Ви. Моля, опитайте отново по-късно.",
     "confirm-email-already-sent": "Е-писмото за потвърждение вече е изпратено. Моля, почакайте още %1 минута/и, преди да изпратите ново.",
@@ -74,11 +74,9 @@
     "uploads-are-disabled": "Качването не е разрешено",
     "signature-too-long": "Съжаляваме, но подписът Ви трябва да съдържа не повече от %1 символ(а).",
     "about-me-too-long": "Съжаляваме, но информацията за Вас трябва да съдържа не повече от %1 символ(а).",
-    "cant-chat-with-yourself": "Не можете да пишете съобщение на себе си!",
+    "cant-chat-with-yourself": "Не можете да пишете чат съобщение на себе си!",
-    "chat-restricted": "Този потребител е ограничил съобщенията до себе си. Той трябва първо да Ви последва, преди да можете да си пишете с него.",
+    "chat-restricted": "Този потребител е ограничил чат съобщенията до себе си. Той трябва първо да Ви последва, преди да можете да си пишете с него.",
     "too-many-messages": "Изпратили сте твърде много съобщения. Моля, изчакайте малко.",
-    "invalid-chat-message": "Invalid chat message",
-    "chat-message-too-long": "Chat message is too long",
     "reputation-system-disabled": "Системата за репутация е изключена.",
     "downvoting-disabled": "Отрицателното гласуване е изключено",
     "not-enough-reputation-to-downvote": "Нямате достатъчно репутация, за да гласувате отрицателно за тази публикация",

public/language/bg/global.json

@@ -29,13 +29,12 @@
     "header.popular": "Популярни",
     "header.users": "Потребители",
     "header.groups": "Групи",
-    "header.chats": "Разговори",
+    "header.chats": "Чатове",
     "header.notifications": "Известия",
     "header.search": "Търсене",
     "header.profile": "Профил",
-    "header.navigation": "Навигация",
     "notifications.loading": "Зареждане на известията",
-    "chats.loading": "Зареждане на разговорите",
+    "chats.loading": "Зареждане на чатовете",
     "motd.welcome": "Добре дошли в NodeBB, системата за дискусии на бъдещето.",
     "previouspage": "Предишна страница",
     "nextpage": "Следваща страница",

public/language/bg/groups.json

@@ -12,9 +12,6 @@
     "invited.none": "В момента няма поканени членове",
     "invited.uninvite": "Отмяна на поканата",
     "invited.search": "Потърсете потребител, когото да поканите в тази група",
-    "invited.notification_title": "You have been invited to join <strong>%1</strong>",
-    "request.notification_title": "Group Membership Request from <strong>%1</strong>",
-    "request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
     "cover-instructions": "Плъзнете снимка, наместете я в предпочитаната позиция и натистнете <strong>Запазване</strong>",
     "cover-change": "Промяна",
     "cover-save": "Запазване",

public/language/bg/modules.json

@@ -1,16 +1,16 @@
 {
-    "chat.chatting_with": "Разговор с <span id=\"chat-with-name\"></span>",
+    "chat.chatting_with": "Чат с <span id=\"chat-with-name\"></span>",
-    "chat.placeholder": "Въведете съобщението тук и натиснете Ентер за изпращане",
+    "chat.placeholder": "Въведете чат съобщението тук и натиснете Ентер за изпращане",
     "chat.send": "Изпращане",
-    "chat.no_active": "Нямате текущи разговори.",
+    "chat.no_active": "Нямате текущи чатове.",
     "chat.user_typing": "%1 пише...",
     "chat.user_has_messaged_you": "%1 Ви написа съобщение.",
-    "chat.see_all": "Вижте всички разговори",
+    "chat.see_all": "Вижте всички чатове",
-    "chat.no-messages": "Моля, изберете получател, за да видите историята на съобщенията",
+    "chat.no-messages": "Моля, изберете получател, за да видите историята на чат съобщенията",
-    "chat.recent-chats": "Скорошни разговори",
+    "chat.recent-chats": "Скорошни чатове",
     "chat.contacts": "Контакти",
     "chat.message-history": "История на съобщенията",
-    "chat.pop-out": "Отделяне на разговора в прозорец",
+    "chat.pop-out": "Отделяне на чата в прозорец",
     "chat.maximize": "Уголемяване",
     "chat.seven_days": "7 дни",
     "chat.thirty_days": "30 дни",
@@ -22,8 +22,5 @@
     "composer.user_said": "%1 каза:",
     "composer.discard": "Сигурни ли сте, че искате да отхвърлите тази публикация?",
     "composer.submit_and_lock": "Публикуване и заключване",
-    "composer.toggle_dropdown": "Превключване на падащото меню",
+    "composer.toggle_dropdown": "Превключване на падащото меню"
-    "bootbox.ok": "Добре",
-    "bootbox.cancel": "Отказ",
-    "bootbox.confirm": "Потвърждаване"
 }

public/language/bg/pages.json

@@ -1,37 +1,21 @@
 {
     "home": "Начало",
     "unread": "Непрочетени теми",
-    "popular-day": "Популярните теми днес",
+    "popular": "Популярни теми",
-    "popular-week": "Популярните теми тази седмица",
-    "popular-month": "Популярните теми този месец",
-    "popular-alltime": "Популярните теми за всички времена",
     "recent": "Скорошни теми",
-    "users/online": "Потребители на линия",
+    "users": "Регистрирани потребители",
-    "users/latest": "Последни потребители",
-    "users/sort-posts": "Потребители с най-много публикации",
-    "users/sort-reputation": "Потребители с най-висока репутация",
-    "users/map": "Карта на потребителите",
-    "users/search": "Търсене на потребители",
     "notifications": "Известия",
     "tags": "Етикети",
     "tag": "Теми, отбелязани като „%1“",
-    "register": "Регистрирайте акаунт",
+    "user.edit": "Редактиране на „%1“",
-    "login": "Влезте в акаунта си",
+    "user.following": "Хора, които %1 следва",
-    "reset": "Подновете паролата за акаунта си",
+    "user.followers": "Хора, които следват %1",
-    "categories": "Категории",
+    "user.posts": "Публикации от %1",
-    "groups": "Групи",
+    "user.topics": "Теми, създадени от %1",
-    "group": "Група %1",
+    "user.groups": "Групите на %1",
-    "chats": "Разговори",
+    "user.favourites": "Любимите публикации на %1",
-    "chat": "Разговаря с %1",
+    "user.settings": "Настройки на потребителя",
-    "account/edit": "Редактиране на „%1“",
+    "user.watched": "Теми, следени от %1",
-    "account/following": "Хора, които %1 следва",
-    "account/followers": "Хора, които следват %1",
-    "account/posts": "Публикации от %1",
-    "account/topics": "Теми, създадени от %1",
-    "account/groups": "Групите на %1",
-    "account/favourites": "Любимите публикации на %1",
-    "account/settings": "Потребителски настройки",
-    "account/watched": "Теми, следени от %1",
     "maintenance.text": "%1 в момента е в профилактика. Моля, върнете се по-късно.",
     "maintenance.messageIntro": "В допълнение, администраторът е оставил това съобщение:"
 }

public/language/bg/topic.json

@@ -9,7 +9,7 @@
     "profile": "Профил",
     "posted_by": "Публикувано от %1",
     "posted_by_guest": "Публикувано от гост",
-    "chat": "Разговор",
+    "chat": "Чат",
     "notify_me": "Получавайте известия за новите отговори в тази тема",
     "quote": "Цитат",
     "reply": "Отговор",

public/language/bg/user.json

@@ -12,7 +12,6 @@
     "delete_account": "Изтриване на акаунта",
     "delete_account_confirm": "Сигурни ли сте, че искате да изтриете акаунта си? <br /><strong>Това действие е необратимо и няма да можете да възстановите нищо от данните си</strong><br /><br />Въведете потребителското си име, за да потвърдите, че искате да унищожите този акаунт.",
     "delete_this_account_confirm": "Сигурни ли сте, че искате да изтриете този акаунт? <br /><strong>Това действие е необратимо и няма да можете да възстановите нищо от данните</strong><br /><br />",
-    "account-deleted": "Account deleted",
     "fullname": "Цяло име",
     "website": "Уеб сайт",
     "location": "Местоположение",
@@ -30,7 +29,7 @@
     "signature": "Подпис",
     "gravatar": "Граватар",
     "birthday": "Рождена дата",
-    "chat": "Разговор",
+    "chat": "Чат",
     "follow": "Следване",
     "unfollow": "Спиране на следването",
     "more": "Още",
@@ -50,22 +49,21 @@
     "change_password_success": "Паролата ви е обновена!",
     "confirm_password": "Потвърдете паролата",
     "password": "Парола",
-    "username_taken_workaround": "Потребителското име, което искате, е заето и затова ние го променихме малко. Вие ще се наричате <strong>%1</strong>",
+    "username_taken_workaround": "Потребителското име, което искате, е заето и затова ние го променихме леко. Вие ще се наричате <strong>%1</strong>",
     "upload_picture": "Качване на снимка",
     "upload_a_picture": "Качване на снимка",
-    "remove_uploaded_picture": "Remove Uploaded Picture",
     "image_spec": "Можете да качвате само PNG, JPG, или GIF файлове",
     "settings": "Настройки",
     "show_email": "Да се показва е-пощата ми",
     "show_fullname": "Да се показва цялото ми име",
-    "restrict_chats": "Разрешаване на съобщенията само от потребители, които следвам",
+    "restrict_chats": "Разрешаване на чат съобщенията само от потребители, които следвам",
     "digest_label": "Абониране за резюмета",
     "digest_description": "Абониране за новини по е-пощата относно този форум (нови известия и теми) според избрания график",
     "digest_off": "Изключено",
     "digest_daily": "Ежедневно",
     "digest_weekly": "Ежеседмично",
     "digest_monthly": "Ежемесечно",
-    "send_chat_notifications": "Изпращане на е-писмо, ако получа ново съобщение в разговор, а не съм на линия",
+    "send_chat_notifications": "Изпращане на е-писмо, ако получа ново чат съобщения, а не съм на линия",
     "send_post_notifications": "Изпращане на е-писмо, когато се появи отговор в темите, за които съм абониран/а.",
     "settings-require-reload": "Някои промени в настройките изискват презареждане. Натиснете тук, за да презаредите страницата.",
     "has_no_follower": "Този потребител няма последователи :(",
@@ -86,6 +84,5 @@
     "follow_topics_you_reply_to": "Следване на темите, на които отговаряте",
     "follow_topics_you_create": "Следване на темите, които създавате",
     "grouptitle": "Изберете заглавието на групата, което искате да се показва",
-    "no-group-title": "Няма заглавие на група",
+    "no-group-title": "Няма заглавие на група"
-    "select-skin": "Изберете облик"
 }

public/language/bn/error.json

@@ -77,8 +77,6 @@
     "cant-chat-with-yourself": "আপনি নিজের সাথে চ্যাট করতে পারবেন না!",
     "chat-restricted": "এই সদস্য তার বার্তালাপ সংরক্ষিত রেখেছেন। এই সদস্য আপনাকে ফলো করার পরই কেবলমাত্র আপনি তার সাথে চ্যাট করতে পারবেন",
     "too-many-messages": "You have sent too many messages, please wait awhile.",
-    "invalid-chat-message": "Invalid chat message",
-    "chat-message-too-long": "Chat message is too long",
     "reputation-system-disabled": "সম্মাননা ব্যাবস্থা নিস্ক্রীয় রাখা হয়েছে",
     "downvoting-disabled": "ঋণাত্মক ভোট নিস্ক্রীয় রাখা হয়েছে।",
     "not-enough-reputation-to-downvote": "আপনার এই পোস্ট downvote করার জন্য পর্যাপ্ত সম্মাননা নেই",

public/language/bn/global.json

@@ -33,7 +33,6 @@
     "header.notifications": "বিজ্ঞপ্তি",
     "header.search": "অনুসন্ধান",
     "header.profile": "প্রোফাইল",
-    "header.navigation": "Navigation",
     "notifications.loading": "বিজ্ঞপ্তিগুলি লোড হচ্ছে",
     "chats.loading": "কথোপকথনগুলি লোড হচ্ছে ",
     "motd.welcome": "ভবিষ্যতের আলোচনার প্লাটফর্ম, NodeBB তে স্বাগতম।",
@@ -68,7 +67,7 @@
     "recentposts": "সাম্প্রতিক পোস্ট",
     "recentips": "সাম্প্রতিক প্রবেশকৃত আইপি সমুহ",
     "away": "দূরে",
-    "dnd": "Do not disturb",
+    "dnd": "বিরক্ত করবেন না",
     "invisible": "অদৃশ্য",
     "offline": "অফলাইন",
     "email": "ইমেইল",

public/language/bn/groups.json

@@ -12,9 +12,6 @@
     "invited.none": "There are no invited members at this time",
     "invited.uninvite": "Rescind Invitation",
     "invited.search": "Search for a user to invite to this group",
-    "invited.notification_title": "You have been invited to join <strong>%1</strong>",
-    "request.notification_title": "Group Membership Request from <strong>%1</strong>",
-    "request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
     "cover-instructions": "Drag and Drop a photo, drag to position, and hit <strong>Save</strong>",
     "cover-change": "Change",
     "cover-save": "Save",

public/language/bn/modules.json

@@ -5,7 +5,7 @@
     "chat.no_active": "আপনার কোন সচল কথোপকথন নেই",
     "chat.user_typing": "%1 লিখছেন",
     "chat.user_has_messaged_you": "%1 আপনাকে বার্তা পাঠিয়েছেন",
-    "chat.see_all": "See all chats",
+    "chat.see_all": "সকল কথোপকথন দেখুন",
     "chat.no-messages": "মেসেজ হিস্টোরী দেখতে প্রাপক নির্বাচন করুন",
     "chat.recent-chats": "সাম্প্রতিক চ্যাটসমূহ",
     "chat.contacts": "কন্টাক্টস",
@@ -22,8 +22,5 @@
     "composer.user_said": "%1 বলেছেনঃ",
     "composer.discard": "আপনি কি নিশ্চিত যে আপনি এই পোস্ট বাতিল করতে ইচ্ছুক?",
     "composer.submit_and_lock": "Submit and Lock",
-    "composer.toggle_dropdown": "Toggle Dropdown",
+    "composer.toggle_dropdown": "Toggle Dropdown"
-    "bootbox.ok": "OK",
-    "bootbox.cancel": "Cancel",
-    "bootbox.confirm": "Confirm"
 }

public/language/bn/notifications.json

@@ -1,7 +1,7 @@
 {
     "title": "বিজ্ঞপ্তিগুলো",
     "no_notifs": "আপনার নতুন কোন বিজ্ঞপ্তি নেই",
-    "see_all": "See all notifications",
+    "see_all": "সকল বিজ্ঞপ্তিগুলো দেখুন",
     "mark_all_read": "Mark all notifications read",
     "back_to_home": "ফিরুন %1",
     "outgoing_link": "বহির্গামী লিঙ্ক",

public/language/bn/pages.json

@@ -1,37 +1,21 @@
 {
     "home": "নীড়পাতা",
     "unread": "অপঠিত টপিক",
-    "popular-day": "Popular topics today",
+    "popular": "জনপ্রিয় টপিক",
-    "popular-week": "Popular topics this week",
-    "popular-month": "Popular topics this month",
-    "popular-alltime": "All time popular topics",
     "recent": "সাম্প্রতিক টপিক",
-    "users/online": "Online Users",
+    "users": "নিবন্ধিত সদস্যগণ",
-    "users/latest": "Latest Users",
-    "users/sort-posts": "Users with the most posts",
-    "users/sort-reputation": "Users with the most reputation",
-    "users/map": "User Map",
-    "users/search": "User Search",
     "notifications": "বিজ্ঞপ্তি",
     "tags": "Tags",
     "tag": "Topics tagged under \"%1\"",
-    "register": "Register an account",
+    "user.edit": "সম্পাদনা \"%1\"",
-    "login": "Login to your account",
+    "user.following": "%1 যাদের অনুসরণ করেন",
-    "reset": "Reset your account password",
+    "user.followers": "যারা %1 কে অনুসরণ করেন",
-    "categories": "Categories",
+    "user.posts": "%1 এর পোস্ট সমুহ",
-    "groups": "Groups",
+    "user.topics": "%1 এর টপিক সমুহ",
-    "group": "%1 group",
+    "user.groups": "%1's Groups",
-    "chats": "Chats",
+    "user.favourites": "%1'র প্রিয় পোস্টগুলো",
-    "chat": "Chatting with %1",
+    "user.settings": "সদস্য সেটিংস",
-    "account/edit": "Editing \"%1\"",
+    "user.watched": "Topics watched by %1",
-    "account/following": "People %1 follows",
-    "account/followers": "People who follow %1",
-    "account/posts": "Posts made by %1",
-    "account/topics": "Topics created by %1",
-    "account/groups": "%1's Groups",
-    "account/favourites": "%1's Favourite Posts",
-    "account/settings": "User Settings",
-    "account/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/user.json

@@ -12,7 +12,6 @@
     "delete_account": "একাউন্ট মুছে ফেলুন",
     "delete_account_confirm": "আপনি কি নিশ্চিত যে আপনি আপনার একাউন্ট মুছে ফেলতে চান ?  <br /><strong>এই কাজটির ফলে আপনার কোন তথ্য পুনরূদ্ধার করা সম্ভব নয়  </strong><br /><br /> নিশ্চিত করতে আপনার ইউজারনেম প্রবেশ করান। ",
     "delete_this_account_confirm": "Are you sure you want to delete this account? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
-    "account-deleted": "Account deleted",
     "fullname": "পুর্ণ নাম",
     "website": "ওয়েবসাইট",
     "location": "স্থান",
@@ -53,7 +52,6 @@
     "username_taken_workaround": "আপনি যে ইউজারনেম চাচ্ছিলেন সেটি ইতিমধ্যে নেয়া হয়ে গেছে, কাজেই আমরা এটি কিঞ্চিং পরিবর্তন করেছি। আপনি এখন <strong>%1</strong> হিসেবে পরিচিত",
     "upload_picture": "ছবি আপলোড করুন",
     "upload_a_picture": "ছবি (একটি) আপলোড করুন",
-    "remove_uploaded_picture": "Remove Uploaded Picture",
     "image_spec": "আপনি কেবলমাত্র PNG, JPG অথবা GIF ফাইল আপলোড করতে পারবেন",
     "settings": "সেটিংস",
     "show_email": "আমার ইমেইল দেখাও",
@@ -86,6 +84,5 @@
     "follow_topics_you_reply_to": "Follow topics that you reply to",
     "follow_topics_you_create": "Follow topics you create",
     "grouptitle": "Select the group title you would like to display",
-    "no-group-title": "No group title",
+    "no-group-title": "No group title"
-    "select-skin": "Select a Skin"
 }

public/language/cs/error.json

@@ -77,8 +77,6 @@
     "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.",
-    "invalid-chat-message": "Invalid chat message",
-    "chat-message-too-long": "Chat message is too long",
     "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/global.json

@@ -33,7 +33,6 @@
     "header.notifications": "Oznámení",
     "header.search": "Hledat",
     "header.profile": "Můj profil",
-    "header.navigation": "Navigation",
     "notifications.loading": "Načítání upozornění",
     "chats.loading": "Načítání grafů",
     "motd.welcome": "Vítejte na NodeBB, diskusní platforma buducnosti.",
@@ -68,7 +67,7 @@
     "recentposts": "Nedávné příspěvky",
     "recentips": "Recently Logged In IPs",
     "away": "Pryč",
-    "dnd": "Do not disturb",
+    "dnd": "Nerušit",
     "invisible": "Neviditelný",
     "offline": "Offline",
     "email": "Email",

public/language/cs/groups.json

@@ -12,9 +12,6 @@
     "invited.none": "There are no invited members at this time",
     "invited.uninvite": "Rescind Invitation",
     "invited.search": "Search for a user to invite to this group",
-    "invited.notification_title": "You have been invited to join <strong>%1</strong>",
-    "request.notification_title": "Group Membership Request from <strong>%1</strong>",
-    "request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
     "cover-instructions": "Drag and Drop a photo, drag to position, and hit <strong>Save</strong>",
     "cover-change": "Change",
     "cover-save": "Save",

public/language/cs/modules.json

@@ -5,7 +5,7 @@
     "chat.no_active": "Nemáte žádné aktivní konverzace.",
     "chat.user_typing": "%1 píše ...",
     "chat.user_has_messaged_you": "%1 has messaged you.",
-    "chat.see_all": "See all chats",
+    "chat.see_all": "See all Chats",
     "chat.no-messages": "Please select a recipient to view chat message history",
     "chat.recent-chats": "Recent Chats",
     "chat.contacts": "Kontakty",
@@ -22,8 +22,5 @@
     "composer.user_said": "%1 said:",
     "composer.discard": "Are you sure you wish to discard this post?",
     "composer.submit_and_lock": "Submit and Lock",
-    "composer.toggle_dropdown": "Toggle Dropdown",
+    "composer.toggle_dropdown": "Toggle Dropdown"
-    "bootbox.ok": "OK",
-    "bootbox.cancel": "Cancel",
-    "bootbox.confirm": "Confirm"
 }

public/language/cs/notifications.json

@@ -1,7 +1,7 @@
 {
     "title": "Upozornění",
     "no_notifs": "You have no new notifications",
-    "see_all": "See all notifications",
+    "see_all": "See all Notifications",
     "mark_all_read": "Mark all notifications read",
     "back_to_home": "Back to %1",
     "outgoing_link": "Odkaz mimo fórum",

public/language/cs/pages.json

@@ -1,37 +1,21 @@
 {
     "home": "Home",
     "unread": "Unread Topics",
-    "popular-day": "Popular topics today",
+    "popular": "Popular Topics",
-    "popular-week": "Popular topics this week",
-    "popular-month": "Popular topics this month",
-    "popular-alltime": "All time popular topics",
     "recent": "Recent Topics",
-    "users/online": "Online Users",
+    "users": "Registered Users",
-    "users/latest": "Latest Users",
-    "users/sort-posts": "Users with the most posts",
-    "users/sort-reputation": "Users with the most reputation",
-    "users/map": "User Map",
-    "users/search": "User Search",
     "notifications": "Notifications",
     "tags": "Tags",
     "tag": "Topics tagged under \"%1\"",
-    "register": "Register an account",
+    "user.edit": "Editing \"%1\"",
-    "login": "Login to your account",
+    "user.following": "People %1 Follows",
-    "reset": "Reset your account password",
+    "user.followers": "People who Follow %1",
-    "categories": "Categories",
+    "user.posts": "Posts made by %1",
-    "groups": "Groups",
+    "user.topics": "Topics created by %1",
-    "group": "%1 group",
+    "user.groups": "%1's Groups",
-    "chats": "Chats",
+    "user.favourites": "%1's Favourite Posts",
-    "chat": "Chatting with %1",
+    "user.settings": "User Settings",
-    "account/edit": "Editing \"%1\"",
+    "user.watched": "Topics watched by %1",
-    "account/following": "People %1 follows",
-    "account/followers": "People who follow %1",
-    "account/posts": "Posts made by %1",
-    "account/topics": "Topics created by %1",
-    "account/groups": "%1's Groups",
-    "account/favourites": "%1's Favourite Posts",
-    "account/settings": "User Settings",
-    "account/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/user.json

@@ -12,7 +12,6 @@
     "delete_account": "Vymazat účet",
     "delete_account_confirm": "Opravdu chcete smazat váš účet? <br /><strong>Tato akce je nevratná a nebude možné obnovit žádné vaše data.</strong><br /><br /> Pro potvrzení smazání účtu napište vaše uživatelské jméno.",
     "delete_this_account_confirm": "Are you sure you want to delete this account? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
-    "account-deleted": "Account deleted",
     "fullname": "Jméno a příjmení",
     "website": "Webové stránky",
     "location": "Poloha",
@@ -53,7 +52,6 @@
     "username_taken_workaround": "The username you requested was already taken, so we have altered it slightly. You are now known as <strong>%1</strong>",
     "upload_picture": "Nahrát obrázek",
     "upload_a_picture": "Nahrát obrázek",
-    "remove_uploaded_picture": "Remove Uploaded Picture",
     "image_spec": "Nahrávat lze pouze soubory PNG, JPG a GIF",
     "settings": "Nastavení",
     "show_email": "Zobrazovat můj email v profilu",
@@ -86,6 +84,5 @@
     "follow_topics_you_reply_to": "Follow topics that you reply to",
     "follow_topics_you_create": "Follow topics you create",
     "grouptitle": "Select the group title you would like to display",
-    "no-group-title": "No group title",
+    "no-group-title": "No group title"
-    "select-skin": "Select a Skin"
 }

public/language/da/error.json

@@ -77,8 +77,6 @@
     "cant-chat-with-yourself": "Du kan ikke chatte med dig selv!",
     "chat-restricted": "Denne bruger har spæret adgangen til chat beskeder. Brugeren må følge dig før du kan chatte med ham/hende",
     "too-many-messages": "Du har sendt for mange beskeder, vent venligt lidt.",
-    "invalid-chat-message": "Ugyldig chat besked",
-    "chat-message-too-long": "Chat beskeden er for lang",
     "reputation-system-disabled": "Vurderingssystem er slået fra.",
     "downvoting-disabled": "Nedvurdering er slået fra",
     "not-enough-reputation-to-downvote": "Du har ikke nok omdømme til at nedstemme dette indlæg",

public/language/da/global.json

@@ -33,7 +33,6 @@
     "header.notifications": "Notifikationer",
     "header.search": "Søg",
     "header.profile": "Profil",
-    "header.navigation": "Navigation",
     "notifications.loading": "Indlæser notifikationer",
     "chats.loading": "Indlæser chats",
     "motd.welcome": "Velkommen til NodeBB, fremtidens diskussion platform. ",

public/language/da/groups.json

@@ -12,9 +12,6 @@
     "invited.none": "Der er ingen inviterede medlemmer i øjeblikket",
     "invited.uninvite": "Tilbagetræk invitation",
     "invited.search": "Søg efter en bruger at invitere til denne gruppe",
-    "invited.notification_title": "Du er blevet inviteret til at blive medlem af <strong>%1</strong>",
-    "request.notification_title": "Gruppe medlemskab anmodning fra <strong>%1</strong>",
-    "request.notification_text": "<strong>%1</strong> har anmodet om at blive medlem af <strong>%2</strong>",
     "cover-instructions": "Træk og slip et billede, træk til positionen og tryk <strong>Gem</strong>",
     "cover-change": "Ændre",
     "cover-save": "Gem",

public/language/da/modules.json

@@ -5,7 +5,7 @@
     "chat.no_active": "Du har ingen aktive chats.",
     "chat.user_typing": "%1 skriver ...",
     "chat.user_has_messaged_you": "1% har skrevet til dig.",
-    "chat.see_all": "See all chats",
+    "chat.see_all": "Se alle chats.",
     "chat.no-messages": "Vælg en modtager for at se beskedhistorikken",
     "chat.recent-chats": "Seneste chats",
     "chat.contacts": "Kontakter",
@@ -22,8 +22,5 @@
     "composer.user_said": "%1 sagde:",
     "composer.discard": "Er du sikker på at du vil kassere dette indlæg?",
     "composer.submit_and_lock": "Send og lås",
-    "composer.toggle_dropdown": "Skift mellem dropdown",
+    "composer.toggle_dropdown": "Skift mellem dropdown"
-    "bootbox.ok": "OK",
-    "bootbox.cancel": "Cancel",
-    "bootbox.confirm": "Confirm"
 }

public/language/da/notifications.json

@@ -1,7 +1,7 @@
 {
     "title": "Notifikationer",
     "no_notifs": "Du har ingen nye notifkationer",
-    "see_all": "See all notifications",
+    "see_all": "Se alle notifikationer",
     "mark_all_read": "Marker alle notifikationer læst",
     "back_to_home": "Tilbage til %1",
     "outgoing_link": "Udgående link",

public/language/da/pages.json

@@ -1,37 +1,21 @@
 {
     "home": "Forside",
     "unread": "Ulæste tråde",
-    "popular-day": "Popular topics today",
+    "popular": "Populære tråde",
-    "popular-week": "Popular topics this week",
-    "popular-month": "Popular topics this month",
-    "popular-alltime": "All time popular topics",
     "recent": "Seneste tråde",
-    "users/online": "Online Users",
+    "users": "Registrerede brugere",
-    "users/latest": "Latest Users",
-    "users/sort-posts": "Users with the most posts",
-    "users/sort-reputation": "Users with the most reputation",
-    "users/map": "User Map",
-    "users/search": "User Search",
     "notifications": "Notifikationer",
     "tags": "Tags",
     "tag": "Tråde tagget under \"%1\"",
-    "register": "Register an account",
+    "user.edit": "Redigere \"%1\"",
-    "login": "Login to your account",
+    "user.following": "Folk som %1 følger",
-    "reset": "Reset your account password",
+    "user.followers": "Folk der følger %1",
-    "categories": "Categories",
+    "user.posts": "Indlæg skrevet af %1",
-    "groups": "Groups",
+    "user.topics": "Tråde oprettet af %1",
-    "group": "%1 group",
+    "user.groups": "%1s grupper",
-    "chats": "Chats",
+    "user.favourites": "%1s favorit indlæg",
-    "chat": "Chatting with %1",
+    "user.settings": "Brugerindstillinger",
-    "account/edit": "Editing \"%1\"",
+    "user.watched": "Tråde overvåget af %1",
-    "account/following": "People %1 follows",
-    "account/followers": "People who follow %1",
-    "account/posts": "Posts made by %1",
-    "account/topics": "Topics created by %1",
-    "account/groups": "%1's Groups",
-    "account/favourites": "%1's Favourite Posts",
-    "account/settings": "User Settings",
-    "account/watched": "Topics watched by %1",
     "maintenance.text": "%1 er under vedligeholdelse. Kom venligst tilbage senere.",
     "maintenance.messageIntro": "Administratoren har yderligere vedlagt denne besked:"
 }

public/language/da/user.json

@@ -12,7 +12,6 @@
     "delete_account": "Slet konto",
     "delete_account_confirm": "Er du sikker på du vil slette din konto? <br /><strong>Dette kan ikke fortrydes, og du vil ikke være istand til at genoprette dine data</strong><br /><br />Indtast dit brugernavn for at bekræfte at du ønsker at slette din konto.",
     "delete_this_account_confirm": "Er du sikker på at du vil slette denne konto?<br /><strong>Denne handling kan ikke fortrydes, og du kan ikke genskabe nogen data.</strong><br /><br />",
-    "account-deleted": "Account deleted",
     "fullname": "Fulde navn",
     "website": "Webside",
     "location": "Lokation",
@@ -53,7 +52,6 @@
     "username_taken_workaround": "Det valgte brugernavn er allerede taget, så vi har ændret det en smule. Du hedder nu <strong>%1</strong>",
     "upload_picture": "Upload billede",
     "upload_a_picture": "Upload et billede",
-    "remove_uploaded_picture": "Remove Uploaded Picture",
     "image_spec": "Du kan kun uploade PNG, JPG eller GIF billeder",
     "settings": "Indstillinger",
     "show_email": "Vis min emailaddresse",
@@ -86,6 +84,5 @@
     "follow_topics_you_reply_to": "Følg emner du har skrevet indlæg i",
     "follow_topics_you_create": "Følg emner du opretter",
     "grouptitle": "Vælg gruppe titlen du gerne vil fremvise",
-    "no-group-title": "Ingen gruppe titel",
+    "no-group-title": "Ingen gruppe titel"
-    "select-skin": "Select a Skin"
 }

public/language/de/category.json

@@ -1,12 +1,12 @@
 {
-    "category": "Kategorie",
+    "category": "Category",
-    "subcategories": "Unterkategorien",
+    "subcategories": "Subcategories",
     "new_topic_button": "Neues Thema",
     "guest-login-post": "Anmelden um einen Beitrag zu erstellen",
     "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",
-    "no_new_posts": "Keine neue Beiträge.",
+    "no_new_posts": "No new posts.",
     "share_this_category": "Teile diese Kategorie",
     "watch": "Beobachten",
     "ignore": "Ignorieren",

public/language/de/error.json

@@ -46,8 +46,8 @@
     "too-many-posts-newbie": "Als neuer Benutzer können Sie nur einen Beitrag innerhalb von %1 Sekunden erstellen - Bitte warten Sie bevor Sie erneut einen Beitrag erstellen.",
     "tag-too-short": "Bitte geben Sie ein längeres Schlagwort ein. Tags sollten mindestens %1 Zeichen enthalten.",
     "tag-too-long": "Bitte geben Sie ein kürzeres Schlagwort ein. Tags können nicht länger als %1 Zeichen sein.",
-    "not-enough-tags": "Nicht genügend Tags. Themen müssen mindestens %1 Tag(s) enthalten",
+    "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
-    "too-many-tags": "Zu viele Tags. Themen dürfen nicht mehr als %1 Tag(s) enthalten",
+    "too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)",
     "file-too-big": "Die maximale Dateigröße ist %1 kB, bitte laden Sie eine kleinere Datei hoch.",
     "cant-vote-self-post": "Du kannst deinen eigenen Beitrag nicht bewerten",
     "already-favourited": "Dieser Beitrag ist bereits in deinen Favoriten enthalten",
@@ -77,8 +77,6 @@
     "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.",
-    "invalid-chat-message": "Invalid chat message",
-    "chat-message-too-long": "Chat message is too long",
     "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.",

public/language/de/global.json

@@ -22,7 +22,7 @@
     "pagination.out_of": "%1 von %2",
     "pagination.enter_index": "Seitenzahl eingeben",
     "header.admin": "Admin",
-    "header.categories": "Kategorien",
+    "header.categories": "Categories",
     "header.recent": "Aktuell",
     "header.unread": "Ungelesen",
     "header.tags": "Tags",
@@ -33,7 +33,6 @@
     "header.notifications": "Benachrichtigungen",
     "header.search": "Suche",
     "header.profile": "Profil",
-    "header.navigation": "Navigation",
     "notifications.loading": "Benachrichtigungen werden geladen",
     "chats.loading": "Nachrichten werden geladen",
     "motd.welcome": "Willkommen auf NodeBB, der Diskussionsplattform der Zukunft.",

public/language/de/groups.json

@@ -12,9 +12,6 @@
     "invited.none": "Es sind zur Zeit keine weiteren Mitglieder eingeladen",
     "invited.uninvite": "Einladung zurücknehmen",
     "invited.search": "Suche nach einem Benutzer um ihn in diese Gruppe aufzunehmen",
-    "invited.notification_title": "You have been invited to join <strong>%1</strong>",
-    "request.notification_title": "Group Membership Request from <strong>%1</strong>",
-    "request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
     "cover-instructions": "Foto auf eine Position bewegen, und <strong>Speichern</strong> drücken",
     "cover-change": "Ändern",
     "cover-save": "Speichern",
@@ -41,13 +38,13 @@
     "details.private_help": "Wenn aktiviert, setzt ein Gruppenbeitritt die Zustimmung eines Gruppenbesitzers voraus",
     "details.hidden": "Versteckt",
     "details.hidden_help": "Wenn aktiviert, wird diese Gruppe in der Gruppenliste nicht zu finden sein, und Benutzer werden manuell eingeladen werden müssen.",
-    "details.delete_group": "Gruppe löschen",
+    "details.delete_group": "Delete Group",
     "event.updated": "Gruppendetails wurden aktualisiert",
     "event.deleted": "Die Gruppe \"%1\" wurde gelöscht.",
-    "membership.accept-invitation": "Einladung akzeptieren",
+    "membership.accept-invitation": "Accept Invitation",
-    "membership.invitation-pending": "Einladung ausstehend",
+    "membership.invitation-pending": "Invitation Pending",
-    "membership.join-group": "Gruppe beitreten",
+    "membership.join-group": "Join Group",
-    "membership.leave-group": "Gruppe verlassen",
+    "membership.leave-group": "Leave Group",
-    "membership.reject": "Ablehnen",
+    "membership.reject": "Reject",
-    "new-group.group_name": "Gruppenname:"
+    "new-group.group_name": "Group Name:"
 }

public/language/de/modules.json

@@ -5,7 +5,7 @@
     "chat.no_active": "Du hast keine aktiven Chats.",
     "chat.user_typing": "%1 tippt gerade ...",
     "chat.user_has_messaged_you": "%1 hat dir geschrieben.",
-    "chat.see_all": "Alle Diagramme anzeigen",
+    "chat.see_all": "Alle Chats anzeigen",
     "chat.no-messages": "Bitte wähle einen Empfänger, um den jeweiligen Nachrichtenverlauf anzuzeigen.",
     "chat.recent-chats": "Aktuelle Chats",
     "chat.contacts": "Kontakte",
@@ -22,8 +22,5 @@
     "composer.user_said": "%1 sagte:",
     "composer.discard": "Bist du sicher, dass du diesen Beitrag verwerfen möchtest?",
     "composer.submit_and_lock": "Einreichen und Sperren",
-    "composer.toggle_dropdown": "Menu aus-/einblenden",
+    "composer.toggle_dropdown": "Menu aus-/einblenden"
-    "bootbox.ok": "OK",
-    "bootbox.cancel": "Abbrechen",
-    "bootbox.confirm": "Bestätigen"
 }

public/language/de/notifications.json

@@ -1,7 +1,7 @@
 {
     "title": "Benachrichtigungen",
     "no_notifs": "Du hast keine neuen Benachrichtigungen",
-    "see_all": "Alle Benachrichtigungen anzeigen",
+    "see_all": "Alle Benachrichtigungen ansehen",
     "mark_all_read": "Alle Benachrichtigungen als gelesen markieren",
     "back_to_home": "Zurück zu %1",
     "outgoing_link": "Externer Link",

public/language/de/pages.json

@@ -1,37 +1,21 @@
 {
     "home": "Home",
     "unread": "Ungelesene Themen",
-    "popular-day": "Beliebte Themen von Heute",
+    "popular": "Beliebte Themen",
-    "popular-week": "Beliebte Themen dieser Woche",
-    "popular-month": "Beliebte Themen dieses Monats",
-    "popular-alltime": "Beliebteste Themen",
     "recent": "Neueste Themen",
-    "users/online": "Benutzer online",
+    "users": "Registrierte User",
-    "users/latest": "Neuste Benutzer",
-    "users/sort-posts": "Benutzer mit den meisten Beiträgen",
-    "users/sort-reputation": "Benutzer mit der besten Reputation",
-    "users/map": "Benutzer Karte",
-    "users/search": "Benutzer Suche",
     "notifications": "Benachrichtigungen",
     "tags": "Markierungen",
     "tag": "Themen markiert unter \"%1\"",
-    "register": "Einen Benutzer erstellen",
+    "user.edit": "Bearbeite \"%1\"",
-    "login": "Einloggen",
+    "user.following": "Nutzer, die %1 folgt",
-    "reset": "Passwort zurücksetzen",
+    "user.followers": "Nutzer, die %1 folgen",
-    "categories": "Kategorien",
+    "user.posts": "Beiträge von %1",
-    "groups": "Gruppen",
+    "user.topics": "Themen von %1",
-    "group": "%1's Gruppen",
+    "user.groups": "%1's Gruppen",
-    "chats": "Chats",
+    "user.favourites": "Von %1 favorisierte Beiträge",
-    "chat": "Chatte mit %1",
+    "user.settings": "Benutzer-Einstellungen",
-    "account/edit": "Bearbeite %1",
+    "user.watched": "Themen angeschaut von %1",
-    "account/following": "Nutzer, die %1 folgt",
-    "account/followers": "Nutzer, die %1 folgen",
-    "account/posts": "Beiträge von %1",
-    "account/topics": "Themen verfasst von %1",
-    "account/groups": "%1's Gruppen",
-    "account/favourites": "Von %1 favorisierte Beiträge",
-    "account/settings": "Benutzer-Einstellungen",
-    "account/watched": "Themen angeschaut von %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/recent.json

@@ -15,5 +15,5 @@
     "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": "Zum aktualisieren hier klicken."
+    "click-here-to-reload": "Hier klicken um zu aktualisieren."
 }

public/language/de/user.json

@@ -12,7 +12,6 @@
     "delete_account": "Konto löschen",
     "delete_account_confirm": "Bist du sicher, dass du dein Konto löschen möchtest? <br /><strong>Diese Aktion kann nicht rückgängig gemacht werden und du kannst deine Daten nicht wiederherstellen</strong><br /><br />Gebe deinen Benutzernamen ein, um zu bestätigen, dass du dieses Konto löschen möchtest.",
     "delete_this_account_confirm": "Bist du sicher, dass du dieses Konto löschen möchtest?<br /><strong>Diese Aktion kann nicht rückgangig gemacht werden und du kannst die Daten nicht wiederherstellen</strong><br /><br />",
-    "account-deleted": "Account deleted",
     "fullname": "Kompletter Name",
     "website": "Homepage",
     "location": "Wohnort",
@@ -53,7 +52,6 @@
     "username_taken_workaround": "Der gewünschte Benutzername ist bereits vergeben, deshalb haben wir ihn ein wenig verändert. Du bist jetzt unter dem Namen <strong>%1</strong> bekannt.",
     "upload_picture": "Bild hochladen",
     "upload_a_picture": "Ein Bild hochladen",
-    "remove_uploaded_picture": "Remove Uploaded Picture",
     "image_spec": "Sie dürfen nur Dateien vom Typ PNG, JPG oder GIF hochladen",
     "settings": "Einstellungen",
     "show_email": "Zeige meine E-Mail Adresse an.",
@@ -67,7 +65,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": "Einige Einstellungsänderung benötigen eine Aktualisierung. Hier klicken um die Seite neu zu laden.",
+    "settings-require-reload": "Manche Einstellungsänderung benötigt ein aktualisieren. Drücke hier um die Seite neu zu laden.",
     "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.",
@@ -86,6 +84,5 @@
     "follow_topics_you_reply_to": "Themen folgen, in denen auf dich geantwortet wird",
     "follow_topics_you_create": "Themen folgen, die du erstellst",
     "grouptitle": "Wähle den anzuzeigenden Gruppen Titel aus",
-    "no-group-title": "Kein Gruppentitel",
+    "no-group-title": "Kein Gruppentitel"
-    "select-skin": "Einen Skin auswählen"
 }

public/language/el/error.json

@@ -77,8 +77,6 @@
     "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.",
-    "invalid-chat-message": "Invalid chat message",
-    "chat-message-too-long": "Chat message is too long",
     "reputation-system-disabled": "Το σύστημα φήμης έχει απενεργοποιηθεί.",
     "downvoting-disabled": "Η καταψήφιση έχει απενεργοποιηθεί",
     "not-enough-reputation-to-downvote": "Δεν έχεις αρκετή φήμη για να καταψηφίσεις αυτή την δημοσίευση",

public/language/el/global.json

@@ -33,7 +33,6 @@
     "header.notifications": "Ειδοποιήσεις",
     "header.search": "Αναζήτηση",
     "header.profile": "Προφίλ",
-    "header.navigation": "Navigation",
     "notifications.loading": "Φόρτωση Ειδοποιήσεων",
     "chats.loading": "Φόρτωση Συνομιλιών",
     "motd.welcome": "Καλωσόρισες στο NodeBB, την πλατφόρμα συζητήσεων του μέλλοντος.",
@@ -68,7 +67,7 @@
     "recentposts": "Πρόσφατες Δημοσιεύσεις",
     "recentips": "Πρόσφατη IP Σύνδεσης",
     "away": "Απών/ούσα",
-    "dnd": "Do not disturb",
+    "dnd": "Μην ενοχλείτε",
     "invisible": "Αόρατος/η",
     "offline": "Εκτός Σύνδεσης",
     "email": "Email",

public/language/el/groups.json

@@ -12,9 +12,6 @@
     "invited.none": "There are no invited members at this time",
     "invited.uninvite": "Rescind Invitation",
     "invited.search": "Search for a user to invite to this group",
-    "invited.notification_title": "You have been invited to join <strong>%1</strong>",
-    "request.notification_title": "Group Membership Request from <strong>%1</strong>",
-    "request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
     "cover-instructions": "Drag and Drop a photo, drag to position, and hit <strong>Save</strong>",
     "cover-change": "Change",
     "cover-save": "Save",

public/language/el/modules.json

@@ -5,7 +5,7 @@
     "chat.no_active": "Δεν έχεις ενεργές συνομιλίες.",
     "chat.user_typing": "Ο/Η %1 πληκτρολογεί...",
     "chat.user_has_messaged_you": "Ο/Η %1 σου έστειλε μήνυμα.",
-    "chat.see_all": "See all chats",
+    "chat.see_all": "Προβολή όλων των Συνομιλιών",
     "chat.no-messages": "Παρακαλώ επέλεξε έναν παραλήπτη για να δείς το ιστορικό της συνομιλίας",
     "chat.recent-chats": "Πρόσφατες Συνομιλίες",
     "chat.contacts": "Επαφές",
@@ -22,8 +22,5 @@
     "composer.user_said": "Ο/Η %1 είπε:",
     "composer.discard": "Είσαι σίγουρος/η πως θέλεις να πετάξεις αυτή την δημοσίευση;",
     "composer.submit_and_lock": "Submit and Lock",
-    "composer.toggle_dropdown": "Toggle Dropdown",
+    "composer.toggle_dropdown": "Toggle Dropdown"
-    "bootbox.ok": "OK",
-    "bootbox.cancel": "Cancel",
-    "bootbox.confirm": "Confirm"
 }

public/language/el/notifications.json

@@ -1,7 +1,7 @@
 {
     "title": "Ειδοποιήσεις",
     "no_notifs": "Δεν έχεις νέες ειδοποιήσεις;",
-    "see_all": "See all notifications",
+    "see_all": "Προβολή όλων των ειδοποιήσεων",
     "mark_all_read": "Mark all notifications read",
     "back_to_home": "Πίσω στο %1",
     "outgoing_link": "Εξερχόμενος Σύνδεσμος",

public/language/el/pages.json

@@ -1,37 +1,21 @@
 {
     "home": "Κεντρική",
     "unread": "Μη αναγνωσμένα Θέματα",
-    "popular-day": "Popular topics today",
+    "popular": "Δημοφιλή Θέματα",
-    "popular-week": "Popular topics this week",
-    "popular-month": "Popular topics this month",
-    "popular-alltime": "All time popular topics",
     "recent": "Πρόσφατα Θέματα",
-    "users/online": "Online Users",
+    "users": "Εγγεγραμμένοι Χρήστες",
-    "users/latest": "Latest Users",
-    "users/sort-posts": "Users with the most posts",
-    "users/sort-reputation": "Users with the most reputation",
-    "users/map": "User Map",
-    "users/search": "User Search",
     "notifications": "Ειδοποιήσεις",
     "tags": "Tags",
     "tag": "Topics tagged under \"%1\"",
-    "register": "Register an account",
+    "user.edit": "Επεξεργασία του \"%1\"",
-    "login": "Login to your account",
+    "user.following": "Άτομα που ακολουθεί ο/η %1",
-    "reset": "Reset your account password",
+    "user.followers": "Άτομα που ακολουθούν τον/την %1",
-    "categories": "Categories",
+    "user.posts": "Δημοσιεύσεις από τον/την %1",
-    "groups": "Groups",
+    "user.topics": "Θέματα από τον/την %1",
-    "group": "%1 group",
+    "user.groups": "%1's Groups",
-    "chats": "Chats",
+    "user.favourites": "Οι αγαπημένες δημοσιεύσεις του/της %1",
-    "chat": "Chatting with %1",
+    "user.settings": "Επιλογές Χρήστη",
-    "account/edit": "Editing \"%1\"",
+    "user.watched": "Topics watched by %1",
-    "account/following": "People %1 follows",
-    "account/followers": "People who follow %1",
-    "account/posts": "Posts made by %1",
-    "account/topics": "Topics created by %1",
-    "account/groups": "%1's Groups",
-    "account/favourites": "%1's Favourite Posts",
-    "account/settings": "User Settings",
-    "account/watched": "Topics watched by %1",
     "maintenance.text": "Το %1 αυτή την στιγμή συντηρείται. Παρακαλώ έλα αργότερα.",
     "maintenance.messageIntro": "Additionally, the administrator has left this message:"
 }

public/language/el/user.json

@@ -12,7 +12,6 @@
     "delete_account": "Διαγραφή Λογαριασμού",
     "delete_account_confirm": "Είσαι σίγουρος/η πως θέλεις να διαγράψεις τον λογαριασμό σου; <br /><strong>Αυτή η ενέργεια δεν μπορεί να αναιρεθεί και δεν θα μπορέσεις να επανακτήσεις τα δεδομένα σου</strong><br /><br />Γράψε το όνομα χρήστη σου για να επιβεβαιώσεις πως θέλεις να καταστρέψεις αυτόν τον λογαριασμό.",
     "delete_this_account_confirm": "Are you sure you want to delete this account? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
-    "account-deleted": "Account deleted",
     "fullname": "Πλήρες Όνομα",
     "website": "Ιστοσελίδα",
     "location": "Τοποθεσία",
@@ -53,7 +52,6 @@
     "username_taken_workaround": "Το όνομα χρήστη που ζήτησες χρησιμοποιείται ήδη, οπότε το τροποποιήσαμε λίγο. Πλέον είσαι γνωστός/ή ώς <strong>%1</strong>",
     "upload_picture": "Ανέβασμα φωτογραφίας",
     "upload_a_picture": "Ανέβασε μια φωτογραφία",
-    "remove_uploaded_picture": "Remove Uploaded Picture",
     "image_spec": "Μπορείς να ανεβάσεις αρχεία τύπου PNG, JPG ή GIF μόνο",
     "settings": "Επιλογές",
     "show_email": "Εμφάνιση του email μου",
@@ -86,6 +84,5 @@
     "follow_topics_you_reply_to": "Follow topics that you reply to",
     "follow_topics_you_create": "Follow topics you create",
     "grouptitle": "Select the group title you would like to display",
-    "no-group-title": "No group title",
+    "no-group-title": "No group title"
-    "select-skin": "Select a Skin"
 }

public/language/en@pirate/error.json

@@ -77,8 +77,6 @@
     "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.",
-    "invalid-chat-message": "Invalid chat message",
-    "chat-message-too-long": "Chat message is too long",
     "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/global.json

@@ -33,7 +33,6 @@
     "header.notifications": "Parrot Calls",
     "header.search": "Finderer",
     "header.profile": "Bunk",
-    "header.navigation": "Navigation",
     "notifications.loading": "Fetching yer Parrot Calls",
     "chats.loading": "Loading Yik-Yaks",
     "motd.welcome": "Welcome to NodeBB, th' discussion platform 'o th' future.",
@@ -68,7 +67,7 @@
     "recentposts": "Recent Messages",
     "recentips": "Recently Logged In IPs",
     "away": "Out to sea",
-    "dnd": "Do not disturb",
+    "dnd": "Do not Disturb",
     "invisible": "Magic usin'",
     "offline": "Dead",
     "email": "Email",

public/language/en@pirate/groups.json

@@ -12,9 +12,6 @@
     "invited.none": "There are no invited members at this time",
     "invited.uninvite": "Rescind Invitation",
     "invited.search": "Search for a user to invite to this group",
-    "invited.notification_title": "You have been invited to join <strong>%1</strong>",
-    "request.notification_title": "Group Membership Request from <strong>%1</strong>",
-    "request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
     "cover-instructions": "Drag and Drop a photo, drag to position, and hit <strong>Save</strong>",
     "cover-change": "Change",
     "cover-save": "Save",

public/language/en@pirate/modules.json

@@ -5,7 +5,7 @@
     "chat.no_active": "Ye be a lonely sailor.",
     "chat.user_typing": "%1 is typing ...",
     "chat.user_has_messaged_you": "%1 has messaged you.",
-    "chat.see_all": "See all chats",
+    "chat.see_all": "See all Chats",
     "chat.no-messages": "Please select a recipient to view chat message history",
     "chat.recent-chats": "Recent Chats",
     "chat.contacts": "Contacts",
@@ -22,8 +22,5 @@
     "composer.user_said": "%1 said:",
     "composer.discard": "Are you sure you wish to discard this post?",
     "composer.submit_and_lock": "Submit and Lock",
-    "composer.toggle_dropdown": "Toggle Dropdown",
+    "composer.toggle_dropdown": "Toggle Dropdown"
-    "bootbox.ok": "OK",
-    "bootbox.cancel": "Cancel",
-    "bootbox.confirm": "Confirm"
 }

public/language/en@pirate/notifications.json

@@ -1,7 +1,7 @@
 {
     "title": "Notifications",
     "no_notifs": "You have no new notifications",
-    "see_all": "See all notifications",
+    "see_all": "Spy wit' ye eye all ye notifications",
     "mark_all_read": "Mark all notifications read",
     "back_to_home": "Back to %1",
     "outgoing_link": "Go offshore",

public/language/en@pirate/pages.json

@@ -1,37 +1,21 @@
 {
     "home": "Home",
     "unread": "Unread Topics",
-    "popular-day": "Popular topics today",
+    "popular": "Popular Topics",
-    "popular-week": "Popular topics this week",
-    "popular-month": "Popular topics this month",
-    "popular-alltime": "All time popular topics",
     "recent": "Recent Topics",
-    "users/online": "Online Users",
+    "users": "Registered Users",
-    "users/latest": "Latest Users",
-    "users/sort-posts": "Users with the most posts",
-    "users/sort-reputation": "Users with the most reputation",
-    "users/map": "User Map",
-    "users/search": "User Search",
     "notifications": "Notifications",
     "tags": "Tags",
     "tag": "Topics tagged under \"%1\"",
-    "register": "Register an account",
+    "user.edit": "Editing \"%1\"",
-    "login": "Login to your account",
+    "user.following": "People %1 Follows",
-    "reset": "Reset your account password",
+    "user.followers": "People who Follow %1",
-    "categories": "Categories",
+    "user.posts": "Posts made by %1",
-    "groups": "Groups",
+    "user.topics": "Topics created by %1",
-    "group": "%1 group",
+    "user.groups": "%1's Groups",
-    "chats": "Chats",
+    "user.favourites": "%1's Favourite Posts",
-    "chat": "Chatting with %1",
+    "user.settings": "User Settings",
-    "account/edit": "Editing \"%1\"",
+    "user.watched": "Topics watched by %1",
-    "account/following": "People %1 follows",
-    "account/followers": "People who follow %1",
-    "account/posts": "Posts made by %1",
-    "account/topics": "Topics created by %1",
-    "account/groups": "%1's Groups",
-    "account/favourites": "%1's Favourite Posts",
-    "account/settings": "User Settings",
-    "account/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/user.json

@@ -12,7 +12,6 @@
     "delete_account": "Delete Account",
     "delete_account_confirm": "Are you sure you want to delete your account? <br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your username to confirm that you wish to destroy this account.",
     "delete_this_account_confirm": "Are you sure you want to delete this account? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
-    "account-deleted": "Account deleted",
     "fullname": "Full Name",
     "website": "Website",
     "location": "Location",
@@ -53,7 +52,6 @@
     "username_taken_workaround": "The username you requested was already taken, so we have altered it slightly. You are now known as <strong>%1</strong>",
     "upload_picture": "Upload picture",
     "upload_a_picture": "Upload a picture",
-    "remove_uploaded_picture": "Remove Uploaded Picture",
     "image_spec": "You may only upload PNG, JPG, or GIF files",
     "settings": "Settings",
     "show_email": "Show My Email",
@@ -86,6 +84,5 @@
     "follow_topics_you_reply_to": "Follow topics that you reply to",
     "follow_topics_you_create": "Follow topics you create",
     "grouptitle": "Select the group title you would like to display",
-    "no-group-title": "No group title",
+    "no-group-title": "No group title"
-    "select-skin": "Select a Skin"
 }

public/language/en_GB/error.json

@@ -100,8 +100,6 @@
 	"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.",
-	"invalid-chat-message": "Invalid chat message",
-	"chat-message-too-long": "Chat message is too long",
 
 	"reputation-system-disabled": "Reputation system is disabled.",
 	"downvoting-disabled": "Downvoting is disabled",

public/language/en_GB/global.json

@@ -39,7 +39,6 @@
 	"header.notifications": "Notifications",
 	"header.search": "Search",
 	"header.profile": "Profile",
-	"header.navigation": "Navigation",
 
 	"notifications.loading": "Loading Notifications",
 	"chats.loading": "Loading Chats",
@@ -88,7 +87,7 @@
 
 	"online": "Online",
 	"away": "Away",
-	"dnd": "Do not disturb",
+	"dnd": "Do not Disturb",
 	"invisible": "Invisible",
 	"offline": "Offline",
 

public/language/en_GB/groups.json

@@ -14,10 +14,6 @@
 	"invited.none": "There are no invited members at this time",
 	"invited.uninvite": "Rescind Invitation",
 	"invited.search": "Search for a user to invite to this group",
-	"invited.notification_title": "You have been invited to join <strong>%1</strong>",
-
-	"request.notification_title": "Group Membership Request from <strong>%1</strong>",
-	"request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
 
 	"cover-instructions": "Drag and Drop a photo, drag to position, and hit <strong>Save</strong>",
 	"cover-change": "Change",

public/language/en_GB/modules.json

@@ -5,7 +5,7 @@
 	"chat.no_active": "You have no active chats.",
 	"chat.user_typing": "%1 is typing ...",
 	"chat.user_has_messaged_you": "%1 has messaged you.",
-	"chat.see_all": "See all chats",
+	"chat.see_all": "See all Chats",
 	"chat.no-messages": "Please select a recipient to view chat message history",
 	"chat.recent-chats": "Recent Chats",
 	"chat.contacts": "Contacts",
@@ -23,9 +23,5 @@
 	"composer.user_said": "%1 said:",
 	"composer.discard": "Are you sure you wish to discard this post?",
 	"composer.submit_and_lock": "Submit and Lock",
-	"composer.toggle_dropdown": "Toggle Dropdown",
+	"composer.toggle_dropdown": "Toggle Dropdown"
-
-	"bootbox.ok": "OK",
-	"bootbox.cancel": "Cancel",
-	"bootbox.confirm": "Confirm"
 }

public/language/en_GB/notifications.json

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

public/language/en_GB/pages.json

@@ -1,42 +1,21 @@
 {
 	"home": "Home",
 	"unread": "Unread Topics",
-	"popular-day": "Popular topics today",
+	"popular": "Popular Topics",
-	"popular-week": "Popular topics this week",
-	"popular-month": "Popular topics this month",
-	"popular-alltime": "All time popular topics",
 	"recent": "Recent Topics",
-
+	"users": "Registered Users",
-	"users/online": "Online Users",
-	"users/latest": "Latest Users",
-	"users/sort-posts": "Users with the most posts",
-	"users/sort-reputation": "Users with the most reputation",
-	"users/map": "User Map",
-	"users/search": "User Search",
-
 	"notifications": "Notifications",
 	"tags": "Tags",
 	"tag": "Topics tagged under \"%1\"",
-	"register": "Register an account",
+	"user.edit": "Editing \"%1\"",
-	"login": "Login to your account",
+	"user.following": "People %1 Follows",
-	"reset": "Reset your account password",
+	"user.followers": "People who Follow %1",
-	"categories": "Categories",
+	"user.posts": "Posts made by %1",
-
+	"user.topics": "Topics created by %1",
-	"groups": "Groups",
+	"user.groups": "%1's Groups",
-	"group": "%1 group",
+	"user.favourites": "%1's Favourite Posts",
-
+	"user.settings": "User Settings",
-	"chats": "Chats",
+	"user.watched": "Topics watched by %1",
-	"chat": "Chatting with %1",
-
-	"account/edit": "Editing \"%1\"",
-	"account/following": "People %1 follows",
-	"account/followers": "People who follow %1",
-	"account/posts": "Posts made by %1",
-	"account/topics": "Topics created by %1",
-	"account/groups": "%1's Groups",
-	"account/favourites": "%1's Favourite Posts",
-	"account/settings": "User Settings",
-	"account/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_GB/user.json

@@ -13,7 +13,6 @@
 	"delete_account": "Delete Account",
 	"delete_account_confirm": "Are you sure you want to delete your account? <br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your username to confirm that you wish to destroy this account.",
 	"delete_this_account_confirm": "Are you sure you want to delete this account? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
-	"account-deleted": "Account deleted",
 
 	"fullname": "Full Name",
 	"website": "Website",
@@ -57,7 +56,6 @@
 
 	"upload_picture": "Upload picture",
 	"upload_a_picture": "Upload a picture",
-	"remove_uploaded_picture" : "Remove Uploaded Picture",
 	"image_spec": "You may only upload PNG, JPG, or GIF files",
 
 	"settings": "Settings",

public/language/en_US/error.json

@@ -50,8 +50,8 @@
     "too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)",
     "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
     "cant-vote-self-post": "You cannot vote for your own post",
-    "already-favourited": "You have already favorited this post",
+    "already-favourited": "You have already favourited this post",
-    "already-unfavourited": "You have already unfavorited this post",
+    "already-unfavourited": "You have already unfavourited this post",
     "cant-ban-other-admins": "You can't ban other admins!",
     "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
     "invalid-image-type": "Invalid image type. Allowed types are: %1",
@@ -77,8 +77,6 @@
     "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.",
-    "invalid-chat-message": "Invalid chat message",
-    "chat-message-too-long": "Chat message is too long",
     "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/global.json

@@ -33,7 +33,6 @@
     "header.notifications": "Notifications",
     "header.search": "Search",
     "header.profile": "Profile",
-    "header.navigation": "Navigation",
     "notifications.loading": "Loading Notifications",
     "chats.loading": "Loading Chats",
     "motd.welcome": "Welcome to NodeBB, the discussion platform of the future.",
@@ -68,7 +67,7 @@
     "recentposts": "Recent Posts",
     "recentips": "Recently Logged In IPs",
     "away": "Away",
-    "dnd": "Do not disturb",
+    "dnd": "Do not Disturb",
     "invisible": "Invisible",
     "offline": "Offline",
     "email": "Email",

public/language/en_US/groups.json

@@ -12,9 +12,6 @@
     "invited.none": "There are no invited members at this time",
     "invited.uninvite": "Rescind Invitation",
     "invited.search": "Search for a user to invite to this group",
-    "invited.notification_title": "You have been invited to join <strong>%1</strong>",
-    "request.notification_title": "Group Membership Request from <strong>%1</strong>",
-    "request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
     "cover-instructions": "Drag and Drop a photo, drag to position, and hit <strong>Save</strong>",
     "cover-change": "Change",
     "cover-save": "Save",
@@ -35,7 +32,7 @@
     "details.description": "Description",
     "details.badge_preview": "Badge Preview",
     "details.change_icon": "Change Icon",
-    "details.change_colour": "Change Color",
+    "details.change_colour": "Change Colour",
     "details.badge_text": "Badge Text",
     "details.userTitleEnabled": "Show Badge",
     "details.private_help": "If enabled, joining of groups requires approval from a group owner",

public/language/en_US/modules.json

@@ -5,7 +5,7 @@
     "chat.no_active": "You have no active chats.",
     "chat.user_typing": "%1 is typing ...",
     "chat.user_has_messaged_you": "%1 has messaged you.",
-    "chat.see_all": "See all chats",
+    "chat.see_all": "See all Chats",
     "chat.no-messages": "Please select a recipient to view chat message history",
     "chat.recent-chats": "Recent Chats",
     "chat.contacts": "Contacts",
@@ -22,8 +22,5 @@
     "composer.user_said": "%1 said:",
     "composer.discard": "Are you sure you wish to discard this post?",
     "composer.submit_and_lock": "Submit and Lock",
-    "composer.toggle_dropdown": "Toggle Dropdown",
+    "composer.toggle_dropdown": "Toggle Dropdown"
-    "bootbox.ok": "OK",
-    "bootbox.cancel": "Cancel",
-    "bootbox.confirm": "Confirm"
 }

public/language/en_US/notifications.json

@@ -1,7 +1,7 @@
 {
     "title": "Notifications",
     "no_notifs": "You have no new notifications",
-    "see_all": "See all notifications",
+    "see_all": "See all Notifications",
     "mark_all_read": "Mark all notifications read",
     "back_to_home": "Back to %1",
     "outgoing_link": "Outgoing Link",
@@ -14,7 +14,7 @@
     "upvoted_your_post_in": "<strong>%1</strong> has upvoted your post in <strong>%2</strong>.",
     "moved_your_post": "<strong>%1</strong> has moved your post.",
     "moved_your_topic": "<strong>%1</strong> has moved your topic.",
-    "favourited_your_post_in": "<strong>%1</strong> has favorited your post in <strong>%2</strong>.",
+    "favourited_your_post_in": "<strong>%1</strong> has favourited your post in <strong>%2</strong>.",
     "user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
     "user_posted_to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
     "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",

public/language/en_US/pages.json

@@ -1,37 +1,21 @@
 {
     "home": "Home",
     "unread": "Unread Topics",
-    "popular-day": "Popular topics today",
+    "popular": "Popular Topics",
-    "popular-week": "Popular topics this week",
-    "popular-month": "Popular topics this month",
-    "popular-alltime": "All time popular topics",
     "recent": "Recent Topics",
-    "users/online": "Online Users",
+    "users": "Registered Users",
-    "users/latest": "Latest Users",
-    "users/sort-posts": "Users with the most posts",
-    "users/sort-reputation": "Users with the most reputation",
-    "users/map": "User Map",
-    "users/search": "User Search",
     "notifications": "Notifications",
     "tags": "Tags",
     "tag": "Topics tagged under \"%1\"",
-    "register": "Register an account",
+    "user.edit": "Editing \"%1\"",
-    "login": "Login to your account",
+    "user.following": "People %1 Follows",
-    "reset": "Reset your account password",
+    "user.followers": "People who Follow %1",
-    "categories": "Categories",
+    "user.posts": "Posts made by %1",
-    "groups": "Groups",
+    "user.topics": "Topics created by %1",
-    "group": "%1 group",
+    "user.groups": "%1's Groups",
-    "chats": "Chats",
+    "user.favourites": "%1's Favorite Posts",
-    "chat": "Chatting with %1",
+    "user.settings": "User Settings",
-    "account/edit": "Editing \"%1\"",
+    "user.watched": "Topics watched by %1",
-    "account/following": "People %1 follows",
-    "account/followers": "People who follow %1",
-    "account/posts": "Posts made by %1",
-    "account/topics": "Topics created by %1",
-    "account/groups": "%1's Groups",
-    "account/favourites": "%1's Favorite Posts",
-    "account/settings": "User Settings",
-    "account/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/user.json

@@ -12,7 +12,6 @@
     "delete_account": "Delete Account",
     "delete_account_confirm": "Are you sure you want to delete your account? <br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your username to confirm that you wish to destroy this account.",
     "delete_this_account_confirm": "Are you sure you want to delete this account? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
-    "account-deleted": "Account deleted",
     "fullname": "Full Name",
     "website": "Website",
     "location": "Location",
@@ -53,7 +52,6 @@
     "username_taken_workaround": "The username you requested was already taken, so we have altered it slightly. You are now known as <strong>%1</strong>",
     "upload_picture": "Upload picture",
     "upload_a_picture": "Upload a picture",
-    "remove_uploaded_picture": "Remove Uploaded Picture",
     "image_spec": "You may only upload PNG, JPG, or GIF files",
     "settings": "Settings",
     "show_email": "Show My Email",
@@ -82,10 +80,9 @@
     "browsing": "Browsing Settings",
     "open_links_in_new_tab": "Open outgoing links in new tab",
     "enable_topic_searching": "Enable In-Topic Searching",
-    "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behavior and allow you to search through the entire topic, instead of what is only shown on screen",
+    "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",
     "grouptitle": "Select the group title you would like to display",
-    "no-group-title": "No group title",
+    "no-group-title": "No group title"
-    "select-skin": "Select a Skin"
 }

public/language/es/category.json

@@ -1,12 +1,12 @@
 {
-    "category": "Categoría",
+    "category": "Category",
-    "subcategories": "Subcategorías",
+    "subcategories": "Subcategories",
     "new_topic_button": "Nuevo tema",
     "guest-login-post": "Acceder para poder escribir un mensaje",
     "no_topics": "<strong>No hay temas en esta categoría.</strong><br />¿Por qué no te animas y publicas uno?",
     "browsing": "viendo ahora",
     "no_replies": "Nadie ha respondido aún",
-    "no_new_posts": "No hay mensajes nuevos.",
+    "no_new_posts": "No new posts.",
     "share_this_category": "Compartir esta categoría",
     "watch": "Seguir",
     "ignore": "Ignorar",

public/language/es/error.json

@@ -77,8 +77,6 @@
     "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.",
-    "invalid-chat-message": "Invalid chat message",
-    "chat-message-too-long": "Chat message is too long",
     "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",

public/language/es/global.json

@@ -33,7 +33,6 @@
     "header.notifications": "Notificaciones",
     "header.search": "Buscar",
     "header.profile": "Perfil",
-    "header.navigation": "Navegación",
     "notifications.loading": "Cargando notificaciones",
     "chats.loading": "Cargando chats",
     "motd.welcome": "Bienvenido a NodeBB, la plataforma de debate del el futuro.",

public/language/es/groups.json

@@ -12,9 +12,6 @@
     "invited.none": "No hay miembros invitados en este momento",
     "invited.uninvite": "Cancelar invitación",
     "invited.search": "Buscar un usuario para invitar a este grupo",
-    "invited.notification_title": "You have been invited to join <strong>%1</strong>",
-    "request.notification_title": "Group Membership Request from <strong>%1</strong>",
-    "request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
     "cover-instructions": "Arrastra y suelta una foto, arrastra a la posición, y pulsa <strong> Guardar </strong>",
     "cover-change": "Cambiar",
     "cover-save": "Guardar",
@@ -49,5 +46,5 @@
     "membership.join-group": "Unirse al grupo",
     "membership.leave-group": "Dejar el grupo",
     "membership.reject": "Rechazar",
-    "new-group.group_name": "Nombre de Grupo:"
+    "new-group.group_name": "Group Name:"
 }

public/language/es/modules.json

@@ -5,7 +5,7 @@
     "chat.no_active": "No tiene conversaciones activas.",
     "chat.user_typing": "%1 está escribiendo...",
     "chat.user_has_messaged_you": "%1 te ha enviado un mensaje.",
-    "chat.see_all": "Ver todos los chats",
+    "chat.see_all": "Ver todas las conversaciones",
     "chat.no-messages": "Por favor, selecciona un contacto para ver el historial de mensajes",
     "chat.recent-chats": "Chats recientes",
     "chat.contacts": "Contactos",
@@ -22,8 +22,5 @@
     "composer.user_said": "%1 dijo:",
     "composer.discard": "¿Estás seguro de que deseas descartar este mensaje?",
     "composer.submit_and_lock": "Enviar y Bloquear",
-    "composer.toggle_dropdown": "Alternar desplegable",
+    "composer.toggle_dropdown": "Alternar desplegable"
-    "bootbox.ok": "OK",
-    "bootbox.cancel": "Cancelar",
-    "bootbox.confirm": "Confirmar"
 }

public/language/es/notifications.json

@@ -2,7 +2,7 @@
     "title": "Notificaciones",
     "no_notifs": "No tienes nuevas notificaciones",
     "see_all": "Ver todas las notificaciones",
-    "mark_all_read": "Marcar todas las notificaciones como leídas",
+    "mark_all_read": "Marcar todas las notificaciones cómo leídas",
     "back_to_home": "Volver a %1",
     "outgoing_link": "Enlace externo",
     "outgoing_link_message": "Ahora estás saliendo de %1.",

public/language/es/pages.json

@@ -1,37 +1,21 @@
 {
     "home": "Inicio",
     "unread": "Temas no leídos",
-    "popular-day": "Temas populares hoy",
+    "popular": "Temas populares",
-    "popular-week": "Temas populares de la semana",
-    "popular-month": "Temas populares del mes",
-    "popular-alltime": "Temas populares de siempre",
     "recent": "Temas recientes",
-    "users/online": "Conectados",
+    "users": "Usuarios registrados",
-    "users/latest": "Últimos usuarios",
-    "users/sort-posts": "Top por mensajes",
-    "users/sort-reputation": "Más reputados",
-    "users/map": "Actividad",
-    "users/search": "Buscar",
     "notifications": "Notificaciones",
     "tags": "Etiquetas",
     "tag": "Temas etiquetados en \"%1\"",
-    "register": "Registrar una cuenta",
+    "user.edit": "Editando \"%1\"",
-    "login": "Acceder a tu cuenta",
+    "user.following": "Gente que sigue %1 ",
-    "reset": "Restablecer contraseña",
+    "user.followers": "Seguidores de %1",
-    "categories": "Categorías",
+    "user.posts": "Mensajes de %1",
-    "groups": "Grupos",
+    "user.topics": "Temas creados por %1",
-    "group": "Grupo de %1",
+    "user.groups": "%1's Grupos",
-    "chats": "Chats",
+    "user.favourites": "Publicaciones favoritas de %1 ",
-    "chat": "Chateando con %1",
+    "user.settings": "Preferencias de usuario",
-    "account/edit": "Editando \"%1\"",
+    "user.watched": "Temas vistos por 1%",
-    "account/following": "Gente que sigue %1",
-    "account/followers": "Seguidores de %1",
-    "account/posts": "Publicados por %1",
-    "account/topics": "Temas creados por %1",
-    "account/groups": "Grupos de %1",
-    "account/favourites": "Favoritos de %1",
-    "account/settings": "Preferencias",
-    "account/watched": "Temas seguidos por %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/user.json

@@ -12,7 +12,6 @@
     "delete_account": "Eliminar cuenta",
     "delete_account_confirm": "¿Estás seguro de que quieres eliminar tu cuenta? <br /><strong>Esta acción es irreversible y no podrás recuperar ninguno de tus datos.</strong><br /><br />Introduce tu nombre de usuario para confirmar la eliminación de la cuenta.",
     "delete_this_account_confirm": "Esta seguro de eliminar este usuario? <br /><strong>Esta acción de irreversible y no podrás recuperar ningún dato</strong><br /><br />",
-    "account-deleted": "Account deleted",
     "fullname": "Nombre completo",
     "website": "Sitio web",
     "location": "Ubicación",
@@ -53,7 +52,6 @@
     "username_taken_workaround": "El nombre de usuario que has solicitada ya está siendo usado, por tanto lo hemos alterado ligeramente. Ahora eres conocido como <strong>%1</strong>.",
     "upload_picture": "Subir foto",
     "upload_a_picture": "Subir una foto",
-    "remove_uploaded_picture": "Remove Uploaded Picture",
     "image_spec": "Sólo puedes subir imágenes en formato PNG, JPG o GIF.",
     "settings": "Opciones",
     "show_email": "Mostrar mi correo electrónico",
@@ -86,6 +84,5 @@
     "follow_topics_you_reply_to": "Seguir los temas en los que respondes",
     "follow_topics_you_create": "Seguir publicaciones que creas",
     "grouptitle": "Selecciona el título del grupo que deseas visualizar",
-    "no-group-title": "Sin título de grupo",
+    "no-group-title": "Sin título de grupo"
-    "select-skin": "Seleccionar una plantilla"
 }

public/language/et/error.json

@@ -77,8 +77,6 @@
     "cant-chat-with-yourself": "Sa ei saa endaga vestelda!",
     "chat-restricted": "Kasutaja on piiranud sõnumite saatmist. Privaatsõnumi saatmiseks peab kasutaja sind jälgima",
     "too-many-messages": "Oled saatnud liiga palju sõnumeid, oota natukene.",
-    "invalid-chat-message": "Invalid chat message",
-    "chat-message-too-long": "Chat message is too long",
     "reputation-system-disabled": "Reputatsiooni süsteem ei ole aktiveeritud",
     "downvoting-disabled": "Negatiivsete häälte andmine ei ole võimaldatud",
     "not-enough-reputation-to-downvote": "Sul ei ole piisavalt reputatsiooni, et anda negatiivset hinnangut sellele postitusele.",

public/language/et/global.json

@@ -33,7 +33,6 @@
     "header.notifications": "Teated",
     "header.search": "Otsi",
     "header.profile": "Profiil",
-    "header.navigation": "Navigation",
     "notifications.loading": "Laen teateid",
     "chats.loading": "Laen vestlusi",
     "motd.welcome": "Tere tulemast NodeBB foorumisse.",
@@ -68,7 +67,7 @@
     "recentposts": "Hiljutised postitused",
     "recentips": "Hiljutised IP'd, millelt sisse logitud",
     "away": "Eemal",
-    "dnd": "Do not disturb",
+    "dnd": "Hõivatud",
     "invisible": "Nähtamatu",
     "offline": "Väljas",
     "email": "Emaili aadress",

public/language/et/groups.json

@@ -12,9 +12,6 @@
     "invited.none": "Hetkel ei ole kutsutud kasutajaid",
     "invited.uninvite": "Tühistage kutse",
     "invited.search": "Otsige kasutajat, keda kutsuda antud gruppi.",
-    "invited.notification_title": "You have been invited to join <strong>%1</strong>",
-    "request.notification_title": "Group Membership Request from <strong>%1</strong>",
-    "request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
     "cover-instructions": "Lohista kaanepilt siia ning vajuta <strong>salvesta</strong>",
     "cover-change": "Muuda",
     "cover-save": "Salvesta",

public/language/et/modules.json

@@ -5,7 +5,7 @@
     "chat.no_active": "Sul ei ole hetkel aktiivseid vestlusi.",
     "chat.user_typing": "%1 kirjutab sõnumit...",
     "chat.user_has_messaged_you": "%1 saatis sulle sõnumi.",
-    "chat.see_all": "See all chats",
+    "chat.see_all": "Vaata kõiki vestlusi",
     "chat.no-messages": "Vali sõnumisaaja, et vaadata sõnumite ajalugu.",
     "chat.recent-chats": "Hiljutised vestlused",
     "chat.contacts": "Kontaktid",
@@ -22,8 +22,5 @@
     "composer.user_said": "%1 ütles:",
     "composer.discard": "Oled kindel, et soovid selle postituse tühistada?",
     "composer.submit_and_lock": "Kinnita ja Lukusta",
-    "composer.toggle_dropdown": "Aktiveeri rippmenüü",
+    "composer.toggle_dropdown": "Aktiveeri rippmenüü"
-    "bootbox.ok": "OK",
-    "bootbox.cancel": "Cancel",
-    "bootbox.confirm": "Confirm"
 }

public/language/et/notifications.json

@@ -1,7 +1,7 @@
 {
     "title": "Teated",
     "no_notifs": "Sul pole uusi teateid",
-    "see_all": "See all notifications",
+    "see_all": "Vaata kõiki teateid",
     "mark_all_read": "Märgi kõik teavitused loetuks",
     "back_to_home": "Tagasi %1",
     "outgoing_link": "Väljaminev link",

public/language/et/pages.json

@@ -1,37 +1,21 @@
 {
     "home": "Avaleht",
     "unread": "Lugemata teemad",
-    "popular-day": "Popular topics today",
+    "popular": "Populaarsed teemad",
-    "popular-week": "Popular topics this week",
-    "popular-month": "Popular topics this month",
-    "popular-alltime": "All time popular topics",
     "recent": "Hiljutised teemad",
-    "users/online": "Online Users",
+    "users": "Registreeritud kasutajad",
-    "users/latest": "Latest Users",
-    "users/sort-posts": "Users with the most posts",
-    "users/sort-reputation": "Users with the most reputation",
-    "users/map": "User Map",
-    "users/search": "User Search",
     "notifications": "Teated",
     "tags": "Märksõnad",
     "tag": "Teemad märksõnadega \"%1\"",
-    "register": "Register an account",
+    "user.edit": "Muudan \"%1\"",
-    "login": "Login to your account",
+    "user.following": "Kasutaja %1 jälgib",
-    "reset": "Reset your account password",
+    "user.followers": "Kasutajad, kes jälgivad %1",
-    "categories": "Categories",
+    "user.posts": "Postitused, mis on tehtud kasutaja %1 poolt",
-    "groups": "Groups",
+    "user.topics": "Teemad on kirjutanud %1",
-    "group": "%1 group",
+    "user.groups": "%1's grupid",
-    "chats": "Chats",
+    "user.favourites": "%1's lemmikud postitused",
-    "chat": "Chatting with %1",
+    "user.settings": "Kasutaja sätted",
-    "account/edit": "Editing \"%1\"",
+    "user.watched": "Teemasid jälgib %1 kasutajat",
-    "account/following": "People %1 follows",
-    "account/followers": "People who follow %1",
-    "account/posts": "Posts made by %1",
-    "account/topics": "Topics created by %1",
-    "account/groups": "%1's Groups",
-    "account/favourites": "%1's Favourite Posts",
-    "account/settings": "User Settings",
-    "account/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/user.json

@@ -12,7 +12,6 @@
     "delete_account": "Kustuta kasutaja",
     "delete_account_confirm": "Oled kindel, et soovid oma kasutaja kustutada?<br /><strong>Pärast kustutamist pole võimalik andmeid ja kasutajat taastada.</strong><br /><br />Sisesta oma kasutajanimi, et kinnitada kasutaja kustutamine.",
     "delete_this_account_confirm": "Olete kindel, et soovide seda kasutajat kustutada? <br /><strong>Pärast seda pole võimalik kasutajat ja andmeid taastada</strong><br /><br />",
-    "account-deleted": "Account deleted",
     "fullname": "Täisnimi",
     "website": "Koduleht",
     "location": "Asukoht",
@@ -53,7 +52,6 @@
     "username_taken_workaround": "Kasutajanimi mida soovisid, ei olnud saadaval, seeg muutsime seda natukene. Sinu uus kasutajanimi on nüüd: <strong>%1</strong>",
     "upload_picture": "Laadi pilt",
     "upload_a_picture": "Lae pilt üles",
-    "remove_uploaded_picture": "Remove Uploaded Picture",
     "image_spec": "Failid peavad olema PNG, JPG või GIF vormingus.",
     "settings": "Seaded",
     "show_email": "Näita minu emaili",
@@ -86,6 +84,5 @@
     "follow_topics_you_reply_to": "Järgi teemasid, millele olete vastanud.",
     "follow_topics_you_create": "Järgi teemasi, mis on teie loodud.",
     "grouptitle": "Vali grupile tiitel mida kuvada soovid",
-    "no-group-title": "Grupi tiitel puudub",
+    "no-group-title": "Grupi tiitel puudub"
-    "select-skin": "Select a Skin"
 }

public/language/fa_IR/category.json

@@ -1,15 +1,15 @@
 {
-    "category": "شاخه",
+    "category": "Category",
-    "subcategories": "زیر شاخه ها",
+    "subcategories": "Subcategories",
     "new_topic_button": "جستار تازه",
     "guest-login-post": "برای ثبت نظر وارد شوید",
     "no_topics": "<strong>هیچ پستی در این دسته نیست.</strong><br />چرا شما یکی نفرستید؟",
     "browsing": "بیننده‌ها",
     "no_replies": "هیچ کسی پاسخ نداده است.",
-    "no_new_posts": "هیچ پست جدیدی موجود نیست.",
+    "no_new_posts": "No new posts.",
-    "share_this_category": "به اشتراک‌گذاری این شاخه",
+    "share_this_category": "به اشتراک‌گذاری این دسته",
     "watch": "نظارت کردن",
     "ignore": "نادیده گرفتن",
-    "watch.message": "در حال حاظر شما به روز رسانی های این شاخه را دنبال می کنید",
+    "watch.message": "در حال حاظر شما به روز رسانی های این دسته را دنبال می کنید",
-    "ignore.message": "در حال حاظر شما به روز رسانی های این شاخه را نادیده میگیرد"
+    "ignore.message": "در حال حاظر شما به روز رسانی های این دسته را نادیده میگیرد"
 }