Merge commit '83a817a2212a1706b7bb2486130cb9f448b3e201' into weekly

README.md

@@ -37,7 +37,6 @@ Additional functionality is enabled through the use of third-party plugins.
 
 ## How can I follow along/contribute?
 
-* Our feature roadmap is hosted on the project wiki's [Version History / Roadmap](https://github.com/NodeBB/NodeBB/wiki/Version-History-%26-Roadmap)
 * If you are a developer, feel free to check out the source and submit pull requests. We also have a wide array of [plugins](http://community.nodebb.org/category/7/nodebb-plugins) which would be a great starting point for learning the codebase.
 * If you are a designer, [NodeBB needs themes](http://community.nodebb.org/category/10/nodebb-themes)! NodeBB's theming system allows extention of the base templates as well as styling via LESS or CSS. NodeBB's base theme utilizes [Bootstrap 3](http://getbootstrap.com/) but themes can choose to use a different framework altogether.
 * If you know languages other than English you can help us translate NodeBB. We use [Transifex](https://www.transifex.com/projects/p/nodebb/) for internationalization.

package.json

@@ -13,8 +13,7 @@
     "start": "node loader.js",
     "lint": "eslint --cache .",
     "pretest": "npm run lint",
-    "test": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- ./tests -t 10000",
-    "test-windows": "./node_modules/.bin/_mocha.cmd ./tests -t 10000"
+    "test": "istanbul cover _mocha test"
   },
   "dependencies": {
     "async": "~1.5.0",
@@ -51,7 +50,7 @@
     "morgan": "^1.3.2",
     "mousetrap": "^1.5.3",
     "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "4.2.7",
+    "nodebb-plugin-composer-default": "4.2.8",
     "nodebb-plugin-dbsearch": "1.0.2",
     "nodebb-plugin-emoji-extended": "1.1.1",
     "nodebb-plugin-emoji-one": "1.1.5",
@@ -61,8 +60,8 @@
     "nodebb-plugin-spam-be-gone": "0.4.10",
     "nodebb-rewards-essentials": "0.0.9",
     "nodebb-theme-lavender": "3.0.14",
-    "nodebb-theme-persona": "4.1.56",
-    "nodebb-theme-vanilla": "5.1.37",
+    "nodebb-theme-persona": "4.1.58",
+    "nodebb-theme-vanilla": "5.1.39",
     "nodebb-widget-essentials": "2.0.11",
     "nodemailer": "2.0.0",
     "nodemailer-sendmail-transport": "1.0.0",
@@ -98,7 +97,7 @@
     "grunt": "~0.4.5",
     "grunt-contrib-watch": "^1.0.0",
     "istanbul": "^0.4.2",
-    "mocha": "~1.13.0"
+    "mocha": "~3.1.0"
   },
   "bugs": {
     "url": "https://github.com/NodeBB/NodeBB/issues"

public/language/ar/category.json

@@ -14,7 +14,7 @@
     "ignoring": "متجاهل",
     "watching.description": "أظهر المواضيع في غير مقروء",
     "ignoring.description": "لا تظهر المواضيع في غير مقروء",
-    "watch.message": "أنت اﻷن تتابع تحديثات هذه الفئة",
-    "ignore.message": "أنت اﻷن تتجاهل تحديثات هذه الفئة",
+    "watch.message": "You are now watching updates from this category and all subcategories",
+    "ignore.message": "You are now ignoring updates from this category and all subcategories",
     "watched-categories": "الفئات المتابعة"
 }

public/language/ar/error.json

@@ -62,6 +62,7 @@
     "content-too-long": "يرجى ادخال موضوع أقصر. على المواضيع أن لا تتخطى %1 حرف.",
     "title-too-short": "يرجى إدخال عنوان أطول. على العناوين أن تحتوي على %1 حرف على الأقل.",
     "title-too-long": "يرجى ادخال عنوان أقصر. على العناوين أن لا تتخطى %1 حرف.",
+    "category-not-selected": "Category not selected.",
     "too-many-posts": "يسمح لك بالنشر مرة كل %1 ثانية - يرجى الإنتظار قبل النشر مجدداً",
     "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
     "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",

public/language/ar/global.json

@@ -19,6 +19,7 @@
     "welcome_back": "مرحبًا بعودتك",
     "you_have_successfully_logged_in": "تم سجيل الدخول بنجاح",
     "save_changes": "حفظ التغييرات",
+    "save": "Save",
     "close": "أغلق",
     "pagination": "الصفحات",
     "pagination.out_of": "%1 من %2",

public/language/ar/groups.json

@@ -50,5 +50,7 @@
     "membership.leave-group": "غادر المجموعة",
     "membership.reject": "رفض",
     "new-group.group_name": "اسم المجموعة",
-    "upload-group-cover": "Upload group cover"
+    "upload-group-cover": "Upload group cover",
+    "bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
+    "bulk-invite": "Bulk Invite"
 }

public/language/ar/modules.json

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

public/language/ar/pages.json

@@ -18,6 +18,7 @@
     "tags": "الكلمات الدلالية",
     "tag": "المواضيع المرتبطة بالوسم %1",
     "register": "تسجيل حساب",
+    "registration-complete": "Registration complete",
     "login": "سجل الدخول الى حسابك",
     "reset": "إعادة تعيين كلمة مرور حسابك",
     "categories": "الفئات",

public/language/ar/topic.json

@@ -31,6 +31,21 @@
     "bookmark_instructions": "اضغط هنا للعودة لأخر مشاركة مقروءة في الموضوع",
     "flag_title": "إشعار بمشاركة مخلة.",
     "flag_success": "تم الإشعار بهذه المشاركة على أنها مخلة",
+    "flag_manage_title": "Flagged post in %1",
+    "flag_manage_history": "Action History",
+    "flag_manage_no_history": "No event history to report",
+    "flag_manage_assignee": "Assignee",
+    "flag_manage_state": "State",
+    "flag_manage_state_open": "New/Open",
+    "flag_manage_state_wip": "Work in Progress",
+    "flag_manage_state_resolved": "Resolved",
+    "flag_manage_state_rejected": "Rejected",
+    "flag_manage_notes": "Shared Notes",
+    "flag_manage_update": "Update Flag Status",
+    "flag_manage_history_assignee": "Assigned to %1",
+    "flag_manage_history_state": "Updated state to %1",
+    "flag_manage_history_notes": "Updated flag notes",
+    "flag_manage_saved": "Flag Details Updated",
     "deleted_message": "هذه المشاركة محذوفة. فقط من لهم صلاحية الإشراف على ا لمشاركات يمكنهم معاينتها.",
     "following_topic.message": "ستستلم تنبيها عند كل مشاركة جديدة في هذا الموضوع.",
     "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",

public/language/ar/user.json

@@ -123,5 +123,7 @@
     "info.banned-reason-label": "Reason",
     "info.banned-no-reason": "No reason given.",
     "info.username-history": "Username History",
-    "info.email-history": "Email History"
+    "info.email-history": "Email History",
+    "info.moderation-note": "Moderation Note",
+    "info.moderation-note.success": "Moderation note saved"
 }

public/language/bg/category.json

@@ -14,7 +14,7 @@
     "ignoring": "Пренебрегвате",
     "watching.description": "Темите ще се показват в непрочетените",
     "ignoring.description": "Темите няма да се показват в непрочетените",
-    "watch.message": "Вече следите обновленията в тази категория",
-    "ignore.message": "Вече не следите обновленията в тази категория",
+    "watch.message": "Вече наблюдавате новите неща в тази категория и всички под-категории",
+    "ignore.message": "Вече не следите новите неща в тази категория и всички под-категории",
     "watched-categories": "Наблюдавани категории"
 }

public/language/bg/error.json

@@ -62,6 +62,7 @@
     "content-too-long": "Моля, въведете по-кратък текст на публикацията. Публикациите трябва да съдържат не повече от %1 символ(а).",
     "title-too-short": "Моля, въведете по-дълго заглавие. Заглавията трябва да съдържат поне %1 символ(а).",
     "title-too-long": "Моля, въведете по-кратко заглавие. Заглавията трябва да съдържат не повече от %1 символ(а).",
+    "category-not-selected": "Не е избрана категория.",
     "too-many-posts": "Можете да публикувате веднъж на %1 секунда/и – моля, изчакайте малко, преди да опитате да публикувате отново",
     "too-many-posts-newbie": "Като нов потребител, Вие можете да публикувате веднъж на %1 секунда/и, докато не натрупате %2 репутация – моля, изчакайте малко, преди да опитате да публикувате отново",
     "tag-too-short": "Моля, въведете по-дълъг етикет. Етикетите трябва да съдържат поне %1 символ(а)",

public/language/bg/global.json

@@ -19,6 +19,7 @@
     "welcome_back": "Добре дошли отново",
     "you_have_successfully_logged_in": "Вие влязохте успешно",
     "save_changes": "Запазване на промените",
+    "save": "Запазване",
     "close": "Затваряне",
     "pagination": "Страници",
     "pagination.out_of": "%1 от %2",

public/language/bg/groups.json

@@ -50,5 +50,7 @@
     "membership.leave-group": "Напускане на групата",
     "membership.reject": "Отхвърляне",
     "new-group.group_name": "Име на групата:",
-    "upload-group-cover": "Качване на снимка за показване на групата"
+    "upload-group-cover": "Качване на снимка за показване на групата",
+    "bulk-invite-instructions": "Въведете списък от потребителски имена, разделени със запетаи",
+    "bulk-invite": "Масова покана"
 }

public/language/bg/modules.json

@@ -38,6 +38,7 @@
     "composer.upload-picture": "Качване на изображение",
     "composer.upload-file": "Качване на файл",
     "composer.zen_mode": "Режим Дзен",
+    "composer.select_category": "Изберете категория",
     "bootbox.ok": "Добре",
     "bootbox.cancel": "Отказ",
     "bootbox.confirm": "Потвърждаване",

public/language/bg/pages.json

@@ -18,6 +18,7 @@
     "tags": "Етикети",
     "tag": "Теми, отбелязани като „%1“",
     "register": "Регистрирайте акаунт",
+    "registration-complete": "Регистрацията е завършена",
     "login": "Влезте в акаунта си",
     "reset": "Подновете паролата за акаунта си",
     "categories": "Категории",

public/language/bg/topic.json

@@ -31,6 +31,21 @@
     "bookmark_instructions": "Щракнете тук, за да се върнете към последно прочетената публикация в тази тема.",
     "flag_title": "Докладване на тази публикация до модератор",
     "flag_success": "Тази публикация е била докладвана до модератор.",
+    "flag_manage_title": "Докладвана публикация в %1",
+    "flag_manage_history": "История на дейността",
+    "flag_manage_no_history": "Няма история на събитията",
+    "flag_manage_assignee": "Назначен",
+    "flag_manage_state": "Състояние",
+    "flag_manage_state_open": "Нов/отворен",
+    "flag_manage_state_wip": "В процес на работа",
+    "flag_manage_state_resolved": "Разрешен",
+    "flag_manage_state_rejected": "Отхвърлен",
+    "flag_manage_notes": "Споделени бележки",
+    "flag_manage_update": "Обновяване на състоянието на доклада",
+    "flag_manage_history_assignee": "Разпределен на %1",
+    "flag_manage_history_state": "Състоянието е променено на „%1“",
+    "flag_manage_history_notes": "Бележките към доклада са обновени",
+    "flag_manage_saved": "Подробностите за доклада са обновени",
     "deleted_message": "Тази тема е била изтрита. Само потребители с права за управление на темите могат да я видят.",
     "following_topic.message": "Вече ще получавате известия когато някой публикува коментар в тази тема.",
     "not_following_topic.message": "Ще виждате тази тема в списъка с непрочетени теми, но няма да получавате известия, когато хората публикуват нещо в нея.",

public/language/bg/user.json

@@ -123,5 +123,7 @@
     "info.banned-reason-label": "Причина",
     "info.banned-no-reason": "Няма посочена причина.",
     "info.username-history": "История на потребителските имена",
-    "info.email-history": "Историята на е-пощите"
+    "info.email-history": "Историята на е-пощите",
+    "info.moderation-note": "Модераторска бележка",
+    "info.moderation-note.success": "Модераторската бележка е запазена"
 }

public/language/bn/category.json

@@ -14,7 +14,7 @@
     "ignoring": "Ignoring",
     "watching.description": "Show topics in unread",
     "ignoring.description": "Do not show topics in unread",
-    "watch.message": "আপনি এই বিভাগটিতে নজর রাখছেন",
-    "ignore.message": "আপনি এই বিভাগটির উপেক্ষা করছেন ",
+    "watch.message": "You are now watching updates from this category and all subcategories",
+    "ignore.message": "You are now ignoring updates from this category and all subcategories",
     "watched-categories": "প্রেক্ষিত বিভাগসমূহ"
 }

public/language/bn/error.json

@@ -62,6 +62,7 @@
     "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
     "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 character(s).",
+    "category-not-selected": "Category not selected.",
     "too-many-posts": "You can only post once every %1 second(s) - please wait before posting again",
     "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
     "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",

public/language/bn/global.json

@@ -19,6 +19,7 @@
     "welcome_back": "আপনাকে স্বাগতম",
     "you_have_successfully_logged_in": "আপনি সফলভাবে প্রবেশ করেছেন",
     "save_changes": "পরিবর্তনগুলি সঞ্চয় করুন",
+    "save": "Save",
     "close": "বন্ধ",
     "pagination": "পাতা নং",
     "pagination.out_of": "%2 এর মাঝে %1",

public/language/bn/groups.json

@@ -50,5 +50,7 @@
     "membership.leave-group": "Leave Group",
     "membership.reject": "Reject",
     "new-group.group_name": "Group Name:",
-    "upload-group-cover": "Upload group cover"
+    "upload-group-cover": "Upload group cover",
+    "bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
+    "bulk-invite": "Bulk Invite"
 }

public/language/bn/modules.json

@@ -38,6 +38,7 @@
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
     "composer.zen_mode": "Zen Mode",
+    "composer.select_category": "Select a category",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",

public/language/bn/pages.json

@@ -18,6 +18,7 @@
     "tags": "ট্যাগসমূহ",
     "tag": "Topics tagged under \"%1\"",
     "register": "Register an account",
+    "registration-complete": "Registration complete",
     "login": "Login to your account",
     "reset": "Reset your account password",
     "categories": "বিভাগ",

public/language/bn/topic.json

@@ -31,6 +31,21 @@
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "মডারেশনের জন্য এই পোস্টটি ফ্ল্যাগ করুন",
     "flag_success": "এই পোস্টটি মডারেশনের জন্য ফ্ল্যাগ করা হয়েছে।",
+    "flag_manage_title": "Flagged post in %1",
+    "flag_manage_history": "Action History",
+    "flag_manage_no_history": "No event history to report",
+    "flag_manage_assignee": "Assignee",
+    "flag_manage_state": "State",
+    "flag_manage_state_open": "New/Open",
+    "flag_manage_state_wip": "Work in Progress",
+    "flag_manage_state_resolved": "Resolved",
+    "flag_manage_state_rejected": "Rejected",
+    "flag_manage_notes": "Shared Notes",
+    "flag_manage_update": "Update Flag Status",
+    "flag_manage_history_assignee": "Assigned to %1",
+    "flag_manage_history_state": "Updated state to %1",
+    "flag_manage_history_notes": "Updated flag notes",
+    "flag_manage_saved": "Flag Details Updated",
     "deleted_message": "এই টপিকটি মুছে ফেলা হয়েছে। শুধুমাত্র টপিক ব্যবস্থাপনার ক্ষমতাপ্রাপ্ত সদস্যগণ এটি দেখতে পারবেন।",
     "following_topic.message": "এখন থেকে এই টপিকে অন্যকেউ পোস্ট করলে আপনি নোটিফিকেশন পাবেন।",
     "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",

public/language/bn/user.json

@@ -123,5 +123,7 @@
     "info.banned-reason-label": "Reason",
     "info.banned-no-reason": "No reason given.",
     "info.username-history": "Username History",
-    "info.email-history": "Email History"
+    "info.email-history": "Email History",
+    "info.moderation-note": "Moderation Note",
+    "info.moderation-note.success": "Moderation note saved"
 }

public/language/cs/category.json

@@ -14,7 +14,7 @@
     "ignoring": "Ignoring",
     "watching.description": "Show topics in unread",
     "ignoring.description": "Do not show topics in unread",
-    "watch.message": "Nyní sledujete aktualizace ve skupině",
-    "ignore.message": "Nyní ignorujete aktualizace ve skupině ",
+    "watch.message": "You are now watching updates from this category and all subcategories",
+    "ignore.message": "You are now ignoring updates from this category and all subcategories",
     "watched-categories": "Sledované kategorie"
 }

public/language/cs/error.json

@@ -62,6 +62,7 @@
     "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
     "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 character(s).",
+    "category-not-selected": "Category not selected.",
     "too-many-posts": "You can only post once every %1 second(s) - please wait before posting again",
     "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
     "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",

public/language/cs/global.json

@@ -19,6 +19,7 @@
     "welcome_back": "Vítejte zpět",
     "you_have_successfully_logged_in": "Vaše přihlášení proběhlo úspěšně",
     "save_changes": "Uložit změny",
+    "save": "Save",
     "close": "Zrušit",
     "pagination": "Stránkování",
     "pagination.out_of": "%1 z %2",

public/language/cs/groups.json

@@ -50,5 +50,7 @@
     "membership.leave-group": "Opustit skupinu",
     "membership.reject": "Odmítnout",
     "new-group.group_name": "Název skupiny:",
-    "upload-group-cover": "Nahrát titulní obrázek skupiny"
+    "upload-group-cover": "Nahrát titulní obrázek skupiny",
+    "bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
+    "bulk-invite": "Bulk Invite"
 }

public/language/cs/modules.json

@@ -38,6 +38,7 @@
     "composer.upload-picture": "Nahrát obrázek",
     "composer.upload-file": "Nahrát soubor",
     "composer.zen_mode": "Zen Mode",
+    "composer.select_category": "Select a category",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Zrušit",
     "bootbox.confirm": "Potvrdit",

public/language/cs/pages.json

@@ -18,6 +18,7 @@
     "tags": "Tagy",
     "tag": "Téma označeno pod \"%1\"",
     "register": "Zaregistrovat účet",
+    "registration-complete": "Registration complete",
     "login": "Přihlásit se ke svému účtu",
     "reset": "Obnovit heslo k účtu",
     "categories": "Kategorie",

public/language/cs/topic.json

@@ -31,6 +31,21 @@
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Flag this post for moderation",
     "flag_success": "This post has been flagged for moderation.",
+    "flag_manage_title": "Flagged post in %1",
+    "flag_manage_history": "Action History",
+    "flag_manage_no_history": "No event history to report",
+    "flag_manage_assignee": "Assignee",
+    "flag_manage_state": "State",
+    "flag_manage_state_open": "New/Open",
+    "flag_manage_state_wip": "Work in Progress",
+    "flag_manage_state_resolved": "Resolved",
+    "flag_manage_state_rejected": "Rejected",
+    "flag_manage_notes": "Shared Notes",
+    "flag_manage_update": "Update Flag Status",
+    "flag_manage_history_assignee": "Assigned to %1",
+    "flag_manage_history_state": "Updated state to %1",
+    "flag_manage_history_notes": "Updated flag notes",
+    "flag_manage_saved": "Flag Details Updated",
     "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
     "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
     "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",

public/language/cs/user.json

@@ -123,5 +123,7 @@
     "info.banned-reason-label": "Reason",
     "info.banned-no-reason": "No reason given.",
     "info.username-history": "Username History",
-    "info.email-history": "Email History"
+    "info.email-history": "Email History",
+    "info.moderation-note": "Moderation Note",
+    "info.moderation-note.success": "Moderation note saved"
 }

public/language/da/category.json

@@ -14,7 +14,7 @@
     "ignoring": "Ignoring",
     "watching.description": "Show topics in unread",
     "ignoring.description": "Do not show topics in unread",
-    "watch.message": "Du overvåger nu opdateringer fra denne kategori",
-    "ignore.message": "Du ignorere nu opdateringer fra denne kategori",
+    "watch.message": "You are now watching updates from this category and all subcategories",
+    "ignore.message": "You are now ignoring updates from this category and all subcategories",
     "watched-categories": "Fulgte kategorier"
 }

public/language/da/error.json

@@ -62,6 +62,7 @@
     "content-too-long": "Venligt indtast et kortere indlæg. Indlæg kan ikke være længere end %1 karakter(er).",
     "title-too-short": "Venligst indtast en længere titel. Titlen skal mindst indeholde %1 karakter(er).",
     "title-too-long": "Venligst indtast en kortere titel. Titlen kan ikke indeholde flere end %1 karakter(er).",
+    "category-not-selected": "Category not selected.",
     "too-many-posts": "Du kan højest skrive et indlæg hver %1 sekund(er) - venligst vent et øjeblik før næste indlæg",
     "too-many-posts-newbie": "Som ny bruger kan du kun skrive et indlæg engang hvert %1. sekund() indtil du har optjent %2 omdømme point - venligst vent et øjeblik før næste indlæg.",
     "tag-too-short": "Indtast et længere tag. Tags skal indeholde mindst %1 karakter(er).",

public/language/da/global.json

@@ -19,6 +19,7 @@
     "welcome_back": "Velkommen tilbage",
     "you_have_successfully_logged_in": "Du er nu logget ind",
     "save_changes": "Gem ændringer",
+    "save": "Save",
     "close": "Luk",
     "pagination": "Sidetal",
     "pagination.out_of": "%1 ud af %2",

public/language/da/groups.json

@@ -50,5 +50,7 @@
     "membership.leave-group": "Forlad Gruppe",
     "membership.reject": "Afvis",
     "new-group.group_name": "Gruppe Navn:",
-    "upload-group-cover": "Upload Gruppe coverbillede"
+    "upload-group-cover": "Upload Gruppe coverbillede",
+    "bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
+    "bulk-invite": "Bulk Invite"
 }

public/language/da/modules.json

@@ -38,6 +38,7 @@
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
     "composer.zen_mode": "Zen Mode",
+    "composer.select_category": "Select a category",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Annuller",
     "bootbox.confirm": "Bekræft",

public/language/da/pages.json

@@ -18,6 +18,7 @@
     "tags": "Tags",
     "tag": "Tråde tagget under \"%1\"",
     "register": "Registre en konto",
+    "registration-complete": "Registration complete",
     "login": "Login til din konto",
     "reset": "Nulstil din adgangskode",
     "categories": "Kategorier",

public/language/da/topic.json

@@ -31,6 +31,21 @@
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Meld dette indlæg til moderation",
     "flag_success": "Dette indlæg er blevet meldt til moderation.",
+    "flag_manage_title": "Flagged post in %1",
+    "flag_manage_history": "Action History",
+    "flag_manage_no_history": "No event history to report",
+    "flag_manage_assignee": "Assignee",
+    "flag_manage_state": "State",
+    "flag_manage_state_open": "New/Open",
+    "flag_manage_state_wip": "Work in Progress",
+    "flag_manage_state_resolved": "Resolved",
+    "flag_manage_state_rejected": "Rejected",
+    "flag_manage_notes": "Shared Notes",
+    "flag_manage_update": "Update Flag Status",
+    "flag_manage_history_assignee": "Assigned to %1",
+    "flag_manage_history_state": "Updated state to %1",
+    "flag_manage_history_notes": "Updated flag notes",
+    "flag_manage_saved": "Flag Details Updated",
     "deleted_message": "Denne tråd er blevet slettet. Kun brugere med emne behandlings privilegier kan se den.",
     "following_topic.message": "Du vil nu modtage notifikationer når nogle skriver et indlæg i dette emne.",
     "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",

public/language/da/user.json

@@ -123,5 +123,7 @@
     "info.banned-reason-label": "Reason",
     "info.banned-no-reason": "No reason given.",
     "info.username-history": "Username History",
-    "info.email-history": "Email History"
+    "info.email-history": "Email History",
+    "info.moderation-note": "Moderation Note",
+    "info.moderation-note.success": "Moderation note saved"
 }

public/language/de/category.json

@@ -14,7 +14,7 @@
     "ignoring": "Ignoriere",
     "watching.description": "Show topics in unread",
     "ignoring.description": "Do not show topics in unread",
-    "watch.message": "Du beobachtest jetzt Änderungen in dieser Kategorie",
-    "ignore.message": "Du ignorierst jetzt Änderungen in dieser Kategorie",
+    "watch.message": "You are now watching updates from this category and all subcategories",
+    "ignore.message": "You are now ignoring updates from this category and all subcategories",
     "watched-categories": "Zuletzt angesehen Kategorien"
 }

public/language/de/error.json

@@ -62,6 +62,7 @@
     "content-too-long": "Bitte schreibe einen kürzeren Beitrag. Beiträge können nicht länger als %1 Zeichen sein.",
     "title-too-short": "Bitte gebe einen längeren Titel ein. Ein Titel muss mindestens %1 Zeichen enthalten.",
     "title-too-long": "Bitten gebe einen kürzeren Titel ein. Ein Titel darf nicht mehr als %1 Zeichen enthalten.",
+    "category-not-selected": "Category not selected.",
     "too-many-posts": "Du kannst nur einen Beitrag innerhalb von %1 Sekunden erstellen - Bitte warte bevor Du erneut einen Beitrag erstellst.",
     "too-many-posts-newbie": "Als neuer Benutzer kannst du nur einen Beitrag innerhalb von %1 Sekunden erstellen bis dein Ansehen %2 erreicht hat - Bitte warte bevor du erneut einen Beitrag erstellst.",
     "tag-too-short": "Bitte gebe ein längeres Schlagwort ein. Tags sollten mindestens %1 Zeichen enthalten.",

public/language/de/global.json

@@ -19,6 +19,7 @@
     "welcome_back": "Willkommen zurück",
     "you_have_successfully_logged_in": "Du hast dich erfolgreich angemeldet",
     "save_changes": "Speichere Änderungen",
+    "save": "Save",
     "close": "Schließen",
     "pagination": "Seitennummerierung",
     "pagination.out_of": "%1 von %2",

public/language/de/groups.json

@@ -50,5 +50,7 @@
     "membership.leave-group": "Gruppe verlassen",
     "membership.reject": "Ablehnen",
     "new-group.group_name": "Gruppenname:",
-    "upload-group-cover": "Gruppentitelbild hochladen"
+    "upload-group-cover": "Gruppentitelbild hochladen",
+    "bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
+    "bulk-invite": "Bulk Invite"
 }

public/language/de/modules.json

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

public/language/de/pages.json

@@ -18,6 +18,7 @@
     "tags": "Markierungen",
     "tag": "Themen markiert unter \"%1\"",
     "register": "Einen Benutzer erstellen",
+    "registration-complete": "Registration complete",
     "login": "Einloggen",
     "reset": "Passwort zurücksetzen",
     "categories": "Kategorien",

public/language/de/topic.json

@@ -31,6 +31,21 @@
     "bookmark_instructions": "Klicke hier, um zum letzten gelesenen Beitrag des Themas zurückzukehren.",
     "flag_title": "Diesen Beitrag zur Moderation markieren",
     "flag_success": "Dieser Beitrag wurde erfolgreich für die Moderation markiert.",
+    "flag_manage_title": "Flagged post in %1",
+    "flag_manage_history": "Action History",
+    "flag_manage_no_history": "No event history to report",
+    "flag_manage_assignee": "Assignee",
+    "flag_manage_state": "State",
+    "flag_manage_state_open": "New/Open",
+    "flag_manage_state_wip": "Work in Progress",
+    "flag_manage_state_resolved": "Resolved",
+    "flag_manage_state_rejected": "Rejected",
+    "flag_manage_notes": "Shared Notes",
+    "flag_manage_update": "Update Flag Status",
+    "flag_manage_history_assignee": "Assigned to %1",
+    "flag_manage_history_state": "Updated state to %1",
+    "flag_manage_history_notes": "Updated flag notes",
+    "flag_manage_saved": "Flag Details Updated",
     "deleted_message": "Dieses Thema wurde gelöscht. Nur Nutzer mit entsprechenden Rechten können es sehen.",
     "following_topic.message": "Du erhälst nun eine Benachrichtigung, wenn jemand einen Beitrag zu diesem Thema verfasst.",
     "not_following_topic.message": "Ungelesene Beiträge in diesem Thema werden angezeigt, aber du erhältst keine Benachrichtigung wenn jemand einen Beitrag zu diesem Thema verfasst.",

public/language/de/user.json

@@ -123,5 +123,7 @@
     "info.banned-reason-label": "Grund",
     "info.banned-no-reason": "Kein Grund angegeben.",
     "info.username-history": "Username History",
-    "info.email-history": "Email History"
+    "info.email-history": "Email History",
+    "info.moderation-note": "Moderation Note",
+    "info.moderation-note.success": "Moderation note saved"
 }

public/language/el/category.json

@@ -14,7 +14,7 @@
     "ignoring": "Ignoring",
     "watching.description": "Show topics in unread",
     "ignoring.description": "Do not show topics in unread",
-    "watch.message": "You are now watching updates from this category",
-    "ignore.message": "You are now ignoring updates from this category",
+    "watch.message": "You are now watching updates from this category and all subcategories",
+    "ignore.message": "You are now ignoring updates from this category and all subcategories",
     "watched-categories": "Watched categories"
 }

public/language/el/error.json

@@ -62,6 +62,7 @@
     "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
     "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 character(s).",
+    "category-not-selected": "Category not selected.",
     "too-many-posts": "You can only post once every %1 second(s) - please wait before posting again",
     "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
     "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",

public/language/el/global.json

@@ -19,6 +19,7 @@
     "welcome_back": "Καλωσόρισες Πάλι",
     "you_have_successfully_logged_in": "Συνδέθηκες με επιτυχία",
     "save_changes": "Αποθήκευση Αλλαγών",
+    "save": "Save",
     "close": "Κλείσιμο",
     "pagination": "Σελιδοποίηση",
     "pagination.out_of": "%1 από %2",

public/language/el/groups.json

@@ -50,5 +50,7 @@
     "membership.leave-group": "Leave Group",
     "membership.reject": "Reject",
     "new-group.group_name": "Group Name:",
-    "upload-group-cover": "Upload group cover"
+    "upload-group-cover": "Upload group cover",
+    "bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
+    "bulk-invite": "Bulk Invite"
 }

public/language/el/modules.json

@@ -38,6 +38,7 @@
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
     "composer.zen_mode": "Zen Mode",
+    "composer.select_category": "Select a category",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",

public/language/el/pages.json

@@ -18,6 +18,7 @@
     "tags": "Tags",
     "tag": "Topics tagged under \"%1\"",
     "register": "Register an account",
+    "registration-complete": "Registration complete",
     "login": "Login to your account",
     "reset": "Reset your account password",
     "categories": "Categories",

public/language/el/topic.json

@@ -31,6 +31,21 @@
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Επισήμανση αυτής της δημοσίευσης για συντονισμό",
     "flag_success": "Αυτή η δημοσίευση έχει επισημανθεί για συντονισμό.",
+    "flag_manage_title": "Flagged post in %1",
+    "flag_manage_history": "Action History",
+    "flag_manage_no_history": "No event history to report",
+    "flag_manage_assignee": "Assignee",
+    "flag_manage_state": "State",
+    "flag_manage_state_open": "New/Open",
+    "flag_manage_state_wip": "Work in Progress",
+    "flag_manage_state_resolved": "Resolved",
+    "flag_manage_state_rejected": "Rejected",
+    "flag_manage_notes": "Shared Notes",
+    "flag_manage_update": "Update Flag Status",
+    "flag_manage_history_assignee": "Assigned to %1",
+    "flag_manage_history_state": "Updated state to %1",
+    "flag_manage_history_notes": "Updated flag notes",
+    "flag_manage_saved": "Flag Details Updated",
     "deleted_message": "Το θέμα αυτό έχει διαγραφεί. Μόνο οι χρήστες με δικαιώματα διαχειριστή θεμάτων μπορούν να το δουν.",
     "following_topic.message": "Θα λαμβάνεις ειδοποιήσεις όποτε κάποιος δημοσιεύει κάτι σε αυτό το θέμα.",
     "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",

public/language/el/user.json

@@ -123,5 +123,7 @@
     "info.banned-reason-label": "Reason",
     "info.banned-no-reason": "No reason given.",
     "info.username-history": "Username History",
-    "info.email-history": "Email History"
+    "info.email-history": "Email History",
+    "info.moderation-note": "Moderation Note",
+    "info.moderation-note.success": "Moderation note saved"
 }

public/language/en@pirate/category.json

@@ -14,7 +14,7 @@
     "ignoring": "Ignoring",
     "watching.description": "Show topics in unread",
     "ignoring.description": "Do not show topics in unread",
-    "watch.message": "Ye now be watchin' updates from 'tis category",
-    "ignore.message": "Ye now be ignorin' updates from 'tis category",
+    "watch.message": "You are now watching updates from this category and all subcategories",
+    "ignore.message": "You are now ignoring updates from this category and all subcategories",
     "watched-categories": "Categories ye be watchin'"
 }

public/language/en@pirate/error.json

@@ -62,6 +62,7 @@
     "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
     "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 character(s).",
+    "category-not-selected": "Category not selected.",
     "too-many-posts": "You can only post once every %1 second(s) - please wait before posting again",
     "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
     "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",

public/language/en@pirate/global.json

@@ -19,6 +19,7 @@
     "welcome_back": "Welcome Back",
     "you_have_successfully_logged_in": "Ye have successfully logged in",
     "save_changes": "Save yer Changes",
+    "save": "Save",
     "close": "Shoot down",
     "pagination": "Pagination",
     "pagination.out_of": "%1 out of %2",

public/language/en@pirate/groups.json

@@ -50,5 +50,7 @@
     "membership.leave-group": "Leave Group",
     "membership.reject": "Reject",
     "new-group.group_name": "Group Name:",
-    "upload-group-cover": "Upload group cover"
+    "upload-group-cover": "Upload group cover",
+    "bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
+    "bulk-invite": "Bulk Invite"
 }

public/language/en@pirate/modules.json

@@ -38,6 +38,7 @@
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
     "composer.zen_mode": "Zen Mode",
+    "composer.select_category": "Select a category",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",

public/language/en@pirate/pages.json

@@ -18,6 +18,7 @@
     "tags": "Tags",
     "tag": "Topics tagged under \"%1\"",
     "register": "Register an account",
+    "registration-complete": "Registration complete",
     "login": "Login to your account",
     "reset": "Reset your account password",
     "categories": "Categories",

public/language/en@pirate/topic.json

@@ -31,6 +31,21 @@
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Flag this post for moderation",
     "flag_success": "This post has been flagged for moderation.",
+    "flag_manage_title": "Flagged post in %1",
+    "flag_manage_history": "Action History",
+    "flag_manage_no_history": "No event history to report",
+    "flag_manage_assignee": "Assignee",
+    "flag_manage_state": "State",
+    "flag_manage_state_open": "New/Open",
+    "flag_manage_state_wip": "Work in Progress",
+    "flag_manage_state_resolved": "Resolved",
+    "flag_manage_state_rejected": "Rejected",
+    "flag_manage_notes": "Shared Notes",
+    "flag_manage_update": "Update Flag Status",
+    "flag_manage_history_assignee": "Assigned to %1",
+    "flag_manage_history_state": "Updated state to %1",
+    "flag_manage_history_notes": "Updated flag notes",
+    "flag_manage_saved": "Flag Details Updated",
     "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
     "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
     "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",

public/language/en@pirate/user.json

@@ -123,5 +123,7 @@
     "info.banned-reason-label": "Reason",
     "info.banned-no-reason": "No reason given.",
     "info.username-history": "Username History",
-    "info.email-history": "Email History"
+    "info.email-history": "Email History",
+    "info.moderation-note": "Moderation Note",
+    "info.moderation-note.success": "Moderation note saved"
 }

public/language/en_GB/error.json

@@ -88,8 +88,8 @@
 	"file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
 	"guest-upload-disabled": "Guest uploading has been disabled",
 
-	"already-favourited": "You have already bookmarked this post",
-	"already-unfavourited": "You have already unbookmarked this post",
+	"already-bookmarked": "You have already bookmarked this post",
+	"already-unbookmarked": "You have already unbookmarked 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",

public/language/en_GB/pages.json

@@ -41,7 +41,7 @@
 	"account/posts": "Posts made by %1",
 	"account/topics": "Topics created by %1",
 	"account/groups": "%1's Groups",
-	"account/favourites": "%1's Bookmarked Posts",
+	"account/bookmarks": "%1's Bookmarked Posts",
 	"account/settings": "User Settings",
 	"account/watched": "Topics watched by %1",
 	"account/upvoted": "Posts upvoted by %1",

public/language/en_GB/topic.json

@@ -104,9 +104,9 @@
 	"confirm_move": "Move",
 	"confirm_fork": "Fork",
 
-	"favourite": "Bookmark",
-	"favourites": "Bookmarks",
-	"favourites.has_no_favourites": "You haven't bookmarked any posts yet.",
+	"bookmark": "Bookmark",
+	"bookmarks": "Bookmarks",
+	"bookmarks.has_no_bookmarks": "You haven't bookmarked any posts yet.",
 
 	"loading_more_posts": "Loading More Posts",
 	"move_topic": "Move Topic",

public/language/en_GB/user.json

@@ -25,7 +25,7 @@
 	"profile": "Profile",
 	"profile_views": "Profile views",
 	"reputation": "Reputation",
-	"favourites":"Bookmarks",
+	"bookmarks":"Bookmarks",
 	"watched": "Watched",
 	"followers": "Followers",
 	"following": "Following",

public/language/en_US/category.json

@@ -14,7 +14,7 @@
     "ignoring": "Ignoring",
     "watching.description": "Show topics in unread",
     "ignoring.description": "Do not show topics in unread",
-    "watch.message": "You are now watching updates from this category",
-    "ignore.message": "You are now ignoring updates from this category",
+    "watch.message": "You are now watching updates from this category and all subcategories",
+    "ignore.message": "You are now ignoring updates from this category and all subcategories",
     "watched-categories": "Watched categories"
 }

public/language/en_US/error.json

@@ -62,6 +62,7 @@
     "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).",
     "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).",
     "title-too-long": "Please enter a shorter title. Titles can't be longer than %1 character(s).",
+    "category-not-selected": "Category not selected.",
     "too-many-posts": "You can only post once every %1 second(s) - please wait before posting again",
     "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
     "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",

public/language/en_US/global.json

@@ -19,6 +19,7 @@
     "welcome_back": "Welcome Back",
     "you_have_successfully_logged_in": "You have successfully logged in",
     "save_changes": "Save Changes",
+    "save": "Save",
     "close": "Close",
     "pagination": "Pagination",
     "pagination.out_of": "%1 out of %2",

public/language/en_US/groups.json

@@ -50,5 +50,7 @@
     "membership.leave-group": "Leave Group",
     "membership.reject": "Reject",
     "new-group.group_name": "Group Name:",
-    "upload-group-cover": "Upload group cover"
+    "upload-group-cover": "Upload group cover",
+    "bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
+    "bulk-invite": "Bulk Invite"
 }

public/language/en_US/modules.json

@@ -38,6 +38,7 @@
     "composer.upload-picture": "Upload Image",
     "composer.upload-file": "Upload File",
     "composer.zen_mode": "Zen Mode",
+    "composer.select_category": "Select a category",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",

public/language/en_US/pages.json

@@ -18,6 +18,7 @@
     "tags": "Tags",
     "tag": "Topics tagged under \"%1\"",
     "register": "Register an account",
+    "registration-complete": "Registration complete",
     "login": "Login to your account",
     "reset": "Reset your account password",
     "categories": "Categories",

public/language/en_US/topic.json

@@ -31,6 +31,21 @@
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
     "flag_title": "Flag this post for moderation",
     "flag_success": "This post has been flagged for moderation.",
+    "flag_manage_title": "Flagged post in %1",
+    "flag_manage_history": "Action History",
+    "flag_manage_no_history": "No event history to report",
+    "flag_manage_assignee": "Assignee",
+    "flag_manage_state": "State",
+    "flag_manage_state_open": "New/Open",
+    "flag_manage_state_wip": "Work in Progress",
+    "flag_manage_state_resolved": "Resolved",
+    "flag_manage_state_rejected": "Rejected",
+    "flag_manage_notes": "Shared Notes",
+    "flag_manage_update": "Update Flag Status",
+    "flag_manage_history_assignee": "Assigned to %1",
+    "flag_manage_history_state": "Updated state to %1",
+    "flag_manage_history_notes": "Updated flag notes",
+    "flag_manage_saved": "Flag Details Updated",
     "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
     "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",
     "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",

public/language/en_US/user.json

@@ -123,5 +123,7 @@
     "info.banned-reason-label": "Reason",
     "info.banned-no-reason": "No reason given.",
     "info.username-history": "Username History",
-    "info.email-history": "Email History"
+    "info.email-history": "Email History",
+    "info.moderation-note": "Moderation Note",
+    "info.moderation-note.success": "Moderation note saved"
 }

public/language/es/category.json

@@ -14,7 +14,7 @@
     "ignoring": "Ignorando",
     "watching.description": "Mostrar temas en no leidos",
     "ignoring.description": "No mostrar temas en no leidos",
-    "watch.message": "Ahora estás viendo actualizaciones de esta categoría",
-    "ignore.message": "Ahora estás ignorando las actualizaciones de esta categoría",
+    "watch.message": "Ahora puede ver la actualizaciones de esta categoría y todas las subcategorías",
+    "ignore.message": "Dejar de ver las actualizaciones de esta categoría y todas las subcategorías",
     "watched-categories": "Categorías seguidas"
 }

public/language/es/error.json

@@ -29,7 +29,7 @@
     "username-too-long": "Nombre de usuario demasiado largo",
     "password-too-long": "Contraseña muy corta",
     "user-banned": "Usuario baneado",
-    "user-banned-reason": "User banned (Reason: %1)",
+    "user-banned-reason": "Usuario Baneado (Reason: %1)",
     "user-too-new": "Lo sentimos, es necesario que esperes %1 segundo(s) antes poder hacer tu primera publicación",
     "blacklisted-ip": "Lo sentimos, tu dirección IP ha sido baneada de esta comunidad. Si crees que debe de haber un error, por favor contacte con un administrador.",
     "ban-expiry-missing": "Por favor pon una fecha de fin del ban",
@@ -62,6 +62,7 @@
     "content-too-long": "Por favor introduzca un mensaje más corto. Los mensajes no pueden exceder los %1 caractere(s).",
     "title-too-short": "Por favor introduzca un título más largo. Los títulos deben contener al menos %1 caractere(s).",
     "title-too-long": "Por favor, introduce un título más corto, que no sobrepase los %1 caractere(s).",
+    "category-not-selected": "Categoría no seleccionada.",
     "too-many-posts": "Solo puedes publicar una vez cada %1 segundo(s) - por favor espere antes de volver a publicar",
     "too-many-posts-newbie": "Como nuevo usuario, solo puedes publicar una vez cada %1 segundo(s) hasta hayas ganado una reputación de %2 - por favor espera antes de volver a publicar",
     "tag-too-short": "Por favor introduce una etiqueta más larga. Las etiquetas deben contener por lo menos %1 caractere(s)",

public/language/es/global.json

@@ -19,6 +19,7 @@
     "welcome_back": "¡Bienvenido de nuevo!",
     "you_have_successfully_logged_in": "Identificado satisfactoriamente",
     "save_changes": "Guardar cambios",
+    "save": "Guardar",
     "close": "Cerrar",
     "pagination": "Paginación",
     "pagination.out_of": "%1 de %2",

public/language/es/groups.json

@@ -50,5 +50,7 @@
     "membership.leave-group": "Dejar el grupo",
     "membership.reject": "Rechazar",
     "new-group.group_name": "Nombre de Grupo:",
-    "upload-group-cover": "Cargar foto para el grupo"
+    "upload-group-cover": "Cargar foto para el grupo",
+    "bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
+    "bulk-invite": "Bulk Invite"
 }

public/language/es/modules.json

@@ -38,6 +38,7 @@
     "composer.upload-picture": "Subir foto",
     "composer.upload-file": "Subir archivo",
     "composer.zen_mode": "Modo Zen",
+    "composer.select_category": "Select a category",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancelar",
     "bootbox.confirm": "Confirmar",

public/language/es/pages.json

@@ -18,6 +18,7 @@
     "tags": "Etiquetas",
     "tag": "Temas etiquetados en \"%1\"",
     "register": "Registrar una cuenta",
+    "registration-complete": "Registration complete",
     "login": "Acceder a tu cuenta",
     "reset": "Restablecer contraseña",
     "categories": "Categorías",

public/language/es/topic.json

@@ -31,6 +31,21 @@
     "bookmark_instructions": "Haz click aquí para volver a tu último mensaje leído en este tema",
     "flag_title": "Reportar este mensaje",
     "flag_success": "Este mensaje ha sido reportado para moderación.",
+    "flag_manage_title": "Flagged post in %1",
+    "flag_manage_history": "Action History",
+    "flag_manage_no_history": "No event history to report",
+    "flag_manage_assignee": "Assignee",
+    "flag_manage_state": "State",
+    "flag_manage_state_open": "New/Open",
+    "flag_manage_state_wip": "Work in Progress",
+    "flag_manage_state_resolved": "Resolved",
+    "flag_manage_state_rejected": "Rejected",
+    "flag_manage_notes": "Shared Notes",
+    "flag_manage_update": "Update Flag Status",
+    "flag_manage_history_assignee": "Assigned to %1",
+    "flag_manage_history_state": "Updated state to %1",
+    "flag_manage_history_notes": "Updated flag notes",
+    "flag_manage_saved": "Flag Details Updated",
     "deleted_message": "Este tema ha sido borrado. Solo los usuarios que tengan privilegios de administración de temas pueden verlo.",
     "following_topic.message": "Ahora recibiras notificaciones cuando alguien publique en este tema.",
     "not_following_topic.message": "Podras ver este tema en la lista de no leidos, pero no recibirás notificaciones cuando alguien escriba en él.",

public/language/es/user.json

@@ -123,5 +123,7 @@
     "info.banned-reason-label": "Motivo",
     "info.banned-no-reason": "Motivo no especificado",
     "info.username-history": "Username History",
-    "info.email-history": "Email History"
+    "info.email-history": "Email History",
+    "info.moderation-note": "Moderation Note",
+    "info.moderation-note.success": "Moderation note saved"
 }

public/language/et/category.json

@@ -14,7 +14,7 @@
     "ignoring": "Ignoreerib",
     "watching.description": "Näita teemasid lugemata teemade hulgas",
     "ignoring.description": "Ära näita teemasid lugemata teemade hulgas",
-    "watch.message": "Jälgid nüüdsest teateid sellest kategooriast",
-    "ignore.message": "Ignoreerid nüüdsest teateid sellest kategooriast",
+    "watch.message": "You are now watching updates from this category and all subcategories",
+    "ignore.message": "You are now ignoring updates from this category and all subcategories",
     "watched-categories": "Jälgitavad kategooriad"
 }

public/language/et/error.json

@@ -62,6 +62,7 @@
     "content-too-long": "Palun tehke lühem postitus. Postituse pikkus peab olema vähem kui %1 tähemärk(i).",
     "title-too-short": "Palun sisesta pikem pealkiri. Pealkirjad ei saa olla lühemad kui %1 tähemärk(i).",
     "title-too-long": "Palun sisesta lühem pealkiri. Pealkirjad ei saa olla pikemad kui %1 tähemärk(i).",
+    "category-not-selected": "Category not selected.",
     "too-many-posts": "Te saate postitada %1 sekundi tagant - palun oodake enne uue postituse tegemist.",
     "too-many-posts-newbie": "Uue kasutajana saadte postitada vaid iga %1 sekundi tagant, seniks kuni olete teeninud vähemalt %2 reputatsiooni - palun oodake enne uue postituse tegemist.",
     "tag-too-short": "Palun sisestage pikem märksõna. Märksõna pikkus peab olema vähemalt %1 tähemärk(i).",

public/language/et/global.json

@@ -19,6 +19,7 @@
     "welcome_back": "Tere tulemast tagasi!",
     "you_have_successfully_logged_in": "Edukalt sisse logitud",
     "save_changes": "Salvesta muudatused",
+    "save": "Save",
     "close": "Sulge",
     "pagination": "Lehekülgede numeratsioon",
     "pagination.out_of": "%1 kõigist %2-st",

public/language/et/groups.json

@@ -50,5 +50,7 @@
     "membership.leave-group": "Lahku grupist",
     "membership.reject": "Lükka tagasi",
     "new-group.group_name": "Grupi nimi:",
-    "upload-group-cover": "Lae gruppi pilt üles"
+    "upload-group-cover": "Lae gruppi pilt üles",
+    "bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
+    "bulk-invite": "Bulk Invite"
 }

public/language/et/modules.json

@@ -38,6 +38,7 @@
     "composer.upload-picture": "Lae pilt üles",
     "composer.upload-file": "Lae fail üles",
     "composer.zen_mode": "Zen Mode",
+    "composer.select_category": "Select a category",
     "bootbox.ok": "Olgu",
     "bootbox.cancel": "Katkesta",
     "bootbox.confirm": "Kinnita",

public/language/et/pages.json

@@ -18,6 +18,7 @@
     "tags": "Märksõnad",
     "tag": "Teemad märksõnadega \"%1\"",
     "register": "Registreeri kasutaja",
+    "registration-complete": "Registration complete",
     "login": "Logi oma kasutajasse sisse",
     "reset": "Lähtesta oma kasutaja parool",
     "categories": "Kategooriad",

public/language/et/topic.json

@@ -31,6 +31,21 @@
     "bookmark_instructions": "Vajuta siia, et tagasi minna viimati loetud postituse juurde siin teemas.",
     "flag_title": "Märgista see postitus modereerimiseks",
     "flag_success": "See postitus on nüüd märgistatud modereerimiseks.",
+    "flag_manage_title": "Flagged post in %1",
+    "flag_manage_history": "Action History",
+    "flag_manage_no_history": "No event history to report",
+    "flag_manage_assignee": "Assignee",
+    "flag_manage_state": "State",
+    "flag_manage_state_open": "New/Open",
+    "flag_manage_state_wip": "Work in Progress",
+    "flag_manage_state_resolved": "Resolved",
+    "flag_manage_state_rejected": "Rejected",
+    "flag_manage_notes": "Shared Notes",
+    "flag_manage_update": "Update Flag Status",
+    "flag_manage_history_assignee": "Assigned to %1",
+    "flag_manage_history_state": "Updated state to %1",
+    "flag_manage_history_notes": "Updated flag notes",
+    "flag_manage_saved": "Flag Details Updated",
     "deleted_message": "See teema on kustutatud. Ainult kasutajad kellel on piisavalt õigusi saavad seda näha.",
     "following_topic.message": "Sulle ei edastata enam teateid uutest postitustest kui keegi postitab siia teemasse.",
     "not_following_topic.message": "Sa näed seda postitust lugemata postituste nimekirjas, kuid sa ei näe selle kohta teateid, kui keegi sinna postitab.",

public/language/et/user.json

@@ -123,5 +123,7 @@
     "info.banned-reason-label": "Reason",
     "info.banned-no-reason": "No reason given.",
     "info.username-history": "Username History",
-    "info.email-history": "Email History"
+    "info.email-history": "Email History",
+    "info.moderation-note": "Moderation Note",
+    "info.moderation-note.success": "Moderation note saved"
 }

public/language/fa_IR/category.json

@@ -14,7 +14,7 @@
     "ignoring": "در حال نادیده گرفتن",
     "watching.description": "نمایش موضوعات خوانده نشده",
     "ignoring.description": "هنوز موضوعات خوانده نشده را نشان نده",
-    "watch.message": "در حال حاضر شما بروز رسانی های این دسته بندی را دنبال می کنید",
-    "ignore.message": "در حال حاضر شما بروز رسانی های این دسته بندی را نادیده میگیرد",
+    "watch.message": "شما در حال حاضر در حال مشاهده به‌روزرسانی این دسته‌بندی و همه زیر شاخه‌های آن هستید",
+    "ignore.message": "شما در حال حاضر نادیده گرفته‌اید به‌روزرسانی این دسته‌بندی و همه زیر شاخه‌های آن",
     "watched-categories": "دسته بندی های پیگیری شده"
 }

public/language/fa_IR/error.json

@@ -62,6 +62,7 @@
     "content-too-long": "لطفا طول مطلب را کوتاه تر کنید. طول پست نمیتواند بیشتر از %1 کاراکتر باشد.",
     "title-too-short": "لطفا یک عنوان بلندتر وارد کنید. عنوان باید حداقل %1 کاراکتر داشته باشد.",
     "title-too-long": "لطفا یک عنوان بلندتر وارد کنید. عنوان باید حداقل %1 کاراکتر داشته باشد.",
+    "category-not-selected": "هیچ دسته‌بندی انتخاب نشده.",
     "too-many-posts": "شما می توانید هر %1 ثانیه یک پست ایجاد کنید - لطفا قبل از ارسال پست جدید صبر کنید",
     "too-many-posts-newbie": "به عنوان یک کاربر جدید ، تا زمانی که شما 2% اعتبار کسب کنید می توانید هر %1 ثانیه یک پست ایجاد کنید - لطفا قبل از ایجاد پست جدید صبر کنید .",
     "tag-too-short": "لطفا برچسب بلندتری وارد کنید. برچسبها باید حداقل %1 کاراکتر داشته باشند.",

public/language/fa_IR/global.json

@@ -19,6 +19,7 @@
     "welcome_back": "خوش آمدید",
     "you_have_successfully_logged_in": "با موفقیت درون آمده‌اید",
     "save_changes": "اندوختن تغییرها",
+    "save": "ذخیره",
     "close": "بستن",
     "pagination": "صفحه‌بندی",
     "pagination.out_of": "%1 از %2",

public/language/fa_IR/groups.json

@@ -50,5 +50,7 @@
     "membership.leave-group": "خروج از گروه",
     "membership.reject": "رد",
     "new-group.group_name": "نام گروه:",
-    "upload-group-cover": "آپلود کاور گروه"
+    "upload-group-cover": "آپلود کاور گروه",
+    "bulk-invite-instructions": "برای دعوت به این گروه فهرستی از نام‌کاربری که با کاما جدا کنید را وارد کنید",
+    "bulk-invite": "میزان دعوت"
 }

public/language/fa_IR/modules.json

@@ -38,6 +38,7 @@
     "composer.upload-picture": "بارگذاری عکس",
     "composer.upload-file": "بارگذاری فایل",
     "composer.zen_mode": "حالت ذن",
+    "composer.select_category": "یک دسته‌بندی انتخاب کنید",
     "bootbox.ok": "باشه",
     "bootbox.cancel": "انصراف",
     "bootbox.confirm": "تایید",

public/language/fa_IR/pages.json

@@ -18,6 +18,7 @@
     "tags": "برچسب‌ها",
     "tag": "موضوع های داری کلیدواژه \"%1\"",
     "register": "ثبت نام یک حساب",
+    "registration-complete": "ثبت نام تکمیل شد",
     "login": "به حساب خوب وارد شوید",
     "reset": "رمز عبور حساب خود را بازنشانی کنید",
     "categories": "دسته‌بندی‌ها",