diff --git a/README.md b/README.md
index 2d1c90fed8..70e2c9773b 100644
--- a/README.md
+++ b/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.
diff --git a/package.json b/package.json
index 96f0af6916..18c15f15ff 100644
--- a/package.json
+++ b/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"
diff --git a/public/language/ar/category.json b/public/language/ar/category.json
index 807b1579e3..6f61d752c6 100644
--- a/public/language/ar/category.json
+++ b/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": "الفئات المتابعة"
}
\ No newline at end of file
diff --git a/public/language/ar/error.json b/public/language/ar/error.json
index fea4dbc9b1..a1b111af1f 100644
--- a/public/language/ar/error.json
+++ b/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)",
diff --git a/public/language/ar/global.json b/public/language/ar/global.json
index fdfd1362f8..e95f80d67f 100644
--- a/public/language/ar/global.json
+++ b/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",
diff --git a/public/language/ar/groups.json b/public/language/ar/groups.json
index 673fba23e2..d9bb5dc4d9 100644
--- a/public/language/ar/groups.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/ar/modules.json b/public/language/ar/modules.json
index ce14cc171b..a9a07325e6 100644
--- a/public/language/ar/modules.json
+++ b/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": "تأكيد",
diff --git a/public/language/ar/pages.json b/public/language/ar/pages.json
index 6f3769508c..1519fa8d8a 100644
--- a/public/language/ar/pages.json
+++ b/public/language/ar/pages.json
@@ -18,6 +18,7 @@
"tags": "الكلمات الدلالية",
"tag": "المواضيع المرتبطة بالوسم %1",
"register": "تسجيل حساب",
+ "registration-complete": "Registration complete",
"login": "سجل الدخول الى حسابك",
"reset": "إعادة تعيين كلمة مرور حسابك",
"categories": "الفئات",
diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json
index f9b5a5774f..46f816b0e4 100644
--- a/public/language/ar/topic.json
+++ b/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.",
diff --git a/public/language/ar/user.json b/public/language/ar/user.json
index dbee05cfab..2bec30bc76 100644
--- a/public/language/ar/user.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/bg/category.json b/public/language/bg/category.json
index 0844bf6d93..a81544e227 100644
--- a/public/language/bg/category.json
+++ b/public/language/bg/category.json
@@ -14,7 +14,7 @@
"ignoring": "Пренебрегвате",
"watching.description": "Темите ще се показват в непрочетените",
"ignoring.description": "Темите няма да се показват в непрочетените",
- "watch.message": "Вече следите обновленията в тази категория",
- "ignore.message": "Вече не следите обновленията в тази категория",
+ "watch.message": "Вече наблюдавате новите неща в тази категория и всички под-категории",
+ "ignore.message": "Вече не следите новите неща в тази категория и всички под-категории",
"watched-categories": "Наблюдавани категории"
}
\ No newline at end of file
diff --git a/public/language/bg/error.json b/public/language/bg/error.json
index 301cd0640e..edfc95351b 100644
--- a/public/language/bg/error.json
+++ b/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 символ(а)",
diff --git a/public/language/bg/global.json b/public/language/bg/global.json
index 06eb4b3e59..644165e47d 100644
--- a/public/language/bg/global.json
+++ b/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",
diff --git a/public/language/bg/groups.json b/public/language/bg/groups.json
index f5ab2262ce..14f4d84bf3 100644
--- a/public/language/bg/groups.json
+++ b/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": "Масова покана"
}
\ No newline at end of file
diff --git a/public/language/bg/modules.json b/public/language/bg/modules.json
index e17f98847b..3838200b0a 100644
--- a/public/language/bg/modules.json
+++ b/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": "Потвърждаване",
diff --git a/public/language/bg/pages.json b/public/language/bg/pages.json
index 0ea75ffb7f..2230e2e5e2 100644
--- a/public/language/bg/pages.json
+++ b/public/language/bg/pages.json
@@ -18,6 +18,7 @@
"tags": "Етикети",
"tag": "Теми, отбелязани като „%1“",
"register": "Регистрирайте акаунт",
+ "registration-complete": "Регистрацията е завършена",
"login": "Влезте в акаунта си",
"reset": "Подновете паролата за акаунта си",
"categories": "Категории",
diff --git a/public/language/bg/topic.json b/public/language/bg/topic.json
index b6484ed616..36500647ef 100644
--- a/public/language/bg/topic.json
+++ b/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": "Ще виждате тази тема в списъка с непрочетени теми, но няма да получавате известия, когато хората публикуват нещо в нея.",
diff --git a/public/language/bg/user.json b/public/language/bg/user.json
index 2bac3f837e..44b8689945 100644
--- a/public/language/bg/user.json
+++ b/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": "Модераторската бележка е запазена"
}
\ No newline at end of file
diff --git a/public/language/bn/category.json b/public/language/bn/category.json
index 3023c8c3ee..93309521f8 100644
--- a/public/language/bn/category.json
+++ b/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": "প্রেক্ষিত বিভাগসমূহ"
}
\ No newline at end of file
diff --git a/public/language/bn/error.json b/public/language/bn/error.json
index f321d4406a..0e226b9097 100644
--- a/public/language/bn/error.json
+++ b/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)",
diff --git a/public/language/bn/global.json b/public/language/bn/global.json
index 35c002b5c3..c3892735fa 100644
--- a/public/language/bn/global.json
+++ b/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",
diff --git a/public/language/bn/groups.json b/public/language/bn/groups.json
index d2752a71e8..15be27e837 100644
--- a/public/language/bn/groups.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/bn/modules.json b/public/language/bn/modules.json
index 67a8aeddd3..9e705a29fc 100644
--- a/public/language/bn/modules.json
+++ b/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",
diff --git a/public/language/bn/pages.json b/public/language/bn/pages.json
index 42e731c384..864c02003e 100644
--- a/public/language/bn/pages.json
+++ b/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": "বিভাগ",
diff --git a/public/language/bn/topic.json b/public/language/bn/topic.json
index 30678c8227..6000265eaa 100644
--- a/public/language/bn/topic.json
+++ b/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.",
diff --git a/public/language/bn/user.json b/public/language/bn/user.json
index 59811361ce..b1d12ca4c6 100644
--- a/public/language/bn/user.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/cs/category.json b/public/language/cs/category.json
index 604f8bba0e..4a0009323c 100644
--- a/public/language/cs/category.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/cs/error.json b/public/language/cs/error.json
index e3f4a05c9f..204707feab 100644
--- a/public/language/cs/error.json
+++ b/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)",
diff --git a/public/language/cs/global.json b/public/language/cs/global.json
index 9043a00952..f491e40a0a 100644
--- a/public/language/cs/global.json
+++ b/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",
diff --git a/public/language/cs/groups.json b/public/language/cs/groups.json
index c1684ee4f0..4715b0aefa 100644
--- a/public/language/cs/groups.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/cs/modules.json b/public/language/cs/modules.json
index d12f123cb1..38bcd30ba9 100644
--- a/public/language/cs/modules.json
+++ b/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",
diff --git a/public/language/cs/pages.json b/public/language/cs/pages.json
index 22739e22a5..9c0b783a44 100644
--- a/public/language/cs/pages.json
+++ b/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",
diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json
index 4696189942..62964c42dc 100644
--- a/public/language/cs/topic.json
+++ b/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.",
diff --git a/public/language/cs/user.json b/public/language/cs/user.json
index 5694a135f0..24fde19720 100644
--- a/public/language/cs/user.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/da/category.json b/public/language/da/category.json
index 7c28d42ac3..e40ba1bc55 100644
--- a/public/language/da/category.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/da/error.json b/public/language/da/error.json
index 3265c62c5a..eff66f2cd1 100644
--- a/public/language/da/error.json
+++ b/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).",
diff --git a/public/language/da/global.json b/public/language/da/global.json
index 0d07e841e8..c3fb639f3f 100644
--- a/public/language/da/global.json
+++ b/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",
diff --git a/public/language/da/groups.json b/public/language/da/groups.json
index f02ec79938..94f8ec881e 100644
--- a/public/language/da/groups.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/da/modules.json b/public/language/da/modules.json
index 01a3655865..ce13f1ec67 100644
--- a/public/language/da/modules.json
+++ b/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",
diff --git a/public/language/da/pages.json b/public/language/da/pages.json
index 1d231fefa3..9fe6a704a7 100644
--- a/public/language/da/pages.json
+++ b/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",
diff --git a/public/language/da/topic.json b/public/language/da/topic.json
index dc3bbd7331..7d74d3ee19 100644
--- a/public/language/da/topic.json
+++ b/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.",
diff --git a/public/language/da/user.json b/public/language/da/user.json
index 11a2dd8a92..6ebeb2e391 100644
--- a/public/language/da/user.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/de/category.json b/public/language/de/category.json
index f76ea9ae94..1f245fae7a 100644
--- a/public/language/de/category.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/de/error.json b/public/language/de/error.json
index d833ba50dc..0b99880516 100644
--- a/public/language/de/error.json
+++ b/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.",
diff --git a/public/language/de/global.json b/public/language/de/global.json
index 99a92d3cf5..bbd3695b3f 100644
--- a/public/language/de/global.json
+++ b/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",
diff --git a/public/language/de/groups.json b/public/language/de/groups.json
index 5d328ac70d..89c33fee3c 100644
--- a/public/language/de/groups.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/de/modules.json b/public/language/de/modules.json
index 688564237f..d54cea21ab 100644
--- a/public/language/de/modules.json
+++ b/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",
diff --git a/public/language/de/pages.json b/public/language/de/pages.json
index 899af940dc..dfb8e30cdd 100644
--- a/public/language/de/pages.json
+++ b/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",
diff --git a/public/language/de/topic.json b/public/language/de/topic.json
index cc105cd8f4..8da8b5111a 100644
--- a/public/language/de/topic.json
+++ b/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.",
diff --git a/public/language/de/user.json b/public/language/de/user.json
index 63a7e1a2e1..3be8c26959 100644
--- a/public/language/de/user.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/el/category.json b/public/language/el/category.json
index 023e79f554..33820bce02 100644
--- a/public/language/el/category.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/el/error.json b/public/language/el/error.json
index 87c1c1e434..54f4e8700f 100644
--- a/public/language/el/error.json
+++ b/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)",
diff --git a/public/language/el/global.json b/public/language/el/global.json
index a88c6acf22..43b3b73e75 100644
--- a/public/language/el/global.json
+++ b/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",
diff --git a/public/language/el/groups.json b/public/language/el/groups.json
index 29ae716a22..d921ff9ff5 100644
--- a/public/language/el/groups.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/el/modules.json b/public/language/el/modules.json
index 2103f5def7..ede8e8cd3c 100644
--- a/public/language/el/modules.json
+++ b/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",
diff --git a/public/language/el/pages.json b/public/language/el/pages.json
index 8ca2f9cc36..50489d170c 100644
--- a/public/language/el/pages.json
+++ b/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",
diff --git a/public/language/el/topic.json b/public/language/el/topic.json
index f832374a32..1cee055532 100644
--- a/public/language/el/topic.json
+++ b/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.",
diff --git a/public/language/el/user.json b/public/language/el/user.json
index c83190a479..c312841409 100644
--- a/public/language/el/user.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/en@pirate/category.json b/public/language/en@pirate/category.json
index d437e642c4..fa7ffd33e8 100644
--- a/public/language/en@pirate/category.json
+++ b/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'"
}
\ No newline at end of file
diff --git a/public/language/en@pirate/error.json b/public/language/en@pirate/error.json
index a28c95316f..076a5c0345 100644
--- a/public/language/en@pirate/error.json
+++ b/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)",
diff --git a/public/language/en@pirate/global.json b/public/language/en@pirate/global.json
index 2b231e6687..13a2d3d7e6 100644
--- a/public/language/en@pirate/global.json
+++ b/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",
diff --git a/public/language/en@pirate/groups.json b/public/language/en@pirate/groups.json
index 3c4f6ce638..8af283d60e 100644
--- a/public/language/en@pirate/groups.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/en@pirate/modules.json b/public/language/en@pirate/modules.json
index aca98482b4..ec634a0258 100644
--- a/public/language/en@pirate/modules.json
+++ b/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",
diff --git a/public/language/en@pirate/pages.json b/public/language/en@pirate/pages.json
index 0fd86ae295..4b27eda706 100644
--- a/public/language/en@pirate/pages.json
+++ b/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",
diff --git a/public/language/en@pirate/topic.json b/public/language/en@pirate/topic.json
index 305fba409a..a6bf44624a 100644
--- a/public/language/en@pirate/topic.json
+++ b/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.",
diff --git a/public/language/en@pirate/user.json b/public/language/en@pirate/user.json
index 9c67a66c10..37d68aa70c 100644
--- a/public/language/en@pirate/user.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json
index a7f47b9ac3..5a0cc50e52 100644
--- a/public/language/en_GB/error.json
+++ b/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",
diff --git a/public/language/en_GB/pages.json b/public/language/en_GB/pages.json
index c9b2014d79..52d9f2b4e3 100644
--- a/public/language/en_GB/pages.json
+++ b/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",
diff --git a/public/language/en_GB/topic.json b/public/language/en_GB/topic.json
index 36daa3d044..af49c4763e 100644
--- a/public/language/en_GB/topic.json
+++ b/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",
diff --git a/public/language/en_GB/user.json b/public/language/en_GB/user.json
index 10a21ff03e..fd6f11e250 100644
--- a/public/language/en_GB/user.json
+++ b/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",
diff --git a/public/language/en_US/category.json b/public/language/en_US/category.json
index 827564deca..ec91137d81 100644
--- a/public/language/en_US/category.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/en_US/error.json b/public/language/en_US/error.json
index a28c95316f..076a5c0345 100644
--- a/public/language/en_US/error.json
+++ b/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)",
diff --git a/public/language/en_US/global.json b/public/language/en_US/global.json
index d2a0e03fa3..9b01509159 100644
--- a/public/language/en_US/global.json
+++ b/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",
diff --git a/public/language/en_US/groups.json b/public/language/en_US/groups.json
index ffc0224c5e..593eb34a4b 100644
--- a/public/language/en_US/groups.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/en_US/modules.json b/public/language/en_US/modules.json
index ac0177941a..d00b009403 100644
--- a/public/language/en_US/modules.json
+++ b/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",
diff --git a/public/language/en_US/pages.json b/public/language/en_US/pages.json
index 0fd86ae295..4b27eda706 100644
--- a/public/language/en_US/pages.json
+++ b/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",
diff --git a/public/language/en_US/topic.json b/public/language/en_US/topic.json
index 305fba409a..a6bf44624a 100644
--- a/public/language/en_US/topic.json
+++ b/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.",
diff --git a/public/language/en_US/user.json b/public/language/en_US/user.json
index 00a3201eb2..ce8c78f283 100644
--- a/public/language/en_US/user.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/es/category.json b/public/language/es/category.json
index 1997061dea..c1d8fb3d7c 100644
--- a/public/language/es/category.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/es/error.json b/public/language/es/error.json
index 95830f27a1..569a35f539 100644
--- a/public/language/es/error.json
+++ b/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)",
diff --git a/public/language/es/global.json b/public/language/es/global.json
index ba5f1ee95b..da2a21b1fa 100644
--- a/public/language/es/global.json
+++ b/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",
diff --git a/public/language/es/groups.json b/public/language/es/groups.json
index 657fe67599..415f9e1ed8 100644
--- a/public/language/es/groups.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/es/modules.json b/public/language/es/modules.json
index b2ce72e4ae..14114aa88c 100644
--- a/public/language/es/modules.json
+++ b/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",
diff --git a/public/language/es/pages.json b/public/language/es/pages.json
index 3c0f7ee139..3548c8225e 100644
--- a/public/language/es/pages.json
+++ b/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",
diff --git a/public/language/es/topic.json b/public/language/es/topic.json
index 93589cb5a3..0f7acfaca0 100644
--- a/public/language/es/topic.json
+++ b/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.",
diff --git a/public/language/es/user.json b/public/language/es/user.json
index 508ffdae32..e605cf72a0 100644
--- a/public/language/es/user.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/et/category.json b/public/language/et/category.json
index 6ff291b297..3202f90ab4 100644
--- a/public/language/et/category.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/et/error.json b/public/language/et/error.json
index 74d2ee9a29..be7a5dcd48 100644
--- a/public/language/et/error.json
+++ b/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).",
diff --git a/public/language/et/global.json b/public/language/et/global.json
index 12c77773ba..07a395cc83 100644
--- a/public/language/et/global.json
+++ b/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",
diff --git a/public/language/et/groups.json b/public/language/et/groups.json
index a78fc57db4..3ccbe588b8 100644
--- a/public/language/et/groups.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/et/modules.json b/public/language/et/modules.json
index bb0f15c66a..5824723051 100644
--- a/public/language/et/modules.json
+++ b/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",
diff --git a/public/language/et/pages.json b/public/language/et/pages.json
index 1b7cd02ef6..6e2b708160 100644
--- a/public/language/et/pages.json
+++ b/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",
diff --git a/public/language/et/topic.json b/public/language/et/topic.json
index 74f27dc863..003ec3b941 100644
--- a/public/language/et/topic.json
+++ b/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.",
diff --git a/public/language/et/user.json b/public/language/et/user.json
index 1d356f8229..ab2d33c6e4 100644
--- a/public/language/et/user.json
+++ b/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"
}
\ No newline at end of file
diff --git a/public/language/fa_IR/category.json b/public/language/fa_IR/category.json
index 5b15b38d6e..174e85bb67 100644
--- a/public/language/fa_IR/category.json
+++ b/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": "دسته بندی های پیگیری شده"
}
\ No newline at end of file
diff --git a/public/language/fa_IR/error.json b/public/language/fa_IR/error.json
index 497dcd049a..d6c420b126 100644
--- a/public/language/fa_IR/error.json
+++ b/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 کاراکتر داشته باشند.",
diff --git a/public/language/fa_IR/global.json b/public/language/fa_IR/global.json
index 476d95651f..d9b70f3224 100644
--- a/public/language/fa_IR/global.json
+++ b/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",
diff --git a/public/language/fa_IR/groups.json b/public/language/fa_IR/groups.json
index dfb7fcd3d2..1c0331ba78 100644
--- a/public/language/fa_IR/groups.json
+++ b/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": "میزان دعوت"
}
\ No newline at end of file
diff --git a/public/language/fa_IR/modules.json b/public/language/fa_IR/modules.json
index e9a68b4c27..dac3c93b2f 100644
--- a/public/language/fa_IR/modules.json
+++ b/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": "تایید",
diff --git a/public/language/fa_IR/pages.json b/public/language/fa_IR/pages.json
index b45df48eff..9cdc93044d 100644
--- a/public/language/fa_IR/pages.json
+++ b/public/language/fa_IR/pages.json
@@ -18,6 +18,7 @@
"tags": "برچسبها",
"tag": "موضوع های داری کلیدواژه \"%1\"",
"register": "ثبت نام یک حساب",
+ "registration-complete": "ثبت نام تکمیل شد",
"login": "به حساب خوب وارد شوید",
"reset": "رمز عبور حساب خود را بازنشانی کنید",
"categories": "دستهبندیها",
diff --git a/public/language/fa_IR/topic.json b/public/language/fa_IR/topic.json
index d9c1ddb346..391b15731d 100644
--- a/public/language/fa_IR/topic.json
+++ b/public/language/fa_IR/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": "شما این موضوع را تو فهرست موضوعات خوانده نشده میبینید، اما وقتی پست جدیدی ارسال میشود آگاهسازی دریافت نمیکنید.",
diff --git a/public/language/fa_IR/user.json b/public/language/fa_IR/user.json
index 6e0fd1416a..520868319b 100644
--- a/public/language/fa_IR/user.json
+++ b/public/language/fa_IR/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": "یادداشت میانهروی ذخیره شد"
}
\ No newline at end of file
diff --git a/public/language/fi/category.json b/public/language/fi/category.json
index 822b7f7372..a328811300 100644
--- a/public/language/fi/category.json
+++ b/public/language/fi/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"
}
\ No newline at end of file
diff --git a/public/language/fi/error.json b/public/language/fi/error.json
index cbeaf9533b..90ade01717 100644
--- a/public/language/fi/error.json
+++ b/public/language/fi/error.json
@@ -62,6 +62,7 @@
"content-too-long": "Ole hyvä ja syötä lyhyempi viesti. Sen voi sisältää vain %1 merkki(ä).",
"title-too-short": "Ole hyä ja syötä pidempi otsikko. Sen pitäisi sisältää anakin %1 merkki(ä).",
"title-too-long": "Ole hyvä ja syötä lyhyempi otsikko. Se voi sisältää vain %1 merkki(ä).",
+ "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)",
diff --git a/public/language/fi/global.json b/public/language/fi/global.json
index a56b79e888..adea62f9c0 100644
--- a/public/language/fi/global.json
+++ b/public/language/fi/global.json
@@ -19,6 +19,7 @@
"welcome_back": "Tervetuloa takaisin",
"you_have_successfully_logged_in": "Olet onnistuneesti kirjautunut sisään",
"save_changes": "Tallenna muutokset",
+ "save": "Save",
"close": "Sulje",
"pagination": "Sivutus",
"pagination.out_of": "%1/%2",
diff --git a/public/language/fi/groups.json b/public/language/fi/groups.json
index 55e7b41f2e..b9625fb64a 100644
--- a/public/language/fi/groups.json
+++ b/public/language/fi/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"
}
\ No newline at end of file
diff --git a/public/language/fi/modules.json b/public/language/fi/modules.json
index bc7af01bb1..2038bdfd96 100644
--- a/public/language/fi/modules.json
+++ b/public/language/fi/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",
diff --git a/public/language/fi/pages.json b/public/language/fi/pages.json
index fa8f12c926..46a8a5a1d0 100644
--- a/public/language/fi/pages.json
+++ b/public/language/fi/pages.json
@@ -18,6 +18,7 @@
"tags": "Tunnisteet",
"tag": "Topics tagged under \"%1\"",
"register": "Luo käyttäjät",
+ "registration-complete": "Registration complete",
"login": "Kirjaudu käyttäjällesi",
"reset": "Reset your account password",
"categories": "Categories",
diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json
index 40dc0a3e45..18950d0fda 100644
--- a/public/language/fi/topic.json
+++ b/public/language/fi/topic.json
@@ -31,6 +31,21 @@
"bookmark_instructions": "Click here to return to the last read post in this thread.",
"flag_title": "Ilmianna tämä viesti moderaattoreille",
"flag_success": "Tämä viesti ilmiannettiin moderaattoreille.",
+ "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": "Tämä aihe on poistettu. Vain käyttäjät, joilla on aiheen hallintaoikeudet, voivat nähdä sen.",
"following_topic.message": "Saat nyt ilmoituksen, kun joku kirjoittaa tähän aiheeseen.",
"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.",
diff --git a/public/language/fi/user.json b/public/language/fi/user.json
index ad20653c29..f1344be78f 100644
--- a/public/language/fi/user.json
+++ b/public/language/fi/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"
}
\ No newline at end of file
diff --git a/public/language/fr/category.json b/public/language/fr/category.json
index 16cfe2fbca..5c70da5593 100644
--- a/public/language/fr/category.json
+++ b/public/language/fr/category.json
@@ -14,7 +14,7 @@
"ignoring": "Ignoré",
"watching.description": "Affiche les sujets dans la section Non lus",
"ignoring.description": "N'affiche pas les sujets dans la section Non lus",
- "watch.message": "Vous êtes désormais abonné aux mises à jour de cette catégorie.",
- "ignore.message": "Vous ne surveillez plus les mises jour de cette catégorie.",
+ "watch.message": "Vous êtes désormais abonné aux mises à jour de cette catégorie et de ses sous-catégories.",
+ "ignore.message": "Vous n'êtes plus abonné aux mises à jour de cette catégorie et de ses sous-catégories.",
"watched-categories": "Abonnements"
}
\ No newline at end of file
diff --git a/public/language/fr/error.json b/public/language/fr/error.json
index a6440cb83a..a71e59534c 100644
--- a/public/language/fr/error.json
+++ b/public/language/fr/error.json
@@ -62,6 +62,7 @@
"content-too-long": "Veuillez poster un message plus cours. Les messages ne peuvent être plus long que %1 caractère(s).",
"title-too-short": "Veuillez entrer un titre plus long. %1 caractère(s) minimum.",
"title-too-long": "Veuillez entrer un titre plus court. Les titres ne peuvent excéder %1 caractère(s).",
+ "category-not-selected": "Aucune catégorie sélectionnée",
"too-many-posts": "Vous ne pouvez poster que toutes les %1 seconde(s).",
"too-many-posts-newbie": "En tant que nouvel utilisateur, vous ne pouvez poster que toutes les %1 seconde(s) jusqu'à ce que vous obteniez une réputation de %2 - patientez avant de publier de nouveau.",
"tag-too-short": "Veuillez entrer un mot-clé plus long. Les mots-clés doivent contenir au moins %1 caractère(s).",
diff --git a/public/language/fr/global.json b/public/language/fr/global.json
index 84d20f4319..05dfc319fc 100644
--- a/public/language/fr/global.json
+++ b/public/language/fr/global.json
@@ -19,6 +19,7 @@
"welcome_back": "Bienvenue",
"you_have_successfully_logged_in": "Vous vous êtes bien connecté",
"save_changes": "Enregistrer les changements",
+ "save": "Enregistrer",
"close": "Fermer",
"pagination": "Pagination",
"pagination.out_of": "%1 sur %2",
diff --git a/public/language/fr/groups.json b/public/language/fr/groups.json
index 65a5274979..48f1ad2b2a 100644
--- a/public/language/fr/groups.json
+++ b/public/language/fr/groups.json
@@ -50,5 +50,7 @@
"membership.leave-group": "Quitter le groupe",
"membership.reject": "Refuser",
"new-group.group_name": "Nom du groupe :",
- "upload-group-cover": "Envoyer une image de groupe"
+ "upload-group-cover": "Envoyer une image de groupe",
+ "bulk-invite-instructions": "Entrez une liste de nom d'utilisateurs séparés par des virgules pour les inviter à rejoindre ce groupe.",
+ "bulk-invite": "Invitation multiple"
}
\ No newline at end of file
diff --git a/public/language/fr/modules.json b/public/language/fr/modules.json
index 9a9eaa0675..7cbdc0ebc6 100644
--- a/public/language/fr/modules.json
+++ b/public/language/fr/modules.json
@@ -38,6 +38,7 @@
"composer.upload-picture": "Envoyer une image",
"composer.upload-file": "Envoyer un fichier",
"composer.zen_mode": "Mode Zen",
+ "composer.select_category": "Sélectionnez une catégorie",
"bootbox.ok": "OK",
"bootbox.cancel": "Annuler",
"bootbox.confirm": "Confirmer",
diff --git a/public/language/fr/pages.json b/public/language/fr/pages.json
index 1a0c819bd2..190c2134af 100644
--- a/public/language/fr/pages.json
+++ b/public/language/fr/pages.json
@@ -18,6 +18,7 @@
"tags": "Mots-clés",
"tag": "Sujets ayant le mot-clé \"%1\"",
"register": "Créer un compte",
+ "registration-complete": "Inscription terminée",
"login": "Connectez-vous à votre compte",
"reset": "Remettez à zéro votre mot de passe",
"categories": "Catégories",
diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json
index 242c365212..06c08bd13e 100644
--- a/public/language/fr/topic.json
+++ b/public/language/fr/topic.json
@@ -31,6 +31,21 @@
"bookmark_instructions": "Cliquez ici pour retourner au dernier message lu de ce fil.",
"flag_title": "Signaler ce message à la modération",
"flag_success": "Ce message a bien été signalé aux modérateurs.",
+ "flag_manage_title": "Post signalé dans %1",
+ "flag_manage_history": "Historique des actions",
+ "flag_manage_no_history": "Aucun historique d'évènement à reporter",
+ "flag_manage_assignee": "Assigné à",
+ "flag_manage_state": "État",
+ "flag_manage_state_open": "Nouveau/Ouvert",
+ "flag_manage_state_wip": "En cours",
+ "flag_manage_state_resolved": "Résolu",
+ "flag_manage_state_rejected": "Rejeté",
+ "flag_manage_notes": "Notes partagées",
+ "flag_manage_update": "Mettre à jour l'état du signalement",
+ "flag_manage_history_assignee": "Assigné à %1",
+ "flag_manage_history_state": "État mis à jour à %1",
+ "flag_manage_history_notes": "Notes du signalement à jour",
+ "flag_manage_saved": "Détails du signalement à jour",
"deleted_message": "Ce sujet a été supprimé. Seuls les utilisateurs avec les droits d'administration peuvent le voir.",
"following_topic.message": "Vous recevrez désormais des notifications lorsque quelqu'un postera dans ce sujet.",
"not_following_topic.message": "Vous verrez ce sujet dans la liste des sujets non-lus, mais vous ne recevrez pas de notification lorsque quelqu'un postera dans ce sujet.",
diff --git a/public/language/fr/user.json b/public/language/fr/user.json
index c6633441f3..6379677d76 100644
--- a/public/language/fr/user.json
+++ b/public/language/fr/user.json
@@ -123,5 +123,7 @@
"info.banned-reason-label": "Raison",
"info.banned-no-reason": "Aucune raison donnée",
"info.username-history": "Historique des noms d'utilisateur",
- "info.email-history": "Historique des adresses email"
+ "info.email-history": "Historique des adresses email",
+ "info.moderation-note": "Note de modération",
+ "info.moderation-note.success": "Note de modération enregistrée"
}
\ No newline at end of file
diff --git a/public/language/gl/category.json b/public/language/gl/category.json
index aeafc9f8e0..45bee7454e 100644
--- a/public/language/gl/category.json
+++ b/public/language/gl/category.json
@@ -14,7 +14,7 @@
"ignoring": "Ignorando",
"watching.description": "Amosa-los temas en \"non lidos\"",
"ignoring.description": "Non amosa-los temas en \"non lidos\"",
- "watch.message": "Agora segues as novidades desta categoría.",
- "ignore.message": "Agora ignoras as novidades nesta categoría.",
+ "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": "Categorías vixiadas"
}
\ No newline at end of file
diff --git a/public/language/gl/error.json b/public/language/gl/error.json
index b0870bda3b..80efe2e431 100644
--- a/public/language/gl/error.json
+++ b/public/language/gl/error.json
@@ -62,6 +62,7 @@
"content-too-long": "Por favor, introduce unha publicación máis curta. As publicacións non poden conter máis de %1 carácter(es).",
"title-too-short": "Por favor, introduce un título máis longo. Os títulos deben conter %1 carácter(es) como mínimo.",
"title-too-long": "Por favor, introduce un título máis curto. Os títulos non poden conter máis de %1 carácter(es).",
+ "category-not-selected": "Category not selected.",
"too-many-posts": "Só podes postear unha vez cada %1 segundo(s) - por favor agarda antes de publicar de novo.",
"too-many-posts-newbie": "Como novo usuario, só podes publicar unha vez cada %1 segundo(s) ata que acades %2 de reputación -por favor, agarda para publicar de novo.",
"tag-too-short": "Por favor, introduce unha etiqueta máis longa. As etiquetas deben conter %1 carácter(es) como mínimo.",
diff --git a/public/language/gl/global.json b/public/language/gl/global.json
index f2aa29ee3d..e4e8889b60 100644
--- a/public/language/gl/global.json
+++ b/public/language/gl/global.json
@@ -19,6 +19,7 @@
"welcome_back": "Benvido de novo",
"you_have_successfully_logged_in": "Fuches rexistrado con éxito.",
"save_changes": "Gardar Cambios",
+ "save": "Save",
"close": "Pechar ",
"pagination": "Paxinación",
"pagination.out_of": "%1 de %2",
diff --git a/public/language/gl/groups.json b/public/language/gl/groups.json
index f0f16871e4..ef5b61ed89 100644
--- a/public/language/gl/groups.json
+++ b/public/language/gl/groups.json
@@ -50,5 +50,7 @@
"membership.leave-group": "Marchar do grupo",
"membership.reject": "Rexeitar",
"new-group.group_name": "Nome do grupo:",
- "upload-group-cover": "Cargar foto para o grupo"
+ "upload-group-cover": "Cargar foto para o grupo",
+ "bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
+ "bulk-invite": "Bulk Invite"
}
\ No newline at end of file
diff --git a/public/language/gl/modules.json b/public/language/gl/modules.json
index 3cff4867cd..f2f4605276 100644
--- a/public/language/gl/modules.json
+++ b/public/language/gl/modules.json
@@ -38,6 +38,7 @@
"composer.upload-picture": "Subir foto",
"composer.upload-file": "Subir arquivo",
"composer.zen_mode": "Modo Zen",
+ "composer.select_category": "Select a category",
"bootbox.ok": "De acordo",
"bootbox.cancel": "Cancelar",
"bootbox.confirm": "Confirmar",
diff --git a/public/language/gl/pages.json b/public/language/gl/pages.json
index 21ad9aaff3..5b6d9e28e3 100644
--- a/public/language/gl/pages.json
+++ b/public/language/gl/pages.json
@@ -18,6 +18,7 @@
"tags": "Etiquetas",
"tag": "Temas etiquetados con \"%1\"",
"register": "Rexistrar conta",
+ "registration-complete": "Registration complete",
"login": "Ingresa coa túa conta",
"reset": "Reinicia o teu contrasinal",
"categories": "Categorías",
diff --git a/public/language/gl/topic.json b/public/language/gl/topic.json
index 61c25c89f7..a66c0907ef 100644
--- a/public/language/gl/topic.json
+++ b/public/language/gl/topic.json
@@ -31,6 +31,21 @@
"bookmark_instructions": "Pica aquí para volver á última mensaxe lida neste tema ",
"flag_title": "Reportar esta mensaxe",
"flag_success": "Esta mensaxe foi reportada 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 foi borrado. Só os usuarios con privilexios administrativos poden velo.",
"following_topic.message": "Agora recibirás notificacións cando alguén publique neste tema.",
"not_following_topic.message": "Poderás ver este tema na lista de No Lidos, pero non recibirás notificacións cando alguén escriba nel.",
diff --git a/public/language/gl/user.json b/public/language/gl/user.json
index 3fd472308b..350604ac8b 100644
--- a/public/language/gl/user.json
+++ b/public/language/gl/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"
}
\ No newline at end of file
diff --git a/public/language/he/category.json b/public/language/he/category.json
index 394ea4f57f..fbf21e942d 100644
--- a/public/language/he/category.json
+++ b/public/language/he/category.json
@@ -14,7 +14,7 @@
"ignoring": "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": "קטגוריות נעקבות"
}
\ No newline at end of file
diff --git a/public/language/he/error.json b/public/language/he/error.json
index 1213807b3b..f84a042f25 100644
--- a/public/language/he/error.json
+++ b/public/language/he/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": "כמשתמש חדש, אתה יכול לפרסם פוסט רק פעם ב-%1 שניות עד שיהיו לך %2 נקודות מוניטין - אנא המתן לפני פרסום שוב",
"tag-too-short": "אנא הכנס תגית ארוכה יותר. תגיות חייבות להכיל לפחות %1 תווים",
diff --git a/public/language/he/global.json b/public/language/he/global.json
index a5dc920333..8ada0b3245 100644
--- a/public/language/he/global.json
+++ b/public/language/he/global.json
@@ -19,6 +19,7 @@
"welcome_back": "ברוכים השבים",
"you_have_successfully_logged_in": "התחברת בהצלחה",
"save_changes": "שמור שינויים",
+ "save": "Save",
"close": "סגור",
"pagination": "עימוד",
"pagination.out_of": "%1 מתוך %2",
diff --git a/public/language/he/groups.json b/public/language/he/groups.json
index 94f76a2ffd..4e505a826e 100644
--- a/public/language/he/groups.json
+++ b/public/language/he/groups.json
@@ -50,5 +50,7 @@
"membership.leave-group": "עזוב קבוצה",
"membership.reject": "דחה",
"new-group.group_name": "שם קבוצה",
- "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"
}
\ No newline at end of file
diff --git a/public/language/he/modules.json b/public/language/he/modules.json
index 91827e7141..fda2dd982c 100644
--- a/public/language/he/modules.json
+++ b/public/language/he/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": "בסדר",
"bootbox.cancel": "בטל",
"bootbox.confirm": "אשר",
diff --git a/public/language/he/pages.json b/public/language/he/pages.json
index b8a6049f8c..3e94e2d6ed 100644
--- a/public/language/he/pages.json
+++ b/public/language/he/pages.json
@@ -18,6 +18,7 @@
"tags": "תגיות",
"tag": "נושאים שתוייגו תחת \"%1\"",
"register": "יצירת חשבון",
+ "registration-complete": "Registration complete",
"login": "התחבר לחשבונך",
"reset": "איפוס סיסמה למשתמש",
"categories": "קטגוריות",
diff --git a/public/language/he/topic.json b/public/language/he/topic.json
index 425cc1ff0f..aef745d1d3 100644
--- a/public/language/he/topic.json
+++ b/public/language/he/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.",
diff --git a/public/language/he/user.json b/public/language/he/user.json
index 7373c8c74c..f09484a711 100644
--- a/public/language/he/user.json
+++ b/public/language/he/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"
}
\ No newline at end of file
diff --git a/public/language/hu/category.json b/public/language/hu/category.json
index 497cdbe8ec..4e703da034 100644
--- a/public/language/hu/category.json
+++ b/public/language/hu/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"
}
\ No newline at end of file
diff --git a/public/language/hu/error.json b/public/language/hu/error.json
index afd1c84a0b..7f77bc1fff 100644
--- a/public/language/hu/error.json
+++ b/public/language/hu/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)",
diff --git a/public/language/hu/global.json b/public/language/hu/global.json
index fbca98ab9f..17b9be5766 100644
--- a/public/language/hu/global.json
+++ b/public/language/hu/global.json
@@ -19,6 +19,7 @@
"welcome_back": "Üdvözlet",
"you_have_successfully_logged_in": "Sikeres bejelentkezés",
"save_changes": "Változások mentése",
+ "save": "Save",
"close": "Bezárás",
"pagination": "Lapozás",
"pagination.out_of": "%1 - %2",
diff --git a/public/language/hu/groups.json b/public/language/hu/groups.json
index 0430f698e5..26ef5b4d2e 100644
--- a/public/language/hu/groups.json
+++ b/public/language/hu/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"
}
\ No newline at end of file
diff --git a/public/language/hu/modules.json b/public/language/hu/modules.json
index cd01a6c35f..6b050a4f2f 100644
--- a/public/language/hu/modules.json
+++ b/public/language/hu/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",
diff --git a/public/language/hu/pages.json b/public/language/hu/pages.json
index ebd6c51e3a..011c1512ba 100644
--- a/public/language/hu/pages.json
+++ b/public/language/hu/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",
diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json
index 34b12bc307..8185a77748 100644
--- a/public/language/hu/topic.json
+++ b/public/language/hu/topic.json
@@ -31,6 +31,21 @@
"bookmark_instructions": "Click here to return to the last read post in this thread.",
"flag_title": "A hozzászólás jelentése a moderátoroknál",
"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.",
diff --git a/public/language/hu/user.json b/public/language/hu/user.json
index 40710b2266..45bfad8825 100644
--- a/public/language/hu/user.json
+++ b/public/language/hu/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"
}
\ No newline at end of file
diff --git a/public/language/id/category.json b/public/language/id/category.json
index fed1ba2ef9..aedde51460 100644
--- a/public/language/id/category.json
+++ b/public/language/id/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"
}
\ No newline at end of file
diff --git a/public/language/id/error.json b/public/language/id/error.json
index 39c2518a99..0994f23233 100644
--- a/public/language/id/error.json
+++ b/public/language/id/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)",
diff --git a/public/language/id/global.json b/public/language/id/global.json
index 9d596c7d6e..a6285fcf1a 100644
--- a/public/language/id/global.json
+++ b/public/language/id/global.json
@@ -19,6 +19,7 @@
"welcome_back": "Selamat Datang Kembali",
"you_have_successfully_logged_in": "Kamu sudah login",
"save_changes": "Menyimpan perubahan",
+ "save": "Save",
"close": "Tutup",
"pagination": "Halaman",
"pagination.out_of": "%1 dari %2",
diff --git a/public/language/id/groups.json b/public/language/id/groups.json
index 32f99e3fdc..255c6caef0 100644
--- a/public/language/id/groups.json
+++ b/public/language/id/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"
}
\ No newline at end of file
diff --git a/public/language/id/modules.json b/public/language/id/modules.json
index e56070fdd4..cd256ea920 100644
--- a/public/language/id/modules.json
+++ b/public/language/id/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",
diff --git a/public/language/id/pages.json b/public/language/id/pages.json
index f6802ec0a2..8af6560d4d 100644
--- a/public/language/id/pages.json
+++ b/public/language/id/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",
diff --git a/public/language/id/topic.json b/public/language/id/topic.json
index be6594802b..fee041af64 100644
--- a/public/language/id/topic.json
+++ b/public/language/id/topic.json
@@ -31,6 +31,21 @@
"bookmark_instructions": "Click here to return to the last read post in this thread.",
"flag_title": "Tandai posting ini untuk moderasi",
"flag_success": "Posting ini telah ditandai untuk moderasi",
+ "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": "Topik ini telah dihapus. Hanya pengguna dengan hak manajemen topik yang dapat melihatnya.",
"following_topic.message": "Saat ini kamu akan menerima pemberitahuan saat seseorang membuat posting di dalam topik ini.",
"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.",
diff --git a/public/language/id/user.json b/public/language/id/user.json
index d0c0032195..1d7e1a2ae1 100644
--- a/public/language/id/user.json
+++ b/public/language/id/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"
}
\ No newline at end of file
diff --git a/public/language/it/category.json b/public/language/it/category.json
index bb6aef06dd..a4dd47ce50 100644
--- a/public/language/it/category.json
+++ b/public/language/it/category.json
@@ -14,7 +14,7 @@
"ignoring": "Ignorato",
"watching.description": "Mostra discussione in non letti",
"ignoring.description": "Non mostrare discussione in non letti",
- "watch.message": "Non stai seguendo gli aggiornamenti di questa categoria",
- "ignore.message": "Da ora saranno ignorati gli aggiornamenti di questa categoria",
+ "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": "Categorie osservate"
}
\ No newline at end of file
diff --git a/public/language/it/error.json b/public/language/it/error.json
index 375f3b17bc..b25b46dd30 100644
--- a/public/language/it/error.json
+++ b/public/language/it/error.json
@@ -62,6 +62,7 @@
"content-too-long": "Inserisci un post più breve. I post non possono essere più lunghi di %1 caratteri.",
"title-too-short": "Inserisci un titolo più lungo. I titoli devono contenere almeno %1 caratteri.",
"title-too-long": "Inserisci un titolo più corto. I titoli non possono essere più lunghi di %1 caratteri.",
+ "category-not-selected": "Category not selected.",
"too-many-posts": "È possibile inserire un Post ogni %1 secondi - si prega di attendere prima di postare di nuovo",
"too-many-posts-newbie": "Come nuovo utente puoi postare solamente una volta ogni %1 secondi finché non hai raggiunto un livello di reputazione %2 - per favore attendi prima di scrivere ancora",
"tag-too-short": "Inserisci un tag più lungo. I tag devono contenere almeno %1 caratteri.",
diff --git a/public/language/it/global.json b/public/language/it/global.json
index 57bbaa0164..d4754d8171 100644
--- a/public/language/it/global.json
+++ b/public/language/it/global.json
@@ -19,6 +19,7 @@
"welcome_back": "Bentornato",
"you_have_successfully_logged_in": "Login avvenuto con successo",
"save_changes": "Salva cambiamenti",
+ "save": "Save",
"close": "Chiudi",
"pagination": "Paginazione",
"pagination.out_of": "%1 di %2",
diff --git a/public/language/it/groups.json b/public/language/it/groups.json
index 45cc2d894b..e79ff1c869 100644
--- a/public/language/it/groups.json
+++ b/public/language/it/groups.json
@@ -50,5 +50,7 @@
"membership.leave-group": "Lascia il Gruppo",
"membership.reject": "Rifiuta",
"new-group.group_name": "Nome Gruppo:",
- "upload-group-cover": "Carica copertina del gruppo"
+ "upload-group-cover": "Carica copertina del gruppo",
+ "bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
+ "bulk-invite": "Bulk Invite"
}
\ No newline at end of file
diff --git a/public/language/it/modules.json b/public/language/it/modules.json
index 5688dd9976..4f5fc93596 100644
--- a/public/language/it/modules.json
+++ b/public/language/it/modules.json
@@ -38,6 +38,7 @@
"composer.upload-picture": "Carica immagine",
"composer.upload-file": "Carica file",
"composer.zen_mode": "Zen Mode",
+ "composer.select_category": "Select a category",
"bootbox.ok": "OK",
"bootbox.cancel": "Annulla",
"bootbox.confirm": "Conferma",
diff --git a/public/language/it/pages.json b/public/language/it/pages.json
index f42d53aceb..1a5c8f101f 100644
--- a/public/language/it/pages.json
+++ b/public/language/it/pages.json
@@ -18,6 +18,7 @@
"tags": "Tags",
"tag": "Discussioni taggate \"%1\"",
"register": "Registrati",
+ "registration-complete": "Registration complete",
"login": "Autenticati",
"reset": "Resetta password",
"categories": "Categorie",
diff --git a/public/language/it/topic.json b/public/language/it/topic.json
index 922c7fda43..dff02fccca 100644
--- a/public/language/it/topic.json
+++ b/public/language/it/topic.json
@@ -31,6 +31,21 @@
"bookmark_instructions": "Clicca qui per tornare all'ultimo post letto in questa discussione.",
"flag_title": "Segnala questo post per la moderazione",
"flag_success": "Questo post è stato contrassegnato per la moderazione.",
+ "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": "Questa discussione è stata cancellata. Solo gli utenti con diritti di gestione possono vederla.",
"following_topic.message": "Da ora riceverai notifiche quando qualcuno posterà in questa discussione.",
"not_following_topic.message": "Vedrai questa discussione nella lista delle discussioni non lette, ma non riceverai notifiche quando qualcuno risponde a questa discussione.",
diff --git a/public/language/it/user.json b/public/language/it/user.json
index 0042f1ba9f..1562ecfc2f 100644
--- a/public/language/it/user.json
+++ b/public/language/it/user.json
@@ -123,5 +123,7 @@
"info.banned-reason-label": "Motivo",
"info.banned-no-reason": "Non è stata data nessuna motivazione.",
"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"
}
\ No newline at end of file
diff --git a/public/language/ja/category.json b/public/language/ja/category.json
index b9de9f4f98..71161923cd 100644
--- a/public/language/ja/category.json
+++ b/public/language/ja/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": "ウォッチ中のカテゴリ"
}
\ No newline at end of file
diff --git a/public/language/ja/error.json b/public/language/ja/error.json
index 67d3215940..100b4c7099 100644
--- a/public/language/ja/error.json
+++ b/public/language/ja/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": "あなたは%2評判を得ているまで、新しいユーザーとしては、一度だけごとに%1秒を投稿することができます - 再び投稿する前にお待ちください",
"tag-too-short": "より長くタグを入力して下さい。タグはせめて%1文字が必要です。",
diff --git a/public/language/ja/global.json b/public/language/ja/global.json
index e38ea7315b..ef6a6a08c5 100644
--- a/public/language/ja/global.json
+++ b/public/language/ja/global.json
@@ -19,6 +19,7 @@
"welcome_back": "おかえりなさい",
"you_have_successfully_logged_in": "ログインできました",
"save_changes": "保存する",
+ "save": "Save",
"close": "閉じる",
"pagination": "ページ",
"pagination.out_of": "%2部の%1",
diff --git a/public/language/ja/groups.json b/public/language/ja/groups.json
index d108373457..218fb64183 100644
--- a/public/language/ja/groups.json
+++ b/public/language/ja/groups.json
@@ -50,5 +50,7 @@
"membership.leave-group": "Leave Group",
"membership.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"
}
\ No newline at end of file
diff --git a/public/language/ja/modules.json b/public/language/ja/modules.json
index 0eb13821d6..c4b8124768 100644
--- a/public/language/ja/modules.json
+++ b/public/language/ja/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",
diff --git a/public/language/ja/pages.json b/public/language/ja/pages.json
index 83efe5e886..c7423ab04e 100644
--- a/public/language/ja/pages.json
+++ b/public/language/ja/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": "カテゴリ",
diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json
index 489dcb4c54..0493792872 100644
--- a/public/language/ja/topic.json
+++ b/public/language/ja/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.",
diff --git a/public/language/ja/user.json b/public/language/ja/user.json
index 9379383b8a..f4220e7287 100644
--- a/public/language/ja/user.json
+++ b/public/language/ja/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"
}
\ No newline at end of file
diff --git a/public/language/ko/category.json b/public/language/ko/category.json
index 0c5f877d53..6e0cb5e177 100644
--- a/public/language/ko/category.json
+++ b/public/language/ko/category.json
@@ -14,7 +14,7 @@
"ignoring": "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": "관심 카테고리"
}
\ No newline at end of file
diff --git a/public/language/ko/error.json b/public/language/ko/error.json
index 48643741b3..0934b4c439 100644
--- a/public/language/ko/error.json
+++ b/public/language/ko/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": "신규 사용자는 %2 만큼의 인지도를 얻기 전까지 %1초마다 게시물을 작성할 수 있습니다. 조금 천천히 작성해주세요.",
"tag-too-short": "꼬리표가 너무 짧습니다. 꼬리표는 최소 %1자 이상이어야 합니다.",
diff --git a/public/language/ko/global.json b/public/language/ko/global.json
index 9fd5fa47ef..ce67b536f6 100644
--- a/public/language/ko/global.json
+++ b/public/language/ko/global.json
@@ -19,6 +19,7 @@
"welcome_back": "환영합니다.",
"you_have_successfully_logged_in": "성공적으로 로그인했습니다.",
"save_changes": "저장",
+ "save": "Save",
"close": "닫기",
"pagination": "페이지",
"pagination.out_of": "%2개 중 %1개",
diff --git a/public/language/ko/groups.json b/public/language/ko/groups.json
index 18eb6a0b07..266cee3877 100644
--- a/public/language/ko/groups.json
+++ b/public/language/ko/groups.json
@@ -50,5 +50,7 @@
"membership.leave-group": "그룹 나가기",
"membership.reject": "거절",
"new-group.group_name": "그룹명:",
- "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"
}
\ No newline at end of file
diff --git a/public/language/ko/modules.json b/public/language/ko/modules.json
index 1a4cfa7b1c..caca46f119 100644
--- a/public/language/ko/modules.json
+++ b/public/language/ko/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": "확인",
"bootbox.cancel": "취소",
"bootbox.confirm": "확인",
diff --git a/public/language/ko/pages.json b/public/language/ko/pages.json
index 2558ee5d94..44a3f4f63a 100644
--- a/public/language/ko/pages.json
+++ b/public/language/ko/pages.json
@@ -18,6 +18,7 @@
"tags": "태그",
"tag": "\"%1\" 꼬리표가 달린 주제",
"register": "회원가입",
+ "registration-complete": "Registration complete",
"login": "로그인",
"reset": "패스워드 초기화",
"categories": "카테고리",
diff --git a/public/language/ko/topic.json b/public/language/ko/topic.json
index 61a12ffb0c..1783ea7f83 100644
--- a/public/language/ko/topic.json
+++ b/public/language/ko/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.",
diff --git a/public/language/ko/user.json b/public/language/ko/user.json
index b58a7d9480..14da55592c 100644
--- a/public/language/ko/user.json
+++ b/public/language/ko/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"
}
\ No newline at end of file
diff --git a/public/language/lt/category.json b/public/language/lt/category.json
index abe245da73..5bae8755ef 100644
--- a/public/language/lt/category.json
+++ b/public/language/lt/category.json
@@ -14,7 +14,7 @@
"ignoring": "Ignoruojama",
"watching.description": "Show topics in unread",
"ignoring.description": "Do not show topics in unread",
- "watch.message": "Jūs dabar stebite atnaujinimus iš šios kategorijos",
- "ignore.message": "Jūs dabar ignoruojate atnaujinimus iš šios kategorijos",
+ "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": "Stebimos kategorijos"
}
\ No newline at end of file
diff --git a/public/language/lt/error.json b/public/language/lt/error.json
index aada6824bf..f9e6d7772e 100644
--- a/public/language/lt/error.json
+++ b/public/language/lt/error.json
@@ -62,6 +62,7 @@
"content-too-long": "Prašome parašyti trumpesnį pranešimą. Pranešimas negali sudaryti daugiau %1 simboli(us)",
"title-too-short": "Prašome įvesti ilgesni pavadinimą. Pavadinimas turi sudaryti mažiausiai %1 simboli(us)",
"title-too-long": "Prašome įvesti trumpersnį pavadinimą. Pavadinimas negali sudaryti daugiau %1 simboli(us)",
+ "category-not-selected": "Category not selected.",
"too-many-posts": "Jus galite rašyti kas %1 sekunde(s) - prašome palaukti prieš rašant dar kartą",
"too-many-posts-newbie": "Kadangi esate naujas narys, jūs galite tik rašyti kas %1 sekunde(s) kol jūs pasieksite %2 reputacija - prašome palaukti prieš rašant dar kartą",
"tag-too-short": "Prašome įvesti ilgesnę žymą. Žyma turi sudaryti mažiausiai %1 simboli(us)",
diff --git a/public/language/lt/global.json b/public/language/lt/global.json
index 1a6070a82c..763572f29d 100644
--- a/public/language/lt/global.json
+++ b/public/language/lt/global.json
@@ -19,6 +19,7 @@
"welcome_back": "Sveiki sugrįžę",
"you_have_successfully_logged_in": "Jūs sėkmingai prisijungėte",
"save_changes": "Išsaugoti pakeitimus",
+ "save": "Save",
"close": "Uždaryti",
"pagination": "Numeracija",
"pagination.out_of": "%1 iš %2",
diff --git a/public/language/lt/groups.json b/public/language/lt/groups.json
index cbb1b4118f..50ce9cc980 100644
--- a/public/language/lt/groups.json
+++ b/public/language/lt/groups.json
@@ -50,5 +50,7 @@
"membership.leave-group": "Palikti Grupę",
"membership.reject": "Atšaukti",
"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"
}
\ No newline at end of file
diff --git a/public/language/lt/modules.json b/public/language/lt/modules.json
index a339fe7558..579beeb269 100644
--- a/public/language/lt/modules.json
+++ b/public/language/lt/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",
diff --git a/public/language/lt/pages.json b/public/language/lt/pages.json
index 4fccb071b6..6e70235171 100644
--- a/public/language/lt/pages.json
+++ b/public/language/lt/pages.json
@@ -18,6 +18,7 @@
"tags": "Žymos",
"tag": "Temos su šia žymą \"%1\"",
"register": "Register an account",
+ "registration-complete": "Registration complete",
"login": "Login to your account",
"reset": "Reset your account password",
"categories": "Categories",
diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json
index 574ab67cd2..b2239c392d 100644
--- a/public/language/lt/topic.json
+++ b/public/language/lt/topic.json
@@ -31,6 +31,21 @@
"bookmark_instructions": "Click here to return to the last read post in this thread.",
"flag_title": "Pažymėti ši pranešimą moderatoriams",
"flag_success": "Šis pranešimas buvo pažymėtas moderatorių patikrinimui.",
+ "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": "Ši tema buvo ištrinta. Tik Vartotojai su temos redagavimo privilegijomis gali matyti ja",
"following_topic.message": "Dabar jūs gausite pranešimus kai kas nors atrašys šioje temoje.",
"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.",
diff --git a/public/language/lt/user.json b/public/language/lt/user.json
index 2b52a624bd..92c82942ee 100644
--- a/public/language/lt/user.json
+++ b/public/language/lt/user.json
@@ -123,5 +123,7 @@
"info.banned-reason-label": "Priežastis",
"info.banned-no-reason": "Be priežasties",
"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"
}
\ No newline at end of file
diff --git a/public/language/ms/category.json b/public/language/ms/category.json
index d683056b87..3b9d9455a4 100644
--- a/public/language/ms/category.json
+++ b/public/language/ms/category.json
@@ -14,7 +14,7 @@
"ignoring": "Ignoring",
"watching.description": "Show topics in unread",
"ignoring.description": "Do not show topics in unread",
- "watch.message": "Anda sedang melihat kemaskini dari kategori ini",
- "ignore.message": "Anda sedang mengabaikan kemaskini dari kategori ini",
+ "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": "Kategori Dilihat"
}
\ No newline at end of file
diff --git a/public/language/ms/error.json b/public/language/ms/error.json
index c6874b35aa..1872e8eddd 100644
--- a/public/language/ms/error.json
+++ b/public/language/ms/error.json
@@ -62,6 +62,7 @@
"content-too-long": "Sila masukkan kiriman yang lebih ringkas. Kiriman mesti mengandungi tidak lebih %1 aksara().",
"title-too-short": "Sila masukkan tajuk yang lebih panjang. Tajuk mesti mengandungi sekurang-kurangnya %1 aksara().",
"title-too-long": "Sila masukkan tajuk yang lebih ringkas. Tajuk mesti mengandungi tidak lebih %1 aksara().",
+ "category-not-selected": "Category not selected.",
"too-many-posts": "Anda hanya boleh mengirim sekali setiap %1 saat() - sila tunggu sebelum kiriman seterusnya",
"too-many-posts-newbie": "Sebagai pengguna baru, anda hanya boleh mengirim sekali setiap %1 saat() sehinnga anda mendapat %2 reputasi - sila tunggu sebelum kiriman seterusnya",
"tag-too-short": "Sila masukkan tag yang lebih panjang. Tag mesti mengandungi sekurang-kurangnya %1 aksara()",
diff --git a/public/language/ms/global.json b/public/language/ms/global.json
index e651a3fdf1..12238c3c06 100644
--- a/public/language/ms/global.json
+++ b/public/language/ms/global.json
@@ -19,6 +19,7 @@
"welcome_back": "Selamat kembali",
"you_have_successfully_logged_in": "Anda telah berjaya log masuk",
"save_changes": "Simpan perubahan",
+ "save": "Save",
"close": "Tutup",
"pagination": "Mukasurat",
"pagination.out_of": "%1 daripada %2",
diff --git a/public/language/ms/groups.json b/public/language/ms/groups.json
index 3c84b65c91..df34778d33 100644
--- a/public/language/ms/groups.json
+++ b/public/language/ms/groups.json
@@ -50,5 +50,7 @@
"membership.leave-group": "Keluar Kumpulan",
"membership.reject": "Tolak",
"new-group.group_name": "Nama Kumpulan:",
- "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"
}
\ No newline at end of file
diff --git a/public/language/ms/modules.json b/public/language/ms/modules.json
index 15c7f29f9f..7ae33cbc09 100644
--- a/public/language/ms/modules.json
+++ b/public/language/ms/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": "Batal",
"bootbox.confirm": "Pasti",
diff --git a/public/language/ms/pages.json b/public/language/ms/pages.json
index de883b3683..7b3ccee57c 100644
--- a/public/language/ms/pages.json
+++ b/public/language/ms/pages.json
@@ -18,6 +18,7 @@
"tags": "Tag",
"tag": "Topik ditag di bawwah \"%1\"",
"register": "Daftar Akaun",
+ "registration-complete": "Registration complete",
"login": "Log Masuk Ke Akaun Anda",
"reset": "Set Semula Kata Laluan",
"categories": "Kategori",
diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json
index 40d87da294..266fd059f6 100644
--- a/public/language/ms/topic.json
+++ b/public/language/ms/topic.json
@@ -31,6 +31,21 @@
"bookmark_instructions": "Click here to return to the last read post in this thread.",
"flag_title": "Tanda kiriman ini untuk diselia",
"flag_success": "Kiriman ini telah ditandakan untuk diselia",
+ "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": "Topik ini telah dipadam. Hanya pengguna dengan kuasa pengurusan boleh melihatnya.",
"following_topic.message": "Anda akan menerima makluman apabila ada kiriman ke dalam topik ini",
"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.",
diff --git a/public/language/ms/user.json b/public/language/ms/user.json
index 3d9402845d..ba0db632de 100644
--- a/public/language/ms/user.json
+++ b/public/language/ms/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"
}
\ No newline at end of file
diff --git a/public/language/nb/category.json b/public/language/nb/category.json
index 7d885ac0b7..759889274b 100644
--- a/public/language/nb/category.json
+++ b/public/language/nb/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åker nå oppdateringer fra denne kategorien",
- "ignore.message": "Du ignorerer nå oppdateringer fra denne kategorien",
+ "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": "Overvåkede kategorier"
}
\ No newline at end of file
diff --git a/public/language/nb/error.json b/public/language/nb/error.json
index 1fd4792c83..b5be6dd71f 100644
--- a/public/language/nb/error.json
+++ b/public/language/nb/error.json
@@ -62,6 +62,7 @@
"content-too-long": "Vennligst skriv et kortere innlegg. Innlegg kan ikke være lengre enn %1 tegn.",
"title-too-short": "Vennligst skriv en lengre tittel. Titler må inneholde minst %1 tegn.",
"title-too-long": "Vennligst skriv en kortere tittel. Tittel kan ikke være lengre enn %1 tegn.",
+ "category-not-selected": "Category not selected.",
"too-many-posts": "Du kan bare poste en gang per %1 sekund(er) – vennligst vent før du poster igjen",
"too-many-posts-newbie": "Som ny bruker kan du bare poste en gang per %1. sekund(er), før du har opparbeidet %2 i rykte – vennligst vent før du poster igjen",
"tag-too-short": "Vennligst skriv et lengre emneord. Disse må være på minst %1 tegn",
diff --git a/public/language/nb/global.json b/public/language/nb/global.json
index 03ab9adf9f..7ed463830b 100644
--- a/public/language/nb/global.json
+++ b/public/language/nb/global.json
@@ -19,6 +19,7 @@
"welcome_back": "Velkommen tilbake",
"you_have_successfully_logged_in": "Du har blitt logget inn",
"save_changes": "Lagre endringer",
+ "save": "Save",
"close": "Lukk",
"pagination": "Paginering",
"pagination.out_of": "%1 ut av %2",
diff --git a/public/language/nb/groups.json b/public/language/nb/groups.json
index 9354de5542..71e267d64f 100644
--- a/public/language/nb/groups.json
+++ b/public/language/nb/groups.json
@@ -50,5 +50,7 @@
"membership.leave-group": "Forlat gruppe",
"membership.reject": "Avslå",
"new-group.group_name": "Gruppenavn:",
- "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"
}
\ No newline at end of file
diff --git a/public/language/nb/modules.json b/public/language/nb/modules.json
index 999358e96c..3a71afce68 100644
--- a/public/language/nb/modules.json
+++ b/public/language/nb/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": "Avbryt",
"bootbox.confirm": "Bekreft",
diff --git a/public/language/nb/pages.json b/public/language/nb/pages.json
index 18aa026b01..6d9f6afc9e 100644
--- a/public/language/nb/pages.json
+++ b/public/language/nb/pages.json
@@ -18,6 +18,7 @@
"tags": "Emneord",
"tag": "Emner under emneord \"%1\"",
"register": "Registrer en konto",
+ "registration-complete": "Registration complete",
"login": "Logg inn på kontoen din",
"reset": "Tilbakestill passordet ditt",
"categories": "Kategorier",
diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json
index 277fce0070..88d2b0e85a 100644
--- a/public/language/nb/topic.json
+++ b/public/language/nb/topic.json
@@ -31,6 +31,21 @@
"bookmark_instructions": "Click here to return to the last read post in this thread.",
"flag_title": "Rapporter dette innlegget for granskning",
"flag_success": "Dette innlegget har blitt rapportert.",
+ "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": "Dette emnet har blitt slettet. Bare brukere med emnehåndterings-privilegier kan se den.",
"following_topic.message": "Du vil nå motta varsler når noen skriver i denne tråden.",
"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.",
diff --git a/public/language/nb/user.json b/public/language/nb/user.json
index 0fed01f667..8e5a07a38a 100644
--- a/public/language/nb/user.json
+++ b/public/language/nb/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"
}
\ No newline at end of file
diff --git a/public/language/nl/category.json b/public/language/nl/category.json
index f34a6a46fc..13cfde9a39 100644
--- a/public/language/nl/category.json
+++ b/public/language/nl/category.json
@@ -14,7 +14,7 @@
"ignoring": "Negerend",
"watching.description": "Toon ongelezen onderwerpen",
"ignoring.description": "Toon geen onderwerpen onder ongelezen onderwerpen",
- "watch.message": "Van deze categorie worden nu meldingen ontvangen",
- "ignore.message": "Er worden geen meldingen van deze categorie ontvangen",
+ "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": "Categorieën die bekeken zijn."
}
\ No newline at end of file
diff --git a/public/language/nl/error.json b/public/language/nl/error.json
index e4791abff6..a3545d8fd9 100644
--- a/public/language/nl/error.json
+++ b/public/language/nl/error.json
@@ -62,6 +62,7 @@
"content-too-long": "Kort het bericht wat in, het aantal gebruikte tekens overschrijdt het ingestelde limiet want berichten mogen niet meer dan %1 teken(s) bevatten.",
"title-too-short": "Geef een titel op die uit meer tekens bestaat. Titels dienen ten minste uit %1 teken(s) te bestaan.",
"title-too-long": "Geef een kortere titel op. Titels mogen uit niet meer dan %1 teken(s) bestaan.",
+ "category-not-selected": "Category not selected.",
"too-many-posts": "Het is slechts toegestaan iedere %1 seconde(n) een bericht te plaatsen - wacht even voordat opnieuw een bericht verzonden wordt",
"too-many-posts-newbie": "Nieuwe gebruikersaccounts zoals deze zijn begrensd en mogen slechts iedere %1 seconde(n) berichten plaatsen, tot het moment dat %2 reputatie verdiend is - wacht daarom even met opnieuw een bericht te plaatsten",
"tag-too-short": "Geef een tag op die uit meer tekens bestaat. Tags dienen uit minimaal %1 teken(s) te bestaan.",
diff --git a/public/language/nl/global.json b/public/language/nl/global.json
index 2cf9f0d6f6..b8e4f21a31 100644
--- a/public/language/nl/global.json
+++ b/public/language/nl/global.json
@@ -19,6 +19,7 @@
"welcome_back": "Welkom terug",
"you_have_successfully_logged_in": "Aanmelden succesvol",
"save_changes": "Wijzigingen opslaan",
+ "save": "Opslaan",
"close": "Sluiten",
"pagination": "Paginering",
"pagination.out_of": "%1 van %2",
@@ -97,5 +98,5 @@
"allowed-file-types": "Toegestane bestandstypen zijn %1",
"unsaved-changes": "You have unsaved changes. Are you sure you wish to navigate away?",
"reconnecting-message": "Looks like your connection to %1 was lost, please wait while we try to reconnect.",
- "play": "Play"
+ "play": "Afspelen"
}
\ No newline at end of file
diff --git a/public/language/nl/groups.json b/public/language/nl/groups.json
index e146a2d29c..23bab29f72 100644
--- a/public/language/nl/groups.json
+++ b/public/language/nl/groups.json
@@ -50,5 +50,7 @@
"membership.leave-group": "Verlaat groep",
"membership.reject": "Afwijzen",
"new-group.group_name": "Groepsnaam:",
- "upload-group-cover": "Upload groepscover"
+ "upload-group-cover": "Upload groepscover",
+ "bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
+ "bulk-invite": "Massa uitnodiging"
}
\ No newline at end of file
diff --git a/public/language/nl/modules.json b/public/language/nl/modules.json
index 5d27c1549f..2d000043d1 100644
--- a/public/language/nl/modules.json
+++ b/public/language/nl/modules.json
@@ -38,6 +38,7 @@
"composer.upload-picture": "Upload afbeelding",
"composer.upload-file": "Upload bestand",
"composer.zen_mode": "Zen Mode",
+ "composer.select_category": "Select a category",
"bootbox.ok": "OK",
"bootbox.cancel": "Annuleren",
"bootbox.confirm": "Bevestig",
diff --git a/public/language/nl/pages.json b/public/language/nl/pages.json
index c1f0dc4961..212073afd3 100644
--- a/public/language/nl/pages.json
+++ b/public/language/nl/pages.json
@@ -18,6 +18,7 @@
"tags": "Tags",
"tag": "Onderwerpen geplaatst onder \"%1\"",
"register": "Registeer een gebruikersaccount",
+ "registration-complete": "Registratie compleet",
"login": "Login met u gebruikersaccount in",
"reset": "Gebruikerswachtwoord opnieuw instellen",
"categories": "Categorieën",
diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json
index e0bee62ba1..e4a415c463 100644
--- a/public/language/nl/topic.json
+++ b/public/language/nl/topic.json
@@ -31,6 +31,21 @@
"bookmark_instructions": "Klik hier om terug te keren naar de laatst gelezen post in deze thread.",
"flag_title": "Bericht aan beheerders melden",
"flag_success": "Dit bericht is gerapporteerd aan de beheerder.",
+ "flag_manage_title": "Flagged post in %1",
+ "flag_manage_history": "Activiteiten geschiedenis",
+ "flag_manage_no_history": "No event history to report",
+ "flag_manage_assignee": "Assignee",
+ "flag_manage_state": "State",
+ "flag_manage_state_open": "Nieuw/Open",
+ "flag_manage_state_wip": "Work in Progress",
+ "flag_manage_state_resolved": "Opgelost",
+ "flag_manage_state_rejected": "Afgewezen",
+ "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": "Dit onderwerp is verwijderd. Alleen gebruikers met beheerrechten op onderwerpniveau kunnen dit inzien.",
"following_topic.message": "Vanaf nu worden meldingen ontvangen zodra iemand een reactie op dit onderwerp geeft.",
"not_following_topic.message": "Dit onderwerp zal verschijnen in de lijst van ongelezen onderwerpen, maar er zullen geen meldingen ontvangen zodra iemand een reactie op dit onderwerp geeft.",
@@ -51,7 +66,7 @@
"not-watching.description": "Stuur me geen melding van nieuwe reacties. Toon onderwerp in ongelezen mits de categorie niet genegeerd wordt.",
"ignoring.description": "Stuur me geen melding van nieuwe reacties. Toon dit onderwerp niet onder de ongelezen onderwerpen.",
"thread_tools.title": "Acties",
- "thread_tools.markAsUnreadForAll": "Mark unread for all",
+ "thread_tools.markAsUnreadForAll": "Markeer alles als ongelezen",
"thread_tools.pin": "Onderwerp vastpinnen",
"thread_tools.unpin": "Onderwerp losmaken",
"thread_tools.lock": "Onderwerp sluiten",
@@ -86,7 +101,7 @@
"topic_will_be_moved_to": "Dit onderwerp zal naar de categorie verplaatst worden",
"fork_topic_instruction": "Klik op de berichten die afgesplitst moeten worden",
"fork_no_pids": "Geen berichten geselecteerd!",
- "fork_pid_count": "%1 post(s) selected",
+ "fork_pid_count": "%1 bericht(en) geselecteerd",
"fork_success": "Onderwerp is succesvol afgesplitst. Klik hier om het nieuwe onderwerp te zien.",
"delete_posts_instruction": "Klik op de berichten die verwijderd moeten worden",
"composer.title_placeholder": "Voer hier de titel van het onderwerp in...",
diff --git a/public/language/nl/user.json b/public/language/nl/user.json
index a06c32c5cb..a17760a41a 100644
--- a/public/language/nl/user.json
+++ b/public/language/nl/user.json
@@ -89,11 +89,11 @@
"topics_per_page": "Onderwerpen per pagina",
"posts_per_page": "Berichten per pagina",
"notification_sounds": "Speel een geluid af wanneer ik een notificatie ontvang",
- "notifications_and_sounds": "Notifications & Sounds",
- "incoming-message-sound": "Incoming message sound",
- "outgoing-message-sound": "Outgoing message sound",
- "notification-sound": "Notification sound",
- "no-sound": "No sound",
+ "notifications_and_sounds": "Notificaties & Geluiden",
+ "incoming-message-sound": "Inkomend bericht geluid",
+ "outgoing-message-sound": "Uitgaand bericht geluid",
+ "notification-sound": "Notificatie geluid",
+ "no-sound": "Geen geluid",
"browsing": "Instellingen voor bladeren",
"open_links_in_new_tab": "Open uitgaande links naar een externe site in een nieuw tabblad",
"enable_topic_searching": "Inschakelen mogelijkheid op onderwerp te kunnen zoeken",
@@ -120,8 +120,10 @@
"info.no-ban-history": "Deze gebruiker is nooit eerder verbannen",
"info.banned-until": "Verbannen tot %1",
"info.banned-permanently": "Voor altijd verbannen",
- "info.banned-reason-label": "Reason",
- "info.banned-no-reason": "No reason given.",
- "info.username-history": "Username History",
- "info.email-history": "Email History"
+ "info.banned-reason-label": "Reden",
+ "info.banned-no-reason": "Geen reden opgegeven",
+ "info.username-history": "Gebruikersnaam geschiedenis",
+ "info.email-history": "Email geschiedenis",
+ "info.moderation-note": "Moderatie notitie",
+ "info.moderation-note.success": "Moderatie notitie opgeslagen"
}
\ No newline at end of file
diff --git a/public/language/pl/category.json b/public/language/pl/category.json
index bbbdeee94c..8b6e792605 100644
--- a/public/language/pl/category.json
+++ b/public/language/pl/category.json
@@ -14,7 +14,7 @@
"ignoring": "Ignorowanie",
"watching.description": "Pokaż tematy jako nieprzeczytane",
"ignoring.description": "Nie pokazuj tematów jako nieprzeczytane",
- "watch.message": "Obserwujesz teraz uaktualnienia z tej kategorii",
- "ignore.message": "Ignorujesz teraz uaktualnienia z tej kategorii",
+ "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": "Obserwowane kategorie"
}
\ No newline at end of file
diff --git a/public/language/pl/error.json b/public/language/pl/error.json
index b865879460..5285ccd8eb 100644
--- a/public/language/pl/error.json
+++ b/public/language/pl/error.json
@@ -62,6 +62,7 @@
"content-too-long": "Prosimy wpisać krótszy post. Posty nie mogą zawierać więcej niż %1 znaków.",
"title-too-short": "Prosimy podać dłuższy tytuł. Tytuły powinny zawierać co najmniej %1 znaków.",
"title-too-long": "Prosimy podać krótszy tytuł. Tytuły nie mogą być dłuższe niż %1 znaków.",
+ "category-not-selected": "Category not selected.",
"too-many-posts": "Możesz wysyłać posty raz na %1 sekund - prosimy poczekać przed ponownym dodaniem posta",
"too-many-posts-newbie": "Jako nowy użytkownik możesz wysyłać posty raz na %1 sekund, dopóki nie zdobędziesz %2 reputacji - prosimy poczekać przed ponownym dodaniem posta",
"tag-too-short": "Prosimy wprowadzić dłuższy tag. Tagi muszą posiadać przynajmniej %1 znak(ów)",
diff --git a/public/language/pl/global.json b/public/language/pl/global.json
index cccd6705d6..c8f158685b 100644
--- a/public/language/pl/global.json
+++ b/public/language/pl/global.json
@@ -19,6 +19,7 @@
"welcome_back": "Witamy ponownie!",
"you_have_successfully_logged_in": "Zostałeś pomyślnie zalogowany.",
"save_changes": "Zapisz zmiany",
+ "save": "Zapisz",
"close": "Zamknij",
"pagination": "Numerowanie stron",
"pagination.out_of": "%1 z %2",
diff --git a/public/language/pl/groups.json b/public/language/pl/groups.json
index 8fdb1b3f9b..9124dc8a64 100644
--- a/public/language/pl/groups.json
+++ b/public/language/pl/groups.json
@@ -50,5 +50,7 @@
"membership.leave-group": "Opuść Grupę",
"membership.reject": "Odrzuć",
"new-group.group_name": "Nazwa Grupy:",
- "upload-group-cover": "Załaduj zdjęcie tła grupy"
+ "upload-group-cover": "Załaduj zdjęcie tła grupy",
+ "bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
+ "bulk-invite": "Bulk Invite"
}
\ No newline at end of file
diff --git a/public/language/pl/modules.json b/public/language/pl/modules.json
index c405a728ef..39b9f025bc 100644
--- a/public/language/pl/modules.json
+++ b/public/language/pl/modules.json
@@ -38,6 +38,7 @@
"composer.upload-picture": "Wyślij obraz",
"composer.upload-file": "Wyślij plik",
"composer.zen_mode": "Tryb Zen",
+ "composer.select_category": "Select a category",
"bootbox.ok": "OK",
"bootbox.cancel": "Anuluj",
"bootbox.confirm": "Potwierdź",
diff --git a/public/language/pl/pages.json b/public/language/pl/pages.json
index d748c3919b..24f820e6e4 100644
--- a/public/language/pl/pages.json
+++ b/public/language/pl/pages.json
@@ -18,6 +18,7 @@
"tags": "Tagi",
"tag": "Tematy oznaczone jako \"%1\"",
"register": "Utwórz konto",
+ "registration-complete": "Registration complete",
"login": "Zaloguj się na swoje konto",
"reset": "Zresetuj hasło do swojego konta",
"categories": "Kategorie",
diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json
index cf2c18fbe3..168bce58bf 100644
--- a/public/language/pl/topic.json
+++ b/public/language/pl/topic.json
@@ -31,6 +31,21 @@
"bookmark_instructions": "Click here to return to the last read post in this thread.",
"flag_title": "Zgłoś post do moderacji",
"flag_success": "Ten post został oznaczony do moderacji.",
+ "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": "Ten temat został skasowany. Tylko użytkownicy z uprawnieniami do zarządzania mogą go zobaczyć.",
"following_topic.message": "Będziesz od teraz otrzymywał powiadomienia, gdy ktoś odpowie w tym temacie.",
"not_following_topic.message": "Zobaczysz ten temat na liście nieprzeczytanych, ale nie otrzymasz żadnego powiadomienia dotyczącego tego tematu.",
diff --git a/public/language/pl/user.json b/public/language/pl/user.json
index 0fc4ba0af9..e7d16aff71 100644
--- a/public/language/pl/user.json
+++ b/public/language/pl/user.json
@@ -123,5 +123,7 @@
"info.banned-reason-label": "Powód",
"info.banned-no-reason": "Nie podano powodu.",
"info.username-history": "Historia nazwy użytkownika",
- "info.email-history": "Historia adresu e-mail"
+ "info.email-history": "Historia adresu e-mail",
+ "info.moderation-note": "Moderation Note",
+ "info.moderation-note.success": "Moderation note saved"
}
\ No newline at end of file
diff --git a/public/language/pt_BR/category.json b/public/language/pt_BR/category.json
index ad56253599..0152ea54d0 100644
--- a/public/language/pt_BR/category.json
+++ b/public/language/pt_BR/category.json
@@ -14,7 +14,7 @@
"ignoring": "Ignorando",
"watching.description": "Mostrar tópicos em não-lido",
"ignoring.description": "Não mostrar tópicos em não-lido",
- "watch.message": "Agora você está acompanhando as atualizações desta categoria",
- "ignore.message": "Agora você está ignorando as atualizações desta categoria",
+ "watch.message": "Agora você está seguindo as atualizações desta categoria e de todas as subcategorias",
+ "ignore.message": "Agora você está ignorando as atualizações desta categoria e de todas as subcategorias",
"watched-categories": "Categorias acompanhadas"
}
\ No newline at end of file
diff --git a/public/language/pt_BR/error.json b/public/language/pt_BR/error.json
index 38571fe60d..291656a8e9 100644
--- a/public/language/pt_BR/error.json
+++ b/public/language/pt_BR/error.json
@@ -62,6 +62,7 @@
"content-too-long": "Por favor digite um post mais curto. Posts não podem ser maiores que %1 caractere(s)",
"title-too-short": "Por favor digite um título maior. Títulos devem conter no mínimo %1 caractere(s)",
"title-too-long": "Por favor digite um título menor. Títulos não podem ser maiores que %1 caractere(s).",
+ "category-not-selected": "Categoria não escolhida.",
"too-many-posts": "Você pode postar uma vez a cada %1 segundo(s) - por favor aguarde antes de postar novamente",
"too-many-posts-newbie": "Como novo usuário, você pode postar uma vez a cada %1 segundo(s) até que você tenha recebido reputação de %2 - por favor aguarde antes de postar novamente",
"tag-too-short": "Por favor digite uma tag maior. Tags devem conter pelo menos %1 caractere(s)",
diff --git a/public/language/pt_BR/global.json b/public/language/pt_BR/global.json
index 7e3b515eed..352f1633e7 100644
--- a/public/language/pt_BR/global.json
+++ b/public/language/pt_BR/global.json
@@ -19,6 +19,7 @@
"welcome_back": "Bem-vindo de volta",
"you_have_successfully_logged_in": "Você logou com sucesso",
"save_changes": "Salvar Alterações",
+ "save": "Salvar",
"close": "Fechar",
"pagination": "Paginação",
"pagination.out_of": "%1 de %2",
diff --git a/public/language/pt_BR/groups.json b/public/language/pt_BR/groups.json
index ed5727555f..5a6cdd04f2 100644
--- a/public/language/pt_BR/groups.json
+++ b/public/language/pt_BR/groups.json
@@ -50,5 +50,7 @@
"membership.leave-group": "Deixar Grupo",
"membership.reject": "Rejeitar",
"new-group.group_name": "Nome do Grupo:",
- "upload-group-cover": "Fazer upload de capa do grupo"
+ "upload-group-cover": "Fazer upload de capa do grupo",
+ "bulk-invite-instructions": "Entre uma lista separada por vírgulas de nome usuários para convidar à este grupo",
+ "bulk-invite": "Convite em Lote"
}
\ No newline at end of file
diff --git a/public/language/pt_BR/modules.json b/public/language/pt_BR/modules.json
index d02547efe4..602ef9dc03 100644
--- a/public/language/pt_BR/modules.json
+++ b/public/language/pt_BR/modules.json
@@ -38,6 +38,7 @@
"composer.upload-picture": "Fazer upload de Imagem",
"composer.upload-file": "Fazer upload de Arquivo",
"composer.zen_mode": "Modo Zen",
+ "composer.select_category": "Escolha uma categoria",
"bootbox.ok": "OK",
"bootbox.cancel": "Cancelar",
"bootbox.confirm": "Confirmar",
diff --git a/public/language/pt_BR/pages.json b/public/language/pt_BR/pages.json
index 68b771bdb8..92d51b3958 100644
--- a/public/language/pt_BR/pages.json
+++ b/public/language/pt_BR/pages.json
@@ -18,6 +18,7 @@
"tags": "Tags",
"tag": "Tópicos com a tag \"%1\"",
"register": "Registrar uma conta",
+ "registration-complete": "Registro completado",
"login": "Entrar na sua conta",
"reset": "Redefinir a senha da sua conta",
"categories": "Categorias",
diff --git a/public/language/pt_BR/topic.json b/public/language/pt_BR/topic.json
index 3d7531fadd..14d35366da 100644
--- a/public/language/pt_BR/topic.json
+++ b/public/language/pt_BR/topic.json
@@ -31,6 +31,21 @@
"bookmark_instructions": "Clique aqui para retornar ao último post lido neste tópico.",
"flag_title": "Sinalizar este post para moderação",
"flag_success": "Este post foi sinalizado para ser moderado.",
+ "flag_manage_title": "Post sinalizado em %1",
+ "flag_manage_history": "Histórico de Atividades",
+ "flag_manage_no_history": "Nenhum histórico de eventos para mostrar",
+ "flag_manage_assignee": "Procurador",
+ "flag_manage_state": "Situação",
+ "flag_manage_state_open": "Novo/Aberto",
+ "flag_manage_state_wip": "Trabalho em Andamento",
+ "flag_manage_state_resolved": "Resolvido",
+ "flag_manage_state_rejected": "Rejeitado",
+ "flag_manage_notes": "Notas Compartilhadas",
+ "flag_manage_update": "Atualizar Status da Sinalização",
+ "flag_manage_history_assignee": "Procuração concedida para %1",
+ "flag_manage_history_state": "Situação atualizada para %1",
+ "flag_manage_history_notes": "Notas de sinalização atualizadas",
+ "flag_manage_saved": "Detalhes da Sinalização Atualizados",
"deleted_message": "Este tópico foi deletado. Apenas usuários com privilégios de moderação de tópico podem vê-lo.",
"following_topic.message": "Agora você receberá notificações quando alguém responder este tópico.",
"not_following_topic.message": "Você verá este tópico na lista de tópicos não-lidos, mas você não receberá notificações quendo alguém posta no tópico.",
diff --git a/public/language/pt_BR/user.json b/public/language/pt_BR/user.json
index 2d306417f6..f7e79b1f13 100644
--- a/public/language/pt_BR/user.json
+++ b/public/language/pt_BR/user.json
@@ -123,5 +123,7 @@
"info.banned-reason-label": "Motivo",
"info.banned-no-reason": "Sem motivo escolhido.",
"info.username-history": "Histórico do Nome de Usuário",
- "info.email-history": "Histórico do Email"
+ "info.email-history": "Histórico do Email",
+ "info.moderation-note": "Nota da Moderação",
+ "info.moderation-note.success": "Nota da moderação salva"
}
\ No newline at end of file
diff --git a/public/language/ro/category.json b/public/language/ro/category.json
index 2f8542557c..a090e3ac07 100644
--- a/public/language/ro/category.json
+++ b/public/language/ro/category.json
@@ -14,7 +14,7 @@
"ignoring": "Ignoring",
"watching.description": "Show topics in unread",
"ignoring.description": "Do not show topics in unread",
- "watch.message": "Urmăriți acum actualizări din această categorie",
- "ignore.message": "Ignorați acum actualizări din această categorie",
+ "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": "Categorii urmărite"
}
\ No newline at end of file
diff --git a/public/language/ro/error.json b/public/language/ro/error.json
index 3e8dcded59..96802562e2 100644
--- a/public/language/ro/error.json
+++ b/public/language/ro/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)",
diff --git a/public/language/ro/global.json b/public/language/ro/global.json
index f8b346044f..8f39ff6550 100644
--- a/public/language/ro/global.json
+++ b/public/language/ro/global.json
@@ -19,6 +19,7 @@
"welcome_back": "Bine ai revenit",
"you_have_successfully_logged_in": "Te-ai conectat cu succes",
"save_changes": "Salvează Modificări",
+ "save": "Save",
"close": "Închide",
"pagination": "Paginație",
"pagination.out_of": "%1 din %2",
diff --git a/public/language/ro/groups.json b/public/language/ro/groups.json
index b116606f87..6bc6baa2c9 100644
--- a/public/language/ro/groups.json
+++ b/public/language/ro/groups.json
@@ -50,5 +50,7 @@
"membership.leave-group": "Părăsește grupul",
"membership.reject": "Respinge",
"new-group.group_name": "Numele grupului:",
- "upload-group-cover": "Încarcă coperta de grup"
+ "upload-group-cover": "Încarcă coperta de grup",
+ "bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
+ "bulk-invite": "Bulk Invite"
}
\ No newline at end of file
diff --git a/public/language/ro/modules.json b/public/language/ro/modules.json
index 1c25e2a5ba..eda44c3a00 100644
--- a/public/language/ro/modules.json
+++ b/public/language/ro/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",
diff --git a/public/language/ro/pages.json b/public/language/ro/pages.json
index bfce4e0d50..20017cc361 100644
--- a/public/language/ro/pages.json
+++ b/public/language/ro/pages.json
@@ -18,6 +18,7 @@
"tags": "Taguri",
"tag": "Topics tagged under \"%1\"",
"register": "Înregistrează un cont nou",
+ "registration-complete": "Registration complete",
"login": "Login to your account",
"reset": "Resetează parola contului tău",
"categories": "Categorii",
diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json
index 7db40a2e74..e57199a2de 100644
--- a/public/language/ro/topic.json
+++ b/public/language/ro/topic.json
@@ -31,6 +31,21 @@
"bookmark_instructions": "Click here to return to the last read post in this thread.",
"flag_title": "Semnalizează acest mesaj pentru moderare",
"flag_success": "Acest mesaj a fost semnalizat pentru moderare.",
+ "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": "Acest subiect a fost șters. Doar utilizatorii cu privilegii pentru moderarea subiectelor îl poate vedea.",
"following_topic.message": "Vei primi notificări când cineva va posta un nou mesaj in acest subiect.",
"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.",
diff --git a/public/language/ro/user.json b/public/language/ro/user.json
index 9ed9377725..d86c8ab301 100644
--- a/public/language/ro/user.json
+++ b/public/language/ro/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"
}
\ No newline at end of file
diff --git a/public/language/ru/category.json b/public/language/ru/category.json
index 9ac00501c4..e6faa0cb27 100644
--- a/public/language/ru/category.json
+++ b/public/language/ru/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": "Наблюдаемые категории"
}
\ No newline at end of file
diff --git a/public/language/ru/error.json b/public/language/ru/error.json
index 8d7d25e0f4..58c8828584 100644
--- a/public/language/ru/error.json
+++ b/public/language/ru/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": "Вы новый пользователь, поэтому можете создавать сообщение раз в %1 сек., пока не заработаете %2 п. репутации.",
"tag-too-short": "Слишком короткий тэг. Минимум символов: %1.",
diff --git a/public/language/ru/global.json b/public/language/ru/global.json
index 9c584431ed..c736dbb191 100644
--- a/public/language/ru/global.json
+++ b/public/language/ru/global.json
@@ -19,6 +19,7 @@
"welcome_back": "С возвращением",
"you_have_successfully_logged_in": "Вы успешно вошли на форум",
"save_changes": "Сохранить изменения",
+ "save": "Save",
"close": "Закрыть",
"pagination": "Пагинация",
"pagination.out_of": "%1 из %2",
diff --git a/public/language/ru/groups.json b/public/language/ru/groups.json
index 53ac0687f2..4ce0f20f0e 100644
--- a/public/language/ru/groups.json
+++ b/public/language/ru/groups.json
@@ -50,5 +50,7 @@
"membership.leave-group": "Покинуть",
"membership.reject": "Отклонить",
"new-group.group_name": "Название группы:",
- "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"
}
\ No newline at end of file
diff --git a/public/language/ru/modules.json b/public/language/ru/modules.json
index 17151cbc94..629be2fd3d 100644
--- a/public/language/ru/modules.json
+++ b/public/language/ru/modules.json
@@ -38,6 +38,7 @@
"composer.upload-picture": "Загрузить изображение",
"composer.upload-file": "Загрузить файл",
"composer.zen_mode": "Zen Mode",
+ "composer.select_category": "Select a category",
"bootbox.ok": "ОК",
"bootbox.cancel": "Отмена",
"bootbox.confirm": "Подтвердить",
diff --git a/public/language/ru/pages.json b/public/language/ru/pages.json
index d0c8db5878..7602c703e9 100644
--- a/public/language/ru/pages.json
+++ b/public/language/ru/pages.json
@@ -18,6 +18,7 @@
"tags": "Теги",
"tag": "Темы с тегом \"%1\"",
"register": "Зарегистрироваться",
+ "registration-complete": "Registration complete",
"login": "Войти",
"reset": "Забыл пароль?",
"categories": "Категории",
diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json
index 22f76a26fd..e0fd460972 100644
--- a/public/language/ru/topic.json
+++ b/public/language/ru/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": "Вы увидите эту тему в списке непрочитанных тем, но Вы не будете получать уведомления, когда кто-то напишет сообщение в эту тему.",
diff --git a/public/language/ru/user.json b/public/language/ru/user.json
index ab372b0d1a..af684f5059 100644
--- a/public/language/ru/user.json
+++ b/public/language/ru/user.json
@@ -123,5 +123,7 @@
"info.banned-reason-label": "Причина",
"info.banned-no-reason": "Без объяснения причин.",
"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"
}
\ No newline at end of file
diff --git a/public/language/rw/category.json b/public/language/rw/category.json
index 34d2f03283..f9b137bdbf 100644
--- a/public/language/rw/category.json
+++ b/public/language/rw/category.json
@@ -14,7 +14,7 @@
"ignoring": "Ignoring",
"watching.description": "Show topics in unread",
"ignoring.description": "Do not show topics in unread",
- "watch.message": "Uzajya ubu ukurikirana ibishya byongewe muri iki cyiciro",
- "ignore.message": "Ubu urekeye aho kuzajya ubona ibishya byongewe muri iki cyiciro",
+ "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": "Ibyiciro Bikurikirwa"
}
\ No newline at end of file
diff --git a/public/language/rw/error.json b/public/language/rw/error.json
index 11e3d59d6f..b423d96d19 100644
--- a/public/language/rw/error.json
+++ b/public/language/rw/error.json
@@ -62,6 +62,7 @@
"content-too-long": "Gerageza ushyireho ibintu bigufiyaho. Icyo ushyiraho kigomba kuba kigizwe n'inyuguti (cyangwa ibimenyetso) zirenga %1. ",
"title-too-short": "Gerageza ushyireho umutwe muremureho. Umutwe ugomba kuba ugizwe n'inyuguti (cyangwa ibimenyetso) zigera kuri %1. ",
"title-too-long": "Gerageza ushyireho umutwe mugufiyaho. Umutwe ugomba kuba ugizwe n'inyuguti (cyangwa ibimenyetso) zitarenga %1. ",
+ "category-not-selected": "Category not selected.",
"too-many-posts": "Wemerewe kugira icyo ushyiraho rimwe mu masegonda (isegonda) %1. Ba utegerejeho gato kugirango wongere",
"too-many-posts-newbie": "Nk'umuntu mushya, wemerewe gushyiraho ikintu rimwe mu masegonda (isegonda) %1 kugeza igihe ugize amanota agera kuri %2. Ba utegerejeho gato kugirango wongere",
"tag-too-short": "Gerageza ukoreshe akamenyetso kagizwe n'inyuguti (cyangwa ibimenyetso) nibura zigera kuri %1",
diff --git a/public/language/rw/global.json b/public/language/rw/global.json
index f0922ae9ac..44876dcad7 100644
--- a/public/language/rw/global.json
+++ b/public/language/rw/global.json
@@ -19,6 +19,7 @@
"welcome_back": "Urakaza Neza Urisanga",
"you_have_successfully_logged_in": "Winjiyemo nta ngorane",
"save_changes": "Bika ibyamaze gukorwa",
+ "save": "Save",
"close": "Funga",
"pagination": "Umubare wa Paji",
"pagination.out_of": "%1 muri %2",
diff --git a/public/language/rw/groups.json b/public/language/rw/groups.json
index 12ec0b7193..b653c89599 100644
--- a/public/language/rw/groups.json
+++ b/public/language/rw/groups.json
@@ -50,5 +50,7 @@
"membership.leave-group": "Va mu Itsinda",
"membership.reject": "Hakanira",
"new-group.group_name": "Izina ry'Itsinda:",
- "upload-group-cover": "Shyiraho ifoto yo hejuru iranga itsinda"
+ "upload-group-cover": "Shyiraho ifoto yo hejuru iranga itsinda",
+ "bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
+ "bulk-invite": "Bulk Invite"
}
\ No newline at end of file
diff --git a/public/language/rw/modules.json b/public/language/rw/modules.json
index 2ce5ceac86..e73f38df8c 100644
--- a/public/language/rw/modules.json
+++ b/public/language/rw/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": "Sawa",
"bootbox.cancel": "Isubire",
"bootbox.confirm": "Emeza",
diff --git a/public/language/rw/pages.json b/public/language/rw/pages.json
index 7fd3b0b5a7..76df500363 100644
--- a/public/language/rw/pages.json
+++ b/public/language/rw/pages.json
@@ -18,6 +18,7 @@
"tags": "Ibimenyetso",
"tag": "Ibiganiro bifite ibimenyetso bya \"%1\"",
"register": "Fungura Konte",
+ "registration-complete": "Registration complete",
"login": "Injira muri konte yawe",
"reset": "Tangiza bundi bushya konte yawe",
"categories": "Ibyiciro",
diff --git a/public/language/rw/topic.json b/public/language/rw/topic.json
index 2e6e514af7..e8d7adaeac 100644
--- a/public/language/rw/topic.json
+++ b/public/language/rw/topic.json
@@ -31,6 +31,21 @@
"bookmark_instructions": "Click here to return to the last read post in this thread.",
"flag_title": "Bimenyeshe ubuyobozi",
"flag_success": "Bimaze kumenyeshwa ubuyobozi ngo bikurikiranwe. ",
+ "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": "Iki kiganiro cyamaze gukurwaho. Abantu babifitiye uburenganzira ni bo bonyine bashobora kukibona. ",
"following_topic.message": "Ntabwo uzongera kubimenyeshwa nihagira umuntu ugira icyo yandika kuri iki kiganiro. ",
"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.",
diff --git a/public/language/rw/user.json b/public/language/rw/user.json
index ab2f435f54..73c0527cf4 100644
--- a/public/language/rw/user.json
+++ b/public/language/rw/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"
}
\ No newline at end of file
diff --git a/public/language/sc/category.json b/public/language/sc/category.json
index 37ada291fb..324b42de64 100644
--- a/public/language/sc/category.json
+++ b/public/language/sc/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"
}
\ No newline at end of file
diff --git a/public/language/sc/error.json b/public/language/sc/error.json
index a28c95316f..076a5c0345 100644
--- a/public/language/sc/error.json
+++ b/public/language/sc/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)",
diff --git a/public/language/sc/global.json b/public/language/sc/global.json
index 159188e8c2..815a01096c 100644
--- a/public/language/sc/global.json
+++ b/public/language/sc/global.json
@@ -19,6 +19,7 @@
"welcome_back": "Welcome Back",
"you_have_successfully_logged_in": "Ses intradu",
"save_changes": "Alloga Acontzos",
+ "save": "Save",
"close": "Serra",
"pagination": "Paginatzione",
"pagination.out_of": "%1 out of %2",
diff --git a/public/language/sc/groups.json b/public/language/sc/groups.json
index 3c4f6ce638..8af283d60e 100644
--- a/public/language/sc/groups.json
+++ b/public/language/sc/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"
}
\ No newline at end of file
diff --git a/public/language/sc/modules.json b/public/language/sc/modules.json
index 9727532086..ed17a97b6a 100644
--- a/public/language/sc/modules.json
+++ b/public/language/sc/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",
diff --git a/public/language/sc/pages.json b/public/language/sc/pages.json
index 1e2b75ba52..48b466e183 100644
--- a/public/language/sc/pages.json
+++ b/public/language/sc/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",
diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json
index d47d4e055b..11c3eeec55 100644
--- a/public/language/sc/topic.json
+++ b/public/language/sc/topic.json
@@ -31,6 +31,21 @@
"bookmark_instructions": "Click here to return to the last read post in this thread.",
"flag_title": "Signala custu arresonu pro sa moderatzione",
"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": "As a retzire notìficas si calincunu pùblica in custa arresonada.",
"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.",
diff --git a/public/language/sc/user.json b/public/language/sc/user.json
index 90746c1fe8..68591dc76b 100644
--- a/public/language/sc/user.json
+++ b/public/language/sc/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"
}
\ No newline at end of file
diff --git a/public/language/sk/category.json b/public/language/sk/category.json
index 7e11cb72d7..b1e017f33f 100644
--- a/public/language/sk/category.json
+++ b/public/language/sk/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"
}
\ No newline at end of file
diff --git a/public/language/sk/error.json b/public/language/sk/error.json
index 5dbdeb828a..1d34a2c7f0 100644
--- a/public/language/sk/error.json
+++ b/public/language/sk/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)",
diff --git a/public/language/sk/global.json b/public/language/sk/global.json
index f184a5f15a..3efe047ecf 100644
--- a/public/language/sk/global.json
+++ b/public/language/sk/global.json
@@ -19,6 +19,7 @@
"welcome_back": "Welcome Back",
"you_have_successfully_logged_in": "Úspešne si sa prihlásil",
"save_changes": "Uložiť zmeny",
+ "save": "Save",
"close": "Zrušiť",
"pagination": "Stránkovanie",
"pagination.out_of": "%1 z %2",
diff --git a/public/language/sk/groups.json b/public/language/sk/groups.json
index ee2368b97e..766742e852 100644
--- a/public/language/sk/groups.json
+++ b/public/language/sk/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"
}
\ No newline at end of file
diff --git a/public/language/sk/modules.json b/public/language/sk/modules.json
index b7450e202c..fda24c5754 100644
--- a/public/language/sk/modules.json
+++ b/public/language/sk/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",
diff --git a/public/language/sk/pages.json b/public/language/sk/pages.json
index f627a21bf8..133f0374c1 100644
--- a/public/language/sk/pages.json
+++ b/public/language/sk/pages.json
@@ -18,6 +18,7 @@
"tags": "Tagy",
"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",
diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json
index 50145c3497..a5c642a501 100644
--- a/public/language/sk/topic.json
+++ b/public/language/sk/topic.json
@@ -31,6 +31,21 @@
"bookmark_instructions": "Click here to return to the last read post in this thread.",
"flag_title": "Označiť príspevok pre moderáciu",
"flag_success": "Tento príspevok bol označený na úpravu. ",
+ "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": "Budete teraz príjimať notifikácie, ked niekto prispeje do témy.",
"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.",
diff --git a/public/language/sk/user.json b/public/language/sk/user.json
index a98ec25207..c519271dd3 100644
--- a/public/language/sk/user.json
+++ b/public/language/sk/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"
}
\ No newline at end of file
diff --git a/public/language/sl/category.json b/public/language/sl/category.json
index 076391e8aa..301b6cfbdc 100644
--- a/public/language/sl/category.json
+++ b/public/language/sl/category.json
@@ -14,7 +14,7 @@
"ignoring": "Prezrto",
"watching.description": "Pokaži teme v Neprebrano",
"ignoring.description": "Ne pokaži tem v Neprebrano",
- "watch.message": "Sedaj spremljaš posodobitve kategorije",
- "ignore.message": "Ne spremljaš posodobitev v kategoriji",
+ "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": "Spremljane kategorije"
}
\ No newline at end of file
diff --git a/public/language/sl/error.json b/public/language/sl/error.json
index 8b5c316e52..edd3b4e0d6 100644
--- a/public/language/sl/error.json
+++ b/public/language/sl/error.json
@@ -62,6 +62,7 @@
"content-too-long": "Prosimo napišite krajšo objavo. Objave ne smejo vsebovati več kot %1 znak(ov).",
"title-too-short": "Prosimo vnesite daljši naslov. Naslovi morajo vsebovati vsaj %1 znak(ov).",
"title-too-long": "Prosimo napišite krajši naslov. Naslovi ne smejo vsebovati več kot %1 znak(ov).",
+ "category-not-selected": "Category not selected.",
"too-many-posts": "Objavljate lahko na vsake %1 sekund - prosimo počakajte pred novo objavo.",
"too-many-posts-newbie": "Kot nov uporabnik lahko objavljate le vsakih %1 sekund(o/i/e), dokler ne dosežete vsaj %2 ugled(a/e/ov) - prosimo počakajte pred novo objavo.",
"tag-too-short": "Prosimo vnesite daljšo oznako. Oznake morajo vsebovati vsaj %1 znak(ov).",
diff --git a/public/language/sl/global.json b/public/language/sl/global.json
index e1bd5970e0..ef0910e47b 100644
--- a/public/language/sl/global.json
+++ b/public/language/sl/global.json
@@ -19,6 +19,7 @@
"welcome_back": "Dobrodošli nazaj",
"you_have_successfully_logged_in": "Uspešno ste se prijavili",
"save_changes": "Shrani spremembe",
+ "save": "Save",
"close": "Zapri",
"pagination": "Oštevilčenje strani",
"pagination.out_of": "%1 od %2",
diff --git a/public/language/sl/groups.json b/public/language/sl/groups.json
index 30eb44f63c..5a62abee98 100644
--- a/public/language/sl/groups.json
+++ b/public/language/sl/groups.json
@@ -50,5 +50,7 @@
"membership.leave-group": "Zapusti skupino",
"membership.reject": "Zavrni",
"new-group.group_name": "Ime skupine:",
- "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"
}
\ No newline at end of file
diff --git a/public/language/sl/modules.json b/public/language/sl/modules.json
index b69277ee96..d1557150bb 100644
--- a/public/language/sl/modules.json
+++ b/public/language/sl/modules.json
@@ -38,6 +38,7 @@
"composer.upload-picture": "Prenesi sliko\t",
"composer.upload-file": "Prenesi datoteko",
"composer.zen_mode": "Zen način",
+ "composer.select_category": "Select a category",
"bootbox.ok": "V redu",
"bootbox.cancel": "Prekliči",
"bootbox.confirm": "Potrdi",
diff --git a/public/language/sl/pages.json b/public/language/sl/pages.json
index dd8d06b1e9..9d56b81302 100644
--- a/public/language/sl/pages.json
+++ b/public/language/sl/pages.json
@@ -18,6 +18,7 @@
"tags": "Oznake",
"tag": "Teme označene kot \"%1\"",
"register": "Registriraj svoj račun",
+ "registration-complete": "Registration complete",
"login": "Prijavi se v svoj račun",
"reset": "Ponastavi geslo svojega računa",
"categories": "Kategorije",
diff --git a/public/language/sl/tags.json b/public/language/sl/tags.json
index 90d0a74dc2..50e7944fde 100644
--- a/public/language/sl/tags.json
+++ b/public/language/sl/tags.json
@@ -1,7 +1,7 @@
{
"no_tag_topics": "Ni novih tem s to oznako.",
"tags": "Oznake",
- "enter_tags_here": "Tu vpišite oznake. Dovoljeno število znakov: najmaj %1 in največ %2.",
+ "enter_tags_here": "Tu vpišite oznake. Dovoljeno število znakov: najmanj %1 in največ %2.",
"enter_tags_here_short": "Vpišite oznake...",
"no_tags": "Oznak še ni."
}
\ No newline at end of file
diff --git a/public/language/sl/topic.json b/public/language/sl/topic.json
index e7c8f7e975..cdab1a601e 100644
--- a/public/language/sl/topic.json
+++ b/public/language/sl/topic.json
@@ -13,7 +13,7 @@
"notify_me": "Bodi obveščen o novih odgovorih na to temo",
"quote": "Citiraj",
"reply": "Odgovori",
- "reply-as-topic": "Odgovori z temo",
+ "reply-as-topic": "Odgovori s temo",
"guest-login-reply": "Prijavi se za odgovor",
"edit": "Uredi",
"delete": "Izbriši",
@@ -31,6 +31,21 @@
"bookmark_instructions": "Klikni tukaj za vrnitev na zadnje prebrano objavo v tej niti",
"flag_title": "Označi to objavo za vodenje",
"flag_success": "Ta objava je bila označena za vodenje.",
+ "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": "Ta tema je bila izbrisana. Le uporabniki s pravicami upravljanja tem jo lahko vidijo.",
"following_topic.message": "Če nekdo objavi v to temo, boste od sedaj dobivali obvestila. ",
"not_following_topic.message": "To temo boste videli v seznamu neprebranih tem. Ne boste pa dobili obvestila, če bo nekdo objavil v tej temi. ",
diff --git a/public/language/sl/user.json b/public/language/sl/user.json
index fedcef19fc..a7d13e5511 100644
--- a/public/language/sl/user.json
+++ b/public/language/sl/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"
}
\ No newline at end of file
diff --git a/public/language/sr/category.json b/public/language/sr/category.json
index 61bde8e12e..29d26b51db 100644
--- a/public/language/sr/category.json
+++ b/public/language/sr/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": "Гледане категорије"
}
\ No newline at end of file
diff --git a/public/language/sr/error.json b/public/language/sr/error.json
index b0e706c2c1..e136a94f7f 100644
--- a/public/language/sr/error.json
+++ b/public/language/sr/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)",
diff --git a/public/language/sr/global.json b/public/language/sr/global.json
index 57615dd8df..c57d8d4d4e 100644
--- a/public/language/sr/global.json
+++ b/public/language/sr/global.json
@@ -19,6 +19,7 @@
"welcome_back": "Добродошли поново",
"you_have_successfully_logged_in": "Успешно сте се пријавили",
"save_changes": "Сними измене",
+ "save": "Save",
"close": "Затвори",
"pagination": "Обележавање страна",
"pagination.out_of": "%1 од %2",
diff --git a/public/language/sr/groups.json b/public/language/sr/groups.json
index 91bd05e916..00127e0eac 100644
--- a/public/language/sr/groups.json
+++ b/public/language/sr/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"
}
\ No newline at end of file
diff --git a/public/language/sr/modules.json b/public/language/sr/modules.json
index 2ef142c34f..adec279e99 100644
--- a/public/language/sr/modules.json
+++ b/public/language/sr/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": "ОК",
"bootbox.cancel": "Откажи",
"bootbox.confirm": "Потврди",
diff --git a/public/language/sr/pages.json b/public/language/sr/pages.json
index 92e6caf93d..4184d6443e 100644
--- a/public/language/sr/pages.json
+++ b/public/language/sr/pages.json
@@ -18,6 +18,7 @@
"tags": "Ознаке",
"tag": "Теме са ознаком „%1“",
"register": "Register an account",
+ "registration-complete": "Registration complete",
"login": "Login to your account",
"reset": "Reset your account password",
"categories": "Категорије",
diff --git a/public/language/sr/topic.json b/public/language/sr/topic.json
index 9a55ad571f..10c126da64 100644
--- a/public/language/sr/topic.json
+++ b/public/language/sr/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.",
diff --git a/public/language/sr/user.json b/public/language/sr/user.json
index 824efb8cc5..0c158620ac 100644
--- a/public/language/sr/user.json
+++ b/public/language/sr/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"
}
\ No newline at end of file
diff --git a/public/language/sv/category.json b/public/language/sv/category.json
index 4fbee91261..42ebe430b9 100644
--- a/public/language/sv/category.json
+++ b/public/language/sv/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 bevakar nu uppdateringar ifrån denna kategori",
- "ignore.message": "Du ignorerar nu uppdateringar ifrån denna 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": "Bevakade kategorier"
}
\ No newline at end of file
diff --git a/public/language/sv/error.json b/public/language/sv/error.json
index c60d19c82a..ca89517bd8 100644
--- a/public/language/sv/error.json
+++ b/public/language/sv/error.json
@@ -62,6 +62,7 @@
"content-too-long": "Skriv ett kortare inlägg. Inlägg kan inte innehålla mer än %1 tecken.",
"title-too-short": "Skriv en längre rubrik. Rubriker måste innehålla minst %1 tecken.",
"title-too-long": "Skriv en kortare rubrik. Rubriker kan inte innehålla mer än %1 tecken.",
+ "category-not-selected": "Category not selected.",
"too-many-posts": "Du måste vänta minst %1 sekund(er) mellan varje inlägg",
"too-many-posts-newbie": "Som ny användare måste du vänta %1 sekund(er) mellan varje inlägg tills dess du har %2 förtroende",
"tag-too-short": "Fyll i en längre tagg. Taggar måste vara minst %1 tecken långa",
diff --git a/public/language/sv/global.json b/public/language/sv/global.json
index 50e107b718..6a50800411 100644
--- a/public/language/sv/global.json
+++ b/public/language/sv/global.json
@@ -19,6 +19,7 @@
"welcome_back": "Välkommen tillbaka ",
"you_have_successfully_logged_in": "Inloggningen lyckades",
"save_changes": "Spara ändringar",
+ "save": "Save",
"close": "Stäng",
"pagination": "Siduppdelning",
"pagination.out_of": "%1 av %2",
diff --git a/public/language/sv/groups.json b/public/language/sv/groups.json
index a88962291c..4c895e83fd 100644
--- a/public/language/sv/groups.json
+++ b/public/language/sv/groups.json
@@ -50,5 +50,7 @@
"membership.leave-group": "Lämna grupp",
"membership.reject": "Neka",
"new-group.group_name": "Gruppnamn:",
- "upload-group-cover": "Ladda upp omslagsbild för grupp"
+ "upload-group-cover": "Ladda upp omslagsbild för grupp",
+ "bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
+ "bulk-invite": "Bulk Invite"
}
\ No newline at end of file
diff --git a/public/language/sv/modules.json b/public/language/sv/modules.json
index 56ddf0ceb5..afe2311120 100644
--- a/public/language/sv/modules.json
+++ b/public/language/sv/modules.json
@@ -38,6 +38,7 @@
"composer.upload-picture": "Ladda upp bild",
"composer.upload-file": "Ladda upp fil",
"composer.zen_mode": "Zen Mode",
+ "composer.select_category": "Select a category",
"bootbox.ok": "OK",
"bootbox.cancel": "Avbryt",
"bootbox.confirm": "Bekräfta",
diff --git a/public/language/sv/pages.json b/public/language/sv/pages.json
index ddcb33fe96..8b345d7bc2 100644
--- a/public/language/sv/pages.json
+++ b/public/language/sv/pages.json
@@ -18,6 +18,7 @@
"tags": "Etiketter",
"tag": "Ämnen märkta med \"%1\"",
"register": "Registrera ett konto",
+ "registration-complete": "Registration complete",
"login": "Logga in på ditt konto",
"reset": "Återställ lösenord",
"categories": "Kategorier",
diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json
index 92b95903e8..9f2f5b0200 100644
--- a/public/language/sv/topic.json
+++ b/public/language/sv/topic.json
@@ -31,6 +31,21 @@
"bookmark_instructions": "Klicka här för att återgå till senast lästa inlägg i detta ämne.",
"flag_title": "Rapportera detta inlägg för granskning",
"flag_success": "Det här inlägget har flaggats för moderering.",
+ "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": "Det här ämnet har raderats. Endast användare med ämneshanterings-privilegier kan se det.",
"following_topic.message": "Du kommer nu få notiser när någon gör inlägg i detta ämne.",
"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.",
diff --git a/public/language/sv/user.json b/public/language/sv/user.json
index 74baf42d74..e039bb98eb 100644
--- a/public/language/sv/user.json
+++ b/public/language/sv/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"
}
\ No newline at end of file
diff --git a/public/language/th/category.json b/public/language/th/category.json
index ece99b838a..1802bb7f1b 100644
--- a/public/language/th/category.json
+++ b/public/language/th/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"
}
\ No newline at end of file
diff --git a/public/language/th/error.json b/public/language/th/error.json
index 31966be6ae..98b15e4d95 100644
--- a/public/language/th/error.json
+++ b/public/language/th/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)",
diff --git a/public/language/th/global.json b/public/language/th/global.json
index 94080b0922..cf889d3a28 100644
--- a/public/language/th/global.json
+++ b/public/language/th/global.json
@@ -19,6 +19,7 @@
"welcome_back": "ยินดีต้อนรับ",
"you_have_successfully_logged_in": "คุณได้เข้าสู่ระบบแล้ว",
"save_changes": "บันทึกการเปลี่ยนแปลง",
+ "save": "Save",
"close": "ปิด",
"pagination": "ให้เลขหน้า",
"pagination.out_of": "%1 จาก %2",
diff --git a/public/language/th/groups.json b/public/language/th/groups.json
index ad202d2ceb..4fbb940168 100644
--- a/public/language/th/groups.json
+++ b/public/language/th/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"
}
\ No newline at end of file
diff --git a/public/language/th/modules.json b/public/language/th/modules.json
index 2527f30e40..8763167692 100644
--- a/public/language/th/modules.json
+++ b/public/language/th/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",
diff --git a/public/language/th/pages.json b/public/language/th/pages.json
index 08000c4ec4..04f1a10c17 100644
--- a/public/language/th/pages.json
+++ b/public/language/th/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",
diff --git a/public/language/th/topic.json b/public/language/th/topic.json
index dce3230acd..047fc51d79 100644
--- a/public/language/th/topic.json
+++ b/public/language/th/topic.json
@@ -31,6 +31,21 @@
"bookmark_instructions": "Click here to return to the last read post in this thread.",
"flag_title": "ปักธงโพสต์นี้เพื่อดำเนินการ",
"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": "Topic นี้ถูกลบไปแล้ว เฉพาะผู้ใช้งานที่มีสิทธิ์ในการจัดการ Topic เท่านั้นที่จะมีสิทธิ์ในการเข้าชม",
"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.",
diff --git a/public/language/th/user.json b/public/language/th/user.json
index 41048b8c6a..24ea6aca74 100644
--- a/public/language/th/user.json
+++ b/public/language/th/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"
}
\ No newline at end of file
diff --git a/public/language/tr/category.json b/public/language/tr/category.json
index 98a430ec0e..a9d1e3dc4a 100644
--- a/public/language/tr/category.json
+++ b/public/language/tr/category.json
@@ -14,7 +14,7 @@
"ignoring": "Yoksayılıyor",
"watching.description": "Okunmamış başlıkları göster",
"ignoring.description": "Okunmamış başlıkları gösterme",
- "watch.message": "Şuan bu kategorideki güncellemeleri izliyorsunuz",
- "ignore.message": "Şuan bu kategoriden güncellemeleri gizliyorsunuz",
+ "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": "Takip edilen kategoriler"
}
\ No newline at end of file
diff --git a/public/language/tr/error.json b/public/language/tr/error.json
index 7ae7eff012..d6b1417609 100644
--- a/public/language/tr/error.json
+++ b/public/language/tr/error.json
@@ -62,6 +62,7 @@
"content-too-long": "Lütfen daha kısa bir ileti girin. İletiler %1 karakterden uzun olamaz.",
"title-too-short": "Lütfen daha uzun bir başlık girin. Başlıklar en az %1 karakter içermelidir.",
"title-too-long": "Lütfen daha kısa bir başlık girin. Başlıklar %1 karakterden uzun olamaz.",
+ "category-not-selected": "Category not selected.",
"too-many-posts": "%1 saniye içinde yalnızca bir ileti gönderebilirsiniz - tekrar ileti göndermeden önce lütfen bekleyin.",
"too-many-posts-newbie": "Yeni bir kullanıcı olarak, %2 saygınlık kazanana kadar %1 saniye içinde bir ileti gönderebilirsiniz - tekrar ileti göndermeden önce lütfen bekleyin.",
"tag-too-short": "Lütfen daha uzun bir etiket girin. Etiketler en az %1 karakter içermelidir.",
diff --git a/public/language/tr/global.json b/public/language/tr/global.json
index 98c65856b4..e5b37be7db 100644
--- a/public/language/tr/global.json
+++ b/public/language/tr/global.json
@@ -19,6 +19,7 @@
"welcome_back": "Tekrar Hoşgeldiniz",
"you_have_successfully_logged_in": "Başarıyla giriş yaptınız!",
"save_changes": "Değişiklikleri kaydet",
+ "save": "Save",
"close": "Kapat",
"pagination": "Sayfalara numara koyma",
"pagination.out_of": "%1 - %2",
@@ -96,6 +97,6 @@
"upload": "Yükle",
"allowed-file-types": "İzin verilen dosya tipleri %1",
"unsaved-changes": "Kaydedilmemiş değişiklikler var. Çıkmak istediğinize emin misiniz?",
- "reconnecting-message": "Looks like your connection to %1 was lost, please wait while we try to reconnect.",
+ "reconnecting-message": "%1 ile bağlantınız koptu, yeniden bağlanmak için lütfen bekleyiniz.",
"play": "Oynat"
}
\ No newline at end of file
diff --git a/public/language/tr/groups.json b/public/language/tr/groups.json
index a67cd1b2cb..2b16f3a242 100644
--- a/public/language/tr/groups.json
+++ b/public/language/tr/groups.json
@@ -50,5 +50,7 @@
"membership.leave-group": "Gruptan Ayrıl",
"membership.reject": "Reddet",
"new-group.group_name": "Grup İsmi:",
- "upload-group-cover": "Grup kapağı yükle"
+ "upload-group-cover": "Grup kapağı yükle",
+ "bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
+ "bulk-invite": "Bulk Invite"
}
\ No newline at end of file
diff --git a/public/language/tr/modules.json b/public/language/tr/modules.json
index 0edc53c346..5c3344f889 100644
--- a/public/language/tr/modules.json
+++ b/public/language/tr/modules.json
@@ -38,6 +38,7 @@
"composer.upload-picture": "Görsel Yükle",
"composer.upload-file": "Dosya Yükle",
"composer.zen_mode": "Zen Modu",
+ "composer.select_category": "Select a category",
"bootbox.ok": "Tamam",
"bootbox.cancel": "İptal",
"bootbox.confirm": "Onayla",
diff --git a/public/language/tr/pages.json b/public/language/tr/pages.json
index f3377dd1b4..922427c522 100644
--- a/public/language/tr/pages.json
+++ b/public/language/tr/pages.json
@@ -18,6 +18,7 @@
"tags": "Etiketler",
"tag": "“%1“ ile etiketlenmiş konular",
"register": "Bir hesap aç",
+ "registration-complete": "Registration complete",
"login": "Hesabına giriş yap",
"reset": "Hesap şifreni baştan yarat",
"categories": "Kategoriler",
diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json
index 56d3adc900..b300341c31 100644
--- a/public/language/tr/topic.json
+++ b/public/language/tr/topic.json
@@ -31,6 +31,21 @@
"bookmark_instructions": "Bu başlıkta en son kaldığın yere dönmek için tıklayın.",
"flag_title": "Bu iletiyi moderatöre haber et",
"flag_success": "Bu ileti yöneticilere bildirildi.",
+ "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": "Bu başlık silindi. Sadece başlık düzenleme yetkisi olan kullanıcılar görebilir.",
"following_topic.message": "Artık bir kullanıcı bu başlığa ileti gönderdiğinde bildirim alacaksınız.",
"not_following_topic.message": "Bu başlığı okunmamışlarda göreceksiniz ama biri bir şey yazdığında bildirim gelmeyecek.",
diff --git a/public/language/tr/user.json b/public/language/tr/user.json
index 1d7b966ecb..80d8b475d1 100644
--- a/public/language/tr/user.json
+++ b/public/language/tr/user.json
@@ -123,5 +123,7 @@
"info.banned-reason-label": "Gerekçe",
"info.banned-no-reason": "Gerekçe belirtilmedi.",
"info.username-history": "Kullanıcı Adı Geçmişi",
- "info.email-history": "Email Geçmişi"
+ "info.email-history": "Email Geçmişi",
+ "info.moderation-note": "Moderation Note",
+ "info.moderation-note.success": "Moderation note saved"
}
\ No newline at end of file
diff --git a/public/language/vi/category.json b/public/language/vi/category.json
index aef6916936..494fa8b153 100644
--- a/public/language/vi/category.json
+++ b/public/language/vi/category.json
@@ -10,11 +10,11 @@
"share_this_category": "Chia sẻ chuyên mục này",
"watch": "Theo dõi",
"ignore": "Bỏ qua",
- "watching": "Watching",
- "ignoring": "Ignoring",
- "watching.description": "Show topics in unread",
- "ignoring.description": "Do not show topics in unread",
- "watch.message": "Bạn đang theo dõi các cập nhật của danh mục này",
- "ignore.message": "Bạn đã tắt cập nhật từ chuyên mục này",
- "watched-categories": "Chuyên mục đang theo dõi"
+ "watching": "Đang theo dõi",
+ "ignoring": "Bỏ qua",
+ "watching.description": "Hiện các chủ đề chưa đọc",
+ "ignoring.description": "Không hiện những chủ đề chưa đọc",
+ "watch.message": "Bạn đang theo dõi các cập nhật ở chuyên mục này và các chuyên mục con",
+ "ignore.message": "Bạn đang bỏ qua các cập nhật ở chuyên mục này và các chuyên mục con",
+ "watched-categories": "Các chuyên mục đã xem"
}
\ No newline at end of file
diff --git a/public/language/vi/error.json b/public/language/vi/error.json
index 73fb8df4c8..13082bec01 100644
--- a/public/language/vi/error.json
+++ b/public/language/vi/error.json
@@ -62,6 +62,7 @@
"content-too-long": "Vui lòng nhập một bài viết ngắn hơn. Bài viết chỉ có thể có tối đa %1 ký tự.",
"title-too-short": "Vui lòng nhập tiêu đề dài hơn. Tiêu đề phải có tối thiểu %1 ký tự.",
"title-too-long": "Vui lòng nhập tiêu đề ngắn hơn. Tiêu đề chỉ có thể có tối đa %1 ký tự.",
+ "category-not-selected": "Category not selected.",
"too-many-posts": "Bạn chỉ có đăng bài mới mỗi %1 giây - vui lòng đợi để tiếp tục đăng bài.",
"too-many-posts-newbie": "Bạn chỉ có thể đăng bài mỗi %1 giây cho đến khi bạn tích luỹ được %2 điểm tín nhiệm - vui lòng đợi để tiếp tục đăng bài.",
"tag-too-short": "Vui lòng nhập tag dài hơn. Tag phải có tối thiểu %1 ký tự.",
diff --git a/public/language/vi/global.json b/public/language/vi/global.json
index 5d16408aae..625d1a0e6c 100644
--- a/public/language/vi/global.json
+++ b/public/language/vi/global.json
@@ -19,6 +19,7 @@
"welcome_back": "Chào mừng bạn quay lại",
"you_have_successfully_logged_in": "Bạn đã đăng nhập thành công",
"save_changes": "Lưu thay đổi",
+ "save": "Lưu",
"close": "Đóng lại",
"pagination": "Số trang",
"pagination.out_of": "%1 trong số %2",
diff --git a/public/language/vi/groups.json b/public/language/vi/groups.json
index eeadc826ec..d8a037b662 100644
--- a/public/language/vi/groups.json
+++ b/public/language/vi/groups.json
@@ -50,5 +50,7 @@
"membership.leave-group": "Rời khỏi nhóm",
"membership.reject": "Từ chối",
"new-group.group_name": "Tên nhóm",
- "upload-group-cover": "Tải ảnh bìa lên cho nhóm"
+ "upload-group-cover": "Tải ảnh bìa lên cho nhóm",
+ "bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
+ "bulk-invite": "Bulk Invite"
}
\ No newline at end of file
diff --git a/public/language/vi/modules.json b/public/language/vi/modules.json
index fda573b3fd..8b6f21e739 100644
--- a/public/language/vi/modules.json
+++ b/public/language/vi/modules.json
@@ -38,6 +38,7 @@
"composer.upload-picture": "Tải ảnh lên",
"composer.upload-file": "Tải file lên",
"composer.zen_mode": "Zen Mode",
+ "composer.select_category": "Chọn một chuyên mục",
"bootbox.ok": "OK",
"bootbox.cancel": "Huỷ bỏ",
"bootbox.confirm": "Xác nhận",
diff --git a/public/language/vi/pages.json b/public/language/vi/pages.json
index 295939c137..d36a84e02b 100644
--- a/public/language/vi/pages.json
+++ b/public/language/vi/pages.json
@@ -18,6 +18,7 @@
"tags": "Tag",
"tag": "Chủ đề được gắn tag \"%1\"",
"register": "Đăng ký một tài khoản mới",
+ "registration-complete": "Đăng ký hoàn tất",
"login": "Đăng nhập vào tài khoản của bạn",
"reset": "Phục hồi mật khẩu của bạn",
"categories": "Chuyên mục",
@@ -29,7 +30,7 @@
"account/edit/password": "Chỉnh sửa mật khẩu của \"%1\"",
"account/edit/username": "Chỉnh sửa tên đăng nhập của \"%1\"",
"account/edit/email": "Chỉnh sửa email của \"%1\"",
- "account/info": "Account Info",
+ "account/info": "Thông tin tài khoản",
"account/following": "Thành viên %1 đang theo dõi",
"account/followers": "Thành viên đang theo dõi %1",
"account/posts": "Bài viết được đăng bởi %1",
diff --git a/public/language/vi/register.json b/public/language/vi/register.json
index c58165735e..07a70bebe7 100644
--- a/public/language/vi/register.json
+++ b/public/language/vi/register.json
@@ -1,6 +1,6 @@
{
"register": "Đăng ký",
- "cancel_registration": "Cancel Registration",
+ "cancel_registration": "Hủy đăng ký",
"help.email": "Theo mặc định, Email của bạn sẽ được ẩn và public sẽ không thấy được",
"help.username_restrictions": "Một tên truy cập duy nhất có từ %1 đến %2 ký tự. Những người khác có thể nhắc đến bạn bằng @tên truy cập.",
"help.minimum_password_length": "Mật khẩu của bạn phải có ít nhất %1 ký tự",
@@ -16,8 +16,8 @@
"alternative_registration": "Đăng ký tài khoản khác",
"terms_of_use": "Điều khoản sử dụng",
"agree_to_terms_of_use": "Tôi đồng ý với các điều khoản sử dụng",
- "terms_of_use_error": "You must agree to the Terms of Use",
+ "terms_of_use_error": "Bạn phải đồng ý với các điều khoản sử dụng",
"registration-added-to-queue": "Yêu cầu đăng ký của bạn đang chờ được chấp thuận. Bạn sẽ nhận được email khi tài khoản của bạn đã được chấp thuận bởi quản trị viên.",
- "interstitial.intro": "We require some additional information before we can create your account.",
- "interstitial.errors-found": "We could not complete your registration:"
+ "interstitial.intro": "Chúng tôi cần thêm một số thông tin trước khi bạn có thể tạo tài khoản.",
+ "interstitial.errors-found": "Chúng tôi không thể hoàn thành đăng ký của bạn:"
}
\ No newline at end of file
diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json
index fae7ded9b2..a5603031f4 100644
--- a/public/language/vi/topic.json
+++ b/public/language/vi/topic.json
@@ -31,6 +31,21 @@
"bookmark_instructions": "Bấm vào đây để quay về đọc bài viết mới nhất trong chủ đề này.",
"flag_title": "Flag bài viết này để chỉnh sửa",
"flag_success": "Chủ đề này đã được flag để chỉnh sửa",
+ "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": "Chủ đề này đã bị xóa. Chỉ ban quản trị mới xem được.",
"following_topic.message": "Từ giờ bạn sẽ nhận được thông báo khi có ai đó gửi bài viết trong chủ đề này",
"not_following_topic.message": "Bạn có thể xem chủ đề này trong danh sách chủ đề chưa xem, nhưng bạn sẽ không nhận thông báo khi có ai đó đăng bài viết trong chủ đề này",
diff --git a/public/language/vi/user.json b/public/language/vi/user.json
index 55615761b0..b640e88ddd 100644
--- a/public/language/vi/user.json
+++ b/public/language/vi/user.json
@@ -6,7 +6,7 @@
"postcount": "Số bài viết",
"email": "Email",
"confirm_email": "Xác nhận email",
- "account_info": "Account Info",
+ "account_info": "Thông tin tài khoản",
"ban_account": "Cấm thành viên",
"ban_account_confirm": "Bạn có chắc bạn muốn cấm thành viên này?",
"unban_account": "Bỏ cấm thành viên",
@@ -119,9 +119,11 @@
"info.ban-history": "Recent Ban History",
"info.no-ban-history": "This user has never been banned",
"info.banned-until": "Banned until %1",
- "info.banned-permanently": "Banned permanently",
- "info.banned-reason-label": "Reason",
+ "info.banned-permanently": "Bị cấm vĩnh viễn",
+ "info.banned-reason-label": "Lý do",
"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"
}
\ No newline at end of file
diff --git a/public/language/zh_CN/category.json b/public/language/zh_CN/category.json
index 8133c1b295..68480df46d 100644
--- a/public/language/zh_CN/category.json
+++ b/public/language/zh_CN/category.json
@@ -14,7 +14,7 @@
"ignoring": "已忽略",
"watching.description": "显示未读帖子",
"ignoring.description": "不显示未读帖子",
- "watch.message": "您现在已经关注了此版块",
- "ignore.message": "您现在已经取消了此版块的关注",
+ "watch.message": "您关注了此版块的动态。",
+ "ignore.message": "您未关注此版块的动态。",
"watched-categories": "已关注的版块"
}
\ No newline at end of file
diff --git a/public/language/zh_CN/error.json b/public/language/zh_CN/error.json
index 3ef83e4a53..af7c770ffe 100644
--- a/public/language/zh_CN/error.json
+++ b/public/language/zh_CN/error.json
@@ -29,7 +29,7 @@
"username-too-long": "用户名太长",
"password-too-long": "密码太长",
"user-banned": "用户已禁止",
- "user-banned-reason": "User banned (Reason: %1)",
+ "user-banned-reason": "用户已禁止(原因：%1)",
"user-too-new": "抱歉，您需要等待 %1 秒后，才可以发帖！",
"blacklisted-ip": "对不起，您的IP地址已被社区禁用。如果您认为这是一个错误，请与管理员联系。",
"ban-expiry-missing": "请提供此次禁言结束日期",
@@ -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": "因为您是新用户，所以限制每隔 %1 秒才能发帖一次，直到您有 %2 点威望为止 —— 请稍候再发帖",
"tag-too-short": "话题太短，不能少于 %1 个字符",
diff --git a/public/language/zh_CN/global.json b/public/language/zh_CN/global.json
index 67baf99e9d..74915d5a66 100644
--- a/public/language/zh_CN/global.json
+++ b/public/language/zh_CN/global.json
@@ -19,6 +19,7 @@
"welcome_back": "欢迎回来",
"you_have_successfully_logged_in": "您已成功登录",
"save_changes": "保存更改",
+ "save": "保存",
"close": "关闭",
"pagination": "分页",
"pagination.out_of": "%1 / %2",
diff --git a/public/language/zh_CN/groups.json b/public/language/zh_CN/groups.json
index f988de4db6..87ee48c385 100644
--- a/public/language/zh_CN/groups.json
+++ b/public/language/zh_CN/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": "批量邀请"
}
\ No newline at end of file
diff --git a/public/language/zh_CN/modules.json b/public/language/zh_CN/modules.json
index b00e1c9aa4..6da86ec505 100644
--- a/public/language/zh_CN/modules.json
+++ b/public/language/zh_CN/modules.json
@@ -38,6 +38,7 @@
"composer.upload-picture": "上传图片",
"composer.upload-file": "上传文件",
"composer.zen_mode": "无干扰模式",
+ "composer.select_category": "选择一个类别",
"bootbox.ok": "确认",
"bootbox.cancel": "取消",
"bootbox.confirm": "确认",
diff --git a/public/language/zh_CN/pages.json b/public/language/zh_CN/pages.json
index b84a05f91d..fdd07e8fe7 100644
--- a/public/language/zh_CN/pages.json
+++ b/public/language/zh_CN/pages.json
@@ -18,6 +18,7 @@
"tags": "话题",
"tag": "\"%1\" 下的主题",
"register": "注册帐号",
+ "registration-complete": "注册完成",
"login": "登录帐号",
"reset": "重置帐户密码",
"categories": "版面",
diff --git a/public/language/zh_CN/topic.json b/public/language/zh_CN/topic.json
index 678b725640..e2abc0a60b 100644
--- a/public/language/zh_CN/topic.json
+++ b/public/language/zh_CN/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": "Work in Progress",
+ "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": "Flag Details Updated",
"deleted_message": "此主题已被删除。只有拥有主题管理权限的用户可以查看。",
"following_topic.message": "当有人回复此主题时，您会收到通知。",
"not_following_topic.message": "您将在未读主题列表中看到这个主题，但您不会在帖子被回复时收到通知。",
diff --git a/public/language/zh_CN/user.json b/public/language/zh_CN/user.json
index fac99339d1..9a3478ba02 100644
--- a/public/language/zh_CN/user.json
+++ b/public/language/zh_CN/user.json
@@ -123,5 +123,7 @@
"info.banned-reason-label": "原因",
"info.banned-no-reason": "没有原因",
"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"
}
\ No newline at end of file
diff --git a/public/language/zh_TW/category.json b/public/language/zh_TW/category.json
index eb4526fd67..06bd70351d 100644
--- a/public/language/zh_TW/category.json
+++ b/public/language/zh_TW/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": "關注的類別"
}
\ No newline at end of file
diff --git a/public/language/zh_TW/error.json b/public/language/zh_TW/error.json
index 26b65dc708..5069c63a22 100644
--- a/public/language/zh_TW/error.json
+++ b/public/language/zh_TW/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": "新使用者需要直到獲得 %2 聲譽後，才能在每 %1 秒後進行張貼一篇文章 - 請在重新張貼前等待這個時間。",
"tag-too-short": "請輸入一個長一點的標籤。標籤長度不能少於 %1 字元。",
diff --git a/public/language/zh_TW/global.json b/public/language/zh_TW/global.json
index 6c523cf698..3bcd5010b2 100644
--- a/public/language/zh_TW/global.json
+++ b/public/language/zh_TW/global.json
@@ -19,6 +19,7 @@
"welcome_back": "歡迎回來！",
"you_have_successfully_logged_in": "你已成功登入！",
"save_changes": "儲存變更",
+ "save": "Save",
"close": "關閉",
"pagination": "分頁",
"pagination.out_of": "%1 於 %2",
diff --git a/public/language/zh_TW/groups.json b/public/language/zh_TW/groups.json
index fc2a300e47..bc5dd42334 100644
--- a/public/language/zh_TW/groups.json
+++ b/public/language/zh_TW/groups.json
@@ -50,5 +50,7 @@
"membership.leave-group": "離開群組",
"membership.reject": "拒絕",
"new-group.group_name": "群組名稱:",
- "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"
}
\ No newline at end of file
diff --git a/public/language/zh_TW/modules.json b/public/language/zh_TW/modules.json
index 1e688f79c3..bb6c359596 100644
--- a/public/language/zh_TW/modules.json
+++ b/public/language/zh_TW/modules.json
@@ -38,6 +38,7 @@
"composer.upload-picture": "上傳圖片",
"composer.upload-file": "上傳檔案",
"composer.zen_mode": "禪(Zen)模式",
+ "composer.select_category": "Select a category",
"bootbox.ok": "好",
"bootbox.cancel": "取消",
"bootbox.confirm": "確認",
diff --git a/public/language/zh_TW/pages.json b/public/language/zh_TW/pages.json
index caa4a99d18..c1ac307487 100644
--- a/public/language/zh_TW/pages.json
+++ b/public/language/zh_TW/pages.json
@@ -18,6 +18,7 @@
"tags": "標籤",
"tag": "有\"%1\"標籤的主題",
"register": "註冊帳號",
+ "registration-complete": "Registration complete",
"login": "登入帳號",
"reset": "重設你的帳號密碼",
"categories": "類別",
diff --git a/public/language/zh_TW/topic.json b/public/language/zh_TW/topic.json
index aba789933f..50ea975eb8 100644
--- a/public/language/zh_TW/topic.json
+++ b/public/language/zh_TW/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": "你將會看到這個主題在未讀主題列表中出現，但你將不會在其他人張貼到這個主題時接收到通知。",
diff --git a/public/language/zh_TW/user.json b/public/language/zh_TW/user.json
index d25b5fc25b..7ba2d27311 100644
--- a/public/language/zh_TW/user.json
+++ b/public/language/zh_TW/user.json
@@ -123,5 +123,7 @@
"info.banned-reason-label": "理由",
"info.banned-no-reason": "沒有給理由",
"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"
}
\ No newline at end of file
diff --git a/public/src/admin/manage/flags.js b/public/src/admin/manage/flags.js
index 15417faa30..30209bca11 100644
--- a/public/src/admin/manage/flags.js
+++ b/public/src/admin/manage/flags.js
@@ -22,6 +22,11 @@ define('admin/manage/flags', [
updateFlagDetails(ajaxify.data.posts);
components.get('posts/flags').on('click', '[component="posts/flag/update"]', updateFlag);
+
+ // Open flag as indicated in location bar
+ if (window.location.hash.startsWith('#flag-pid-')) {
+ $(window.location.hash).collapse('toggle');
+ }
};
function handleDismiss() {
diff --git a/public/src/admin/manage/users.js b/public/src/admin/manage/users.js
index d41913ebc0..db2cd3fef3 100644
--- a/public/src/admin/manage/users.js
+++ b/public/src/admin/manage/users.js
@@ -2,12 +2,10 @@
/* global config, socket, define, templates, bootbox, app, ajaxify */
-define('admin/manage/users', ['admin/modules/selectable', 'translator'], function(selectable, translator) {
+define('admin/manage/users', ['translator'], function(translator) {
var Users = {};
Users.init = function() {
- selectable.enable('#users-container', '.users-box');
-
var navPills = $('.nav-pills li');
var pathname = window.location.pathname;
if (!navPills.find('a[href="' + pathname + '"]').length) {
@@ -17,25 +15,29 @@ define('admin/manage/users', ['admin/modules/selectable', 'translator'], functio
function getSelectedUids() {
var uids = [];
- $('#users-container .users-box.ui-selected').each(function() {
- uids.push(this.getAttribute('data-uid'));
+
+ $('.users-table [component="user/select/single"]').each(function() {
+ if ($(this).is(':checked')) {
+ uids.push($(this).attr('data-uid'));
+ }
});
return uids;
}
function update(className, state) {
- $('#users-container .users-box.ui-selected .labels').find(className).each(function() {
- $(this).toggleClass('hide', !state);
+ $('.users-table [component="user/select/single"]:checked').parents('.user-row').find(className).each(function() {
+ $(this).toggleClass('hidden', !state);
});
}
function unselectAll() {
- $('#users-container .users-box.ui-selected').removeClass('ui-selected');
+ $('.users-table [component="user/select/single"]').prop('checked', false);
+ $('.users-table [component="user/select/all"]').prop('checked', false);
}
function removeSelected() {
- $('#users-container .users-box.ui-selected').remove();
+ $('.users-table [component="user/select/single"]:checked').parents('.user-row').remove();
}
function done(successMessage, className, flag) {
@@ -51,6 +53,14 @@ define('admin/manage/users', ['admin/modules/selectable', 'translator'], functio
};
}
+ $('[component="user/select/all"]').on('click', function() {
+ if ($(this).is(':checked')) {
+ $('.users-table [component="user/select/single"]').prop('checked', true);
+ } else {
+ $('.users-table [component="user/select/single"]').prop('checked', false);
+ }
+ });
+
$('.ban-user').on('click', function() {
var uids = getSelectedUids();
if (!uids.length) {
@@ -164,9 +174,18 @@ define('admin/manage/users', ['admin/modules/selectable', 'translator'], functio
}
bootbox.confirm('Do you want to validate email(s) of these user(s)?', function(confirm) {
- if (confirm) {
- socket.emit('admin.user.validateEmail', uids, done('Emails validated', '.notvalidated', false));
+ if (!confirm) {
+ return;
}
+ socket.emit('admin.user.validateEmail', uids, function(err) {
+ if (err) {
+ return app.alertError(err.message);
+ }
+ app.alertSuccess('Emails validated');
+ update('.notvalidated', false);
+ update('.validated', true);
+ unselectAll();
+ });
});
});
@@ -299,8 +318,6 @@ define('admin/manage/users', ['admin/modules/selectable', 'translator'], functio
var timeoutId = 0;
-
-
$('#search-user-name, #search-user-email, #search-user-ip').on('keyup', function() {
if (timeoutId !== 0) {
clearTimeout(timeoutId);
@@ -319,23 +336,25 @@ define('admin/manage/users', ['admin/modules/selectable', 'translator'], functio
}
templates.parse('admin/manage/users', 'users', data, function(html) {
- $('#users-container').html(html).find('.timeago').timeago();
-
+ html = $(html);
+ $('.users-table tr').not(':first').remove();
+ $('.users-table tr').first().after(html);
+ html.find('.timeago').timeago();
$('.fa-spinner').addClass('hidden');
if (data && data.users.length === 0) {
$('#user-notfound-notify').html('User not found!')
- .show()
+ .removeClass('hide')
.addClass('label-danger')
.removeClass('label-success');
} else {
$('#user-notfound-notify').html(data.users.length + ' user' + (data.users.length > 1 ? 's' : '') + ' found! Search took ' + data.timing + ' ms.')
- .show()
+ .removeClass('hide')
.addClass('label-success')
.removeClass('label-danger');
}
- selectable.enable('#users-container', '.users-box');
+
});
});
}, 250);
diff --git a/public/src/client/account/bookmarks.js b/public/src/client/account/bookmarks.js
new file mode 100644
index 0000000000..d1aca2080e
--- /dev/null
+++ b/public/src/client/account/bookmarks.js
@@ -0,0 +1,17 @@
+'use strict';
+
+/* globals define */
+
+define('forum/account/bookmarks', ['forum/account/header', 'forum/account/posts'], function(header, posts) {
+ var Bookmarks = {};
+
+ Bookmarks.init = function() {
+ header.init();
+
+ $('[component="post/content"] img:not(.not-responsive)').addClass('img-responsive');
+
+ posts.handleInfiniteScroll('posts.loadMoreBookmarks', 'account/bookmarks');
+ };
+
+ return Bookmarks;
+});
diff --git a/public/src/client/account/favourites.js b/public/src/client/account/favourites.js
deleted file mode 100644
index 9d732418c4..0000000000
--- a/public/src/client/account/favourites.js
+++ /dev/null
@@ -1,17 +0,0 @@
-'use strict';
-
-/* globals define, app, utils */
-
-define('forum/account/favourites', ['forum/account/header', 'forum/account/posts'], function(header, posts) {
- var Favourites = {};
-
- Favourites.init = function() {
- header.init();
-
- $('[component="post/content"] img:not(.not-responsive)').addClass('img-responsive');
-
- posts.handleInfiniteScroll('posts.loadMoreFavourites', 'account/favourites');
- };
-
- return Favourites;
-});
diff --git a/public/src/client/account/header.js b/public/src/client/account/header.js
index 2a6641b152..0c65653e0f 100644
--- a/public/src/client/account/header.js
+++ b/public/src/client/account/header.js
@@ -7,14 +7,10 @@ define('forum/account/header', [
'components',
'translator'
], function(coverPhoto, uploader, components, translator) {
- var AccountHeader = {};
- var yourid;
- var theirid;
+ var AccountHeader = {};
var isAdminOrSelfOrGlobalMod;
AccountHeader.init = function() {
- yourid = ajaxify.data.yourid;
- theirid = ajaxify.data.theirid;
isAdminOrSelfOrGlobalMod = ajaxify.data.isAdmin || ajaxify.data.isSelf || ajaxify.data.isGlobalModerator;
hidePrivateLinks();
@@ -33,14 +29,14 @@ define('forum/account/header', [
});
components.get('account/chat').on('click', function() {
- socket.emit('modules.chats.hasPrivateChat', theirid, function(err, roomId) {
+ socket.emit('modules.chats.hasPrivateChat', ajaxify.data.uid, function(err, roomId) {
if (err) {
return app.alertError(err.message);
}
if (roomId) {
app.openChat(roomId);
} else {
- app.newChat(theirid);
+ app.newChat(ajaxify.data.uid);
}
});
});
@@ -71,7 +67,7 @@ define('forum/account/header', [
coverPhoto.init(components.get('account/cover'),
function(imageData, position, callback) {
socket.emit('user.updateCover', {
- uid: yourid,
+ uid: ajaxify.data.uid,
imageData: imageData,
position: position
}, callback);
@@ -80,7 +76,7 @@ define('forum/account/header', [
uploader.show({
title: '[[user:upload_cover_picture]]',
route: config.relative_path + '/api/user/' + ajaxify.data.userslug + '/uploadcover',
- params: {uid: yourid },
+ params: {uid: ajaxify.data.uid },
accept: '.png,.jpg,.bmp'
}, function(imageUrlOnServer) {
components.get('account/cover').css('background-image', 'url(' + imageUrlOnServer + '?v=' + Date.now() + ')');
@@ -92,7 +88,7 @@ define('forum/account/header', [
function toggleFollow(type) {
socket.emit('user.' + type, {
- uid: theirid
+ uid: ajaxify.data.uid
}, function(err) {
if (err) {
return app.alertError(err.message);
diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js
index 4d8434adb8..bba3cb0dcb 100644
--- a/public/src/client/topic/events.js
+++ b/public/src/client/topic/events.js
@@ -16,7 +16,7 @@ define('forum/topic/events', [
var events = {
'event:user_status_change': onUserStatusChange,
'event:voted': updatePostVotesAndUserReputation,
- 'event:favourited': updateFavouriteCount,
+ 'event:bookmarked': updateBookmarkCount,
'event:topic_deleted': threadTools.setDeleteState,
'event:topic_restored': threadTools.setDeleteState,
@@ -36,8 +36,8 @@ define('forum/topic/events', [
'event:post_deleted': togglePostDeleteState,
'event:post_restored': togglePostDeleteState,
- 'posts.favourite': togglePostFavourite,
- 'posts.unfavourite': togglePostFavourite,
+ 'posts.bookmark': togglePostBookmark,
+ 'posts.unbookmark': togglePostBookmark,
'posts.upvote': togglePostVote,
'posts.downvote': togglePostVote,
@@ -69,15 +69,15 @@ define('forum/topic/events', [
}
function updatePostVotesAndUserReputation(data) {
- var votes = components.get('post/vote-count', data.post.pid),
- reputationElements = $('.reputation[data-uid="' + data.post.uid + '"]');
+ var votes = components.get('post/vote-count', data.post.pid);
+ var reputationElements = $('.reputation[data-uid="' + data.post.uid + '"]');
votes.html(data.post.votes).attr('data-votes', data.post.votes);
reputationElements.html(data.user.reputation).attr('data-reputation', data.user.reputation);
}
- function updateFavouriteCount(data) {
- $('[data-pid="' + data.post.pid + '"] .favouriteCount').html(data.post.reputation).attr('data-favourites', data.post.reputation);
+ function updateBookmarkCount(data) {
+ $('[data-pid="' + data.post.pid + '"] .bookmarkCount').html(data.post.bookmarks).attr('data-bookmarks', data.post.bookmarks);
}
function onTopicPurged() {
@@ -198,17 +198,17 @@ define('forum/topic/events', [
}
}
- function togglePostFavourite(data) {
- var favBtn = $('[data-pid="' + data.post.pid + '"] [component="post/favourite"]');
+ function togglePostBookmark(data) {
+ var el = $('[data-pid="' + data.post.pid + '"] [component="post/bookmark"]');
- if (!favBtn.length) {
+ if (!el.length) {
return;
}
- favBtn.attr('data-favourited', data.isFavourited);
+ el.attr('data-bookmarked', data.isBookmarked);
- favBtn.find('[component="post/favourite/on"]').toggleClass('hidden', !data.isFavourited);
- favBtn.find('[component="post/favourite/off"]').toggleClass('hidden', data.isFavourited);
+ el.find('[component="post/bookmark/on"]').toggleClass('hidden', !data.isBookmarked);
+ el.find('[component="post/bookmark/off"]').toggleClass('hidden', data.isBookmarked);
}
function togglePostVote(data) {
diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js
index 86fe03ce03..b5095384da 100644
--- a/public/src/client/topic/postTools.js
+++ b/public/src/client/topic/postTools.js
@@ -52,7 +52,7 @@ define('forum/topic/postTools', ['share', 'navigator', 'components', 'translator
PostTools.toggle = function(pid, isDeleted) {
var postEl = components.get('post', 'pid', pid);
- postEl.find('[component="post/quote"], [component="post/favourite"], [component="post/reply"], [component="post/flag"], [component="user/chat"]')
+ postEl.find('[component="post/quote"], [component="post/bookmark"], [component="post/reply"], [component="post/flag"], [component="user/chat"]')
.toggleClass('hidden', isDeleted);
postEl.find('[component="post/delete"]').toggleClass('hidden', isDeleted);
@@ -149,8 +149,8 @@ define('forum/topic/postTools', ['share', 'navigator', 'components', 'translator
});
});
- postContainer.on('click', '[component="post/favourite"]', function() {
- favouritePost($(this), getData($(this), 'data-pid'));
+ postContainer.on('click', '[component="post/bookmark"]', function() {
+ bookmarkPost($(this), getData($(this), 'data-pid'));
});
postContainer.on('click', '[component="post/upvote"]', function() {
@@ -330,8 +330,8 @@ define('forum/topic/postTools', ['share', 'navigator', 'components', 'translator
return selectionText;
}
- function favouritePost(button, pid) {
- var method = button.attr('data-favourited') === 'false' ? 'posts.favourite' : 'posts.unfavourite';
+ function bookmarkPost(button, pid) {
+ var method = button.attr('data-bookmarked') === 'false' ? 'posts.bookmark' : 'posts.unbookmark';
socket.emit(method, {
pid: pid,
diff --git a/public/src/client/users.js b/public/src/client/users.js
index 8f648e6198..1029c9c216 100644
--- a/public/src/client/users.js
+++ b/public/src/client/users.js
@@ -91,7 +91,7 @@ define('forum/users', ['translator'], function(translator) {
function loadPage(query) {
var qs = decodeURIComponent($.param(query));
- $.get('/api/users?' + qs, renderSearchResults).fail(function(xhrErr) {
+ $.get(config.relative_path + '/api/users?' + qs, renderSearchResults).fail(function(xhrErr) {
if (xhrErr && xhrErr.responseJSON && xhrErr.responseJSON.error) {
app.alertError(xhrErr.responseJSON.error);
}
diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index 6034eacfb0..a856f3d88c 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -302,7 +302,6 @@ define('chat', [
module.load = function(uuid) {
var chatModal = $('div[UUID="' + uuid + '"]');
chatModal.removeClass('hide');
- checkStatus(chatModal);
taskbar.updateActive(uuid);
ChatsMessages.scrollToBottom(chatModal.find('.chat-content'));
module.bringModalToTop(chatModal);
diff --git a/public/src/modules/components.js b/public/src/modules/components.js
index 58773d9821..4a08e4073c 100644
--- a/public/src/modules/components.js
+++ b/public/src/modules/components.js
@@ -28,8 +28,8 @@ define('components', function() {
'post/vote-count': function(pid) {
return components.core.post('pid', pid).find('[component="post/vote-count"]');
},
- 'post/favourite-count': function(pid) {
- return components.core.post('pid', pid).find('[component="post/favourite-count"]');
+ 'post/bookmark-count': function(pid) {
+ return components.core.post('pid', pid).find('[component="post/bookmark-count"]');
},
'user/postcount': function(uid) {
diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js
index 5f162dc10f..965b3ba28e 100644
--- a/public/src/modules/navigator.js
+++ b/public/src/modules/navigator.js
@@ -181,7 +181,7 @@ define('navigator', ['forum/pagination', 'components'], function(pagination, com
};
navigator.scrollTop = function(index) {
- if ($('li[data-index="' + index + '"]').length) {
+ if ($(navigator.selector + '[data-index="' + index + '"]').length) {
navigator.scrollToPost(index, true);
} else {
ajaxify.go(generateUrl());
@@ -192,7 +192,7 @@ define('navigator', ['forum/pagination', 'components'], function(pagination, com
if (parseInt(index, 10) < 0) {
return;
}
- if ($('li[data-index="' + index + '"]').length) {
+ if ($(navigator.selector + '[data-index="' + index + '"]').length) {
navigator.scrollToPost(index, true);
} else {
index = parseInt(index, 10) + 1;
diff --git a/public/vendor/jquery/textcomplete/jquery.textcomplete.js b/public/vendor/jquery/textcomplete/jquery.textcomplete.js
index e42ac31bbf..b4ccd18cfc 100644
--- a/public/vendor/jquery/textcomplete/jquery.textcomplete.js
+++ b/public/vendor/jquery/textcomplete/jquery.textcomplete.js
@@ -17,7 +17,7 @@
* Repository: https://github.com/yuku-t/jquery-textcomplete
* License: MIT (https://github.com/yuku-t/jquery-textcomplete/blob/master/LICENSE)
* Author: Yuku Takahashi
- * Version: 1.3.4
+ * Version: 1.7.3
*/
if (typeof jQuery === 'undefined') {
@@ -137,10 +137,6 @@ if (typeof jQuery === 'undefined') {
return Object.prototype.toString.call(obj) === '[object String]';
};
- var isFunction = function (obj) {
- return Object.prototype.toString.call(obj) === '[object Function]';
- };
-
var uniqueId = 0;
function Completer(element, option) {
@@ -148,32 +144,46 @@ if (typeof jQuery === 'undefined') {
this.id = 'textcomplete' + uniqueId++;
this.strategies = [];
this.views = [];
- this.option = $.extend({}, Completer._getDefaults(), option);
+ this.option = $.extend({}, Completer.defaults, option);
if (!this.$el.is('input[type=text]') && !this.$el.is('input[type=search]') && !this.$el.is('textarea') && !element.isContentEditable && element.contentEditable != 'true') {
throw new Error('textcomplete must be called on a Textarea or a ContentEditable.');
}
- if (element === document.activeElement) {
+ // use ownerDocument to fix iframe / IE issues
+ if (element === element.ownerDocument.activeElement) {
// element has already been focused. Initialize view objects immediately.
this.initialize()
} else {
// Initialize view objects lazily.
var self = this;
this.$el.one('focus.' + this.id, function () { self.initialize(); });
+
+ // Special handling for CKEditor: lazy init on instance load
+ if ((!this.option.adapter || this.option.adapter == 'CKEditor') && typeof CKEDITOR != 'undefined' && (this.$el.is('textarea'))) {
+ CKEDITOR.on("instanceReady", function(event) {
+ event.editor.once("focus", function(event2) {
+ // replace the element with the Iframe element and flag it as CKEditor
+ self.$el = $(event.editor.editable().$);
+ if (!self.option.adapter) {
+ self.option.adapter = $.fn.textcomplete['CKEditor'];
+ self.option.ckeditor_instance = event.editor;
+ }
+ self.initialize();
+ });
+ });
+ }
}
}
- Completer._getDefaults = function () {
- if (!Completer.DEFAULTS) {
- Completer.DEFAULTS = {
- appendTo: $('body'),
- zIndex: '100'
- };
- }
-
- return Completer.DEFAULTS;
- }
+ Completer.defaults = {
+ appendTo: 'body',
+ className: '', // deprecated option
+ dropdownClassName: 'dropdown-menu textcomplete-dropdown',
+ maxCount: 10,
+ zIndex: '100',
+ rightEdgeOffset: 30
+ };
$.extend(Completer.prototype, {
// Public properties
@@ -185,12 +195,26 @@ if (typeof jQuery === 'undefined') {
adapter: null,
dropdown: null,
$el: null,
+ $iframe: null,
// Public methods
// --------------
initialize: function () {
var element = this.$el.get(0);
+
+ // check if we are in an iframe
+ // we need to alter positioning logic if using an iframe
+ if (this.$el.prop('ownerDocument') !== document && window.frames.length) {
+ for (var iframeIndex = 0; iframeIndex < window.frames.length; iframeIndex++) {
+ if (this.$el.prop('ownerDocument') === window.frames[iframeIndex].document) {
+ this.$iframe = $(window.frames[iframeIndex].frameElement);
+ break;
+ }
+ }
+ }
+
+
// Initialize view objects.
this.dropdown = new $.fn.textcomplete.Dropdown(element, this, this.option);
var Adapter, viewName;
@@ -282,7 +306,7 @@ if (typeof jQuery === 'undefined') {
var strategy = this.strategies[i];
var context = strategy.context(text);
if (context || context === '') {
- var matchRegexp = isFunction(strategy.match) ? strategy.match(text) : strategy.match;
+ var matchRegexp = $.isFunction(strategy.match) ? strategy.match(text) : strategy.match;
if (isString(context)) { text = context; }
var match = text.match(matchRegexp);
if (match) { return [strategy, match[strategy.index], match]; }
@@ -400,7 +424,7 @@ if (typeof jQuery === 'undefined') {
var $parent = option.appendTo;
if (!($parent instanceof $)) { $parent = $($parent); }
var $el = $('
+
+
\ No newline at end of file
diff --git a/src/views/admin/manage/flags.tpl b/src/views/admin/manage/flags.tpl
index 54209a279e..dccc3ae46f 100644
--- a/src/views/admin/manage/flags.tpl
+++ b/src/views/admin/manage/flags.tpl
@@ -134,7 +134,6 @@
-
-
Profile Avatars
diff --git a/src/webserver.js b/src/webserver.js
index 9fbe6f0ef9..c91a33a31b 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -129,7 +129,7 @@ function setupExpressApp(app) {
}
function setupFavicon(app) {
- var faviconPath = path.join(__dirname, '../../', 'public', meta.config['brand:favicon'] ? meta.config['brand:favicon'] : 'favicon.ico');
+ var faviconPath = path.join(nconf.get('base_dir'), 'public', meta.config['brand:favicon'] ? meta.config['brand:favicon'] : 'favicon.ico');
if (file.existsSync(faviconPath)) {
app.use(nconf.get('relative_path'), favicon(faviconPath));
}
diff --git a/tests/.jshintrc b/test/.jshintrc
similarity index 100%
rename from tests/.jshintrc
rename to test/.jshintrc
diff --git a/tests/categories.js b/test/categories.js
similarity index 100%
rename from tests/categories.js
rename to test/categories.js
diff --git a/tests/database.js b/test/database.js
similarity index 100%
rename from tests/database.js
rename to test/database.js
diff --git a/tests/database/hash.js b/test/database/hash.js
similarity index 100%
rename from tests/database/hash.js
rename to test/database/hash.js
diff --git a/tests/database/keys.js b/test/database/keys.js
similarity index 100%
rename from tests/database/keys.js
rename to test/database/keys.js
diff --git a/tests/database/list.js b/test/database/list.js
similarity index 100%
rename from tests/database/list.js
rename to test/database/list.js
diff --git a/tests/database/sets.js b/test/database/sets.js
similarity index 100%
rename from tests/database/sets.js
rename to test/database/sets.js
diff --git a/tests/database/sorted.js b/test/database/sorted.js
similarity index 100%
rename from tests/database/sorted.js
rename to test/database/sorted.js
diff --git a/tests/groups.js b/test/groups.js
similarity index 100%
rename from tests/groups.js
rename to test/groups.js
diff --git a/tests/messaging.js b/test/messaging.js
similarity index 100%
rename from tests/messaging.js
rename to test/messaging.js
diff --git a/test/mocha.opts b/test/mocha.opts
new file mode 100644
index 0000000000..b0a5a2aa02
--- /dev/null
+++ b/test/mocha.opts
@@ -0,0 +1,2 @@
+--reporter dot
+--timeout 10000
diff --git a/tests/mocks/databasemock.js b/test/mocks/databasemock.js
similarity index 100%
rename from tests/mocks/databasemock.js
rename to test/mocks/databasemock.js
diff --git a/test/posts.js b/test/posts.js
new file mode 100644
index 0000000000..eda66ce409
--- /dev/null
+++ b/test/posts.js
@@ -0,0 +1,136 @@
+'use strict';
+/*global require, before, after*/
+
+var assert = require('assert');
+var async = require('async');
+
+var db = require('./mocks/databasemock');
+var topics = require('../src/topics');
+var posts = require('../src/posts');
+var categories = require('../src/categories');
+var user = require('../src/user');
+
+describe('Post\'s', function() {
+ var voterUid;
+ var voteeUid;
+ var postData;
+
+ before(function(done) {
+ async.parallel({
+ voterUid: function(next) {
+ user.create({username: 'upvoter'}, next);
+ },
+ voteeUid: function(next) {
+ user.create({username: 'upvotee'}, next);
+ },
+ category: function(next) {
+ categories.create({
+ name: 'Test Category',
+ description: 'Test category created by testing script'
+ }, next);
+ }
+ }, function(err, results) {
+ if (err) {
+ return done(err);
+ }
+
+ voterUid = results.voterUid;
+ voteeUid = results.voteeUid;
+
+ topics.post({
+ uid: results.voteeUid,
+ cid: results.category.cid,
+ title: 'Test Topic Title',
+ content: 'The content of test topic'
+ }, function(err, data) {
+ if (err) {
+ return done(err);
+ }
+ postData = data.postData;
+ done();
+ });
+ });
+ });
+
+ describe('voting', function() {
+
+ it('should upvote a post', function(done) {
+ posts.upvote(postData.pid, voterUid, function(err, result) {
+ assert.ifError(err);
+ assert.equal(result.post.upvotes, 1);
+ assert.equal(result.post.downvotes, 0);
+ assert.equal(result.post.votes, 1);
+ assert.equal(result.user.reputation, 1);
+ posts.hasVoted(postData.pid, voterUid, function(err, data) {
+ assert.ifError(err);
+ assert.equal(data.upvoted, true);
+ assert.equal(data.downvoted, false);
+ done();
+ });
+ });
+ });
+
+ it('should unvote a post', function(done) {
+ posts.unvote(postData.pid, voterUid, function(err, result) {
+ assert.ifError(err);
+ assert.equal(result.post.upvotes, 0);
+ assert.equal(result.post.downvotes, 0);
+ assert.equal(result.post.votes, 0);
+ assert.equal(result.user.reputation, 0);
+ posts.hasVoted(postData.pid, voterUid, function(err, data) {
+ assert.ifError(err);
+ assert.equal(data.upvoted, false);
+ assert.equal(data.downvoted, false);
+ done();
+ });
+ });
+ });
+
+ it('should downvote a post', function(done) {
+ posts.downvote(postData.pid, voterUid, function(err, result) {
+ assert.ifError(err);
+ assert.equal(result.post.upvotes, 0);
+ assert.equal(result.post.downvotes, 1);
+ assert.equal(result.post.votes, -1);
+ assert.equal(result.user.reputation, -1);
+ posts.hasVoted(postData.pid, voterUid, function(err, data) {
+ assert.ifError(err);
+ assert.equal(data.upvoted, false);
+ assert.equal(data.downvoted, true);
+ done();
+ });
+ });
+ });
+ });
+
+ describe('bookmarking', function() {
+ it('should bookmark a post', function(done) {
+ posts.bookmark(postData.pid, voterUid, function(err, data) {
+ assert.ifError(err);
+ assert.equal(data.isBookmarked, true);
+ posts.hasBookmarked(postData.pid, voterUid, function(err, hasBookmarked) {
+ assert.ifError(err);
+ assert.equal(hasBookmarked, true);
+ done();
+ });
+ });
+ });
+
+ it('should unbookmark a post', function(done) {
+ posts.unbookmark(postData.pid, voterUid, function(err, data) {
+ assert.ifError(err);
+ assert.equal(data.isBookmarked, false);
+ posts.hasBookmarked([postData.pid], voterUid, function(err, hasBookmarked) {
+ assert.ifError(err);
+ assert.equal(hasBookmarked[0], false);
+ done();
+ });
+ });
+ });
+ });
+
+
+ after(function(done) {
+ db.flushdb(done);
+ });
+});
diff --git a/tests/topics.js b/test/topics.js
similarity index 100%
rename from tests/topics.js
rename to test/topics.js
diff --git a/tests/translator-new.js b/test/translator-new.js
similarity index 100%
rename from tests/translator-new.js
rename to test/translator-new.js
diff --git a/tests/translator.js b/test/translator.js
similarity index 100%
rename from tests/translator.js
rename to test/translator.js
diff --git a/tests/user.js b/test/user.js
similarity index 100%
rename from tests/user.js
rename to test/user.js
diff --git a/tests/utils.js b/test/utils.js
similarity index 100%
rename from tests/utils.js
rename to test/utils.js