diff --git a/.travis.yml b/.travis.yml index e9db303b27..a28f734796 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,11 @@ before_install: - "echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list" - "sudo apt-get update" - "sudo apt-get install mongodb-org-server" + - "sudo service mongod start" before_script: + - sleep 15 # wait for mongodb to be ready - sh -c "if [ '$DB' = 'mongodb' ]; then node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"mongo\\\",\\\"mongo:host\\\":\\\"127.0.0.1\\\",\\\"mongo:port\\\":27017,\\\"mongo:username\\\":\\\"\\\",\\\"mongo:password\\\":\\\"\\\",\\\"mongo:database\\\":0,\\\"redis:host\\\":\\\"127.0.0.1\\\",\\\"redis:port\\\":6379,\\\"redis:password\\\":\\\"\\\",\\\"redis:database\\\":0,\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"abcdef\\\",\\\"admin:password:confirm\\\":\\\"abcdef\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":27017,\\\"database\\\":0}\"; fi" - sh -c "if [ '$DB' = 'redis' ]; then node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"redis\\\",\\\"mongo:host\\\":\\\"127.0.0.1\\\",\\\"mongo:port\\\":27017,\\\"mongo:username\\\":\\\"\\\",\\\"mongo:password\\\":\\\"\\\",\\\"mongo:database\\\":0,\\\"redis:host\\\":\\\"127.0.0.1\\\",\\\"redis:port\\\":6379,\\\"redis:password\\\":\\\"\\\",\\\"redis:database\\\":0,\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"abcdef\\\",\\\"admin:password:confirm\\\":\\\"abcdef\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":6379,\\\"database\\\":0}\"; fi" - - "until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 1; done" after_success: - "npm run coveralls" language: node_js diff --git a/Gruntfile.js b/Gruntfile.js index adf51fb34b..2d89ad0178 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -99,7 +99,7 @@ module.exports = function (grunt) { 'public/src/**/*.js', 'node_modules/nodebb-*/**/*.js', '!node_modules/nodebb-*/node_modules/**', - 'node_modules/templates.js/lib/templates.js', + 'node_modules/benchpressjs/build/benchpress.js', '!node_modules/nodebb-*/.git/**', ], options: { diff --git a/install/web.js b/install/web.js index 16bef11509..58767b776a 100644 --- a/install/web.js +++ b/install/web.js @@ -9,6 +9,8 @@ var less = require('less'); var async = require('async'); var uglify = require('uglify-js'); var nconf = require('nconf'); +var Benchpress = require('benchpressjs'); + var app = express(); var server; @@ -35,7 +37,7 @@ web.install = function (port) { winston.info('Launching web installer on port', port); app.use(express.static('public', {})); - app.engine('tpl', require('templates.js').__express); + app.engine('tpl', Benchpress.__express); app.set('view engine', 'tpl'); app.set('views', path.join(__dirname, '../src/views')); app.use(bodyParser.urlencoded({ diff --git a/package.json b/package.json index 3e0f592185..6dc6188c85 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "async": "2.4.1", "autoprefixer": "7.1.1", "bcryptjs": "2.4.3", + "benchpressjs": "^1.0.1", "body-parser": "^1.9.0", "bootstrap": "^3.3.7", "chart.js": "^2.4.0", @@ -40,8 +41,7 @@ "express-session": "^1.8.2", "express-useragent": "1.0.7", "html-to-text": "3.3.0", - "ip": "1.1.5", - "ip-range-check": "^0.0.2", + "ipaddr.js": "^1.5.0", "jimp": "0.2.28", "jquery": "^3.1.0", "json-2-csv": "^2.0.22", @@ -66,10 +66,10 @@ "nodebb-plugin-spam-be-gone": "0.5.1", "nodebb-rewards-essentials": "0.0.9", "nodebb-theme-lavender": "4.0.5", - "nodebb-theme-persona": "5.0.30", + "nodebb-theme-persona": "5.0.32", "nodebb-theme-slick": "1.1.1", - "nodebb-theme-vanilla": "6.0.24", - "nodebb-widget-essentials": "3.0.1", + "nodebb-theme-vanilla": "6.0.26", + "nodebb-widget-essentials": "3.0.4", "nodemailer": "2.6.4", "nodemailer-sendmail-transport": "1.0.0", "nodemailer-smtp-transport": "^2.4.1", @@ -93,7 +93,6 @@ "socketio-wildcard": "2.0.0", "spdx-license-list": "^3.0.1", "string": "^3.0.0", - "templates.js": "0.3.11", "toobusy-js": "^0.5.1", "uglify-js": "^3.0.11", "validator": "7.0.0", diff --git a/public/language/ar/admin/extend/plugins.json b/public/language/ar/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/ar/admin/extend/plugins.json +++ b/public/language/ar/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/ar/admin/general/navigation.json b/public/language/ar/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/ar/admin/general/navigation.json +++ b/public/language/ar/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/ar/admin/menu.json b/public/language/ar/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/ar/admin/menu.json +++ b/public/language/ar/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/ar/admin/settings/general.json b/public/language/ar/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/ar/admin/settings/general.json +++ b/public/language/ar/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/ar/admin/settings/post.json b/public/language/ar/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/ar/admin/settings/post.json +++ b/public/language/ar/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/ar/notifications.json b/public/language/ar/notifications.json index fb2a6964cc..089a76e70c 100644 --- a/public/language/ar/notifications.json +++ b/public/language/ar/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 sent a registration request.", "new_register_multiple": "There are %1 registration requests awaiting review.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "تم التحقق من عنوان البريد الإلكتروني", "email-confirmed-message": "شكرًا على إثبات صحة عنوان بريدك الإلكتروني. صار حسابك مفعلًا بالكامل.", "email-confirm-error-message": "حدث خطأ أثناء التحقق من عنوان بريدك الإلكتروني. ربما رمز التفعيل خاطئ أو انتهت صلاحيته.", diff --git a/public/language/ar/pages.json b/public/language/ar/pages.json index 4beb6487c3..07d435c625 100644 --- a/public/language/ar/pages.json +++ b/public/language/ar/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "IP Blacklist", + "post-queue": "Post Queue", "users/online": "اﻷعضاء المتصلون", "users/latest": "أحدث اﻷعضاء", "users/sort-posts": "الأعضاء الأكثر نشاطاً", diff --git a/public/language/ar/success.json b/public/language/ar/success.json index 13b63618e2..6b2670dc00 100644 --- a/public/language/ar/success.json +++ b/public/language/ar/success.json @@ -1,6 +1,7 @@ { "success": "نجاح", "topic-post": "لقد تمت الإضافة بنجاح.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "تم تسجيل الدخول بنجاح", "settings-saved": "تم حفظ التغييرات!" } \ No newline at end of file diff --git a/public/language/bg/admin/extend/plugins.json b/public/language/bg/admin/extend/plugins.json index db488264b2..179a98b8c5 100644 --- a/public/language/bg/admin/extend/plugins.json +++ b/public/language/bg/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB не може да се свърже с пакетния мениджър. Искате ли да продължите с инсталацията на най-новата версия?

Сървърът върна (%1): %2
", "alert.package-manager-unreachable": "

NodeBB не може да се свърже с пакетния мениджър. Не се препоръчва обновяване в момента.

", "alert.incompatible": "

Вашата версия на NodeBB (версия %1) може да използва най-много версия %2 на тази добавка. Моля, обновете NodeBB, ако искате да инсталирате по-нова версия на тази добавка.

", - "alert.possibly-incompatible": "

Няма информация за съвместимостта

Тази добавка не е посочила конкретна версия за инсталация, съвместима с Вашата версия на NodeBB. Не можем да гарантираме пълна съвместимост и има възможност Вашият NodeBB да не може да стартира правилно.

Ако NodeBB не може да стартира, използвайте следната команда:

$ ./nodebb reset plugin=\"%1\"

Искате ли да продължите с инсталацията на най-новата версия на тази добавка?

" + "alert.possibly-incompatible": "

Няма информация за съвместимостта

Тази добавка не е посочила конкретна версия за инсталация, съвместима с Вашата версия на NodeBB. Не можем да гарантираме пълна съвместимост и има възможност Вашият NodeBB да не може да стартира правилно.

Ако NodeBB не може да стартира, използвайте следната команда:

$ ./nodebb reset plugin=\"%1\"

Искате ли да продължите с инсталацията на най-новата версия на тази добавка?

", + + "license.title": "Информация за лиценза на добавката", + "license.intro": "Добавката „%1“ използва лиценза „%2“. Моля, прочетете условията на лиценза и се уверете, че ги разбирате, преди да включите добавката.", + "license.cta": "Искате ли да продължите с включването на тази добавка?" } diff --git a/public/language/bg/admin/general/navigation.json b/public/language/bg/admin/general/navigation.json index ae47ac3c56..baffb3e7b7 100644 --- a/public/language/bg/admin/general/navigation.json +++ b/public/language/bg/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Да е видимо само за администраторите", "only-global-mods-and-admins": "Да е видимо само за глобалните модератори и администраторите", "only-logged-in": "Да е видимо само за вписаните потребители", + "only-guest": "Да е видимо само за гостите", "open-new-window": "Отваряне в нов прозорец", "installed-plugins-required": "Нужни инсталирани добавки:", diff --git a/public/language/bg/admin/menu.json b/public/language/bg/admin/menu.json index 4870901b68..ed1ca5b5c1 100644 --- a/public/language/bg/admin/menu.json +++ b/public/language/bg/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Етикети", "manage/users": "Потребители", "manage/registration": "Регистрационна опашка", + "manage/post-queue": "Опашка за публикации", "manage/groups": "Групи", "manage/ip-blacklist": "Черен списък за IP адреси", diff --git a/public/language/bg/admin/settings/general.json b/public/language/bg/admin/settings/general.json index 684d4a15aa..64e5df51d8 100644 --- a/public/language/bg/admin/settings/general.json +++ b/public/language/bg/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Настройки на уеб сайта", "title": "Заглавие на уеб сайта", + "title.url": "Адрес", + "title.url-placeholder": "Адресът на заглавието на уеб сайта", + "title.url-help": "При щракване върху заглавието, потребителите ще бъдат изпратени на този адрес. Ако бъде оставено празно, потребителите ще бъдат изпращани на началната страница на форума.", "title.name": "Името на общността Ви", "title.show-in-header": "Показване на заглавието на уеб сайта в заглавната част", "browser-title": "Заглавие на браузъра", diff --git a/public/language/bg/admin/settings/post.json b/public/language/bg/admin/settings/post.json index 37b535660f..2d3276ffe4 100644 --- a/public/language/bg/admin/settings/post.json +++ b/public/language/bg/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Първо тези с най-много гласове", "sorting.topic-default": "Подредба по подразбиране на темите", "restrictions": "Ограничения за публикуването", + "restrictions.post-queue": "Включване на опашката за публикации", + "restrictions.post-queue-help": "Ако опашката за публикации е включена, публикациите на новите потребители ще бъдат добавяни в опашка за одобрение.", "restrictions.seconds-between": "Брой секунди между публикациите", "restrictions.seconds-between-new": "Брой секунди между публикациите за нови потребители", "restrictions.rep-threshold": "Необходима репутация за премахване на това ограничение", diff --git a/public/language/bg/notifications.json b/public/language/bg/notifications.json index c064e5e537..f3be5bab25 100644 --- a/public/language/bg/notifications.json +++ b/public/language/bg/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 изпрати заявка за регистрация.", "new_register_multiple": "Има %1 заявки за регистрация, които очакват да бъдат прегледани.", "flag_assigned_to_you": "Докладът %1 беше назначен на Вас", + "post_awaiting_review": "Публикацията чака да бъде прегледана", "email-confirmed": "Е-пощата беше потвърдена", "email-confirmed-message": "Благодарим Ви, че потвърдихте е-пощата си. Акаунтът Ви е вече напълно активиран.", "email-confirm-error-message": "Възникна проблем при потвърждаването на е-пощата Ви. Може кодът да е грешен или давността му да е изтекла.", diff --git a/public/language/bg/pages.json b/public/language/bg/pages.json index aa5be14aa6..566c7139a8 100644 --- a/public/language/bg/pages.json +++ b/public/language/bg/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Модераторски инструменти", "flagged-content": "Докладвано съдържание", "ip-blacklist": "Черен списък за IP адреси", + "post-queue": "Опашка за публикации", "users/online": "Потребители на линия", "users/latest": "Последни потребители", "users/sort-posts": "Потребители с най-много публикации", diff --git a/public/language/bg/success.json b/public/language/bg/success.json index a2945214f1..28725d2552 100644 --- a/public/language/bg/success.json +++ b/public/language/bg/success.json @@ -1,6 +1,7 @@ { "success": "Готово", "topic-post": "Вие публикувахте успешно.", + "post-queued": "Публикацията Ви е добавена в опашката за одобрение.", "authentication-successful": "Успешно удостоверяване", "settings-saved": "Настройките са запазени!" } \ No newline at end of file diff --git a/public/language/bn/admin/extend/plugins.json b/public/language/bn/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/bn/admin/extend/plugins.json +++ b/public/language/bn/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/bn/admin/general/navigation.json b/public/language/bn/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/bn/admin/general/navigation.json +++ b/public/language/bn/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/bn/admin/menu.json b/public/language/bn/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/bn/admin/menu.json +++ b/public/language/bn/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/bn/admin/settings/general.json b/public/language/bn/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/bn/admin/settings/general.json +++ b/public/language/bn/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/bn/admin/settings/post.json b/public/language/bn/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/bn/admin/settings/post.json +++ b/public/language/bn/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/bn/notifications.json b/public/language/bn/notifications.json index ecedc889d3..0ad1832165 100644 --- a/public/language/bn/notifications.json +++ b/public/language/bn/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 sent a registration request.", "new_register_multiple": "There are %1 registration requests awaiting review.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "ইমেইল নিশ্চিত করা হয়েছে", "email-confirmed-message": "আপনার ইমেইল যাচাই করার জন্য আপনাকে ধন্যবাদ। আপনার অ্যাকাউন্টটি এখন সম্পূর্ণরূপে সক্রিয়।", "email-confirm-error-message": "আপনার ইমেল ঠিকানার বৈধতা যাচাইয়ে একটি সমস্যা হয়েছে। সম্ভবত কোডটি ভুল ছিল অথবা কোডের মেয়াদ শেষ হয়ে গিয়েছে।", diff --git a/public/language/bn/pages.json b/public/language/bn/pages.json index d3e8144063..04ed29d13f 100644 --- a/public/language/bn/pages.json +++ b/public/language/bn/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "IP Blacklist", + "post-queue": "Post Queue", "users/online": "Online Users", "users/latest": "Latest Users", "users/sort-posts": "Users with the most posts", diff --git a/public/language/bn/success.json b/public/language/bn/success.json index 281c9af652..c94040eeb1 100644 --- a/public/language/bn/success.json +++ b/public/language/bn/success.json @@ -1,6 +1,7 @@ { "success": "সফল হয়েছে", "topic-post": "আপনি সফলভাবে পোষ্ট করেছেন। ", + "post-queued": "Your post is queued for approval.", "authentication-successful": "অথেন্টিকেশন সফল হয়েছে", "settings-saved": "সেটিংস সেভ করা হয়েছে। " } \ No newline at end of file diff --git a/public/language/cs/admin/extend/plugins.json b/public/language/cs/admin/extend/plugins.json index 5f29cfe530..3c1ff9bc29 100644 --- a/public/language/cs/admin/extend/plugins.json +++ b/public/language/cs/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB se nemohl připojit ke správce balíčku, pokračovat v instalaci poslední verze?

Server odpověděl (%1): %2
", "alert.package-manager-unreachable": "

NodeBB se nemohl připojit ke správci balíčku, aktualizace není doporučena.

", "alert.incompatible": "

Vaše verze NodeBB (v%1) umožňuje jen aktualizovat toto rozšíření na v%2. Aktualizujte prosím NodeBB, chcete-li nainstalovat nejnovější verzi tohoto rozšíření.

", - "alert.possibly-incompatible": "

Nebyla nalezena žádná informace o kompatibilitě

Toto rozšíření nemá nastavenou požadovanou verzi NodeBB. Plná kompatibilita nemůže být garantována a může způsobit, že se vám již NodeBB nespustí.

Nespustí-li se správně NodeBB:

$ ./nodebb reset plugin=\"%1\"

Pokračovat v instalaci této aktuální verze rozšíření?

" + "alert.possibly-incompatible": "

Nebyla nalezena žádná informace o kompatibilitě

Toto rozšíření nemá nastavenou požadovanou verzi NodeBB. Plná kompatibilita nemůže být garantována a může způsobit, že se vám již NodeBB nespustí.

Nespustí-li se správně NodeBB:

$ ./nodebb reset plugin=\"%1\"

Pokračovat v instalaci této aktuální verze rozšíření?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/cs/admin/general/navigation.json b/public/language/cs/admin/general/navigation.json index 379e4e596b..7ec2b67612 100644 --- a/public/language/cs/admin/general/navigation.json +++ b/public/language/cs/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Zobrazuje se jen správci", "only-global-mods-and-admins": "Zobrazuje se jen hlavním moderátorům a správcům", "only-logged-in": "Zobrazuje se jen přihlášeným uživatelům", + "only-guest": "Only display to guests", "open-new-window": "Otevřít v novém okně", "installed-plugins-required": "Vyžadovaná nainstalovaná rozšíření:", diff --git a/public/language/cs/admin/menu.json b/public/language/cs/admin/menu.json index 4ac4eb1a01..c18d35a96a 100644 --- a/public/language/cs/admin/menu.json +++ b/public/language/cs/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/cs/admin/settings/general.json b/public/language/cs/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/cs/admin/settings/general.json +++ b/public/language/cs/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/cs/admin/settings/post.json b/public/language/cs/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/cs/admin/settings/post.json +++ b/public/language/cs/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/cs/notifications.json b/public/language/cs/notifications.json index e2eb415dda..c33de798fd 100644 --- a/public/language/cs/notifications.json +++ b/public/language/cs/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 odeslal registrační požadavek.", "new_register_multiple": "Je zde %1 registračních požadavků čeká na vyřízení.", "flag_assigned_to_you": "Označení %1 vám bylo přiřazeno", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "E-mail potvrzen", "email-confirmed-message": "Děkujeme za ověření vaší e-mailové adresy. Váš účet je nyní aktivní.", "email-confirm-error-message": "Nastal problém s ověřením vaší e-mailové adresy. Kód je pravděpodobně neplatný nebo jeho platnost vypršela.", diff --git a/public/language/cs/pages.json b/public/language/cs/pages.json index fac29434a6..3ce7e08157 100644 --- a/public/language/cs/pages.json +++ b/public/language/cs/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Nástroje moderátora", "flagged-content": "Nahlášený obsah", "ip-blacklist": "Černá listina IP adres", + "post-queue": "Post Queue", "users/online": "Připojení uživatelé", "users/latest": "Nejnovější uživatelé", "users/sort-posts": "Uživatelé s nejvíce příspěvky", diff --git a/public/language/cs/success.json b/public/language/cs/success.json index f86236427e..8b218b567c 100644 --- a/public/language/cs/success.json +++ b/public/language/cs/success.json @@ -1,6 +1,7 @@ { "success": "Úspěšné", "topic-post": "Úspěšně umístěno.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Úspěšné přihlášení", "settings-saved": "Nastavení byla uložena." } \ No newline at end of file diff --git a/public/language/da/admin/extend/plugins.json b/public/language/da/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/da/admin/extend/plugins.json +++ b/public/language/da/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/da/admin/general/navigation.json b/public/language/da/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/da/admin/general/navigation.json +++ b/public/language/da/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/da/admin/menu.json b/public/language/da/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/da/admin/menu.json +++ b/public/language/da/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/da/admin/settings/general.json b/public/language/da/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/da/admin/settings/general.json +++ b/public/language/da/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/da/admin/settings/post.json b/public/language/da/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/da/admin/settings/post.json +++ b/public/language/da/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/da/notifications.json b/public/language/da/notifications.json index c7d15fe5c0..7754539229 100644 --- a/public/language/da/notifications.json +++ b/public/language/da/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 har sendt en registrerings anmodning.", "new_register_multiple": "There are %1 registration requests awaiting review.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Email bekræftet", "email-confirmed-message": "Tak fordi du validerede din email. Din konto er nu fuldt ud aktiveret.", "email-confirm-error-message": "Der var et problem med valideringen af din emailadresse. Bekræftelses koden var muligvis forkert eller udløbet.", diff --git a/public/language/da/pages.json b/public/language/da/pages.json index 787dcddfbf..46254d4757 100644 --- a/public/language/da/pages.json +++ b/public/language/da/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "IP Blacklist", + "post-queue": "Post Queue", "users/online": "Online brugere", "users/latest": "Seneste brugere", "users/sort-posts": "Brugere med de fleste indlæg", diff --git a/public/language/da/success.json b/public/language/da/success.json index 312e34d293..67e8fb02f5 100644 --- a/public/language/da/success.json +++ b/public/language/da/success.json @@ -1,6 +1,7 @@ { "success": "Udført", "topic-post": "Du har indsendt et indlæg.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Du blev autentificeret", "settings-saved": "Indstillinger gemt!" } \ No newline at end of file diff --git a/public/language/de/admin/extend/plugins.json b/public/language/de/admin/extend/plugins.json index 9ceec47023..741369872d 100644 --- a/public/language/de/admin/extend/plugins.json +++ b/public/language/de/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB konnte den Paket-Manager nicht erreichen. Willst Du mit der Installation der neuesten Version fortfahren

Der Server meldete (%1): %2
", "alert.package-manager-unreachable": "

NodeBB konnte den Paket-Manager nicht erreichen, eine Aktualisierung wird momentan nicht empfohlen.

", "alert.incompatible": "

NodeBB Version (v%1) ist nur für Aktualisierungen bis v%2 dieses Plugins bestimmt. Bitte aktualisiere NodeBB, wenn eine neuere Version dieses Plugins installiert werden soll.

", - "alert.possibly-incompatible": "

Keine Kompatibilitätsinformationen gefunden

Dieses Plugin legte keine spezifische NodeBB version fest, welche für die Installation benötigt wird. Volle Kompatibilität kann nicht gewährleistet werden, was dazu führen könnte, dass ihr NodeBB nicht mehr korrekt startet.

Für den Fall, dass NodeBB nicht mehr ordnungsgemäß startet:

$ ./nodebb reset plugin=\"%1\"

Soll mit der installation der neuesten Version dieses Plugins fortgefahren werden?

" + "alert.possibly-incompatible": "

Keine Kompatibilitätsinformationen gefunden

Dieses Plugin legte keine spezifische NodeBB version fest, welche für die Installation benötigt wird. Volle Kompatibilität kann nicht gewährleistet werden, was dazu führen könnte, dass ihr NodeBB nicht mehr korrekt startet.

Für den Fall, dass NodeBB nicht mehr ordnungsgemäß startet:

$ ./nodebb reset plugin=\"%1\"

Soll mit der installation der neuesten Version dieses Plugins fortgefahren werden?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/de/admin/general/navigation.json b/public/language/de/admin/general/navigation.json index 408b4537c5..e589992ae9 100644 --- a/public/language/de/admin/general/navigation.json +++ b/public/language/de/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Nur für Admins sichtbar", "only-global-mods-and-admins": "Nur für Globale Moderatoren und Admins sichtbar", "only-logged-in": "Nur für angemeldete Benutzer sichtbar", + "only-guest": "Only display to guests", "open-new-window": "In neuem Fenster öffnen", "installed-plugins-required": "Benötigte installierte Plugins:", diff --git a/public/language/de/admin/menu.json b/public/language/de/admin/menu.json index 98af5b0481..0b32e6e910 100644 --- a/public/language/de/admin/menu.json +++ b/public/language/de/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Benutzer", "manage/registration": "Warteliste", + "manage/post-queue": "Post Queue", "manage/groups": "Gruppen", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/de/admin/settings/general.json b/public/language/de/admin/settings/general.json index 014843ced2..979ddb2470 100644 --- a/public/language/de/admin/settings/general.json +++ b/public/language/de/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Forum Einstellungen", "title": "Forum Titel", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Name Deiner Community", "title.show-in-header": "Titel im Header anzeigen", "browser-title": "Browser Titel", diff --git a/public/language/de/admin/settings/post.json b/public/language/de/admin/settings/post.json index ab310f421e..0857e8eecb 100644 --- a/public/language/de/admin/settings/post.json +++ b/public/language/de/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Meiste Bewertungen", "sorting.topic-default": "Standardmäßige Themensortierung", "restrictions": "Posting beschränkungen", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Zeit zwischen der Erstellung von Beiträgen", "restrictions.seconds-between-new": "Zeit zwischen der Erstellung von Beiträgen für neue Nutzer", "restrictions.rep-threshold": "Vorrausgesetztes Ansehen um diese Beschränkung aufzuheben", diff --git a/public/language/de/notifications.json b/public/language/de/notifications.json index 0b4d7b937c..2eeaa3c16b 100644 --- a/public/language/de/notifications.json +++ b/public/language/de/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 hat eine Registrationsanfrage geschickt.", "new_register_multiple": "Es erwarten %1 Registrierungsanfragen eine Überprüfung.", "flag_assigned_to_you": "Markierung %1 wurde Ihnen zugewiesen", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "E-Mail bestätigt", "email-confirmed-message": "Vielen Dank für Ihre E-Mail-Validierung. Ihr Konto ist nun vollständig aktiviert.", "email-confirm-error-message": "Es gab ein Problem bei der Validierung Ihrer E-Mail-Adresse. Möglicherweise ist der Code ungültig oder abgelaufen.", diff --git a/public/language/de/pages.json b/public/language/de/pages.json index 4ccb0e6456..35f22415fd 100644 --- a/public/language/de/pages.json +++ b/public/language/de/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Gemeldeter Inhalt", "ip-blacklist": "IP Blacklist", + "post-queue": "Post Queue", "users/online": "Benutzer online", "users/latest": "Neuste Benutzer", "users/sort-posts": "Benutzer mit den meisten Beiträgen", diff --git a/public/language/de/success.json b/public/language/de/success.json index 42461605a2..8e56ce207b 100644 --- a/public/language/de/success.json +++ b/public/language/de/success.json @@ -1,6 +1,7 @@ { "success": "Fertig", "topic-post": "Beitrag erfolgreich erstellt.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Authentifizierung erfolgreich!", "settings-saved": "Einstellungen gespeichert!" } \ No newline at end of file diff --git a/public/language/el/admin/extend/plugins.json b/public/language/el/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/el/admin/extend/plugins.json +++ b/public/language/el/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/el/admin/general/navigation.json b/public/language/el/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/el/admin/general/navigation.json +++ b/public/language/el/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/el/admin/menu.json b/public/language/el/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/el/admin/menu.json +++ b/public/language/el/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/el/admin/settings/general.json b/public/language/el/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/el/admin/settings/general.json +++ b/public/language/el/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/el/admin/settings/post.json b/public/language/el/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/el/admin/settings/post.json +++ b/public/language/el/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/el/notifications.json b/public/language/el/notifications.json index 692813475f..c59382c86c 100644 --- a/public/language/el/notifications.json +++ b/public/language/el/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 sent a registration request.", "new_register_multiple": "There are %1 registration requests awaiting review.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", diff --git a/public/language/el/pages.json b/public/language/el/pages.json index bfbce9f09b..8134b09086 100644 --- a/public/language/el/pages.json +++ b/public/language/el/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "IP Blacklist", + "post-queue": "Post Queue", "users/online": "Συνδεδεμένοι Χρήστες", "users/latest": "Πρόσφατοι Χρήστες", "users/sort-posts": "Users with the most posts", diff --git a/public/language/el/success.json b/public/language/el/success.json index c4fdca5382..df56b7ec5f 100644 --- a/public/language/el/success.json +++ b/public/language/el/success.json @@ -1,6 +1,7 @@ { "success": "Επιτυχία", "topic-post": "Δημοσίευσες με επιτυχία.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Επιτυχής Ταυτοποίηση", "settings-saved": "Οι επιλογές αποθηκεύτηκαν!" } \ No newline at end of file diff --git a/public/language/en-GB/admin/manage/ip-blacklist.json b/public/language/en-GB/admin/manage/ip-blacklist.json index 5106434351..cd79294266 100644 --- a/public/language/en-GB/admin/manage/ip-blacklist.json +++ b/public/language/en-GB/admin/manage/ip-blacklist.json @@ -11,5 +11,8 @@ "validate.x-valid": "%1 out of %2 rule(s) valid.", "validate.x-invalid": "The following %1 rules are invalid:", - "alerts.applied-success": "Blacklist Applied" + "alerts.applied-success": "Blacklist Applied", + + "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" } \ No newline at end of file diff --git a/public/language/en-GB/admin/settings/general.json b/public/language/en-GB/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/en-GB/admin/settings/general.json +++ b/public/language/en-GB/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/en-US/admin/extend/plugins.json b/public/language/en-US/admin/extend/plugins.json index 164fa26434..8da0a8227c 100644 --- a/public/language/en-US/admin/extend/plugins.json +++ b/public/language/en-US/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/en-US/admin/general/navigation.json b/public/language/en-US/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/en-US/admin/general/navigation.json +++ b/public/language/en-US/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/en-US/admin/menu.json b/public/language/en-US/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/en-US/admin/menu.json +++ b/public/language/en-US/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/en-US/admin/settings/general.json b/public/language/en-US/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/en-US/admin/settings/general.json +++ b/public/language/en-US/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/en-US/admin/settings/post.json b/public/language/en-US/admin/settings/post.json index 7ee040cf20..f938a7e7d7 100644 --- a/public/language/en-US/admin/settings/post.json +++ b/public/language/en-US/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/en-US/notifications.json b/public/language/en-US/notifications.json index d8ecd4dae8..8fb6665d1c 100644 --- a/public/language/en-US/notifications.json +++ b/public/language/en-US/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 sent a registration request.", "new_register_multiple": "There are %1 registration requests awaiting review.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", diff --git a/public/language/en-US/pages.json b/public/language/en-US/pages.json index af36850ff4..ddc7317e17 100644 --- a/public/language/en-US/pages.json +++ b/public/language/en-US/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "IP Blacklist", + "post-queue": "Post Queue", "users/online": "Online Users", "users/latest": "Latest Users", "users/sort-posts": "Users with the most posts", diff --git a/public/language/en-US/success.json b/public/language/en-US/success.json index fde8a77044..231f17a160 100644 --- a/public/language/en-US/success.json +++ b/public/language/en-US/success.json @@ -1,6 +1,7 @@ { "success": "Success", "topic-post": "You have successfully posted.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Authentication Successful", "settings-saved": "Settings saved!" } \ No newline at end of file diff --git a/public/language/en-x-pirate/admin/extend/plugins.json b/public/language/en-x-pirate/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/en-x-pirate/admin/extend/plugins.json +++ b/public/language/en-x-pirate/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/en-x-pirate/admin/general/navigation.json b/public/language/en-x-pirate/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/en-x-pirate/admin/general/navigation.json +++ b/public/language/en-x-pirate/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/en-x-pirate/admin/menu.json b/public/language/en-x-pirate/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/en-x-pirate/admin/menu.json +++ b/public/language/en-x-pirate/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/en-x-pirate/admin/settings/general.json b/public/language/en-x-pirate/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/en-x-pirate/admin/settings/general.json +++ b/public/language/en-x-pirate/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/en-x-pirate/admin/settings/post.json b/public/language/en-x-pirate/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/en-x-pirate/admin/settings/post.json +++ b/public/language/en-x-pirate/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/en-x-pirate/notifications.json b/public/language/en-x-pirate/notifications.json index d7a26c97c6..e3641543d5 100644 --- a/public/language/en-x-pirate/notifications.json +++ b/public/language/en-x-pirate/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 sent a registration request.", "new_register_multiple": "There are %1 registration requests awaiting review.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", diff --git a/public/language/en-x-pirate/pages.json b/public/language/en-x-pirate/pages.json index af36850ff4..ddc7317e17 100644 --- a/public/language/en-x-pirate/pages.json +++ b/public/language/en-x-pirate/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "IP Blacklist", + "post-queue": "Post Queue", "users/online": "Online Users", "users/latest": "Latest Users", "users/sort-posts": "Users with the most posts", diff --git a/public/language/en-x-pirate/success.json b/public/language/en-x-pirate/success.json index fde8a77044..231f17a160 100644 --- a/public/language/en-x-pirate/success.json +++ b/public/language/en-x-pirate/success.json @@ -1,6 +1,7 @@ { "success": "Success", "topic-post": "You have successfully posted.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Authentication Successful", "settings-saved": "Settings saved!" } \ No newline at end of file diff --git a/public/language/es/admin/extend/plugins.json b/public/language/es/admin/extend/plugins.json index 3925f3c5cc..c3a8117c37 100644 --- a/public/language/es/admin/extend/plugins.json +++ b/public/language/es/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/es/admin/general/navigation.json b/public/language/es/admin/general/navigation.json index e2a66f7af2..053ea92283 100644 --- a/public/language/es/admin/general/navigation.json +++ b/public/language/es/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/es/admin/menu.json b/public/language/es/admin/menu.json index 7cb50e1dc5..edbd662ff7 100644 --- a/public/language/es/admin/menu.json +++ b/public/language/es/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Etiquetas", "manage/users": "Usuarios", "manage/registration": "Cola de Registro", + "manage/post-queue": "Post Queue", "manage/groups": "Grupos", "manage/ip-blacklist": "Lista negra de IP", diff --git a/public/language/es/admin/settings/general.json b/public/language/es/admin/settings/general.json index 42256a2356..da75fb26a8 100644 --- a/public/language/es/admin/settings/general.json +++ b/public/language/es/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Ajustes del Sitio", "title": "Título del Sitio", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Nombre de tu Comunidad", "title.show-in-header": "Mostrar Título del Sitio en el Encabezado", "browser-title": "Título del Navegador", diff --git a/public/language/es/admin/settings/post.json b/public/language/es/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/es/admin/settings/post.json +++ b/public/language/es/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/es/notifications.json b/public/language/es/notifications.json index 9dc633bc9d..8d8ec31faf 100644 --- a/public/language/es/notifications.json +++ b/public/language/es/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 envió una solicitud de registro.", "new_register_multiple": "Hay %1 peticiones de registros pendientes de revisión", "flag_assigned_to_you": "Reporte %1 te ha sido asignado.", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Correo electrónico confirmado", "email-confirmed-message": "Gracias por validar tu correo electrónico. Tu cuenta ya está completamente activa.", "email-confirm-error-message": "Hubo un problema al validar tu cuenta de correo electrónico. Quizá el código era erróneo o expiró...", diff --git a/public/language/es/pages.json b/public/language/es/pages.json index 97f264a822..dd1f40f2d8 100644 --- a/public/language/es/pages.json +++ b/public/language/es/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Contenido reportado", "ip-blacklist": "Lista negra de IPS", + "post-queue": "Post Queue", "users/online": "Conectados", "users/latest": "Últimos usuarios", "users/sort-posts": "Top por mensajes", diff --git a/public/language/es/success.json b/public/language/es/success.json index ad5ed36c1d..9219799e7d 100644 --- a/public/language/es/success.json +++ b/public/language/es/success.json @@ -1,6 +1,7 @@ { "success": "¡Éxito!", "topic-post": "Mensaje publicado satisfactoriamente.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Identificado satisfactoriamente", "settings-saved": "¡Ajustes guardados satisfactoriamente!" } \ No newline at end of file diff --git a/public/language/et/admin/extend/plugins.json b/public/language/et/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/et/admin/extend/plugins.json +++ b/public/language/et/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/et/admin/general/navigation.json b/public/language/et/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/et/admin/general/navigation.json +++ b/public/language/et/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/et/admin/menu.json b/public/language/et/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/et/admin/menu.json +++ b/public/language/et/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/et/admin/settings/general.json b/public/language/et/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/et/admin/settings/general.json +++ b/public/language/et/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/et/admin/settings/post.json b/public/language/et/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/et/admin/settings/post.json +++ b/public/language/et/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/et/notifications.json b/public/language/et/notifications.json index 30f72650f1..87d23584ed 100644 --- a/public/language/et/notifications.json +++ b/public/language/et/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 saatis registreerimistaotluse.", "new_register_multiple": "%1 registreerimistaotlust ootavad ülevaadet.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Emaili aadress kinnitatud", "email-confirmed-message": "Täname, et kinnitasite oma emaili aadressi. Teie kasutaja on nüüd täielikult aktiveeritud.", "email-confirm-error-message": "Emaili aadressi kinnitamisel tekkis viga. Võibolla kinnituskood oli vale või aegunud.", diff --git a/public/language/et/pages.json b/public/language/et/pages.json index 0ded5b8380..a5469ae585 100644 --- a/public/language/et/pages.json +++ b/public/language/et/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "IP Blacklist", + "post-queue": "Post Queue", "users/online": "Sisseloginud kasutajad", "users/latest": "Hiljutised kasutajad", "users/sort-posts": "Kasutajad, kel on enim postitusi", diff --git a/public/language/et/success.json b/public/language/et/success.json index 07b21b6231..be9cc4d9e6 100644 --- a/public/language/et/success.json +++ b/public/language/et/success.json @@ -1,6 +1,7 @@ { "success": "Õnnestus", "topic-post": "Edukalt postitatud.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Sisse logimine õnnestus!", "settings-saved": "Seaded salvestatud!" } \ No newline at end of file diff --git a/public/language/fa-IR/admin/extend/plugins.json b/public/language/fa-IR/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/fa-IR/admin/extend/plugins.json +++ b/public/language/fa-IR/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/fa-IR/admin/general/navigation.json b/public/language/fa-IR/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/fa-IR/admin/general/navigation.json +++ b/public/language/fa-IR/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/fa-IR/admin/menu.json b/public/language/fa-IR/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/fa-IR/admin/menu.json +++ b/public/language/fa-IR/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/fa-IR/admin/settings/general.json b/public/language/fa-IR/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/fa-IR/admin/settings/general.json +++ b/public/language/fa-IR/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/fa-IR/admin/settings/post.json b/public/language/fa-IR/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/fa-IR/admin/settings/post.json +++ b/public/language/fa-IR/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/fa-IR/notifications.json b/public/language/fa-IR/notifications.json index c102e354d7..7c710b86d6 100644 --- a/public/language/fa-IR/notifications.json +++ b/public/language/fa-IR/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 یک درخواست ثبت نام ارسال کرده است", "new_register_multiple": "تعداد %1 درخواست عضویت برای بررسی وجود دارد.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "ایمیل تایید شد", "email-confirmed-message": "بابت تایید ایمیلتان سپاس‌گزاریم. حساب کاربری شما اکنون به صورت کامل فعال شده است.", "email-confirm-error-message": "خطایی در تایید آدرس ایمیل شما پیش آمده است. ممکن است کد نا‌معتبر و یا منقضی شده باشد.", diff --git a/public/language/fa-IR/pages.json b/public/language/fa-IR/pages.json index e44a61db94..1d4c7983de 100644 --- a/public/language/fa-IR/pages.json +++ b/public/language/fa-IR/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "لیست سیاه آی‌پی", + "post-queue": "Post Queue", "users/online": "کاربران آنلاین", "users/latest": "آخرین کاربران", "users/sort-posts": "کاربران با بیش‌ترین پست", diff --git a/public/language/fa-IR/success.json b/public/language/fa-IR/success.json index df002cfbc9..a2e9138cd3 100644 --- a/public/language/fa-IR/success.json +++ b/public/language/fa-IR/success.json @@ -1,6 +1,7 @@ { "success": "موفقیت‌آمیز", "topic-post": "پست شما باموفقیت فرستاده شد.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "اعتبارسنجی موفق", "settings-saved": "تنظیمات ذخیره شد." } \ No newline at end of file diff --git a/public/language/fi/admin/extend/plugins.json b/public/language/fi/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/fi/admin/extend/plugins.json +++ b/public/language/fi/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/fi/admin/general/navigation.json b/public/language/fi/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/fi/admin/general/navigation.json +++ b/public/language/fi/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/fi/admin/menu.json b/public/language/fi/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/fi/admin/menu.json +++ b/public/language/fi/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/fi/admin/settings/general.json b/public/language/fi/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/fi/admin/settings/general.json +++ b/public/language/fi/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/fi/admin/settings/post.json b/public/language/fi/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/fi/admin/settings/post.json +++ b/public/language/fi/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/fi/notifications.json b/public/language/fi/notifications.json index 469d5d9a84..c2ffeb4f82 100644 --- a/public/language/fi/notifications.json +++ b/public/language/fi/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 sent a registration request.", "new_register_multiple": "There are %1 registration requests awaiting review.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Sähköpostiosoite vahvistettu", "email-confirmed-message": "Kiitos sähköpostiosoitteesi vahvistamisesta. Käyttäjätilisi on nyt täysin aktivoitu.", "email-confirm-error-message": "Ongelma sähköpostiosoitteen vahvistamisessa. Ehkäpä koodi oli virheellinen tai vanhentunut.", diff --git a/public/language/fi/pages.json b/public/language/fi/pages.json index 8155008e3d..37cbf96c00 100644 --- a/public/language/fi/pages.json +++ b/public/language/fi/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "IP Blacklist", + "post-queue": "Post Queue", "users/online": "Paikalla olevat käyttäjät", "users/latest": "Viimeisimmat käyttäjät", "users/sort-posts": "Users with the most posts", diff --git a/public/language/fi/success.json b/public/language/fi/success.json index 95c81898c8..0c0d613bde 100644 --- a/public/language/fi/success.json +++ b/public/language/fi/success.json @@ -1,6 +1,7 @@ { "success": "Onnistui", "topic-post": "Viestin lähettäminen onnistui.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Tunnistautuminen onnistui", "settings-saved": "Asetukset tallennettu!" } \ No newline at end of file diff --git a/public/language/fr/admin/extend/plugins.json b/public/language/fr/admin/extend/plugins.json index 3c6c5f15ea..cf2b1f5bf0 100644 --- a/public/language/fr/admin/extend/plugins.json +++ b/public/language/fr/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB n'a pas pu joindre le gestionnaire de paquets, procéder à l'installation de la dernière version ?

Le serveur a répondu (%1) : %2
", "alert.package-manager-unreachable": "

NodeBB n'a pas pu joindre le gestionnaire de paquets, une mise à jour n'est pas suggérée pour le moment.

", "alert.incompatible": "

Votre version de NodeBB (v%1) ne peut mettre à jour que vers la version v%2 de ce plugin. Veuillez mettre à jour NodeBB si vous souhaitez installer une version plus récente de ce plugin.

", - "alert.possibly-incompatible": "

Aucune information de compatibilité trouvée

Ce plugin n'a pas spécifié de version pour une installation sur votre version de NodeBB. Aucune compatibilité ne peut être garantie et ce plugin pourrait empêcher NodeBB de démarrer correctement.

Dans l'éventualité où NodeBB ne pourrait pas démarrer proprement :

$ ./nodebb reset plugin=\"%1\"

Voulez-vous continuer l'installation de ce plugin ?

" + "alert.possibly-incompatible": "

Aucune information de compatibilité trouvée

Ce plugin n'a pas spécifié de version pour une installation sur votre version de NodeBB. Aucune compatibilité ne peut être garantie et ce plugin pourrait empêcher NodeBB de démarrer correctement.

Dans l'éventualité où NodeBB ne pourrait pas démarrer proprement :

$ ./nodebb reset plugin=\"%1\"

Voulez-vous continuer l'installation de ce plugin ?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/fr/admin/general/navigation.json b/public/language/fr/admin/general/navigation.json index c6edbf2c3c..66adca7fe0 100644 --- a/public/language/fr/admin/general/navigation.json +++ b/public/language/fr/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "N'afficher qu'aux Admins", "only-global-mods-and-admins": "N'affichez qu'aux Admins et Modérateurs Globaux", "only-logged-in": "N'afficher qu'aux utilisateurs connectés", + "only-guest": "Only display to guests", "open-new-window": "Ouvrir dans une nouvelle fenêtre", "installed-plugins-required": "Plugins installés requis :", diff --git a/public/language/fr/admin/menu.json b/public/language/fr/admin/menu.json index 4552354510..a10e4af2de 100644 --- a/public/language/fr/admin/menu.json +++ b/public/language/fr/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Mots-clés", "manage/users": "Utilisateurs", "manage/registration": "File d'inscription", + "manage/post-queue": "Post Queue", "manage/groups": "Groupes", "manage/ip-blacklist": "Liste noire d'IPs", diff --git a/public/language/fr/admin/settings/general.json b/public/language/fr/admin/settings/general.json index 35b67e48be..ee9c180412 100644 --- a/public/language/fr/admin/settings/general.json +++ b/public/language/fr/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Réglages du site", "title": "Titre du site", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Nom de votre communauté", "title.show-in-header": "Afficher le titre du site dans l'en-tête", "browser-title": "Titre dans le navigateur", diff --git a/public/language/fr/admin/settings/post.json b/public/language/fr/admin/settings/post.json index 5b8581552f..560883ff6d 100644 --- a/public/language/fr/admin/settings/post.json +++ b/public/language/fr/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Avec le plus de votes", "sorting.topic-default": "Tri des sujets par défaut", "restrictions": "Restrictions d'envoi", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Nombre de secondes entre chaque message", "restrictions.seconds-between-new": "Nombre de secondes entre chaque message pour les nouveaux utilisateurs", "restrictions.rep-threshold": "Seuil de réputation avant que cette restriction soit levée", diff --git a/public/language/fr/notifications.json b/public/language/fr/notifications.json index 2deb6b63db..f24c13b434 100644 --- a/public/language/fr/notifications.json +++ b/public/language/fr/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 a envoyé une demande d'incription.", "new_register_multiple": "%1 inscription(s) est en attente de validation.", "flag_assigned_to_you": "Drapeau %1 vous a été assigné", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Email vérifié", "email-confirmed-message": "Merci pour la validation de votre adresse email. Votre compte est désormais activé.", "email-confirm-error-message": "Il y a un un problème dans la vérification de votre adresse email. Le code est peut être invalide ou a expiré.", diff --git a/public/language/fr/pages.json b/public/language/fr/pages.json index 3dd00ee381..47b5dac051 100644 --- a/public/language/fr/pages.json +++ b/public/language/fr/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Outils de modération", "flagged-content": "Contenu signalé", "ip-blacklist": "Liste noire d'adresses IP", + "post-queue": "Post Queue", "users/online": "Utilisateurs en ligne", "users/latest": "Derniers inscrits", "users/sort-posts": "Utilisateurs avec le plus de messages", diff --git a/public/language/fr/success.json b/public/language/fr/success.json index 6cb99ee723..6064afcc64 100644 --- a/public/language/fr/success.json +++ b/public/language/fr/success.json @@ -1,6 +1,7 @@ { "success": "Terminé", "topic-post": "Le message a bien été envoyé.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Authentification réussie", "settings-saved": "Paramètres enregistrés !" } \ No newline at end of file diff --git a/public/language/gl/admin/extend/plugins.json b/public/language/gl/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/gl/admin/extend/plugins.json +++ b/public/language/gl/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/gl/admin/general/navigation.json b/public/language/gl/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/gl/admin/general/navigation.json +++ b/public/language/gl/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/gl/admin/menu.json b/public/language/gl/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/gl/admin/menu.json +++ b/public/language/gl/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/gl/admin/settings/general.json b/public/language/gl/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/gl/admin/settings/general.json +++ b/public/language/gl/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/gl/admin/settings/post.json b/public/language/gl/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/gl/admin/settings/post.json +++ b/public/language/gl/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/gl/notifications.json b/public/language/gl/notifications.json index fc391aa2b9..0c4b8aab72 100644 --- a/public/language/gl/notifications.json +++ b/public/language/gl/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 enviou unha petición de rexistro.", "new_register_multiple": "Hai %1 peticións de rexistros pendentes de revisión", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Correo confirmado", "email-confirmed-message": "Grazas por validar o teu correo. A túa conta agora está activada.", "email-confirm-error-message": "Houbo un problema validando o teu correo. Poida que o código fose inválido ou expirase. ", diff --git a/public/language/gl/pages.json b/public/language/gl/pages.json index 40f29c9b94..b453e6798e 100644 --- a/public/language/gl/pages.json +++ b/public/language/gl/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "Lista negra de IPs", + "post-queue": "Post Queue", "users/online": "Usuarios conectados", "users/latest": "Últimos usuarios", "users/sort-posts": "Usuarios con máis temas", diff --git a/public/language/gl/success.json b/public/language/gl/success.json index b25a0fffe7..c98888b604 100644 --- a/public/language/gl/success.json +++ b/public/language/gl/success.json @@ -1,6 +1,7 @@ { "success": "Éxito", "topic-post": "Publicaches con éxito.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Autenticación exitosa", "settings-saved": "Configuración gardada!" } \ No newline at end of file diff --git a/public/language/he/admin/extend/plugins.json b/public/language/he/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/he/admin/extend/plugins.json +++ b/public/language/he/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/he/admin/general/navigation.json b/public/language/he/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/he/admin/general/navigation.json +++ b/public/language/he/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/he/admin/menu.json b/public/language/he/admin/menu.json index b60491a94b..51c439d66b 100644 --- a/public/language/he/admin/menu.json +++ b/public/language/he/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "תגיות", "manage/users": "משתמשים", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/he/admin/settings/general.json b/public/language/he/admin/settings/general.json index 80f76bd519..4dd212aefb 100644 --- a/public/language/he/admin/settings/general.json +++ b/public/language/he/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/he/admin/settings/post.json b/public/language/he/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/he/admin/settings/post.json +++ b/public/language/he/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/he/notifications.json b/public/language/he/notifications.json index 2f3ff9acea..e58a931827 100644 --- a/public/language/he/notifications.json +++ b/public/language/he/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 שלח בקשת הרשמה.", "new_register_multiple": "ישנן %1 בקשות הרשמה שמחכות לבדיקה.", "flag_assigned_to_you": "דיווח %1 הוקצה עבורך", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "כתובת המייל אושרה", "email-confirmed-message": "תודה שאישרת את כתובת המייל שלך. החשבון שלך פעיל כעת.", "email-confirm-error-message": "אירעה שגיאה בעת אישור המייל שלך. ייתכן כי הקוד היה שגוי או פג תוקף.", diff --git a/public/language/he/pages.json b/public/language/he/pages.json index 5ca56df98c..46a3aa6a5b 100644 --- a/public/language/he/pages.json +++ b/public/language/he/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "תוכן מדווח", "ip-blacklist": "רשימת IP שחורה", + "post-queue": "Post Queue", "users/online": "משתמשים מחוברים", "users/latest": "משתמשים אחרונים", "users/sort-posts": "משתמשים עם המונה הגבוה ביותר", diff --git a/public/language/he/success.json b/public/language/he/success.json index 40072ace43..2b24b55fac 100644 --- a/public/language/he/success.json +++ b/public/language/he/success.json @@ -1,6 +1,7 @@ { "success": "הצלחה", "topic-post": "העלת פוסט בהצלחה.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "הנתונים אומתו בהצלחה", "settings-saved": "הנתונים נשמרו!" } \ No newline at end of file diff --git a/public/language/hr/admin/extend/plugins.json b/public/language/hr/admin/extend/plugins.json index 3a489d9189..de82f07eea 100644 --- a/public/language/hr/admin/extend/plugins.json +++ b/public/language/hr/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB nemože uspostaviti komunikaciju sa upraviteljem paketa, nadogradnja se ne preporučuje u ovom trenutku.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/hr/admin/general/navigation.json b/public/language/hr/admin/general/navigation.json index c49c255bb6..c4bfd88a68 100644 --- a/public/language/hr/admin/general/navigation.json +++ b/public/language/hr/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Prikaži samo administratorima", "only-global-mods-and-admins": "Prikazuj samo globalnim moderatorima i administratorima", "only-logged-in": "Prikaži samo prijavljenim korisnicima", + "only-guest": "Only display to guests", "open-new-window": "Otvori u novom prozoru", "installed-plugins-required": "Potrebni su instalirani dodatci:", diff --git a/public/language/hr/admin/menu.json b/public/language/hr/admin/menu.json index 088c6a06ef..e87fcc7ec8 100644 --- a/public/language/hr/admin/menu.json +++ b/public/language/hr/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Oznake", "manage/users": "Korisnici", "manage/registration": "Lista zahtjeva za registraciju", + "manage/post-queue": "Post Queue", "manage/groups": "Grupe", "manage/ip-blacklist": "IP blokade", diff --git a/public/language/hr/admin/settings/general.json b/public/language/hr/admin/settings/general.json index 37c16a92b5..dfcb6332fe 100644 --- a/public/language/hr/admin/settings/general.json +++ b/public/language/hr/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Postavke stranice", "title": "Naslov stranice", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Ime Vaše zajednice", "title.show-in-header": "Prikaži naslov stranice u zaglavlju", "browser-title": "Naslov pretraživača", diff --git a/public/language/hr/admin/settings/post.json b/public/language/hr/admin/settings/post.json index e97f8d77e8..24906ac67e 100644 --- a/public/language/hr/admin/settings/post.json +++ b/public/language/hr/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Najviše glasova", "sorting.topic-default": "Uobičajeno sortiranje tema", "restrictions": "Restrikcije objave", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Sekunde između objava", "restrictions.seconds-between-new": "Sekunde prije objave za nove korisnike", "restrictions.rep-threshold": "Prag reputacije prije nego je ova restrikcija maknuta.", diff --git a/public/language/hr/notifications.json b/public/language/hr/notifications.json index ba6c3cd24e..a66e3f8b58 100644 --- a/public/language/hr/notifications.json +++ b/public/language/hr/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 je poslao zahtjev za registraciju.", "new_register_multiple": "%1 registracija čeka odobrenje.", "flag_assigned_to_you": "Zastava%1 je dodijeljena vama.", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Email potvrđen", "email-confirmed-message": "Hvala na potvrdi emaila. Vaš račun je sada aktivan.", "email-confirm-error-message": "Nastao je problem pri potvrdi Vaše email adrese. Provjerite kod ili zatražite novi.", diff --git a/public/language/hr/pages.json b/public/language/hr/pages.json index 8ea01a73b1..7c9ec35170 100644 --- a/public/language/hr/pages.json +++ b/public/language/hr/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Označene objave", "ip-blacklist": "IP crna lista", + "post-queue": "Post Queue", "users/online": "Online korisnici", "users/latest": "Posljednji korisnici", "users/sort-posts": "Korisnici s najviše objava", diff --git a/public/language/hr/success.json b/public/language/hr/success.json index 55b303fba9..5427792de5 100644 --- a/public/language/hr/success.json +++ b/public/language/hr/success.json @@ -1,6 +1,7 @@ { "success": "Uspijeh", "topic-post": "Uspješna objava", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Autentifikacija uspješna", "settings-saved": "Postavke spremljene!" } \ No newline at end of file diff --git a/public/language/hu/admin/extend/plugins.json b/public/language/hu/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/hu/admin/extend/plugins.json +++ b/public/language/hu/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/hu/admin/general/navigation.json b/public/language/hu/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/hu/admin/general/navigation.json +++ b/public/language/hu/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/hu/admin/menu.json b/public/language/hu/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/hu/admin/menu.json +++ b/public/language/hu/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/hu/admin/settings/general.json b/public/language/hu/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/hu/admin/settings/general.json +++ b/public/language/hu/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/hu/admin/settings/post.json b/public/language/hu/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/hu/admin/settings/post.json +++ b/public/language/hu/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/hu/notifications.json b/public/language/hu/notifications.json index 11747ecac7..e1d3677df0 100644 --- a/public/language/hu/notifications.json +++ b/public/language/hu/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 sent a registration request.", "new_register_multiple": "There are %1 registration requests awaiting review.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "E-mail megerősítve", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", diff --git a/public/language/hu/pages.json b/public/language/hu/pages.json index 1d04f56e18..172383eac8 100644 --- a/public/language/hu/pages.json +++ b/public/language/hu/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "IP Blacklist", + "post-queue": "Post Queue", "users/online": "Aktiv Felhasználok", "users/latest": "Latest Users", "users/sort-posts": "Users with the most posts", diff --git a/public/language/hu/success.json b/public/language/hu/success.json index f1b3f19230..b0501c826a 100644 --- a/public/language/hu/success.json +++ b/public/language/hu/success.json @@ -1,6 +1,7 @@ { "success": "Sikeres", "topic-post": "Sikeres hozzászólás.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Sikeres hitelesítés", "settings-saved": "Beállítások mentve!" } \ No newline at end of file diff --git a/public/language/id/admin/extend/plugins.json b/public/language/id/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/id/admin/extend/plugins.json +++ b/public/language/id/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/id/admin/general/navigation.json b/public/language/id/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/id/admin/general/navigation.json +++ b/public/language/id/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/id/admin/menu.json b/public/language/id/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/id/admin/menu.json +++ b/public/language/id/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/id/admin/settings/general.json b/public/language/id/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/id/admin/settings/general.json +++ b/public/language/id/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/id/admin/settings/post.json b/public/language/id/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/id/admin/settings/post.json +++ b/public/language/id/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/id/notifications.json b/public/language/id/notifications.json index 7ea7d681f2..741909fd39 100644 --- a/public/language/id/notifications.json +++ b/public/language/id/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 mengirim permintaan registrasi.", "new_register_multiple": "There are %1 registration requests awaiting review.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Email telah Dikonfirmasi", "email-confirmed-message": "Terimakasih telah melakukan validasi email. Akunmu saat ini telah aktif sepenuhnya.", "email-confirm-error-message": "Terjadi masalah saat melakukan validasi emailmu. Mungkin terjadi kesalahan kode atau waktu habis.", diff --git a/public/language/id/pages.json b/public/language/id/pages.json index 2ca45423a8..8aa3c230b0 100644 --- a/public/language/id/pages.json +++ b/public/language/id/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "IP Blacklist", + "post-queue": "Post Queue", "users/online": "Online Users", "users/latest": "Latest Users", "users/sort-posts": "Users with the most posts", diff --git a/public/language/id/success.json b/public/language/id/success.json index a978b89347..e73e61b7ff 100644 --- a/public/language/id/success.json +++ b/public/language/id/success.json @@ -1,6 +1,7 @@ { "success": "Sukses", "topic-post": "Kamu berhasil melakukan posting.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Otentikasi Sukses", "settings-saved": "Pengaturan disimpan!" } \ No newline at end of file diff --git a/public/language/it/admin/extend/plugins.json b/public/language/it/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/it/admin/extend/plugins.json +++ b/public/language/it/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/it/admin/general/navigation.json b/public/language/it/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/it/admin/general/navigation.json +++ b/public/language/it/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/it/admin/menu.json b/public/language/it/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/it/admin/menu.json +++ b/public/language/it/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/it/admin/settings/general.json b/public/language/it/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/it/admin/settings/general.json +++ b/public/language/it/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/it/admin/settings/post.json b/public/language/it/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/it/admin/settings/post.json +++ b/public/language/it/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/it/notifications.json b/public/language/it/notifications.json index 11c9941543..dcf4cb684b 100644 --- a/public/language/it/notifications.json +++ b/public/language/it/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 ha inviato una richiesta di registrazione.", "new_register_multiple": "Ci sono %1 richieste di registrazione che attendono di essere esaminate.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Email Confermata", "email-confirmed-message": "Grazie per aver validato la tua email. Il tuo account è ora completamente attivato.", "email-confirm-error-message": "C'è stato un problema nella validazione del tuo indirizzo email. Potrebbe essere il codice non valido o scaduto.", diff --git a/public/language/it/pages.json b/public/language/it/pages.json index b990e75f60..6f7fd11c08 100644 --- a/public/language/it/pages.json +++ b/public/language/it/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "Lista nera degli IP", + "post-queue": "Post Queue", "users/online": "Utenti Online", "users/latest": "Ultimi Utenti", "users/sort-posts": "Utenti maggiori contributori", diff --git a/public/language/it/success.json b/public/language/it/success.json index a3fd2a0115..cf8dd4cad5 100644 --- a/public/language/it/success.json +++ b/public/language/it/success.json @@ -1,6 +1,7 @@ { "success": "Riuscito", "topic-post": "Hai postato correttamente.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Autenticazione Riuscita", "settings-saved": "Impostazioni salvate!" } \ No newline at end of file diff --git a/public/language/ja/admin/advanced/database.json b/public/language/ja/admin/advanced/database.json index 26f19fa233..5b9b0977f0 100644 --- a/public/language/ja/admin/advanced/database.json +++ b/public/language/ja/admin/advanced/database.json @@ -1,7 +1,7 @@ { "x-b": "%1 b", "x-mb": "%1 mb", - "x-gb": "%1 gb", + "x-gb": "%1 GB", "uptime-seconds": "秒単位の稼働時間", "uptime-days": "日単位の稼働時間", diff --git a/public/language/ja/admin/appearance/customise.json b/public/language/ja/admin/appearance/customise.json index c2e1f7cbbc..590a0ca57d 100644 --- a/public/language/ja/admin/appearance/customise.json +++ b/public/language/ja/admin/appearance/customise.json @@ -7,6 +7,6 @@ "custom-header.description": "カスタムしたHTMLを入力してください(例. JavaScript, メタタグなど)。これはフォーラムのマークアップの<head>に追加されます。", "custom-header.enable": "カスタムヘッダーを有効にする", - "custom-css.livereload": "Enable Live Reload", - "custom-css.livereload.description": "Enable this to force all sessions on every device under your account to refresh whenever you click save" + "custom-css.livereload": "ライブリロードを有効にする", + "custom-css.livereload.description": "これを有効にすると、保存ボタンをクリックするたびにアカウントのすべてのデバイスのすべてのセッションが強制的に更新されます。" } \ No newline at end of file diff --git a/public/language/ja/admin/development/info.json b/public/language/ja/admin/development/info.json index c6a7837667..ff97e22501 100644 --- a/public/language/ja/admin/development/info.json +++ b/public/language/ja/admin/development/info.json @@ -1,12 +1,12 @@ { "you-are-on": "お知らせ - あなたは%1:%2", - "nodes-responded": "%1 nodes responded within %2ms!", + "nodes-responded": "％1ノードは％2ms以内に応答しました！", "host": "ホスト", "pid": "pid", "nodejs": "nodejs", "online": "オンライン", "git": "git", - "memory": "memory", + "memory": "メモリ", "load": "ロード", "uptime": "稼働時間", diff --git a/public/language/ja/admin/extend/plugins.json b/public/language/ja/admin/extend/plugins.json index 572c3b61f3..95302c87c1 100644 --- a/public/language/ja/admin/extend/plugins.json +++ b/public/language/ja/admin/extend/plugins.json @@ -12,7 +12,7 @@ "reorder-plugins": "プラグインの並び替え", "order-active": "アクティブなプラグインの並び替え", "dev-interested": "NodeBBのプラグインの作成に興味がありますか？", - "docs-info": "Full documentation regarding plugin authoring can be found in the NodeBB Docs Portal.", + "docs-info": "プラグインオーサリングに関する完璧な文書はNodeBB Docs Portalにあります。", "order.description": "特定のプラグインは他のプラグインの前後で初期化された際に理想的な動作をします。", "order.explanation": "プラグインはここに上から下へ指定された順序でロードされます", @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBBはパッケージマネージャに到達できませんでした。最新バージョンのインストールを続行しましたか？

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBBはパッケージマネージャに到達できませんでした。今アップグレードすることはおすすめしません。

", "alert.incompatible": "

NodeBBのバージョン(v%1)を v%2 にアップデートする必要があります。このプラグインの新しいバージョンをインストールするにはNodeBBをアップデートしてください。

", - "alert.possibly-incompatible": "

No Compatibility Information Found

このプラグインはインストールに必要なNodeBBのバージョンの指定がされていませんでした。完全な互換性は保証されず、NodeBBが正常に起動しなくなる可能性があります。

NodeBBが正常に起動できない場合:

$ ./nodebb reset plugin=\"%1\"

このプラグインの最新バージョンのインストールを続行しますか？

" + "alert.possibly-incompatible": "

No Compatibility Information Found

このプラグインはインストールに必要なNodeBBのバージョンの指定がされていませんでした。完全な互換性は保証されず、NodeBBが正常に起動しなくなる可能性があります。

NodeBBが正常に起動できない場合:

$ ./nodebb reset plugin=\"%1\"

このプラグインの最新バージョンのインストールを続行しますか？

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/ja/admin/general/dashboard.json b/public/language/ja/admin/general/dashboard.json index 3ea3d5f3da..a4057bd2e1 100644 --- a/public/language/ja/admin/general/dashboard.json +++ b/public/language/ja/admin/general/dashboard.json @@ -5,14 +5,14 @@ "users": "ユーザー", "posts": "投稿", "topics": "スレッド", - "page-views-seven": "Last 7 Days", - "page-views-thirty": "Last 30 Days", - "page-views-last-day": "Last 24 hours", - "page-views-custom": "Custom Date Range", - "page-views-custom-start": "Range Start", - "page-views-custom-end": "Range End", - "page-views-custom-help": "Enter a date range of page views you would like to view. If no date picker is available, the accepted format is YYYY-MM-DD", - "page-views-custom-error": "Please enter a valid date range in the format YYYY-MM-DD", + "page-views-seven": "過去7日間", + "page-views-thirty": "過去30日間", + "page-views-last-day": "過去24時間", + "page-views-custom": "カスタム期間", + "page-views-custom-start": "期間開始", + "page-views-custom-end": "期間終了", + "page-views-custom-help": "表示したいページビューの日付範囲を入力します。日付選択ツールが使用できない場合、受け入れ可能な形式は次のとおりです。YYYY-MM-DD", + "page-views-custom-error": "有効な期間をフォーマットで入力してくださいYYYY-MM-DD", "stats.day": "日", "stats.week": "週", @@ -23,8 +23,8 @@ "running-version": "NodeBB v%1 を実行しています。", "keep-updated": "常に最新のセキュリティパッチとバグ修正のためにNodeBBが最新であることを確認してください。", "up-to-date": "

あなたは最新の状態です。

", - "upgrade-available": "

A new version (v%1) has been released. Consider upgrading your NodeBB.

", - "prerelease-upgrade-available": "

This is an outdated pre-release version of NodeBB. A new version (v%1) has been released. Consider upgrading your NodeBB.

", + "upgrade-available": "

新しいバージョン(v%1) のNodeBBが検出されました。アップグレードを検討してください。

", + "prerelease-upgrade-available": "

これはNodeBBの旧リリースのバージョンです。新しいバージョン(v%1)がリリースされています。アップグレードをご検討ください。

", "prerelease-warning": "

これはNodeBBのプレリリース版です。意図しないバグが発生することがあります。

", "running-in-development": "フォーラムが開発モードで動作しています。フォーラムの動作が脆弱かもしれませんので、管理者に問い合わせてください。", diff --git a/public/language/ja/admin/general/languages.json b/public/language/ja/admin/general/languages.json index 095dcd8a0f..1d2f019640 100644 --- a/public/language/ja/admin/general/languages.json +++ b/public/language/ja/admin/general/languages.json @@ -2,5 +2,5 @@ "language-settings": "言語設定", "description": "デフォルトの言語は、フォーラムにアクセスしているすべてのユーザーの言語表示を決定します。
個々のユーザーは、アカウント設定ページでデフォルトの言語を上書きできます。", "default-language": "デフォルトの言語", - "auto-detect": "Auto Detect Language Setting for Guests" + "auto-detect": "ゲストの自動検出言語設定" } \ No newline at end of file diff --git a/public/language/ja/admin/general/navigation.json b/public/language/ja/admin/general/navigation.json index 60aeb2a5c5..386ff8311f 100644 --- a/public/language/ja/admin/general/navigation.json +++ b/public/language/ja/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "管理者にのみ表示する", "only-global-mods-and-admins": "グローバルモデレーターおよび管理者のみに表示", "only-logged-in": "ログインしたユーザーのみに表示", + "only-guest": "Only display to guests", "open-new-window": "新しいウィンドウで開く", "installed-plugins-required": "インストール済みのプラグインが必要です:", diff --git a/public/language/ja/admin/menu.json b/public/language/ja/admin/menu.json index 7408a1aa5d..12b0907c0b 100644 --- a/public/language/ja/admin/menu.json +++ b/public/language/ja/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "タグ", "manage/users": "ユーザー", "manage/registration": "登録キュー", + "manage/post-queue": "Post Queue", "manage/groups": "グループ", "manage/ip-blacklist": "IPブラックリスト", diff --git a/public/language/ja/admin/settings/advanced.json b/public/language/ja/admin/settings/advanced.json index f7ffbdbaf2..5bb5d07758 100644 --- a/public/language/ja/admin/settings/advanced.json +++ b/public/language/ja/admin/settings/advanced.json @@ -6,7 +6,7 @@ "headers.allow-from": "NodeBBをインラインフレーム内に配置するようALLOW-FROMを設定する", "headers.powered-by": "NodeBBから送信された「Powered By」ヘッダーをカスタマイズする", "headers.acao": "アクセス-制御-有効-原点", - "headers.acao-help": "To deny access to all sites, leave empty", + "headers.acao-help": "すべてのサイトへのアクセスを拒否する場合、空のままにしておいてください。", "headers.acam": "アクセス-制御-有効-メソッド", "headers.acah": "アクセス-制御-有効-ヘッダー", "traffic-management": "トラフィック管理", diff --git a/public/language/ja/admin/settings/general.json b/public/language/ja/admin/settings/general.json index dfce753a98..943b8620fc 100644 --- a/public/language/ja/admin/settings/general.json +++ b/public/language/ja/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "サイト設定", "title": "サイトタイトル", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "あなたのコミュニティ名", "title.show-in-header": "ヘッダーにサイトタイトルを表示する", "browser-title": "ブラウザ", diff --git a/public/language/ja/admin/settings/post.json b/public/language/ja/admin/settings/post.json index 2eea0ed739..e99206a882 100644 --- a/public/language/ja/admin/settings/post.json +++ b/public/language/ja/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "最も多い評価", "sorting.topic-default": "デフォルトのスレッドの並び順", "restrictions": "転記の制限", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "投稿間の秒数", "restrictions.seconds-between-new": "新規ユーザーの投稿間の秒数", "restrictions.rep-threshold": "この制限が解除される前の評判しきい値", diff --git a/public/language/ja/admin/settings/uploads.json b/public/language/ja/admin/settings/uploads.json index 4f30d78a06..785016821e 100644 --- a/public/language/ja/admin/settings/uploads.json +++ b/public/language/ja/admin/settings/uploads.json @@ -5,7 +5,7 @@ "max-image-width": "画像を指定した幅(ピクセル単位)にリサイズ", "max-image-width-help": "(ピクセル単位、デフォルト:760px、無効にするには0に設定)", "max-file-size": "最大ファイルサイズ(KB)", - "max-file-size-help": "(in kibibytes, default: 2048 KiB)", + "max-file-size-help": "(キロバイト,デフォルト:2048 KB)", "allow-topic-thumbnails": "ユーザーがスレッドのサムネイルをアップロードできるようにする", "topic-thumb-size": "スレッドのサムネイルの大きさ", "allowed-file-extensions": "ファイル拡張子が有効になりました。", @@ -18,9 +18,9 @@ "profile-image-dimension": "プロファイル画像の寸法", "profile-image-dimension-help": "(ピクセルで、デフォルト：128px)", "max-profile-image-size": "プロフィール画像の最大ファイルサイズ", - "max-profile-image-size-help": "(in kibibytes, default: 256 KiB)", + "max-profile-image-size-help": "(キロバイト単位,デフォルト：256 KB)", "max-cover-image-size": "カバー画像の最大サイズ", - "max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)", + "max-cover-image-size-help": "(キロバイト,デフォルト:2,048 KB)", "keep-all-user-images": "古いバージョンのアバターとプロファイルカバーをサーバーに保管", "profile-covers": "プロフィールのカバー", "default-covers": "デフォルトのカバー画像", diff --git a/public/language/ja/email.json b/public/language/ja/email.json index 8dcf90bb5c..f42c51eb3b 100644 --- a/public/language/ja/email.json +++ b/public/language/ja/email.json @@ -32,9 +32,9 @@ "notif.post.unsub.info": "この投稿の通知はあなたの申し込み設定により送られました。", "test.text1": "このメールはNodeBBのメーラー（emailer）が正しく設定されているか確認をするためのメールです。", "unsub.cta": "ここをクリックして設定を変更する", - "banned.subject": "You have been banned from %1", - "banned.text1": "The user %1 has been banned from %2.", - "banned.text2": "This ban will last until %1.", - "banned.text3": "This is the reason why you have been banned:", + "banned.subject": "%1さんからBANされました。", + "banned.text1": "%1さんは%2さんにBANされています。", + "banned.text2": "このBANは%1まで続きます。", + "banned.text3": "あなたがBANされた理由:", "closing": "ありがとうございます！" } \ No newline at end of file diff --git a/public/language/ja/notifications.json b/public/language/ja/notifications.json index bd93397a09..a0f2027535 100644 --- a/public/language/ja/notifications.json +++ b/public/language/ja/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1が登録リクエストを送りました。", "new_register_multiple": "%1の登録リクエストがレビュー待ちです。", "flag_assigned_to_you": "フラグ %1はあなたに割当てられました", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Eメールが確認されました", "email-confirmed-message": "メールアドレス検証をして頂き、ありがとうございます。あなたのアカウントは完全にアクティブになりました。", "email-confirm-error-message": "あなたのEメールアドレス検証に問題があります。コードが無効か、期限切れです。", diff --git a/public/language/ja/pages.json b/public/language/ja/pages.json index 99beb3cf1a..d4d8c9e52e 100644 --- a/public/language/ja/pages.json +++ b/public/language/ja/pages.json @@ -6,9 +6,10 @@ "popular-month": "今月人気のスレッド", "popular-alltime": "人気のスレッド", "recent": "最新スレッド", - "moderator-tools": "Moderator Tools", + "moderator-tools": "モデレーターツール", "flagged-content": "フラグ付きコンテンツ", "ip-blacklist": "IPブラックリスト", + "post-queue": "Post Queue", "users/online": "オンラインのユーザー", "users/latest": "最近のユーザー", "users/sort-posts": "ほとんどの投稿を持つユーザー", diff --git a/public/language/ja/success.json b/public/language/ja/success.json index c47e3f9003..a651610569 100644 --- a/public/language/ja/success.json +++ b/public/language/ja/success.json @@ -1,6 +1,7 @@ { "success": "成功しました", "topic-post": "投稿に成功しました", + "post-queued": "Your post is queued for approval.", "authentication-successful": "認証に成功しました", "settings-saved": "設定を保存しました。" } \ No newline at end of file diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json index 0e255db706..98e0208920 100644 --- a/public/language/ja/topic.json +++ b/public/language/ja/topic.json @@ -14,7 +14,7 @@ "quote": "引用", "reply": "返信", "replies_to_this_post": "%1 件の返信", - "one_reply_to_this_post": "1 Reply", + "one_reply_to_this_post": "1 件の返信", "last_reply_time": "最後の返信", "reply-as-topic": "スレッドとして返信する", "guest-login-reply": "投稿するのにログインして下さい", @@ -59,7 +59,7 @@ "thread_tools.unlock": "スレッドをアンロック", "thread_tools.move": "スレッドを移動", "thread_tools.move_all": "すべてを移動", - "thread_tools.select_category": "Select Category", + "thread_tools.select_category": "カテゴリを選択", "thread_tools.fork": "スレッドをフォーク", "thread_tools.delete": "スレッドを削除", "thread_tools.delete-posts": "投稿を削除します", diff --git a/public/language/ja/user.json b/public/language/ja/user.json index 4889823207..adf6dd8cc3 100644 --- a/public/language/ja/user.json +++ b/public/language/ja/user.json @@ -60,7 +60,7 @@ "username_taken_workaround": "このユーザー名はすでに使用されています。いまのユーザー名は %1 です。", "password_same_as_username": "パスワードがユーザー名と同じですから、他のパスワードを使って下さい。", "password_same_as_email": "パスワードがメールアドレスと同じです。他のパスワードを使って下さい。", - "weak_password": "Weak password.", + "weak_password": "弱いパスワード", "upload_picture": "画像をアップロード", "upload_a_picture": "画像をアップロード", "remove_uploaded_picture": "アップした写真を取り消します", diff --git a/public/language/ko/admin/extend/plugins.json b/public/language/ko/admin/extend/plugins.json index 786801503d..e0d0a38c2c 100644 --- a/public/language/ko/admin/extend/plugins.json +++ b/public/language/ko/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB가 페키지 매니저 접근에 실패하였습니다. 최신 버젼을 설치하시겠습니까?

서버의 응답 (%1):%2
", "alert.package-manager-unreachable": "

NodeBB가 페키지 매니저 접근에 실패했습니다. 지금 업그레이드 하는 것을 추천하지 않습니다.

", "alert.incompatible": "

지금 사용하시는 NodeBB 버젼(v%1)에서는 이 플러그인을 v%2 버젼까지만 업그레이드 할 수 있습니다. 이 플러그인의 최신 버젼을 설치하고 싶으시다면 먼저 NodeBB를 업그레이드 해주십시오.

", - "alert.possibly-incompatible": "

호환성 관련 정보를 찾지 못했습니다.

이 플러그인은 현재 사용 중이신 NodeBB 버젼에 적합한 버젼을 명시하지 않았습니다. 따라서 완전한 호환성을 보장할 수 없고, 결과적으로 지금 사용중이신 NodeBB에 오류를 일으킬 수도 있습니다.

만약 NodeBB가 제대로 시작되지 않는다면:

$ ./nodebb reset plugin=\"%1\"

이 플러그인의 최신 버젼을 설치를 계속 하시겠습니까?

" + "alert.possibly-incompatible": "

호환성 관련 정보를 찾지 못했습니다.

이 플러그인은 현재 사용 중이신 NodeBB 버젼에 적합한 버젼을 명시하지 않았습니다. 따라서 완전한 호환성을 보장할 수 없고, 결과적으로 지금 사용중이신 NodeBB에 오류를 일으킬 수도 있습니다.

만약 NodeBB가 제대로 시작되지 않는다면:

$ ./nodebb reset plugin=\"%1\"

이 플러그인의 최신 버젼을 설치를 계속 하시겠습니까?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/ko/admin/general/navigation.json b/public/language/ko/admin/general/navigation.json index 6bef01eae2..f3c2940a65 100644 --- a/public/language/ko/admin/general/navigation.json +++ b/public/language/ko/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "관리자에게만 보이기", "only-global-mods-and-admins": "(준)관리자와 관리자에게만 보이기", "only-logged-in": "로그인한 사용자에게만 보이기", + "only-guest": "Only display to guests", "open-new-window": "새 창에서 열기", "installed-plugins-required": "설치된 플러그인 필수:", diff --git a/public/language/ko/admin/menu.json b/public/language/ko/admin/menu.json index 1c47a6c8df..1f7051b424 100644 --- a/public/language/ko/admin/menu.json +++ b/public/language/ko/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "태그", "manage/users": "용자", "manage/registration": "회원 가입 승인 대기자", + "manage/post-queue": "Post Queue", "manage/groups": "그룹", "manage/ip-blacklist": "IP 블랙리스트", diff --git a/public/language/ko/admin/settings/general.json b/public/language/ko/admin/settings/general.json index 3d6b8b6364..4c4c5cdcb0 100644 --- a/public/language/ko/admin/settings/general.json +++ b/public/language/ko/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "사이트 관리", "title": "사이트 제목", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "커뮤니티 이름", "title.show-in-header": "헤더에 사이트 제목 표시", "browser-title": "브라우저 타이틀", diff --git a/public/language/ko/admin/settings/post.json b/public/language/ko/admin/settings/post.json index ce9c3bfe72..6c711c797e 100644 --- a/public/language/ko/admin/settings/post.json +++ b/public/language/ko/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "추천수 순으로 정렬", "sorting.topic-default": "게시물 정렬기준 기본값", "restrictions": "글 작성 제약사항", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "글 작성 간 시간(초)", "restrictions.seconds-between-new": "신규 사용자인 경우, 글 작성 간 시간(초)", "restrictions.rep-threshold": "위 제약을 해제하기 위한 최소 등급", diff --git a/public/language/ko/notifications.json b/public/language/ko/notifications.json index cb3b29e88d..76d9cb9830 100644 --- a/public/language/ko/notifications.json +++ b/public/language/ko/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1님이 가입요청을 했습니다.", "new_register_multiple": "%1 개의 회원가입 요청이 승인 대기중입니다.", "flag_assigned_to_you": "신고 ID %1 이 나에게 배정되었습니다.", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "이메일 인증 되었습니다", "email-confirmed-message": "이메일을 인증해주셔서 감사합니다. 계정이 완전히 활성화되었습니다.", "email-confirm-error-message": "이메일 주소를 인증하지 못했습니다. 코드가 올바르지 않거나 만료 되었을 수 있습니다.", diff --git a/public/language/ko/pages.json b/public/language/ko/pages.json index 8010aefe3f..66e0744fbc 100644 --- a/public/language/ko/pages.json +++ b/public/language/ko/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "신고된 컨텐츠", "ip-blacklist": "IP 블랙리스트", + "post-queue": "Post Queue", "users/online": "접속중인 사용자", "users/latest": "최근 사용자", "users/sort-posts": "가장 많은 게시물을 작성한 사용자", diff --git a/public/language/ko/success.json b/public/language/ko/success.json index 051a6c2299..c671b6a09a 100644 --- a/public/language/ko/success.json +++ b/public/language/ko/success.json @@ -1,6 +1,7 @@ { "success": "성공", "topic-post": "성공적으로 게시물을 작성했습니다.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "인증에 성공했습니다.", "settings-saved": "설정이 저장되었습니다!" } \ No newline at end of file diff --git a/public/language/lt/admin/extend/plugins.json b/public/language/lt/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/lt/admin/extend/plugins.json +++ b/public/language/lt/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/lt/admin/general/navigation.json b/public/language/lt/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/lt/admin/general/navigation.json +++ b/public/language/lt/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/lt/admin/menu.json b/public/language/lt/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/lt/admin/menu.json +++ b/public/language/lt/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/lt/admin/settings/general.json b/public/language/lt/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/lt/admin/settings/general.json +++ b/public/language/lt/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/lt/admin/settings/post.json b/public/language/lt/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/lt/admin/settings/post.json +++ b/public/language/lt/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/lt/notifications.json b/public/language/lt/notifications.json index e8e21e2365..6e8757cb8e 100644 --- a/public/language/lt/notifications.json +++ b/public/language/lt/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 atsiuntė registracijos prašymą", "new_register_multiple": "There are %1 registration requests awaiting review.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "El. paštas patvirtintas", "email-confirmed-message": "Dėkojame už el. pašto patvirtinimą. Jūsų paskyra pilnai aktyvuota.", "email-confirm-error-message": "Įvyko klaida mėginant patvirtinti Jūsų el. pašto adresą. Galbūt kodas yra neteisingas, arba nebegalioajantis.", diff --git a/public/language/lt/pages.json b/public/language/lt/pages.json index 71d3c23dac..fbbb765fe5 100644 --- a/public/language/lt/pages.json +++ b/public/language/lt/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "IP Blacklist", + "post-queue": "Post Queue", "users/online": "Online Users", "users/latest": "Latest Users", "users/sort-posts": "Users with the most posts", diff --git a/public/language/lt/success.json b/public/language/lt/success.json index 3dbf2a77ea..91c9e63dba 100644 --- a/public/language/lt/success.json +++ b/public/language/lt/success.json @@ -1,6 +1,7 @@ { "success": "Pavyko", "topic-post": "Sėkmingai parašėte pranešimą", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Autentifikacija sėkminga", "settings-saved": "Nustatymai išsaugoti!" } \ No newline at end of file diff --git a/public/language/ms/admin/extend/plugins.json b/public/language/ms/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/ms/admin/extend/plugins.json +++ b/public/language/ms/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/ms/admin/general/navigation.json b/public/language/ms/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/ms/admin/general/navigation.json +++ b/public/language/ms/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/ms/admin/menu.json b/public/language/ms/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/ms/admin/menu.json +++ b/public/language/ms/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/ms/admin/settings/general.json b/public/language/ms/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/ms/admin/settings/general.json +++ b/public/language/ms/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/ms/admin/settings/post.json b/public/language/ms/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/ms/admin/settings/post.json +++ b/public/language/ms/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/ms/notifications.json b/public/language/ms/notifications.json index b8a9de990b..db4c47191b 100644 --- a/public/language/ms/notifications.json +++ b/public/language/ms/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 menghantar jemputan pendaftaran.", "new_register_multiple": "Ada %1 permohonan ingin daftar yang sedang menunggu pengesahan.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Emel Disahkan", "email-confirmed-message": "Terima kasih kerana mengesahkan emel anda. Akaun anda telah diaktifkan sepenuhnya.", "email-confirm-error-message": "Berlaku masalah semasa mengesahkan emel anda. Mungkin kod tidak sah atau tamat tempoh.", diff --git a/public/language/ms/pages.json b/public/language/ms/pages.json index 32ef8d361f..e647af11bc 100644 --- a/public/language/ms/pages.json +++ b/public/language/ms/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "IP Blacklist", + "post-queue": "Post Queue", "users/online": "Pengguna Atas Talian", "users/latest": "Pengguna Terkini", "users/sort-posts": "Pengguna Mengikut Kiriman Terbanyak", diff --git a/public/language/ms/success.json b/public/language/ms/success.json index ca52454bf7..bde8980ba9 100644 --- a/public/language/ms/success.json +++ b/public/language/ms/success.json @@ -1,6 +1,7 @@ { "success": "Berjaya", "topic-post": "Kiriman anda berjaya dihantar.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Pengesahan Berjaya", "settings-saved": "Tetapan disimpan!" } \ No newline at end of file diff --git a/public/language/nb/admin/extend/plugins.json b/public/language/nb/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/nb/admin/extend/plugins.json +++ b/public/language/nb/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/nb/admin/general/navigation.json b/public/language/nb/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/nb/admin/general/navigation.json +++ b/public/language/nb/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/nb/admin/menu.json b/public/language/nb/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/nb/admin/menu.json +++ b/public/language/nb/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/nb/admin/settings/general.json b/public/language/nb/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/nb/admin/settings/general.json +++ b/public/language/nb/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/nb/admin/settings/post.json b/public/language/nb/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/nb/admin/settings/post.json +++ b/public/language/nb/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/nb/notifications.json b/public/language/nb/notifications.json index b3e4c5d081..d248bef66e 100644 --- a/public/language/nb/notifications.json +++ b/public/language/nb/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 sendte en forespørsel om registrering", "new_register_multiple": "There are %1 registration requests awaiting review.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "E-post bekreftet", "email-confirmed-message": "Takk for at du har validert din e-post. Kontoen din er nå fullstendig aktivert.", "email-confirm-error-message": "Det oppsto et problem under valdiering av din e-post. Koden kan ha vært ugyldig eller ha utløpt.", diff --git a/public/language/nb/pages.json b/public/language/nb/pages.json index dc6084cd12..44b9d0e5ea 100644 --- a/public/language/nb/pages.json +++ b/public/language/nb/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "IP Blacklist", + "post-queue": "Post Queue", "users/online": "Påloggede Brukere", "users/latest": "Nyeste Brukere", "users/sort-posts": "Brukere med flest innlegg", diff --git a/public/language/nb/success.json b/public/language/nb/success.json index 7e9b6dd822..5345ec339d 100644 --- a/public/language/nb/success.json +++ b/public/language/nb/success.json @@ -1,6 +1,7 @@ { "success": "Suksess", "topic-post": "Du har nå publisert.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Innlogging vellykket!", "settings-saved": "Innstillinger lagret!" } \ No newline at end of file diff --git a/public/language/nl/admin/extend/plugins.json b/public/language/nl/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/nl/admin/extend/plugins.json +++ b/public/language/nl/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/nl/admin/general/navigation.json b/public/language/nl/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/nl/admin/general/navigation.json +++ b/public/language/nl/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/nl/admin/menu.json b/public/language/nl/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/nl/admin/menu.json +++ b/public/language/nl/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/nl/admin/settings/general.json b/public/language/nl/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/nl/admin/settings/general.json +++ b/public/language/nl/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/nl/admin/settings/post.json b/public/language/nl/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/nl/admin/settings/post.json +++ b/public/language/nl/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/nl/notifications.json b/public/language/nl/notifications.json index 29b4234fb7..ff6a6c6492 100644 --- a/public/language/nl/notifications.json +++ b/public/language/nl/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 heeft een registratie verzoek aangevraagd.", "new_register_multiple": "Er is/zijn %1 registratieverzoek(en) die wacht(en) op goedkeuring.", "flag_assigned_to_you": "Flag %1 is aan u toegewezen", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "E-mailadres bevestigd", "email-confirmed-message": "Bedankt voor het bevestigen van je e-mailadres. Je account is nu volledig geactiveerd.", "email-confirm-error-message": "Er was een probleem met het bevestigen van dit e-mailadres. Misschien is de code niet goed ingevoerd of was de beschikbare tijd inmiddels verstreken.", diff --git a/public/language/nl/pages.json b/public/language/nl/pages.json index f3aef4cc67..02c81f5add 100644 --- a/public/language/nl/pages.json +++ b/public/language/nl/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Gemarkeerde content", "ip-blacklist": "IP zwarte lijst", + "post-queue": "Post Queue", "users/online": "Online Gebruikers", "users/latest": "Meest recente gebruikers", "users/sort-posts": "Gebruikers met de meeste berichten", diff --git a/public/language/nl/success.json b/public/language/nl/success.json index 638e1bdcf4..1621699574 100644 --- a/public/language/nl/success.json +++ b/public/language/nl/success.json @@ -1,6 +1,7 @@ { "success": "Geslaagd", "topic-post": "Je bericht is met succes geplaatst.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Aanmelden geslaagd", "settings-saved": "Instellingen opgeslagen!" } \ No newline at end of file diff --git a/public/language/pl/admin/extend/plugins.json b/public/language/pl/admin/extend/plugins.json index 046a9f1ab7..a0a181fd40 100644 --- a/public/language/pl/admin/extend/plugins.json +++ b/public/language/pl/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB nie może dostać się do menedżera pakietów, kontynuować instalacji ostatniej wersji?

Serwer zwrócił (%1): %2
", "alert.package-manager-unreachable": "

NodeBB nie może dostać się do menedżera pakietów, aktualizacja nie jest sugerowana w tym momencie.

", "alert.incompatible": "

Twoja wersja NodeBB (v%1) jest usuwana w celu uaktualnienia do v%2 tego pluginu. Proszę zaktualizuj twoje NodeBB jeżeli chcesz zainstalować nowszą wersję tego pluginu.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/pl/admin/general/navigation.json b/public/language/pl/admin/general/navigation.json index 42302c6834..9068f97491 100644 --- a/public/language/pl/admin/general/navigation.json +++ b/public/language/pl/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Pokaż tylko dla administracji", "only-global-mods-and-admins": "Pokaż tylko dla globalnych moderatorów oraz administracji", "only-logged-in": "Pokaż tylko dla zalogowanych użytkowników", + "only-guest": "Only display to guests", "open-new-window": "Otwórz w nowym oknie", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/pl/admin/menu.json b/public/language/pl/admin/menu.json index 6b86f47e50..31fbeb6bfb 100644 --- a/public/language/pl/admin/menu.json +++ b/public/language/pl/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tagi", "manage/users": "Użytkownicy", "manage/registration": "Kolejka Rejestracji", + "manage/post-queue": "Post Queue", "manage/groups": "Grupy", "manage/ip-blacklist": "Czarna Lista IP", diff --git a/public/language/pl/admin/settings/general.json b/public/language/pl/admin/settings/general.json index 6a9568f8ce..11abf6ff68 100644 --- a/public/language/pl/admin/settings/general.json +++ b/public/language/pl/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Ustawienia Strony", "title": "Tytuł Strony", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/pl/admin/settings/post.json b/public/language/pl/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/pl/admin/settings/post.json +++ b/public/language/pl/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/pl/notifications.json b/public/language/pl/notifications.json index 9d1d4d7882..d973255ee8 100644 --- a/public/language/pl/notifications.json +++ b/public/language/pl/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 wysłał żądanie rejestracji.", "new_register_multiple": "Są %1 nowe żądania rejestracji.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "E-mail potwierdzony", "email-confirmed-message": "Dziękujemy za potwierdzenie maila. Twoje konto zostało aktywowane.", "email-confirm-error-message": "Wystąpił problem przy aktywacji - kod jest błędny lub przestarzały", diff --git a/public/language/pl/pages.json b/public/language/pl/pages.json index 6c9397d75c..694cbfde04 100644 --- a/public/language/pl/pages.json +++ b/public/language/pl/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Treść oflagowanego posta", "ip-blacklist": "Czarna lista adresów IP", + "post-queue": "Post Queue", "users/online": "Dostępni Użytkownicy", "users/latest": "Nowi Użytkownicy", "users/sort-posts": "Użytkownicy z największą liczbą postów", diff --git a/public/language/pl/success.json b/public/language/pl/success.json index afef91d9a0..b52a3bb88a 100644 --- a/public/language/pl/success.json +++ b/public/language/pl/success.json @@ -1,6 +1,7 @@ { "success": "Sukces!", "topic-post": "Twój post został wysłany.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Zostałeś pomyślnie zalogowany.", "settings-saved": "Ustawienia zostały zapisane." } \ No newline at end of file diff --git a/public/language/pt-BR/admin/extend/plugins.json b/public/language/pt-BR/admin/extend/plugins.json index 1dfcf4a36b..9f1ac9cfb4 100644 --- a/public/language/pt-BR/admin/extend/plugins.json +++ b/public/language/pt-BR/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

O NodeBB não pôde encontrar o administrador de pacotes, proceder com a instalação da última versão?

O servidor retornou (%1): %2
", "alert.package-manager-unreachable": "

O NodeBB não pôde encontrar o administrador de pacotes, um upgrade não é sugerível agora.

", "alert.incompatible": "Na

sua versão do NodeBB (v%1) o plugin pode ser atualizado até a sua v%2. Por favor atualize o seu NodeBB se você quiser instalar uma versão mais recente deste plugin.

", - "alert.possibly-incompatible": "

Nenhuma Informação de Compatibilidade Encontrada

Este plugin não especificou uma versão específica para instalação dada a sua versão do NodeBB. A compatibilidade completa não pode ser garantid, e pode causar o seu NodeBB de não mais iniciar adequadamente.

Se ocorrer que o NodeBB não se inicie adequadamente:

$ ./nodebb reset plugin=\"%1\"

Continuar a instalação da última versão deste plugin?

" + "alert.possibly-incompatible": "

Nenhuma Informação de Compatibilidade Encontrada

Este plugin não especificou uma versão específica para instalação dada a sua versão do NodeBB. A compatibilidade completa não pode ser garantid, e pode causar o seu NodeBB de não mais iniciar adequadamente.

Se ocorrer que o NodeBB não se inicie adequadamente:

$ ./nodebb reset plugin=\"%1\"

Continuar a instalação da última versão deste plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/pt-BR/admin/general/navigation.json b/public/language/pt-BR/admin/general/navigation.json index a6d2932812..72432c5c2b 100644 --- a/public/language/pt-BR/admin/general/navigation.json +++ b/public/language/pt-BR/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Mostrar apenas para Administradores", "only-global-mods-and-admins": "Exibir apenas para Moderadores Globais e Administradores", "only-logged-in": "Mostrar apenas para usuários logados", + "only-guest": "Only display to guests", "open-new-window": "Abrir em uma nova janela", "installed-plugins-required": "Plugins Instalados Necessários:", diff --git a/public/language/pt-BR/admin/menu.json b/public/language/pt-BR/admin/menu.json index e47f627ac5..b45710eef0 100644 --- a/public/language/pt-BR/admin/menu.json +++ b/public/language/pt-BR/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Usuários", "manage/registration": "Fila de Registro", + "manage/post-queue": "Post Queue", "manage/groups": "Grupos", "manage/ip-blacklist": "Lista Negra de IPs", diff --git a/public/language/pt-BR/admin/settings/general.json b/public/language/pt-BR/admin/settings/general.json index 7d5ec37639..51f94f0ea2 100644 --- a/public/language/pt-BR/admin/settings/general.json +++ b/public/language/pt-BR/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Configurações do Site", "title": "Título do Site", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Nome da Sua Comunidade", "title.show-in-header": "Mostrar o Título do Site no Cabeçalho", "browser-title": "Título do Navegador", diff --git a/public/language/pt-BR/admin/settings/post.json b/public/language/pt-BR/admin/settings/post.json index 35739bee69..4c03c6b7a0 100644 --- a/public/language/pt-BR/admin/settings/post.json +++ b/public/language/pt-BR/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Mais Votos", "sorting.topic-default": "Ordenação Padrão de Tópicos", "restrictions": "Restições de Postagem", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Segundos entre Posts", "restrictions.seconds-between-new": "Segundos entre Posts para Novos Usuários", "restrictions.rep-threshold": "O tanto de reputação necessário para esta restrição ser retirada", diff --git a/public/language/pt-BR/notifications.json b/public/language/pt-BR/notifications.json index f7a14a5aa1..038ab63ac5 100644 --- a/public/language/pt-BR/notifications.json +++ b/public/language/pt-BR/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 lhe enviou um pedido de cadastro.", "new_register_multiple": "Há %1 pedidos de registro aguardando revisão.", "flag_assigned_to_you": "A Sinalização %1 foi desiganada para você", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Email Confirmado", "email-confirmed-message": "Obrigado por validar o seu email. Agora sua conta está plenamente ativada.", "email-confirm-error-message": "Houve um problema ao validar o seu endereço de email. Talvez o código era invalido ou tenha expirado.", diff --git a/public/language/pt-BR/pages.json b/public/language/pt-BR/pages.json index 2913e5a4f6..83ccc13436 100644 --- a/public/language/pt-BR/pages.json +++ b/public/language/pt-BR/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Ferramentas de Moderação", "flagged-content": "Conteúdo Sinalizado", "ip-blacklist": "Lista negra de IPs", + "post-queue": "Post Queue", "users/online": "Usuários Online", "users/latest": "Últimos Usuários", "users/sort-posts": "Usuários com mais posts", diff --git a/public/language/pt-BR/success.json b/public/language/pt-BR/success.json index 03e8648149..48bba91d32 100644 --- a/public/language/pt-BR/success.json +++ b/public/language/pt-BR/success.json @@ -1,6 +1,7 @@ { "success": "Sucesso", "topic-post": "Você postou com sucesso.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Autenticação Bem-sucedida", "settings-saved": "Configurações salvas!" } \ No newline at end of file diff --git a/public/language/pt-PT/admin/extend/plugins.json b/public/language/pt-PT/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/pt-PT/admin/extend/plugins.json +++ b/public/language/pt-PT/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/pt-PT/admin/general/navigation.json b/public/language/pt-PT/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/pt-PT/admin/general/navigation.json +++ b/public/language/pt-PT/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/pt-PT/admin/menu.json b/public/language/pt-PT/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/pt-PT/admin/menu.json +++ b/public/language/pt-PT/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/pt-PT/admin/settings/general.json b/public/language/pt-PT/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/pt-PT/admin/settings/general.json +++ b/public/language/pt-PT/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/pt-PT/admin/settings/post.json b/public/language/pt-PT/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/pt-PT/admin/settings/post.json +++ b/public/language/pt-PT/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/pt-PT/notifications.json b/public/language/pt-PT/notifications.json index cc059ae2b4..a10b22ccbb 100644 --- a/public/language/pt-PT/notifications.json +++ b/public/language/pt-PT/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 enviou um pedido de registro.", "new_register_multiple": "Existem %1 pedidos de registro aguardando pela tua revisão.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "E-mail confirmado", "email-confirmed-message": "Obrigado por validares o teu endereço de e-mai.. A tua conta está agora totalmente ativa.", "email-confirm-error-message": "Ocorreu um problema a validar o teu endereço de e-mail. Talvez o código fosse inválido ou tenha expirado.", diff --git a/public/language/pt-PT/pages.json b/public/language/pt-PT/pages.json index 543266881e..1c838dfdf1 100644 --- a/public/language/pt-PT/pages.json +++ b/public/language/pt-PT/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "Lista negra de IPs", + "post-queue": "Post Queue", "users/online": "Utilizadores online", "users/latest": "Últimos utilizadores", "users/sort-posts": "Utilizadores com mais publicações", diff --git a/public/language/pt-PT/success.json b/public/language/pt-PT/success.json index ed023f1911..7a49967af8 100644 --- a/public/language/pt-PT/success.json +++ b/public/language/pt-PT/success.json @@ -1,6 +1,7 @@ { "success": "Sucesso", "topic-post": "Publicaste com sucesso.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Autenticação bem sucedida", "settings-saved": "Configurações guardadas!" } \ No newline at end of file diff --git a/public/language/ro/admin/extend/plugins.json b/public/language/ro/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/ro/admin/extend/plugins.json +++ b/public/language/ro/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/ro/admin/general/navigation.json b/public/language/ro/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/ro/admin/general/navigation.json +++ b/public/language/ro/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/ro/admin/menu.json b/public/language/ro/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/ro/admin/menu.json +++ b/public/language/ro/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/ro/admin/settings/general.json b/public/language/ro/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/ro/admin/settings/general.json +++ b/public/language/ro/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/ro/admin/settings/post.json b/public/language/ro/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/ro/admin/settings/post.json +++ b/public/language/ro/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/ro/notifications.json b/public/language/ro/notifications.json index 18f6b7668a..00ed32f237 100644 --- a/public/language/ro/notifications.json +++ b/public/language/ro/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 sent a registration request.", "new_register_multiple": "There are %1 registration requests awaiting review.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Email confirmat", "email-confirmed-message": "Îți mulțumim pentru validarea emailului. Contul tău este acuma activat.", "email-confirm-error-message": "A fost o problemă cu activarea adresei tale de email. Poate codul de activare a fost invalid sau expirat.", diff --git a/public/language/ro/pages.json b/public/language/ro/pages.json index b675c153c8..b21b222a3e 100644 --- a/public/language/ro/pages.json +++ b/public/language/ro/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "IP Blacklist", + "post-queue": "Post Queue", "users/online": "Utilizatori online", "users/latest": "Ultimii membrii", "users/sort-posts": "Membrii cu cele mai multe postări", diff --git a/public/language/ro/success.json b/public/language/ro/success.json index 434d7c67e6..2eb63cf761 100644 --- a/public/language/ro/success.json +++ b/public/language/ro/success.json @@ -1,6 +1,7 @@ { "success": "Succes", "topic-post": "Ai postat cu succes.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Autentificare Reușită", "settings-saved": "Setări salvate!" } \ No newline at end of file diff --git a/public/language/ru/admin/extend/plugins.json b/public/language/ru/admin/extend/plugins.json index 8539ab5c6e..89b319c346 100644 --- a/public/language/ru/admin/extend/plugins.json +++ b/public/language/ru/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/ru/admin/general/navigation.json b/public/language/ru/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/ru/admin/general/navigation.json +++ b/public/language/ru/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/ru/admin/menu.json b/public/language/ru/admin/menu.json index 07b7030f22..c80fcb6820 100644 --- a/public/language/ru/admin/menu.json +++ b/public/language/ru/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Теги", "manage/users": "Пользователи", "manage/registration": "Очередь на регистрацию", + "manage/post-queue": "Post Queue", "manage/groups": "Группы", "manage/ip-blacklist": "Блокировка IP", diff --git a/public/language/ru/admin/settings/general.json b/public/language/ru/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/ru/admin/settings/general.json +++ b/public/language/ru/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/ru/admin/settings/post.json b/public/language/ru/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/ru/admin/settings/post.json +++ b/public/language/ru/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json index 81f06dd3b1..828bab978f 100644 --- a/public/language/ru/notifications.json +++ b/public/language/ru/notifications.json @@ -41,6 +41,7 @@ "new_register": "Посетитель %1 отправил запрос на регистрацию.", "new_register_multiple": "В очереди %1 заявок на регистрацию.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Электронная почта подтверждена", "email-confirmed-message": "Спасибо за подтверждение адреса электронной почты. Ваша учётная запись активирована. Добро пожаловать на наш сайт!", "email-confirm-error-message": "Ошибка проверки адреса электронной почты. Возможно, введён неправильно код подтверждения, либо у него истёк срок действия.", diff --git a/public/language/ru/pages.json b/public/language/ru/pages.json index f35c6c9c12..c29cb0e084 100644 --- a/public/language/ru/pages.json +++ b/public/language/ru/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "Чёрный список IP", + "post-queue": "Post Queue", "users/online": "В сети", "users/latest": "Новые участники", "users/sort-posts": "Участники по количеству сообщений", diff --git a/public/language/ru/success.json b/public/language/ru/success.json index 885b96eb44..086fcfd701 100644 --- a/public/language/ru/success.json +++ b/public/language/ru/success.json @@ -1,6 +1,7 @@ { "success": "Успешно", "topic-post": "Запись была успешно создана", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Авторизация выполнена успешно", "settings-saved": "Настройки сохранены" } \ No newline at end of file diff --git a/public/language/rw/admin/extend/plugins.json b/public/language/rw/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/rw/admin/extend/plugins.json +++ b/public/language/rw/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/rw/admin/general/navigation.json b/public/language/rw/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/rw/admin/general/navigation.json +++ b/public/language/rw/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/rw/admin/menu.json b/public/language/rw/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/rw/admin/menu.json +++ b/public/language/rw/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/rw/admin/settings/general.json b/public/language/rw/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/rw/admin/settings/general.json +++ b/public/language/rw/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/rw/admin/settings/post.json b/public/language/rw/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/rw/admin/settings/post.json +++ b/public/language/rw/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/rw/notifications.json b/public/language/rw/notifications.json index 14cc142c3a..2d919d07cf 100644 --- a/public/language/rw/notifications.json +++ b/public/language/rw/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 yasabye kwandikwa.", "new_register_multiple": "There are %1 registration requests awaiting review.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Email Yemejwe", "email-confirmed-message": "Urakoze kugaragaza ko email yawe ikora. Ubu ngubu konte yawe irakora nta kabuza. ", "email-confirm-error-message": "Havutse ikibazo mu gushaka kumenya niba email yawe ikora. Ushobora kuba wakoresheje kode itari yo cyangwa se yarengeje igihe. ", diff --git a/public/language/rw/pages.json b/public/language/rw/pages.json index b6b2110759..c7a225c80b 100644 --- a/public/language/rw/pages.json +++ b/public/language/rw/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "IP Blacklist", + "post-queue": "Post Queue", "users/online": "Abariho", "users/latest": "Abashya", "users/sort-posts": "Abantu bashyizeho byinshi", diff --git a/public/language/rw/success.json b/public/language/rw/success.json index 80f0d8d3ad..cfe4b261aa 100644 --- a/public/language/rw/success.json +++ b/public/language/rw/success.json @@ -1,6 +1,7 @@ { "success": "Byaciyemo", "topic-post": "Wabishyizeho nta ngorane. ", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Igenzura Ryaciyemo", "settings-saved": "Ibyatunganyijwe byakiriwe!" } \ No newline at end of file diff --git a/public/language/sc/admin/extend/plugins.json b/public/language/sc/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/sc/admin/extend/plugins.json +++ b/public/language/sc/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/sc/admin/general/navigation.json b/public/language/sc/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/sc/admin/general/navigation.json +++ b/public/language/sc/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/sc/admin/menu.json b/public/language/sc/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/sc/admin/menu.json +++ b/public/language/sc/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/sc/admin/settings/general.json b/public/language/sc/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/sc/admin/settings/general.json +++ b/public/language/sc/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/sc/admin/settings/post.json b/public/language/sc/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/sc/admin/settings/post.json +++ b/public/language/sc/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/sc/notifications.json b/public/language/sc/notifications.json index 8890094b28..91ea21d51c 100644 --- a/public/language/sc/notifications.json +++ b/public/language/sc/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 sent a registration request.", "new_register_multiple": "There are %1 registration requests awaiting review.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error-message": "There was a problem validating your email address. Perhaps the code was invalid or has expired.", diff --git a/public/language/sc/pages.json b/public/language/sc/pages.json index f674e9cd07..19ce20a0a4 100644 --- a/public/language/sc/pages.json +++ b/public/language/sc/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "IP Blacklist", + "post-queue": "Post Queue", "users/online": "Online Users", "users/latest": "Latest Users", "users/sort-posts": "Users with the most posts", diff --git a/public/language/sc/success.json b/public/language/sc/success.json index fde8a77044..231f17a160 100644 --- a/public/language/sc/success.json +++ b/public/language/sc/success.json @@ -1,6 +1,7 @@ { "success": "Success", "topic-post": "You have successfully posted.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Authentication Successful", "settings-saved": "Settings saved!" } \ No newline at end of file diff --git a/public/language/sk/admin/extend/plugins.json b/public/language/sk/admin/extend/plugins.json index 5d156ee78e..1a555a495d 100644 --- a/public/language/sk/admin/extend/plugins.json +++ b/public/language/sk/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/sk/admin/general/navigation.json b/public/language/sk/admin/general/navigation.json index 215cf9ba10..77a6f45927 100644 --- a/public/language/sk/admin/general/navigation.json +++ b/public/language/sk/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/sk/admin/menu.json b/public/language/sk/admin/menu.json index 77dc7fdcd4..4306da86f7 100644 --- a/public/language/sk/admin/menu.json +++ b/public/language/sk/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/sk/admin/settings/general.json b/public/language/sk/admin/settings/general.json index 731c73315c..7a42dc2f71 100644 --- a/public/language/sk/admin/settings/general.json +++ b/public/language/sk/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Nastavenia lokality", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Vaše komunitné meno", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/sk/admin/settings/post.json b/public/language/sk/admin/settings/post.json index 573d48fe05..72aac7dba0 100644 --- a/public/language/sk/admin/settings/post.json +++ b/public/language/sk/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Najviac hlasov", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/sk/notifications.json b/public/language/sk/notifications.json index f9c6f649ff..9836ea6dce 100644 --- a/public/language/sk/notifications.json +++ b/public/language/sk/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 odoslal žiadosť o registráciu.", "new_register_multiple": "Nachádzajú sa %1 registrácie čakajúce na preskúmanie.", "flag_assigned_to_you": "Príznak %1 vám bol priradený ", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "E-mail bol potvrdený", "email-confirmed-message": "Ďakujeme za potvrdenie Vášho e-mailu. Účet je plne aktivovaný.", "email-confirm-error-message": "Vyskytla sa chyba pri overení Vašej e-mailovej adresy. ", diff --git a/public/language/sk/pages.json b/public/language/sk/pages.json index abb487d995..6951e6dcdd 100644 --- a/public/language/sk/pages.json +++ b/public/language/sk/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Označený obsah", "ip-blacklist": "IP Blacklist", + "post-queue": "Post Queue", "users/online": "Online užívatelia", "users/latest": "Najnovší užívatelia", "users/sort-posts": "Užívatelia s najväčším počtom príspevkov", diff --git a/public/language/sk/success.json b/public/language/sk/success.json index 2cdd94e000..d68cb4fcaa 100644 --- a/public/language/sk/success.json +++ b/public/language/sk/success.json @@ -1,6 +1,7 @@ { "success": "Úspech", "topic-post": "Úspešne ste pridali nový príspevok.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Overovanie úspešné", "settings-saved": "Nastavenia uložené!" } \ No newline at end of file diff --git a/public/language/sl/admin/extend/plugins.json b/public/language/sl/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/sl/admin/extend/plugins.json +++ b/public/language/sl/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/sl/admin/general/navigation.json b/public/language/sl/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/sl/admin/general/navigation.json +++ b/public/language/sl/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/sl/admin/menu.json b/public/language/sl/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/sl/admin/menu.json +++ b/public/language/sl/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/sl/admin/settings/general.json b/public/language/sl/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/sl/admin/settings/general.json +++ b/public/language/sl/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/sl/admin/settings/post.json b/public/language/sl/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/sl/admin/settings/post.json +++ b/public/language/sl/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/sl/notifications.json b/public/language/sl/notifications.json index 4efc93187d..0a69652eaf 100644 --- a/public/language/sl/notifications.json +++ b/public/language/sl/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 je poslal/-a zahtevo za registracijo.", "new_register_multiple": "Število registracijskih zahtev, ki čakajo na pregled: %1", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "E-poštni naslov potrjen", "email-confirmed-message": "Hvala, da ste potrdili svoj e-naslov. Račun je sedaj aktiviran.", "email-confirm-error-message": "Prišlo je do napake pri preverjanju vašega e-poštnega naslova. Morda je bila koda napačna ali pa je potekla.", diff --git a/public/language/sl/pages.json b/public/language/sl/pages.json index bbf1b740c0..b077f9d54d 100644 --- a/public/language/sl/pages.json +++ b/public/language/sl/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "IP Blacklist", + "post-queue": "Post Queue", "users/online": "Dosegljivi uporabniki", "users/latest": "Zadnji uporabniki", "users/sort-posts": "Uporabniki z največ objavami", diff --git a/public/language/sl/success.json b/public/language/sl/success.json index dc67476de2..288f56f38c 100644 --- a/public/language/sl/success.json +++ b/public/language/sl/success.json @@ -1,6 +1,7 @@ { "success": "Uspešno", "topic-post": "Uspešno ste objavili.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Avtentikacija uspešna", "settings-saved": "Nastavitve shranjene!" } \ No newline at end of file diff --git a/public/language/sr/admin/extend/plugins.json b/public/language/sr/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/sr/admin/extend/plugins.json +++ b/public/language/sr/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/sr/admin/general/navigation.json b/public/language/sr/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/sr/admin/general/navigation.json +++ b/public/language/sr/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/sr/admin/menu.json b/public/language/sr/admin/menu.json index f56feb43d7..7851c1f0a4 100644 --- a/public/language/sr/admin/menu.json +++ b/public/language/sr/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tagovi", "manage/users": "Korisnici", "manage/registration": "Lista Registracija", + "manage/post-queue": "Post Queue", "manage/groups": "Grupe", "manage/ip-blacklist": "Crna Lista IP adresa", diff --git a/public/language/sr/admin/settings/general.json b/public/language/sr/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/sr/admin/settings/general.json +++ b/public/language/sr/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/sr/admin/settings/post.json b/public/language/sr/admin/settings/post.json index a7e7dd7a98..8a7a3630c3 100644 --- a/public/language/sr/admin/settings/post.json +++ b/public/language/sr/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Najviše glasova", "sorting.topic-default": "Uobičajeno sortiranje tema", "restrictions": "Restrikcije postavljanja", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Sekundi između postova", "restrictions.seconds-between-new": "Sekundi između postova za Novog korisnika", "restrictions.rep-threshold": "Prag reputacije pre nego što su restrikcije skinute", diff --git a/public/language/sr/notifications.json b/public/language/sr/notifications.json index 0049d5fa17..5d7cc50a0b 100644 --- a/public/language/sr/notifications.json +++ b/public/language/sr/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 вам је послао захтев за регистрацију.", "new_register_multiple": "Постоје %1 захтева за регистрацију који чекају преглед.", "flag_assigned_to_you": "Заставица %1 је додељена вама", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Е-пошта је потврђена.", "email-confirmed-message": "Хвала на овери ваше е-поште. Ваш налог је сада у потпуности активан.", "email-confirm-error-message": "Дошло је до проблема са овером ваше е-поште. Можда је код неисправан или је истекао.", diff --git a/public/language/sr/pages.json b/public/language/sr/pages.json index 9f1c594dc2..8a075fd622 100644 --- a/public/language/sr/pages.json +++ b/public/language/sr/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Алати модератора", "flagged-content": "Садржај означен заставицом", "ip-blacklist": "Црна листа IP адреса", + "post-queue": "Post Queue", "users/online": "Корисници на мрежи", "users/latest": "Најновији корисници", "users/sort-posts": "Корисници са највише порука", diff --git a/public/language/sr/success.json b/public/language/sr/success.json index 6a033f0492..1d4596c6da 100644 --- a/public/language/sr/success.json +++ b/public/language/sr/success.json @@ -1,6 +1,7 @@ { "success": "Успешно", "topic-post": "Успешно сте послали поруку.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Успешна аутентификација", "settings-saved": "Подешавања су сачувана!" } \ No newline at end of file diff --git a/public/language/sv/admin/extend/plugins.json b/public/language/sv/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/sv/admin/extend/plugins.json +++ b/public/language/sv/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/sv/admin/general/navigation.json b/public/language/sv/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/sv/admin/general/navigation.json +++ b/public/language/sv/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/sv/admin/menu.json b/public/language/sv/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/sv/admin/menu.json +++ b/public/language/sv/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/sv/admin/settings/general.json b/public/language/sv/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/sv/admin/settings/general.json +++ b/public/language/sv/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/sv/admin/settings/post.json b/public/language/sv/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/sv/admin/settings/post.json +++ b/public/language/sv/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/sv/notifications.json b/public/language/sv/notifications.json index c6ab11fbe5..ea14561dc9 100644 --- a/public/language/sv/notifications.json +++ b/public/language/sv/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 skickade en registreringsförfrågan.", "new_register_multiple": "Det finns %1 förfrågningar om registrering som inväntar granskning.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "E-post bekräftad", "email-confirmed-message": "Tack för att du bekräftat din e-postadress. Ditt konto är nu fullt ut aktiverat.", "email-confirm-error-message": "Det uppstod ett problem med bekräftelsen av din e-postadress. Kanske var koden felaktig eller ogiltig.", diff --git a/public/language/sv/pages.json b/public/language/sv/pages.json index 317c1ad401..38eed36013 100644 --- a/public/language/sv/pages.json +++ b/public/language/sv/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "IP Svartlista", + "post-queue": "Post Queue", "users/online": "Användare online", "users/latest": "Senaste Användare", "users/sort-posts": "Användare med flest inlägg", diff --git a/public/language/sv/success.json b/public/language/sv/success.json index 64930548dc..b180901bd3 100644 --- a/public/language/sv/success.json +++ b/public/language/sv/success.json @@ -1,6 +1,7 @@ { "success": "Lyckat", "topic-post": "Du har nu gjort ett inlägg.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Autentisering lyckades", "settings-saved": "Inställningarna sparades." } \ No newline at end of file diff --git a/public/language/th/admin/extend/plugins.json b/public/language/th/admin/extend/plugins.json index e6281c0535..4b40bbe720 100644 --- a/public/language/th/admin/extend/plugins.json +++ b/public/language/th/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/th/admin/general/navigation.json b/public/language/th/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/th/admin/general/navigation.json +++ b/public/language/th/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/th/admin/menu.json b/public/language/th/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/th/admin/menu.json +++ b/public/language/th/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/th/admin/settings/general.json b/public/language/th/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/th/admin/settings/general.json +++ b/public/language/th/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/th/admin/settings/post.json b/public/language/th/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/th/admin/settings/post.json +++ b/public/language/th/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/th/notifications.json b/public/language/th/notifications.json index 86993464d4..df09ed07f0 100644 --- a/public/language/th/notifications.json +++ b/public/language/th/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1ได้ส่งคำขอสมัครสมาชิก", "new_register_multiple": "มี%1คำขอสมัครสมาชิกที่รอการรีวิว", "flag_assigned_to_you": "ปักธง %1ได้ถูกปักธงให้คุณ", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Email ได้รับการยืนยันแล้ว", "email-confirmed-message": "ขอบคุณที่ยืนยัน Email ของคุณ บัญชีของคุณสามารถใช้งานได้แล้ว", "email-confirm-error-message": "มีปัญหาในการยืนยัน Email ของคุณ บางทีรหัสไม่ถูกต้องหรือหมดอายุแล้ว", diff --git a/public/language/th/pages.json b/public/language/th/pages.json index 2bb83cbbb3..dcdb8194b3 100644 --- a/public/language/th/pages.json +++ b/public/language/th/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "เนื้อหาที่ถูกปักธง", "ip-blacklist": "ไอดีที่ถูกขึ้นบัญชีดำ", + "post-queue": "Post Queue", "users/online": "ผู้ใช้ออนไลน์", "users/latest": "ผู้ใช้ล่าสุด", "users/sort-posts": "ผู้ใช้ที่โพสต์เยอะที่สุด", diff --git a/public/language/th/success.json b/public/language/th/success.json index 69575465d4..b79ab75c71 100644 --- a/public/language/th/success.json +++ b/public/language/th/success.json @@ -1,6 +1,7 @@ { "success": "สำเร็จ", "topic-post": "คุณลงข้อความสำเร็จแล้ว", + "post-queued": "Your post is queued for approval.", "authentication-successful": "การระบุตัวตนสำเร็จแล้ว", "settings-saved": "การตั้งค่าได้ถูกบันทึกแล้ว" } \ No newline at end of file diff --git a/public/language/tr/admin/extend/plugins.json b/public/language/tr/admin/extend/plugins.json index 7b9fc61d86..0f74d7bde9 100644 --- a/public/language/tr/admin/extend/plugins.json +++ b/public/language/tr/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/tr/admin/general/navigation.json b/public/language/tr/admin/general/navigation.json index 6de1c5c3c2..58ee12ed62 100644 --- a/public/language/tr/admin/general/navigation.json +++ b/public/language/tr/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/tr/admin/menu.json b/public/language/tr/admin/menu.json index 869d01e0d7..0449c7cd44 100644 --- a/public/language/tr/admin/menu.json +++ b/public/language/tr/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Etiketler", "manage/users": "Kullanıcılar", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/tr/admin/settings/general.json b/public/language/tr/admin/settings/general.json index 8e2a370261..577221dbd7 100644 --- a/public/language/tr/admin/settings/general.json +++ b/public/language/tr/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Ayarları", "title": "Site Başlığı", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Topluluk İsmi", "title.show-in-header": "Show Site Title in Header", "browser-title": "Tarayıcı Başlığı", diff --git a/public/language/tr/admin/settings/post.json b/public/language/tr/admin/settings/post.json index 1a4cb89f77..946f3ee168 100644 --- a/public/language/tr/admin/settings/post.json +++ b/public/language/tr/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/tr/notifications.json b/public/language/tr/notifications.json index dce29e6f2b..11b9b13e10 100644 --- a/public/language/tr/notifications.json +++ b/public/language/tr/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 kayıt olma isteği gönderdi.", "new_register_multiple": "Beklemede %1 kayıt olma isteği bulunmaktadır.", "flag_assigned_to_you": "Bayrak %1 size devredildi", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "E-posta onaylandı", "email-confirmed-message": "E-postanızı onaylandığınız için teşekkürler. Hesabınız tamamen aktive edildi.", "email-confirm-error-message": "E-posta adresinizi onaylarken bir hata oluştu. Kodunuz geçersiz ya da eski olabilir.", diff --git a/public/language/tr/pages.json b/public/language/tr/pages.json index 7512b488d4..4cf9619d5d 100644 --- a/public/language/tr/pages.json +++ b/public/language/tr/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderatör Araçları", "flagged-content": "Bayraklanan İçerik", "ip-blacklist": "IP Karaliste", + "post-queue": "Post Queue", "users/online": "Çevrimiçi Kullanıcılar", "users/latest": "En Yeni Kullanıcılar", "users/sort-posts": "En çok ileti gönderen kullanıcılar", diff --git a/public/language/tr/success.json b/public/language/tr/success.json index 3f45cbb7fd..63075061fc 100644 --- a/public/language/tr/success.json +++ b/public/language/tr/success.json @@ -1,6 +1,7 @@ { "success": "Başarılı", "topic-post": "Başarıyla gönderim yaptınız.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Doğrulama Başarılı", "settings-saved": "Ayarlar kaydoldu!" } \ No newline at end of file diff --git a/public/language/uk/admin/extend/plugins.json b/public/language/uk/admin/extend/plugins.json index 28bdcd0256..d81f354e5f 100644 --- a/public/language/uk/admin/extend/plugins.json +++ b/public/language/uk/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB не вдалося зв'язатися з менеджером пакетів, приступити до установки останньої версії?

Відповідь сервера (%1): %2
", "alert.package-manager-unreachable": "

NodeBB не вдалося зв'язатися з менеджером пакетів, оновлення наразі не рекомендується.

", "alert.incompatible": "

Ваша версія NodeBB (v%1) дозволяє оновлення цього плагіну лише до v%2. Будь ласка, оновіть NodeBB, щоб встановити новішу версію цього плагіну.

", - "alert.possibly-incompatible": "

Інформацію про сумісність не знайдено

У цьому плагіні не вказано сумісну версію NodeBB. Коректна робота не гарантується.

Якщо NodeBB перестане коректно стартувати, виконайте:

$ ./nodebb reset plugin=\"%1\"

Продовжити встановлення останньої версії цього плагіну?

" + "alert.possibly-incompatible": "

Інформацію про сумісність не знайдено

У цьому плагіні не вказано сумісну версію NodeBB. Коректна робота не гарантується.

Якщо NodeBB перестане коректно стартувати, виконайте:

$ ./nodebb reset plugin=\"%1\"

Продовжити встановлення останньої версії цього плагіну?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/uk/admin/general/navigation.json b/public/language/uk/admin/general/navigation.json index 1370621b63..051e920ad7 100644 --- a/public/language/uk/admin/general/navigation.json +++ b/public/language/uk/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Показувати лише Адмінам", "only-global-mods-and-admins": "Показувати лише Модераторам та Адмінам", "only-logged-in": "Показувати лише увійшовшим користувачам", + "only-guest": "Only display to guests", "open-new-window": "Відкривати у новому вікні", "installed-plugins-required": "Необхідні встановлені плагіни:", diff --git a/public/language/uk/admin/menu.json b/public/language/uk/admin/menu.json index ecfcd73b14..4165e18e53 100644 --- a/public/language/uk/admin/menu.json +++ b/public/language/uk/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Теги", "manage/users": "Користувачі", "manage/registration": "Черга реєстрації", + "manage/post-queue": "Post Queue", "manage/groups": "Групи", "manage/ip-blacklist": "Чорний список IP-адрес", diff --git a/public/language/uk/admin/settings/general.json b/public/language/uk/admin/settings/general.json index 8717738b20..55970c790d 100644 --- a/public/language/uk/admin/settings/general.json +++ b/public/language/uk/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Налаштування сайту", "title": "Назва сайту", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Назва вашої спільноти", "title.show-in-header": "Показувати заголовок сайту в шапці", "browser-title": "Заголовок браузера", diff --git a/public/language/uk/admin/settings/post.json b/public/language/uk/admin/settings/post.json index 0be4036412..a861e05379 100644 --- a/public/language/uk/admin/settings/post.json +++ b/public/language/uk/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Кількість голосів", "sorting.topic-default": "Типове сортування тем", "restrictions": "Обмеження постингу", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Кількість секунд між постами", "restrictions.seconds-between-new": "Кількість секунд між постами для нових користувачів", "restrictions.rep-threshold": "Репутація, при якій зі обмеження буде знято", diff --git a/public/language/uk/notifications.json b/public/language/uk/notifications.json index 4cb1239b14..838319c27f 100644 --- a/public/language/uk/notifications.json +++ b/public/language/uk/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 надіслав запит на реєстрацію.", "new_register_multiple": "%1 запити на реєстрацію очікують розгляду.", "flag_assigned_to_you": "На вас була подана скарга %1", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Електронну пошту підтверджено", "email-confirmed-message": "Дякуємо за підтвердження електронної пошти. Ваш акаунт тепер повністю активовано.", "email-confirm-error-message": "При перевірці вашої електронної пошти сталася проблема. Можливо код був недійсним або простроченим.", diff --git a/public/language/uk/pages.json b/public/language/uk/pages.json index 0cac18c161..7f98431931 100644 --- a/public/language/uk/pages.json +++ b/public/language/uk/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Оскаржений вміст", "ip-blacklist": "Чорний список IP адрес", + "post-queue": "Post Queue", "users/online": "Користувачі в мережі", "users/latest": "Останні користувачі", "users/sort-posts": "Користувачі з найбільшою кількістю постів", diff --git a/public/language/uk/success.json b/public/language/uk/success.json index f250023ca4..c3b4883ef7 100644 --- a/public/language/uk/success.json +++ b/public/language/uk/success.json @@ -1,6 +1,7 @@ { "success": "Успіх", "topic-post": "Публікацію успішно створено.", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Аутентифікація успішна", "settings-saved": "Налаштування збережені!" } \ No newline at end of file diff --git a/public/language/vi/admin/extend/plugins.json b/public/language/vi/admin/extend/plugins.json index cf80583db4..7515f72590 100644 --- a/public/language/vi/admin/extend/plugins.json +++ b/public/language/vi/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/vi/admin/general/navigation.json b/public/language/vi/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/vi/admin/general/navigation.json +++ b/public/language/vi/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/vi/admin/menu.json b/public/language/vi/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/vi/admin/menu.json +++ b/public/language/vi/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/vi/admin/settings/general.json b/public/language/vi/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/vi/admin/settings/general.json +++ b/public/language/vi/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/vi/admin/settings/post.json b/public/language/vi/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/vi/admin/settings/post.json +++ b/public/language/vi/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/vi/notifications.json b/public/language/vi/notifications.json index 875b87c7e5..74e6ae5753 100644 --- a/public/language/vi/notifications.json +++ b/public/language/vi/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 đã gửi một yêu cầu tham gia.", "new_register_multiple": "Có %1 đơn đăng ký đang chờ xem xét.", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "Đã xác nhận email", "email-confirmed-message": "Cảm ơn bạn đã xác nhận địa chỉ email của bạn. Tài khoản của bạn đã được kích hoạt đầy đủ.", "email-confirm-error-message": "Đã có lỗi khi xác nhận địa chỉ email. Có thể đoạn mã không đúng hoặc đã hết hạn.", diff --git a/public/language/vi/pages.json b/public/language/vi/pages.json index bd41a9c2dd..aa970094c2 100644 --- a/public/language/vi/pages.json +++ b/public/language/vi/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "IP Blacklist", + "post-queue": "Post Queue", "users/online": "Thành viên đang online", "users/latest": "Thành viên mới nhất", "users/sort-posts": "Thành viên có nhiều bài đăng nhất", diff --git a/public/language/vi/success.json b/public/language/vi/success.json index f88527f3ad..aff07d84ad 100644 --- a/public/language/vi/success.json +++ b/public/language/vi/success.json @@ -1,6 +1,7 @@ { "success": "Thành công", "topic-post": "Bạn đã gửi bài thành công", + "post-queued": "Your post is queued for approval.", "authentication-successful": "Xác thực thành công", "settings-saved": "Đã lưu thiết lập" } \ No newline at end of file diff --git a/public/language/zh-CN/admin/extend/plugins.json b/public/language/zh-CN/admin/extend/plugins.json index b3523af1cf..afddba66e5 100644 --- a/public/language/zh-CN/admin/extend/plugins.json +++ b/public/language/zh-CN/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB 联系不到包管理器， 继续安装最新版本？

服务器返回 (%1): %2
", "alert.package-manager-unreachable": "

NodeBB 联系不到包管理器，暂时不建议升级。

", "alert.incompatible": "

NodeBB 版本(v%1) 只支持到此插件的v%2版本。如需要此插件更加新的版本请先升级 NodeBB。

", - "alert.possibly-incompatible": "

未找到兼容性信息

此插件未注明对应的 NodeBB 版本。可能会产生兼容问题，导致 NodeBB 无法正常启动。

NodeBB 无法正常启动时请运行以下命令：

$ ./nodebb reset plugin=\"%1\"

是否继续安装此插件的最新版本？

" + "alert.possibly-incompatible": "

未找到兼容性信息

此插件未注明对应的 NodeBB 版本。可能会产生兼容问题，导致 NodeBB 无法正常启动。

NodeBB 无法正常启动时请运行以下命令：

$ ./nodebb reset plugin=\"%1\"

是否继续安装此插件的最新版本？

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/zh-CN/admin/general/navigation.json b/public/language/zh-CN/admin/general/navigation.json index 408f52386f..6e5c00cc43 100644 --- a/public/language/zh-CN/admin/general/navigation.json +++ b/public/language/zh-CN/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "仅向管理员展示", "only-global-mods-and-admins": "仅向全局版主及管理员展示", "only-logged-in": "仅向已登录用户展示", + "only-guest": "Only display to guests", "open-new-window": "在新窗口中打开", "installed-plugins-required": "需要已安装的插件：", diff --git a/public/language/zh-CN/admin/menu.json b/public/language/zh-CN/admin/menu.json index 37f31c027a..a2acd7b6b8 100644 --- a/public/language/zh-CN/admin/menu.json +++ b/public/language/zh-CN/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "话题", "manage/users": "用户", "manage/registration": "注册申请", + "manage/post-queue": "Post Queue", "manage/groups": "群组", "manage/ip-blacklist": "IP 黑名单", diff --git a/public/language/zh-CN/admin/settings/general.json b/public/language/zh-CN/admin/settings/general.json index c003b93469..daa6ee3cf7 100644 --- a/public/language/zh-CN/admin/settings/general.json +++ b/public/language/zh-CN/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "站点设置", "title": "站点标题", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "您的社区名称", "title.show-in-header": "在顶部显示站点标题", "browser-title": "浏览器标题", diff --git a/public/language/zh-CN/admin/settings/post.json b/public/language/zh-CN/admin/settings/post.json index c693e256f2..3e020e96f2 100644 --- a/public/language/zh-CN/admin/settings/post.json +++ b/public/language/zh-CN/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "最多投票", "sorting.topic-default": "默认主题排序", "restrictions": "发帖限制", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "发帖间隔（单位：秒）", "restrictions.seconds-between-new": "对于新用户的发帖间隔（单位：秒）", "restrictions.rep-threshold": "取消发帖限制所需的声望值", diff --git a/public/language/zh-CN/notifications.json b/public/language/zh-CN/notifications.json index 850c504005..02090c39af 100644 --- a/public/language/zh-CN/notifications.json +++ b/public/language/zh-CN/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1 发出了注册请求", "new_register_multiple": "有 %1 条注册申请等待批准。", "flag_assigned_to_you": "举报 %1 已经被指派给你", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "电子邮箱已确认", "email-confirmed-message": "感谢您验证您的电子邮箱。您的帐户现已完全激活。", "email-confirm-error-message": "验证的您电子邮箱地址时出现了问题。可能是因为验证码无效或已过期。", diff --git a/public/language/zh-CN/pages.json b/public/language/zh-CN/pages.json index 7faa8cee78..cca14a93aa 100644 --- a/public/language/zh-CN/pages.json +++ b/public/language/zh-CN/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "版主工具", "flagged-content": "已举报的内容", "ip-blacklist": "IP 黑名单", + "post-queue": "Post Queue", "users/online": "在线会员", "users/latest": "最新会员", "users/sort-posts": "发帖最多的会员", diff --git a/public/language/zh-CN/success.json b/public/language/zh-CN/success.json index a43e42c345..660c7fe1bc 100644 --- a/public/language/zh-CN/success.json +++ b/public/language/zh-CN/success.json @@ -1,6 +1,7 @@ { "success": "成功", "topic-post": "您已成功发布。", + "post-queued": "Your post is queued for approval.", "authentication-successful": "验证成功", "settings-saved": "设置已保存！" } \ No newline at end of file diff --git a/public/language/zh-TW/admin/extend/plugins.json b/public/language/zh-TW/admin/extend/plugins.json index d973f96307..be5ca1fe60 100644 --- a/public/language/zh-TW/admin/extend/plugins.json +++ b/public/language/zh-TW/admin/extend/plugins.json @@ -43,5 +43,9 @@ "alert.suggest-error": "

NodeBB could not reach the package manager, proceed with installation of latest version?

Server returned (%1): %2
", "alert.package-manager-unreachable": "

NodeBB could not reach the package manager, an upgrade is not suggested at this time.

", "alert.incompatible": "

Your version of NodeBB (v%1) is only cleared to upgrade to v%2 of this plugin. Please update your NodeBB if you wish to install a newer version of this plugin.

", - "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

" + "alert.possibly-incompatible": "

No Compatibility Information Found

This plugin did not specify a specific version for installation given your NodeBB version. Full compatibility cannot be guaranteed, and may cause your NodeBB to no longer start properly.

In the event that NodeBB cannot boot properly:

$ ./nodebb reset plugin=\"%1\"

Continue installation of latest version of this plugin?

", + + "license.title": "Plugin License Information", + "license.intro": "The plugin %1 is licensed under the %2. Please read and understand the license terms prior to activating this plugin.", + "license.cta": "Do you wish to continue with activating this plugin?" } diff --git a/public/language/zh-TW/admin/general/navigation.json b/public/language/zh-TW/admin/general/navigation.json index c4ba0d09ac..9abf7f58cc 100644 --- a/public/language/zh-TW/admin/general/navigation.json +++ b/public/language/zh-TW/admin/general/navigation.json @@ -11,6 +11,7 @@ "only-admins": "Only display to Admins", "only-global-mods-and-admins": "Only display to Global Moderators and Admins", "only-logged-in": "Only display to logged in users", + "only-guest": "Only display to guests", "open-new-window": "Open in a new window", "installed-plugins-required": "Installed Plugins Required:", diff --git a/public/language/zh-TW/admin/menu.json b/public/language/zh-TW/admin/menu.json index 985c540e8a..3ec4ad41c4 100644 --- a/public/language/zh-TW/admin/menu.json +++ b/public/language/zh-TW/admin/menu.json @@ -12,6 +12,7 @@ "manage/tags": "Tags", "manage/users": "Users", "manage/registration": "Registration Queue", + "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", diff --git a/public/language/zh-TW/admin/settings/general.json b/public/language/zh-TW/admin/settings/general.json index 3f2814bd88..948123f7cb 100644 --- a/public/language/zh-TW/admin/settings/general.json +++ b/public/language/zh-TW/admin/settings/general.json @@ -1,6 +1,9 @@ { "site-settings": "Site Settings", "title": "Site Title", + "title.url": "URL", + "title.url-placeholder": "The URL of the site title", + "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Your Community Name", "title.show-in-header": "Show Site Title in Header", "browser-title": "Browser Title", diff --git a/public/language/zh-TW/admin/settings/post.json b/public/language/zh-TW/admin/settings/post.json index aca8b39d64..a789025597 100644 --- a/public/language/zh-TW/admin/settings/post.json +++ b/public/language/zh-TW/admin/settings/post.json @@ -6,6 +6,8 @@ "sorting.most-votes": "Most Votes", "sorting.topic-default": "Default Topic Sorting", "restrictions": "Posting Restrictions", + "restrictions.post-queue": "Enable post queue", + "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval.", "restrictions.seconds-between": "Seconds between Posts", "restrictions.seconds-between-new": "Seconds between Posts for New Users", "restrictions.rep-threshold": "Reputation threshold before this restriction is lifted", diff --git a/public/language/zh-TW/notifications.json b/public/language/zh-TW/notifications.json index 36f9ee1dbc..7d8351c56e 100644 --- a/public/language/zh-TW/notifications.json +++ b/public/language/zh-TW/notifications.json @@ -41,6 +41,7 @@ "new_register": "%1傳送了註冊要求。", "new_register_multiple": "目前有 %1 個註冊要求等待審核中。", "flag_assigned_to_you": "Flag %1 has been assigned to you", + "post_awaiting_review": "Post awaiting review", "email-confirmed": "已確認電子郵件", "email-confirmed-message": "感謝你驗證電子郵件。你的帳戶現已完整的啟動。", "email-confirm-error-message": "驗證你的電子郵件地址時發生問題。也許是啟動碼無效或是已過期。", diff --git a/public/language/zh-TW/pages.json b/public/language/zh-TW/pages.json index aeeece295f..a6c7130d88 100644 --- a/public/language/zh-TW/pages.json +++ b/public/language/zh-TW/pages.json @@ -9,6 +9,7 @@ "moderator-tools": "Moderator Tools", "flagged-content": "Flagged Content", "ip-blacklist": "IP Blacklist", + "post-queue": "Post Queue", "users/online": "線上使用者", "users/latest": "最近使用者", "users/sort-posts": "最多張貼的使用者", diff --git a/public/language/zh-TW/success.json b/public/language/zh-TW/success.json index 1d652b82e6..fbe9428249 100644 --- a/public/language/zh-TW/success.json +++ b/public/language/zh-TW/success.json @@ -1,6 +1,7 @@ { "success": "成功", "topic-post": "你的文章已張貼成功", + "post-queued": "Your post is queued for approval.", "authentication-successful": "驗證成功", "settings-saved": "設定已儲存" } \ No newline at end of file diff --git a/public/src/admin/manage/ip-blacklist.js b/public/src/admin/manage/ip-blacklist.js index 0b565325d7..4b5b37ce11 100644 --- a/public/src/admin/manage/ip-blacklist.js +++ b/public/src/admin/manage/ip-blacklist.js @@ -1,7 +1,7 @@ 'use strict'; -define('admin/manage/ip-blacklist', [], function () { +define('admin/manage/ip-blacklist', ['Chart'], function (Chart) { var Blacklist = {}; Blacklist.init = function () { @@ -37,6 +37,100 @@ define('admin/manage/ip-blacklist', [], function () { }); }); }); + + Blacklist.setupAnalytics(); + }; + + Blacklist.setupAnalytics = function () { + var hourlyCanvas = document.getElementById('blacklist:hourly'); + var dailyCanvas = document.getElementById('blacklist:daily'); + var hourlyLabels = utils.getHoursArray().map(function (text, idx) { + return idx % 3 ? '' : text; + }); + var dailyLabels = utils.getDaysArray().map(function (text, idx) { + return idx % 3 ? '' : text; + }); + + // Only 7 days displayed in this chart + dailyLabels.length = 7; + + if (utils.isMobile()) { + Chart.defaults.global.tooltips.enabled = false; + } + + var data = { + 'blacklist:hourly': { + labels: hourlyLabels, + datasets: [ + { + label: '', + backgroundColor: 'rgba(186,139,175,0.2)', + borderColor: 'rgba(186,139,175,1)', + pointBackgroundColor: 'rgba(186,139,175,1)', + pointHoverBackgroundColor: '#fff', + pointBorderColor: '#fff', + pointHoverBorderColor: 'rgba(186,139,175,1)', + data: ajaxify.data.analytics.hourly, + }, + ], + }, + 'blacklist:daily': { + labels: dailyLabels, + datasets: [ + { + label: '', + backgroundColor: 'rgba(151,187,205,0.2)', + borderColor: 'rgba(151,187,205,1)', + pointBackgroundColor: 'rgba(151,187,205,1)', + pointHoverBackgroundColor: '#fff', + pointBorderColor: '#fff', + pointHoverBorderColor: 'rgba(151,187,205,1)', + data: ajaxify.data.analytics.daily, + }, + ], + }, + }; + + hourlyCanvas.width = $(hourlyCanvas).parent().width(); + dailyCanvas.width = $(dailyCanvas).parent().width(); + + new Chart(hourlyCanvas.getContext('2d'), { + type: 'line', + data: data['blacklist:hourly'], + options: { + responsive: true, + animation: false, + legend: { + display: false, + }, + scales: { + yAxes: [{ + ticks: { + beginAtZero: true, + }, + }], + }, + }, + }); + + new Chart(dailyCanvas.getContext('2d'), { + type: 'line', + data: data['blacklist:daily'], + options: { + responsive: true, + animation: false, + legend: { + display: false, + }, + scales: { + yAxes: [{ + ticks: { + beginAtZero: true, + }, + }], + }, + }, + }); }; return Blacklist; diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index e2303c501c..98580332eb 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -328,20 +328,10 @@ $(document).ready(function () { }; ajaxify.loadTemplate = function (template, callback) { - if (templates.cache[template]) { - callback(templates.cache[template]); - } else { - $.ajax({ - url: config.relative_path + '/assets/templates/' + template + '.tpl?' + config['cache-buster'], - type: 'GET', - success: function (data) { - callback(data.toString()); - }, - error: function (error) { - throw new Error('Unable to load template: ' + template + ' (' + error.statusText + ')'); - }, - }); - } + require([config.relative_path + '/assets/templates/' + template + '.jst'], callback, function (err) { + console.error('Unable to load template: ' + template); + throw err; + }); }; function ajaxifyAnchors() { @@ -424,7 +414,9 @@ $(document).ready(function () { }); } - templates.registerLoader(ajaxify.loadTemplate); + require(['benchpress'], function (Benchpress) { + Benchpress.registerLoader(ajaxify.loadTemplate); + }); if (window.history && window.history.pushState) { // Progressive Enhancement, ajaxify available only to modern browsers @@ -432,9 +424,4 @@ $(document).ready(function () { } app.load(); - - $('[type="text/tpl"][data-template]').each(function () { - templates.cache[$(this).attr('data-template')] = $('
').html($(this).html()).text(); - $(this).parent().remove(); - }); }); diff --git a/public/src/app.js b/public/src/app.js index a45a99c5b3..993c35b6d2 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -11,7 +11,21 @@ app.cacheBuster = null; (function () { var showWelcomeMessage = !!utils.params().loggedin; - templates.setGlobal('config', config); + require(['benchpress'], function (Benchpress) { + Benchpress.setGlobal('config', config); + if (Object.defineProperty) { + Object.defineProperty(window, 'templates', { + configurable: true, + enumerable: true, + get: function () { + console.warn('[deprecated] Accessing benchpress (formerly know as templates.js) globally is deprecated. Use `require(["benchpress"], function (Benchpress) { ... })` instead'); + return Benchpress; + }, + }); + } else { + window.templates = Benchpress; + } + }); app.cacheBuster = config['cache-buster']; diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js index e4759935b6..fbac7da1de 100644 --- a/public/src/modules/helpers.js +++ b/public/src/modules/helpers.js @@ -3,15 +3,15 @@ (function (factory) { if (typeof module === 'object' && module.exports) { var relative_path = require('nconf').get('relative_path'); - module.exports = factory(require('../utils'), require('templates.js'), require('string'), relative_path); + module.exports = factory(require('../utils'), require('benchpressjs'), require('string'), relative_path); } else if (typeof define === 'function' && define.amd) { - define('helpers', ['string'], function (string) { - return factory(utils, templates, string, config.relative_path); + define('helpers', ['benchpress', 'string'], function (Benchpress, string) { + return factory(utils, Benchpress, string, config.relative_path); }); } else { window.helpers = factory(utils, templates, window.String, config.relative_path); } -}(function (utils, templates, S, relative_path) { +}(function (utils, Benchpress, S, relative_path) { var helpers = { displayMenuItem: displayMenuItem, buildMetaTag: buildMetaTag, @@ -30,8 +30,13 @@ renderDigestAvatar: renderDigestAvatar, userAgentIcons: userAgentIcons, register: register, + __escape: identity, }; + function identity(str) { + return str; + } + function displayMenuItem(data, index) { var item = data.navigation[index]; if (!item) { @@ -270,7 +275,7 @@ function register() { Object.keys(helpers).forEach(function (helperName) { - templates.registerHelper(helperName, helpers[helperName]); + Benchpress.registerHelper(helperName, helpers[helperName]); }); } diff --git a/src/admin/search.js b/src/admin/search.js index 6ffd9db768..dfc9034658 100644 --- a/src/admin/search.js +++ b/src/admin/search.js @@ -14,10 +14,12 @@ function filterDirectories(directories) { // get the relative path return dir.replace(/^.*(admin.*?).tpl$/, '$1'); }).filter(function (dir) { + // exclude .jst files // exclude partials // only include subpaths // exclude category.tpl, group.tpl, category-analytics.tpl - return !dir.includes('/partials/') && + return !dir.endsWith('.jst') && + !dir.includes('/partials/') && /\/.*\//.test(dir) && !/manage\/(category|group|category-analytics)$/.test(dir); }); diff --git a/src/analytics.js b/src/analytics.js index 711eadc865..b4922cf184 100644 --- a/src/analytics.js +++ b/src/analytics.js @@ -211,3 +211,9 @@ Analytics.getErrorAnalytics = function (callback) { }, callback); }; +Analytics.getBlacklistAnalytics = function (callback) { + async.parallel({ + daily: async.apply(Analytics.getDailyStatsForSet, 'analytics:blacklist', Date.now(), 7), + hourly: async.apply(Analytics.getHourlyStatsForSet, 'analytics:blacklist', Date.now(), 24), + }, callback); +}; diff --git a/src/controllers/admin/blacklist.js b/src/controllers/admin/blacklist.js index fb92f377b5..a5f8136463 100644 --- a/src/controllers/admin/blacklist.js +++ b/src/controllers/admin/blacklist.js @@ -2,19 +2,22 @@ var async = require('async'); var meta = require('../../meta'); +var analytics = require('../../analytics'); var blacklistController = module.exports; blacklistController.get = function (req, res, next) { - async.waterfall([ - function (next) { - meta.blacklist.get(next); - }, - function (rules) { - res.render('admin/manage/ip-blacklist', { - rules: rules, - title: '[[pages:ip-blacklist]]', - }); - }, - ], next); + // Analytics.getBlacklistAnalytics + async.parallel({ + rules: async.apply(meta.blacklist.get), + analytics: async.apply(analytics.getBlacklistAnalytics), + }, function (err, data) { + if (err) { + return next(err); + } + + res.render('admin/manage/ip-blacklist', Object.assign(data, { + title: '[[pages:ip-blacklist]]', + })); + }); }; diff --git a/src/controllers/authentication.js b/src/controllers/authentication.js index 8ca33cdc62..f0f64f42fd 100644 --- a/src/controllers/authentication.js +++ b/src/controllers/authentication.js @@ -288,7 +288,6 @@ authenticationController.doLogin = function (req, uid, callback) { }; authenticationController.onSuccessfulLogin = function (req, uid, callback) { - callback = callback || function () {}; var uuid = utils.generateUUID(); req.session.meta = {}; @@ -308,6 +307,7 @@ authenticationController.onSuccessfulLogin = function (req, uid, callback) { }); async.waterfall([ + async.apply(meta.blacklist.test, req.ip), function (next) { async.parallel([ function (next) { @@ -330,7 +330,17 @@ authenticationController.onSuccessfulLogin = function (req, uid, callback) { plugins.fireHook('action:user.loggedIn', { uid: uid, req: req }); next(); }, - ], callback); + ], function (err) { + if (err) { + req.session.destroy(); + } + + if (typeof callback === 'function') { + callback(err); + } else { + return false; + } + }); }; authenticationController.localLogin = function (req, username, password, next) { diff --git a/src/controllers/recent.js b/src/controllers/recent.js index c5d1d2128a..0849c4f576 100644 --- a/src/controllers/recent.js +++ b/src/controllers/recent.js @@ -11,7 +11,7 @@ var meta = require('../meta'); var helpers = require('./helpers'); var pagination = require('../pagination'); -var recentController = {}; +var recentController = module.exports; var validFilter = { '': true, new: true, watched: true }; @@ -47,49 +47,44 @@ recentController.get = function (req, res, next) { topics.getRecentTopics(cid, req.uid, start, stop, filter, next); }, - ], function (err, data) { - if (err) { - return next(err); - } - - data.categories = categoryData.categories; - data.selectedCategory = categoryData.selectedCategory; - data.nextStart = stop + 1; - data.set = 'topics:recent'; - data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1; - data.rssFeedUrl = nconf.get('relative_path') + '/recent.rss'; - data.title = '[[pages:recent]]'; - data.filters = [{ - name: '[[unread:all-topics]]', - url: 'recent', - selected: filter === '', - filter: '', - }, { - name: '[[unread:new-topics]]', - url: 'recent/new', - selected: filter === 'new', - filter: 'new', - }, { - name: '[[unread:watched-topics]]', - url: 'recent/watched', - selected: filter === 'watched', - filter: 'watched', - }]; - - data.selectedFilter = data.filters.find(function (filter) { - return filter && filter.selected; - }); - - var pageCount = Math.max(1, Math.ceil(data.topicCount / settings.topicsPerPage)); - data.pagination = pagination.create(page, pageCount, req.query); - - if (req.path.startsWith('/api/recent') || req.path.startsWith('/recent')) { - data.breadcrumbs = helpers.buildBreadcrumbs([{ text: '[[recent:title]]' }]); - } - - data.querystring = cid ? ('?cid=' + validator.escape(String(cid))) : ''; - res.render('recent', data); - }); + function (data) { + data.categories = categoryData.categories; + data.selectedCategory = categoryData.selectedCategory; + data.nextStart = stop + 1; + data.set = 'topics:recent'; + data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1; + data.rssFeedUrl = nconf.get('relative_path') + '/recent.rss'; + data.title = '[[pages:recent]]'; + data.filters = [{ + name: '[[unread:all-topics]]', + url: 'recent', + selected: filter === '', + filter: '', + }, { + name: '[[unread:new-topics]]', + url: 'recent/new', + selected: filter === 'new', + filter: 'new', + }, { + name: '[[unread:watched-topics]]', + url: 'recent/watched', + selected: filter === 'watched', + filter: 'watched', + }]; + + data.selectedFilter = data.filters.find(function (filter) { + return filter && filter.selected; + }); + + var pageCount = Math.max(1, Math.ceil(data.topicCount / settings.topicsPerPage)); + data.pagination = pagination.create(page, pageCount, req.query); + + if (req.path.startsWith('/api/recent') || req.path.startsWith('/recent')) { + data.breadcrumbs = helpers.buildBreadcrumbs([{ text: '[[recent:title]]' }]); + } + + data.querystring = cid ? ('?cid=' + validator.escape(String(cid))) : ''; + res.render('recent', data); + }, + ], next); }; - -module.exports = recentController; diff --git a/src/database/mongo/sorted/remove.js b/src/database/mongo/sorted/remove.js index e8dea857eb..0a3fd87b6e 100644 --- a/src/database/mongo/sorted/remove.js +++ b/src/database/mongo/sorted/remove.js @@ -41,11 +41,11 @@ module.exports = function (db, module) { var query = { _key: { $in: keys } }; if (min !== '-inf') { - query.score = { $gte: min }; + query.score = { $gte: parseFloat(min) }; } if (max !== '+inf') { query.score = query.score || {}; - query.score.$lte = max; + query.score.$lte = parseFloat(max); } db.collection('objects').remove(query, function (err) { diff --git a/src/emailer.js b/src/emailer.js index cc8dbcb01c..bb9bd3d64d 100644 --- a/src/emailer.js +++ b/src/emailer.js @@ -3,7 +3,7 @@ var async = require('async'); var winston = require('winston'); var nconf = require('nconf'); -var templates = require('templates.js'); +var Benchpress = require('benchpressjs'); var nodemailer = require('nodemailer'); var sendmailTransport = require('nodemailer-sendmail-transport'); var smtpTransport = require('nodemailer-smtp-transport'); @@ -173,9 +173,9 @@ Emailer.sendViaFallback = function (data, callback) { }; function render(tpl, params, next) { - if (meta.config['email:custom:' + tpl.replace('emails/', '')]) { - var text = templates.parse(meta.config['email:custom:' + tpl.replace('emails/', '')], params); - next(null, text); + var customTemplate = meta.config['email:custom:' + tpl.replace('emails/', '')]; + if (customTemplate) { + Benchpress.compileParse(customTemplate, params, next); } else { app.render(tpl, params, next); } diff --git a/src/messaging/delete.js b/src/messaging/delete.js index 6fdf5177ef..e3058c0ba9 100644 --- a/src/messaging/delete.js +++ b/src/messaging/delete.js @@ -14,9 +14,9 @@ module.exports = function (Messaging) { return next(); } var keys = uids.map(function (uid) { - return 'uid:' + uid + ':chat:room:' + roomId + 'mids'; + return 'uid:' + uid + ':chat:room:' + roomId + ':mids'; }); - db.sortedSetsRemove(keys, roomId, next); + db.sortedSetsRemove(keys, mid, next); }, function (next) { db.delete('message:' + mid, next); diff --git a/src/meta/blacklist.js b/src/meta/blacklist.js index 80f3ca1190..4a1eeeb71f 100644 --- a/src/meta/blacklist.js +++ b/src/meta/blacklist.js @@ -1,12 +1,13 @@ 'use strict'; -var ip = require('ip'); -var ipRangeCheck = require('ip-range-check'); +var ipaddr = require('ipaddr.js'); var winston = require('winston'); var async = require('async'); var db = require('../database'); var pubsub = require('../pubsub'); +var plugins = require('../plugins'); +var analytics = require('../analytics'); var Blacklist = { _rules: [], @@ -54,23 +55,38 @@ Blacklist.get = function (callback) { }; Blacklist.test = function (clientIp, callback) { + // Some handy test addresses + // clientIp = '2001:db8:85a3:0:0:8a2e:370:7334'; // IPv6 + // clientIp = '127.0.15.1'; // IPv4 + var addr = ipaddr.parse(clientIp); + if ( Blacklist._rules.ipv4.indexOf(clientIp) === -1 && // not explicitly specified in ipv4 list Blacklist._rules.ipv6.indexOf(clientIp) === -1 && // not explicitly specified in ipv6 list !Blacklist._rules.cidr.some(function (subnet) { - return ip.cidrSubnet(subnet).contains(clientIp); - }) && // not in a blacklisted IPv4 cidr range - !ipRangeCheck(clientIp, Blacklist._rules.cidr6) // not in a blacklisted IPv6 cidr range + return addr.match(ipaddr.parseCIDR(subnet)); + // return ip.cidrSubnet(subnet).contains(clientIp); + }) // not in a blacklisted IPv4 or IPv6 cidr range ) { - if (typeof callback === 'function') { - setImmediate(callback); - } else { - return false; - } + plugins.fireHook('filter:blacklist.test', { // To return test failure, pass back an error in callback + ip: clientIp, + }, function (err) { + if (err) { + analytics.increment('blacklist'); + } + + if (typeof callback === 'function') { + callback(err); + } else { + return !!err; + } + }); } else { var err = new Error('[[error:blacklisted-ip]]'); err.code = 'blacklisted-ip'; + analytics.increment('blacklist'); + if (typeof callback === 'function') { setImmediate(callback, err); } else { @@ -84,11 +100,8 @@ Blacklist.validate = function (rules, callback) { var ipv4 = []; var ipv6 = []; var cidr = []; - var cidr6 = []; var invalid = []; - var isIPv4CidrSubnet = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/([0-9]|[1-2][0-9]|3[0-2]))$/; - var isIPv6CidrSubnet = /^s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?s*(\/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?$/; var inlineCommentMatch = /#.*$/; var whitelist = ['127.0.0.1', '::1', '::ffff:0:127.0.0.1']; @@ -101,29 +114,39 @@ Blacklist.validate = function (rules, callback) { // Filter out invalid rules rules = rules.filter(function (rule) { - if (whitelist.indexOf(rule) !== -1) { - invalid.push(rule); - return false; + var addr; + var isRange = false; + try { + addr = ipaddr.parse(rule); + } catch (e) { + // Do nothing } - if (ip.isV4Format(rule)) { - ipv4.push(rule); - return true; + try { + addr = ipaddr.parseCIDR(rule); + isRange = true; + } catch (e) { + // Do nothing } - if (ip.isV6Format(rule)) { - ipv6.push(rule); - return true; - } - if (isIPv4CidrSubnet.test(rule)) { - cidr.push(rule); - return true; + + if (!addr || whitelist.indexOf(rule) !== -1) { + invalid.push(rule); + return false; } - if (isIPv6CidrSubnet.test(rule)) { + + if (!isRange) { + if (addr.kind() === 'ipv4' && ipaddr.IPv4.isValid(rule)) { + ipv4.push(rule); + return true; + } + if (addr.kind() === 'ipv6' && ipaddr.IPv6.isValid(rule)) { + ipv6.push(rule); + return true; + } + } else { cidr.push(rule); return true; } - - invalid.push(rule); return false; }); @@ -132,7 +155,6 @@ Blacklist.validate = function (rules, callback) { ipv4: ipv4, ipv6: ipv6, cidr: cidr, - cidr6: cidr6, valid: rules, invalid: invalid, }); diff --git a/src/meta/js.js b/src/meta/js.js index 8f483779da..8082be2412 100644 --- a/src/meta/js.js +++ b/src/meta/js.js @@ -29,7 +29,7 @@ JS.scripts = { 'public/vendor/tinycon/tinycon.js', 'public/vendor/xregexp/xregexp.js', 'public/vendor/xregexp/unicode/unicode-base.js', - 'node_modules/templates.js/lib/templates.js', + 'node_modules/benchpressjs/build/benchpress.js', 'public/src/utils.js', 'public/src/sockets.js', 'public/src/app.js', diff --git a/src/meta/templates.js b/src/meta/templates.js index f6776f64e1..18991fc149 100644 --- a/src/meta/templates.js +++ b/src/meta/templates.js @@ -11,6 +11,8 @@ var nconf = require('nconf'); var plugins = require('../plugins'); var file = require('../file'); +var viewsPath = nconf.get('views_dir'); + var Templates = module.exports; Templates.compile = function (callback) { @@ -18,7 +20,6 @@ Templates.compile = function (callback) { var themeConfig = require(nconf.get('theme_config')); var baseTemplatesPaths = themeConfig.baseTheme ? getBaseTemplates(themeConfig.baseTheme) : [nconf.get('base_templates_path')]; - var viewsPath = nconf.get('views_dir'); function processImports(paths, relativePath, source, callback) { var regex = //; @@ -63,9 +64,9 @@ Templates.compile = function (callback) { var source = file.toString(); processImports(paths, relativePath, source, next); }, - function (compiled, next) { + function (source, next) { mkdirp(path.join(viewsPath, path.dirname(relativePath)), function (err) { - next(err, compiled); + next(err, source); }); }, function (compiled, next) { @@ -74,6 +75,9 @@ Templates.compile = function (callback) { ], next); }, next); }, + function (next) { + rimraf(path.join(viewsPath, '*.jst'), next); + }, function (next) { winston.verbose('[meta/templates] Successfully compiled templates.'); next(); @@ -99,7 +103,6 @@ function getBaseTemplates(theme) { function preparePaths(baseTemplatesPaths, callback) { var coreTemplatesPath = nconf.get('core_templates_path'); - var viewsPath = nconf.get('views_dir'); var pluginTemplates; async.waterfall([ function (next) { diff --git a/src/middleware/header.js b/src/middleware/header.js index 29716e1f60..e35cc0e333 100644 --- a/src/middleware/header.js +++ b/src/middleware/header.js @@ -46,6 +46,7 @@ module.exports = function (middleware) { res.locals.config = res.locals.config || {}; var templateValues = { title: meta.config.title || '', + 'title:url': meta.config['title:url'] || '', description: meta.config.description || '', 'cache-buster': meta.config['cache-buster'] || '', 'brand:logo': meta.config['brand:logo'] || '', diff --git a/src/middleware/index.js b/src/middleware/index.js index 9072b0441d..511ae1ddd4 100644 --- a/src/middleware/index.js +++ b/src/middleware/index.js @@ -2,11 +2,13 @@ var async = require('async'); var path = require('path'); +var fs = require('fs'); var csrf = require('csurf'); var validator = require('validator'); var nconf = require('nconf'); var ensureLoggedIn = require('connect-ensure-login'); var toobusy = require('toobusy-js'); +var Benchpress = require('benchpressjs'); var plugins = require('../plugins'); var meta = require('../meta'); @@ -186,3 +188,33 @@ middleware.delayLoading = function (req, res, next) { // Introduces an artificial delay during load so that brute force attacks are effectively mitigated setTimeout(next, 1000); }; + +var viewsDir = nconf.get('views_dir'); +middleware.templatesOnDemand = function (req, res, next) { + var filePath = req.filePath || path.join(viewsDir, req.path); + if (!filePath.endsWith('.jst')) { + return next(); + } + + async.waterfall([ + function (cb) { + file.exists(filePath, cb); + }, + function (exists, cb) { + if (exists) { + return next(); + } + + fs.readFile(filePath.replace(/\.jst$/, '.tpl'), cb); + }, + function (source, cb) { + Benchpress.precompile({ + source: source.toString(), + minify: global.env !== 'development', + }, cb); + }, + function (compiled, cb) { + fs.writeFile(filePath, compiled, cb); + }, + ], next); +}; diff --git a/src/routes/index.js b/src/routes/index.js index a8c3eeefa7..60c97bd8d3 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -4,11 +4,12 @@ var nconf = require('nconf'); var winston = require('winston'); var path = require('path'); var async = require('async'); +var express = require('express'); + var meta = require('../meta'); var controllers = require('../controllers'); var plugins = require('../plugins'); var user = require('../user'); -var express = require('express'); var accountRoutes = require('./accounts'); var metaRoutes = require('./meta'); @@ -147,6 +148,7 @@ module.exports = function (app, middleware, hotswapIds, callback) { } app.use(middleware.privateUploads); + app.use(relativePath + '/assets/templates', middleware.templatesOnDemand); var statics = [ { route: '/assets', path: path.join(__dirname, '../../build/public') }, diff --git a/src/views/500-embed.tpl b/src/views/500-embed.tpl index 9d911e9848..b1045d431f 100644 --- a/src/views/500-embed.tpl +++ b/src/views/500-embed.tpl @@ -1,8 +1,12 @@ - \ No newline at end of file diff --git a/src/views/admin/manage/ip-blacklist.tpl b/src/views/admin/manage/ip-blacklist.tpl index f44ec4113b..e2378e5e5c 100644 --- a/src/views/admin/manage/ip-blacklist.tpl +++ b/src/views/admin/manage/ip-blacklist.tpl @@ -9,7 +9,26 @@
- +
+
+
+
+
[[admin/manage/ip-blacklist:analytics.blacklist-hourly]]
+
+
+
+
+
+
+
+
[[admin/manage/ip-blacklist:analytics.blacklist-daily]]
+
+
+
+ +
+
+
diff --git a/src/views/admin/settings/general.tpl b/src/views/admin/settings/general.tpl index 13dffdf71a..d945c56e05 100644 --- a/src/views/admin/settings/general.tpl +++ b/src/views/admin/settings/general.tpl @@ -9,6 +9,12 @@ + + +

+ [[admin/settings/general:title.url-help]] +

+