From b4dea7930aa61d192b7faef29559b1a9d48c9507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sat, 17 Feb 2018 14:01:54 -0500 Subject: [PATCH 01/23] up spam-be-gone --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 0a05ec9ffb..357bbeeff3 100644 --- a/install/package.json +++ b/install/package.json @@ -67,7 +67,7 @@ "nodebb-plugin-markdown": "8.3.0", "nodebb-plugin-mentions": "2.2.3", "nodebb-plugin-soundpack-default": "1.0.0", - "nodebb-plugin-spam-be-gone": "0.5.2", + "nodebb-plugin-spam-be-gone": "0.5.3", "nodebb-rewards-essentials": "0.0.11", "nodebb-theme-lavender": "5.0.3", "nodebb-theme-persona": "7.2.23", From 225af93b9e3be3eb4e00cd542ca4d5a0ba574e60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sat, 17 Feb 2018 14:34:56 -0500 Subject: [PATCH 02/23] closes #6329 --- src/navigation/admin.js | 16 +++----- src/navigation/index.js | 3 -- src/topics/bookmarks.js | 2 +- src/upgrades/1.7.6/flatten_navigation_data.js | 38 +++++++++++++++++++ 4 files changed, 45 insertions(+), 14 deletions(-) create mode 100644 src/upgrades/1.7.6/flatten_navigation_data.js diff --git a/src/navigation/admin.js b/src/navigation/admin.js index cf854a80a4..8bab6d4219 100644 --- a/src/navigation/admin.js +++ b/src/navigation/admin.js @@ -15,17 +15,13 @@ pubsub.on('admin:navigation:save', function () { admin.save = function (data, callback) { var order = Object.keys(data); - var items = data.map(function (item, idx) { - var data = {}; - + var items = data.map(function (item) { for (var i in item) { - if (item.hasOwnProperty(i)) { - item[i] = typeof item[i] === 'string' ? translator.escape(item[i]) : item[i]; + if (item.hasOwnProperty(i) && typeof item[i] === 'string' && (i === 'title' || i === 'text')) { + item[i] = translator.escape(item[i]); } } - - data[idx] = item; - return JSON.stringify(data); + return JSON.stringify(item); }); admin.cache = null; @@ -53,8 +49,8 @@ admin.get = function (callback) { db.getSortedSetRange('navigation:enabled', 0, -1, next); }, function (data, next) { - data = data.map(function (item, idx) { - return JSON.parse(item)[idx]; + data = data.map(function (item) { + return JSON.parse(item); }); next(null, data); diff --git a/src/navigation/index.js b/src/navigation/index.js index 0712ce79f5..65628fda1c 100644 --- a/src/navigation/index.js +++ b/src/navigation/index.js @@ -38,6 +38,3 @@ navigation.get = function (callback) { }, ], callback); }; - - -module.exports = navigation; diff --git a/src/topics/bookmarks.js b/src/topics/bookmarks.js index d1782b6713..6952474ff6 100644 --- a/src/topics/bookmarks.js +++ b/src/topics/bookmarks.js @@ -30,7 +30,7 @@ module.exports = function (Topics) { }; Topics.getTopicBookmarks = function (tid, callback) { - db.getSortedSetRangeWithScores(['tid:' + tid + ':bookmarks'], 0, -1, callback); + db.getSortedSetRangeWithScores('tid:' + tid + ':bookmarks', 0, -1, callback); }; Topics.updateTopicBookmarks = function (tid, pids, callback) { diff --git a/src/upgrades/1.7.6/flatten_navigation_data.js b/src/upgrades/1.7.6/flatten_navigation_data.js new file mode 100644 index 0000000000..9fd0901274 --- /dev/null +++ b/src/upgrades/1.7.6/flatten_navigation_data.js @@ -0,0 +1,38 @@ +'use strict'; + +var async = require('async'); +var db = require('../../database'); + +module.exports = { + name: 'Flatten navigation data', + timestamp: Date.UTC(2018, 1, 17), + method: function (callback) { + async.waterfall([ + function (next) { + db.getSortedSetRangeWithScores('navigation:enabled', 0, -1, next); + }, + function (data, next) { + var order = []; + var items = []; + data.forEach(function (item) { + var navItem = JSON.parse(item.value); + var keys = Object.keys(navItem); + if (keys.length && parseInt(keys[0], 10) >= 0) { + navItem = navItem[keys[0]]; + } + order.push(item.score); + items.push(JSON.stringify(navItem)); + }); + + async.series([ + function (next) { + db.delete('navigation:enabled', next); + }, + function (next) { + db.sortedSetAdd('navigation:enabled', order, items, next); + }, + ], next); + }, + ], callback); + }, +}; From 0f2103dadf3cb2f1522c95d8c8533ab5c9a5eb38 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sat, 17 Feb 2018 21:31:54 -0500 Subject: [PATCH 03/23] bumping mentions @barisusakli --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 357bbeeff3..07e8f48126 100644 --- a/install/package.json +++ b/install/package.json @@ -64,7 +64,7 @@ "nodebb-plugin-dbsearch": "2.0.9", "nodebb-plugin-emoji": "^2.1.0", "nodebb-plugin-emoji-android": "2.0.0", - "nodebb-plugin-markdown": "8.3.0", + "nodebb-plugin-markdown": "8.3.1", "nodebb-plugin-mentions": "2.2.3", "nodebb-plugin-soundpack-default": "1.0.0", "nodebb-plugin-spam-be-gone": "0.5.3", From 6e45d12a83bd7d1e1ce7d76fe8a92704042cff0e Mon Sep 17 00:00:00 2001 From: Andrew Rodrigues Date: Sun, 18 Feb 2018 01:11:33 -0500 Subject: [PATCH 04/23] bump composer --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 07e8f48126..4dc137a479 100644 --- a/install/package.json +++ b/install/package.json @@ -60,7 +60,7 @@ "morgan": "^1.9.0", "mousetrap": "^1.6.1", "nconf": "^0.9.1", - "nodebb-plugin-composer-default": "6.0.13", + "nodebb-plugin-composer-default": "6.0.14", "nodebb-plugin-dbsearch": "2.0.9", "nodebb-plugin-emoji": "^2.1.0", "nodebb-plugin-emoji-android": "2.0.0", From 9034424369bc677458937d0ff7b5cb80af48684a Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Sun, 18 Feb 2018 09:24:40 +0000 Subject: [PATCH 05/23] Latest translations and fallbacks --- public/language/ru/notifications.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json index a4c9b74119..abccf0fe81 100644 --- a/public/language/ru/notifications.json +++ b/public/language/ru/notifications.json @@ -9,10 +9,10 @@ "continue_to": "Перейти на %1", "return_to": "Вернуться к %1", "new_notification": "Новое уведомление", - "new_notification_from": "You have a new Notification from %1", + "new_notification_from": "У Вас есть новые сообщения от %1", "you_have_unread_notifications": "У вас есть непрочитанные уведомления.", "all": "Все", - "topics": "Topics", + "topics": "Темы", "replies": "Ответы", "chat": "Чаты", "follows": "Следят", @@ -29,8 +29,8 @@ "user_flagged_post_in": "Участник %1 пометил сообщение в %2", "user_flagged_post_in_dual": "Участники %1 и %2 пометили ваше сообщение в %3", "user_flagged_post_in_multiple": "Участник %1 и %2 других пометили ваше сообщение %3", - "user_flagged_user": "%1 flagged a user profile (%2)", - "user_flagged_user_dual": "%1 and %2 flagged a user profile (%3)", + "user_flagged_user": "Участник %1 отметили профиль пользователя (%3)", + "user_flagged_user_dual": "Участник %1 и %2отметили профиль пользователя (%3)", "user_flagged_user_multiple": "%1 and %2 others flagged a user profile (%3)", "user_posted_to": "Участник %1 ответил на запись: %2", "user_posted_to_dual": "Участники %1 и %2 ответили на вашу запись: %3", From e36657d48c2e3c1924cc43b9d14767899a380e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 19 Feb 2018 11:17:15 -0500 Subject: [PATCH 06/23] add tpl path to error messages --- src/middleware/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/middleware/index.js b/src/middleware/index.js index b1e065b3fd..2f995f7b5d 100644 --- a/src/middleware/index.js +++ b/src/middleware/index.js @@ -211,7 +211,7 @@ middleware.templatesOnDemand = function (req, res, next) { if (!filePath.endsWith('.js')) { return next(); } - + var tplPath = filePath.replace(/\.js$/, '.tpl'); if (workingCache[filePath]) { workingCache[filePath].push(next); return; @@ -234,11 +234,11 @@ middleware.templatesOnDemand = function (req, res, next) { } workingCache[filePath] = [next]; - fs.readFile(filePath.replace(/\.js$/, '.tpl'), 'utf8', cb); + fs.readFile(tplPath, 'utf8', cb); }, function (source, cb) { if (!source) { - return cb(new Error('[[error:templatesOnDemand.source-template-empty]]')); + return cb(new Error('[[error:templatesOnDemand.source-template-empty, ' + tplPath + ']]')); } Benchpress.precompile({ source: source, @@ -247,7 +247,7 @@ middleware.templatesOnDemand = function (req, res, next) { }, function (compiled, cb) { if (!compiled) { - return cb(new Error('[[error:templatesOnDemand.compiled-template-empty]]')); + return cb(new Error('[[error:templatesOnDemand.compiled-template-empty, ' + tplPath + ']]')); } fs.writeFile(filePath, compiled, cb); }, From c707e984231aaa27955f4f5eb80e3b77f8635e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 19 Feb 2018 11:45:06 -0500 Subject: [PATCH 07/23] closes #6331 --- src/middleware/index.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/middleware/index.js b/src/middleware/index.js index 2f995f7b5d..f6bee01a53 100644 --- a/src/middleware/index.js +++ b/src/middleware/index.js @@ -237,9 +237,6 @@ middleware.templatesOnDemand = function (req, res, next) { fs.readFile(tplPath, 'utf8', cb); }, function (source, cb) { - if (!source) { - return cb(new Error('[[error:templatesOnDemand.source-template-empty, ' + tplPath + ']]')); - } Benchpress.precompile({ source: source, minify: global.env !== 'development', From 2796cff3dc82dc1896d096ca99d877e01e0382d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 19 Feb 2018 17:31:04 -0500 Subject: [PATCH 08/23] up benchpress --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 4dc137a479..bbb50e76d6 100644 --- a/install/package.json +++ b/install/package.json @@ -21,7 +21,7 @@ "async": "2.6.0", "autoprefixer": "7.2.4", "bcryptjs": "2.4.3", - "benchpressjs": "^1.2.0", + "benchpressjs": "^1.2.1", "body-parser": "^1.18.2", "bootstrap": "^3.3.7", "chart.js": "^2.7.1", From 7bdd2144e0fde6e6a641dee83e0f214c72189422 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Tue, 20 Feb 2018 09:25:02 +0000 Subject: [PATCH 09/23] Latest translations and fallbacks --- public/language/uk/admin/appearance/customise.json | 14 +++++++------- public/language/uk/admin/general/homepage.json | 2 +- public/language/uk/user.json | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/public/language/uk/admin/appearance/customise.json b/public/language/uk/admin/appearance/customise.json index b85d6c8ecf..359ea3d50f 100644 --- a/public/language/uk/admin/appearance/customise.json +++ b/public/language/uk/admin/appearance/customise.json @@ -1,14 +1,14 @@ { - "custom-css": "Custom CSS/LESS", - "custom-css.description": "Enter your own CSS/LESS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS/LESS", + "custom-css": "Користувацькі CSS/LESS", + "custom-css.description": "Введіть свої власні CSS/LESS тут, які будуть застосовані після всіх інших стилів.", + "custom-css.enable": "Увімкнути користувацькі CSS/LESS", - "custom-js": "Custom Javascript", - "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", - "custom-js.enable": "Enable Custom Javascript", + "custom-js": "Користувацький Javascript", + "custom-js.description": "Введіть свій власний код javascript тут. Він буде виконаний після повного завантаження сторінки.", + "custom-js.enable": "Увімкнути користувацький Javascript", "custom-header": "Користувацький заголовок", - "custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <head> section of your forum's markup. Script tags are allowed, but are discouraged, as the Custom Javascript tab is available.", + "custom-header.description": "Введіть свій користувацький HTML тут (наприклад, Meta Теги тощо), який буде додано до <head> розділу розмітки вашого форуму. Теги скриптів допускаються, але вони не рекомендуються, оскільки доступна вкладка Користувацькі Javascript.", "custom-header.enable": "Увімкнути користувацький заголовок", "custom-css.livereload": "Увімкнути Автоматичне Оновлення", diff --git a/public/language/uk/admin/general/homepage.json b/public/language/uk/admin/general/homepage.json index a5e028490b..f0b146ca8f 100644 --- a/public/language/uk/admin/general/homepage.json +++ b/public/language/uk/admin/general/homepage.json @@ -4,5 +4,5 @@ "home-page-route": "Шлях головної сторінки", "custom-route": "Користувацький шлях", "allow-user-home-pages": "Дозволити користувачам власні сторінки", - "home-page-title": "Title of the home page (default \"Home\")" + "home-page-title": "Назва домашньої сторінки (за замовчуванням \"Домашня сторінка\")" } \ No newline at end of file diff --git a/public/language/uk/user.json b/public/language/uk/user.json index eabe845183..c07eeb52f4 100644 --- a/public/language/uk/user.json +++ b/public/language/uk/user.json @@ -25,7 +25,7 @@ "reputation": "Репутація", "bookmarks": "Закладки", "watched": "Переглянуті", - "ignored": "Ignored", + "ignored": "Ігнорується", "followers": "Відстежувачі", "following": "Відстежувані", "aboutme": "Про мене", @@ -85,7 +85,7 @@ "has_no_posts": "Цей користувач ще ніколи нічого не постив.", "has_no_topics": "Цей користувач ще ніколи не створював нових тем.", "has_no_watched_topics": "Цей користувач ще ніколи не переглядав жодної теми.", - "has_no_ignored_topics": "This user hasn't ignored any topics yet.", + "has_no_ignored_topics": "Цей користувач ще не проігнорував будь-які теми.", "has_no_upvoted_posts": "Цей користувач ще не голосував за жоден з постів.", "has_no_downvoted_posts": "Цей користувач ще не голосував проти жодного поста.", "has_no_voted_posts": "У цього користувача немає постів за котрі хтось голосував", @@ -105,7 +105,7 @@ "upvote-notif-freq.all": "All Upvotes", "upvote-notif-freq.everyTen": "Every Ten Upvotes", "upvote-notif-freq.logarithmic": "On 10, 100, 1000...", - "upvote-notif-freq.disabled": "Disabled", + "upvote-notif-freq.disabled": "Вимкнено", "browsing": "Налаштування перегляду", "open_links_in_new_tab": "Відкривати зовнішні посилання у новій вкладці", "enable_topic_searching": "Увімкнути пошук у темах", @@ -126,9 +126,9 @@ "sso.title": "Сервіси єдиного входу", "sso.associated": "Зв'язані з", "sso.not-associated": "Натисніть тут, щоб зв'язати з", - "sso.dissociate": "Dissociate", - "sso.dissociate-confirm-title": "Confirm Dissociation", - "sso.dissociate-confirm": "Are you sure you wish to dissociate your account from %1?", + "sso.dissociate": "Від'єднати", + "sso.dissociate-confirm-title": "Підтвердьте від'єднання", + "sso.dissociate-confirm": "Ви впевнені, що хочете відв'єднати свій обліковий запис від %1?", "info.latest-flags": "Останні скарги", "info.no-flags": "Не знайдено постів зі скаргами", "info.ban-history": "Історія банів", From b9d410d6123bfcb1e1550ef68840baf085b0567e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 20 Feb 2018 12:52:59 -0500 Subject: [PATCH 10/23] closes #6332 --- src/user/digest.js | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/user/digest.js b/src/user/digest.js index b1562aab3f..876e1b7a07 100644 --- a/src/user/digest.js +++ b/src/user/digest.js @@ -106,14 +106,14 @@ Digest.send = function (data, callback) { function (next) { async.parallel({ notifications: async.apply(user.notifications.getDailyUnread, userObj.uid), - popular: async.apply(topics.getPopularTopics, data.interval, userObj.uid, 0, 9), + topics: async.apply(getTermTopics, data.interval, userObj.uid, 0, 9), }, next); }, function (data, next) { var notifications = data.notifications.filter(Boolean); // If there are no notifications and no new topics, don't bother sending a digest - if (!notifications.length && !data.popular.topics.length) { + if (!notifications.length && !data.topics.length) { return next(); } @@ -124,7 +124,7 @@ Digest.send = function (data, callback) { }); // Fix relative paths in topic data - data.popular.topics = data.popular.topics.map(function (topicObj) { + data.topics = data.topics.map(function (topicObj) { var user = topicObj.hasOwnProperty('teaser') && topicObj.teaser !== undefined ? topicObj.teaser.user : topicObj.user; if (user && user.picture && utils.isRelativeUrl(user.picture)) { user.picture = nconf.get('base_url') + user.picture; @@ -138,7 +138,7 @@ Digest.send = function (data, callback) { username: userObj.username, userslug: userObj.userslug, notifications: notifications, - recent: data.popular.topics, + recent: data.topics, interval: data.interval, showUnsubscribe: true, }, function (err) { @@ -154,4 +154,22 @@ Digest.send = function (data, callback) { ], function (err) { callback(err, emailsSent); }); + + function getTermTopics(term, uid, start, stop, callback) { + async.waterfall([ + function (next) { + topics.getPopularTopics(term, uid, start, stop, next); + }, + function (data, next) { + if (!data.topics.length) { + topics.getLatestTopics(uid, start, stop, term, next); + } else { + next(null, data); + } + }, + function (data, next) { + next(null, data.topics); + }, + ], callback); + } }; From 9a1f722a0540f382bf83809419d03ca8e096a163 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 20 Feb 2018 14:51:41 -0500 Subject: [PATCH 11/23] appending X-Upstream-Hostname header in dev mode --- src/middleware/headers.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/middleware/headers.js b/src/middleware/headers.js index eb11ff8718..035608eab6 100644 --- a/src/middleware/headers.js +++ b/src/middleware/headers.js @@ -1,5 +1,7 @@ 'use strict'; +var os = require('os'); + var meta = require('../meta'); module.exports = function (middleware) { @@ -15,6 +17,10 @@ module.exports = function (middleware) { headers['Access-Control-Allow-Origin'] = encodeURI(meta.config['access-control-allow-origin']); } + if (process.env.NODE_ENV === 'development') { + headers['X-Upstream-Hostname'] = os.hostname(); + } + for (var key in headers) { if (headers.hasOwnProperty(key) && headers[key]) { res.setHeader(key, headers[key]); From a4a961639d06430ed1036dc97bc647f29a68e786 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 20 Feb 2018 15:32:44 -0500 Subject: [PATCH 12/23] only triggering forum updated messaging if hostname matches, fixes #6333 --- public/src/app.js | 2 +- public/src/sockets.js | 4 ++++ src/socket.io/index.js | 2 ++ src/webserver.js | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/public/src/app.js b/public/src/app.js index 8a2dd19c18..080063cc89 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -75,7 +75,7 @@ app.cacheBuster = null; socket.removeAllListeners('event:nodebb.ready'); socket.on('event:nodebb.ready', function (data) { - if (!app.cacheBuster || app.cacheBuster !== data['cache-buster']) { + if ((data.hostname === app.upstreamHost) && (!app.cacheBuster || app.cacheBuster !== data['cache-buster'])) { app.cacheBuster = data['cache-buster']; app.alert({ diff --git a/public/src/sockets.js b/public/src/sockets.js index 6b11f49e4f..1aaf02ca53 100644 --- a/public/src/sockets.js +++ b/public/src/sockets.js @@ -34,6 +34,10 @@ app.isConnected = false; } }); + socket.on('setHostname', function (hostname) { + app.upstreamHost = hostname; + }); + socket.on('event:banned', onEventBanned); socket.on('event:alert', app.alert); diff --git a/src/socket.io/index.js b/src/socket.io/index.js index 2e897d0c4c..c22f96154f 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -1,5 +1,6 @@ 'use strict'; +var os = require('os'); var async = require('async'); var nconf = require('nconf'); var winston = require('winston'); @@ -84,6 +85,7 @@ function onConnect(socket) { socket.join('sess_' + socket.request.signedCookies[nconf.get('sessionKey')]); io.sockets.sockets[socket.id].emit('checkSession', socket.uid); + io.sockets.sockets[socket.id].emit('setHostname', os.hostname()); } function onMessage(socket, payload) { diff --git a/src/webserver.js b/src/webserver.js index 57904f8dd0..c4c97fd058 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -3,6 +3,7 @@ var fs = require('fs'); var path = require('path'); +var os = require('os'); var nconf = require('nconf'); var express = require('express'); var app = express(); @@ -72,6 +73,7 @@ module.exports.listen = function (callback) { require('./socket.io').server.emit('event:nodebb.ready', { 'cache-buster': meta.config['cache-buster'], + hostname: os.hostname(), }); plugins.fireHook('action:nodebb.ready'); From 7edc58b727781ac6a1097ebe4b8789f4afcfc02d Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 20 Feb 2018 16:11:07 -0500 Subject: [PATCH 13/23] stricter Referrer-Policy to reduce unintended information leakage --- src/middleware/headers.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/middleware/headers.js b/src/middleware/headers.js index 035608eab6..d63f163d7c 100644 --- a/src/middleware/headers.js +++ b/src/middleware/headers.js @@ -11,6 +11,7 @@ module.exports = function (middleware) { 'X-Frame-Options': meta.config['allow-from-uri'] ? 'ALLOW-FROM ' + encodeURI(meta.config['allow-from-uri']) : 'SAMEORIGIN', 'Access-Control-Allow-Methods': encodeURI(meta.config['access-control-allow-methods'] || ''), 'Access-Control-Allow-Headers': encodeURI(meta.config['access-control-allow-headers'] || ''), + 'Referrer-Policy': 'strict-origin-when-cross-origin', // consider using helmet? }; if (meta.config['access-control-allow-origin']) { From 964fd20213429bc6ce8225e620d739386b3fde1f Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 20 Feb 2018 16:42:13 -0500 Subject: [PATCH 14/23] removed addNoReferrer usage as it is done server-side now --- public/src/utils.js | 14 -------------- public/src/widgets.js | 1 - 2 files changed, 15 deletions(-) diff --git a/public/src/utils.js b/public/src/utils.js index 77c90c4fd9..7443a0ff8a 100644 --- a/public/src/utils.js +++ b/public/src/utils.js @@ -553,20 +553,6 @@ return str.toString().replace(escapeChars, replaceChar); }, - addNoReferrer: function (containerEl) { - containerEl.find('a').attr('rel', function (idx, value) { - value = value ? value.split(' ') : []; - - ['noopener', 'noreferrer'].forEach(function (property) { - if (value.indexOf(property) === -1) { - value.push(property); - } - }); - - return value.join(' '); - }); - }, - isAndroidBrowser: function () { // http://stackoverflow.com/questions/9286355/how-to-detect-only-the-native-android-browser var nua = navigator.userAgent; diff --git a/public/src/widgets.js b/public/src/widgets.js index 8123e18103..badc55c892 100644 --- a/public/src/widgets.js +++ b/public/src/widgets.js @@ -58,7 +58,6 @@ title: $(this).attr('title'), }); }); - utils.addNoReferrer(widgetAreas); $(window).trigger('action:widgets.loaded', {}); callback(); }; From 12fdd7bb6338ab75eb9fd68361b05f1e8b8774fd Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Wed, 21 Feb 2018 09:25:23 +0000 Subject: [PATCH 15/23] Latest translations and fallbacks --- public/language/ru/notifications.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json index abccf0fe81..6ee7b75b4d 100644 --- a/public/language/ru/notifications.json +++ b/public/language/ru/notifications.json @@ -41,18 +41,18 @@ "user_started_following_you_multiple": "Участник %1 и %2 других подписались на вас.", "new_register": "Посетитель %1 отправил запрос на регистрацию.", "new_register_multiple": "В очереди %1 заявок на регистрацию.", - "flag_assigned_to_you": "Flag %1 has been assigned to you", - "post_awaiting_review": "Post awaiting review", + "flag_assigned_to_you": "Метка%1 была вам назначена", + "post_awaiting_review": "Сообщение ожидающее рассмотрения", "email-confirmed": "Электронная почта подтверждена", "email-confirmed-message": "Спасибо за подтверждение адреса электронной почты. Ваша учётная запись активирована. Добро пожаловать на наш сайт!", "email-confirm-error-message": "Ошибка проверки адреса электронной почты. Возможно, введён неправильно код подтверждения, либо у него истёк срок действия.", "email-confirm-sent": "Письмо с проверочным кодом отправлено на ваш электронный адрес", - "none": "None", - "notification_only": "Notification Only", - "email_only": "Email Only", - "notification_and_email": "Notification & Email", - "notificationType_upvote": "When someone upvotes your post", - "notificationType_new-topic": "When someone you follow posts a topic", + "none": "Пусто", + "notification_only": "Только уведомление", + "email_only": "Только электронная почта", + "notification_and_email": "Уведомление & Электронная почта", + "notificationType_upvote": "Когда кто-то проголосовал за ваше сообщение", + "notificationType_new-topic": "Отслеживать сообщения в вашей теме", "notificationType_new-reply": "When a new reply is posted in a topic you are watching", "notificationType_follow": "When someone starts following you", "notificationType_new-chat": "When you receive a chat message", From 264893a71bdc7a131fb72b2d54665f7bdb4daca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 21 Feb 2018 08:41:14 -0500 Subject: [PATCH 16/23] closes #6336 --- public/src/admin/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/admin/settings.js b/public/src/admin/settings.js index 803a3f923c..f42584e6d0 100644 --- a/public/src/admin/settings.js +++ b/public/src/admin/settings.js @@ -143,7 +143,7 @@ define('admin/settings', ['uploader'], function (uploader) { if (ajaxify.currentPage === 'admin/general/sounds') { ajaxify.refresh(); } else { - $('#' + uploadBtn.attr('data-target')).val([image, Date.now()].join('?v=')); + $('#' + uploadBtn.attr('data-target')).val(image); } }); }); From 52678621f97f45917977bc6fa26df790eb48685d Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 21 Feb 2018 11:06:00 -0500 Subject: [PATCH 17/23] revising minimum password strength to be 1 instead of 0 --- src/controllers/accounts/edit.js | 2 +- src/controllers/index.js | 2 +- .../1.7.6/update_min_pass_strength.js | 22 +++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 src/upgrades/1.7.6/update_min_pass_strength.js diff --git a/src/controllers/accounts/edit.js b/src/controllers/accounts/edit.js index 5e40b83ef2..08f5edfaf3 100644 --- a/src/controllers/accounts/edit.js +++ b/src/controllers/accounts/edit.js @@ -89,7 +89,7 @@ function renderRoute(name, req, res, next) { if (name === 'password') { userData.minimumPasswordLength = parseInt(meta.config.minimumPasswordLength, 10); - userData.minimumPasswordStrength = parseInt(meta.config.minimumPasswordStrength || 0, 10); + userData.minimumPasswordStrength = parseInt(meta.config.minimumPasswordStrength || 1, 10); } userData.title = '[[pages:account/edit/' + name + ', ' + userData.username + ']]'; diff --git a/src/controllers/index.js b/src/controllers/index.js index f6bfc322f4..665be289c6 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -166,7 +166,7 @@ Controllers.register = function (req, res, next) { data.minimumUsernameLength = parseInt(meta.config.minimumUsernameLength, 10); data.maximumUsernameLength = parseInt(meta.config.maximumUsernameLength, 10); data.minimumPasswordLength = parseInt(meta.config.minimumPasswordLength, 10); - data.minimumPasswordStrength = parseInt(meta.config.minimumPasswordStrength || 0, 10); + data.minimumPasswordStrength = parseInt(meta.config.minimumPasswordStrength || 1, 10); data.termsOfUse = termsOfUse.postData.content; data.breadcrumbs = helpers.buildBreadcrumbs([{ text: '[[register:register]]', diff --git a/src/upgrades/1.7.6/update_min_pass_strength.js b/src/upgrades/1.7.6/update_min_pass_strength.js new file mode 100644 index 0000000000..c051d1d72e --- /dev/null +++ b/src/upgrades/1.7.6/update_min_pass_strength.js @@ -0,0 +1,22 @@ +'use strict'; + +var db = require('../../database'); + +var async = require('async'); + +module.exports = { + name: 'Revising minimum password strength to 1 (from 0)', + timestamp: Date.UTC(2017, 1, 21), + method: function (callback) { + async.waterfall([ + async.apply(db.getObjectField.bind(db), 'config', 'minimumPasswordStrength'), + function (strength, next) { + if (!strength) { + return db.setObjectField('config', 'minimumPasswordStrength', 1, next); + } + + setImmediate(next); + }, + ], callback); + }, +}; From a0dfc43cc4ef8d83dd69d054611b29217f2cdeb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 21 Feb 2018 11:49:53 -0500 Subject: [PATCH 18/23] up composer --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index bbb50e76d6..82f349de5e 100644 --- a/install/package.json +++ b/install/package.json @@ -60,7 +60,7 @@ "morgan": "^1.9.0", "mousetrap": "^1.6.1", "nconf": "^0.9.1", - "nodebb-plugin-composer-default": "6.0.14", + "nodebb-plugin-composer-default": "6.0.15", "nodebb-plugin-dbsearch": "2.0.9", "nodebb-plugin-emoji": "^2.1.0", "nodebb-plugin-emoji-android": "2.0.0", From c7b73b4e4134e568786a020c7e850cd4c98bdc5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 21 Feb 2018 12:52:26 -0500 Subject: [PATCH 19/23] closes #6337 --- src/controllers/admin/plugins.js | 13 ++++++++++--- src/views/admin/extend/plugins.tpl | 15 ++++++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/controllers/admin/plugins.js b/src/controllers/admin/plugins.js index b04458edae..b5863e7c9e 100644 --- a/src/controllers/admin/plugins.js +++ b/src/controllers/admin/plugins.js @@ -33,11 +33,18 @@ pluginsController.get = function (req, res, next) { var compatiblePkgNames = payload.compatible.map(function (pkgData) { return pkgData.name; }); + var installedPlugins = payload.compatible.filter(function (plugin) { + return plugin && plugin.installed; + }); + var activePlugins = payload.all.filter(function (plugin) { + return plugin && plugin.installed && plugin.active; + }); res.render('admin/extend/plugins', { - installed: payload.compatible.filter(function (plugin) { - return plugin.installed; - }), + installed: installedPlugins, + installedCount: installedPlugins.length, + activeCount: activePlugins.length, + inactiveCount: Math.max(0, installedPlugins.length - activePlugins.length), upgradeCount: payload.compatible.reduce(function (count, current) { if (current.installed && current.outdated) { count += 1; diff --git a/src/views/admin/extend/plugins.tpl b/src/views/admin/extend/plugins.tpl index 7afffd5e08..cbf44febf8 100644 --- a/src/views/admin/extend/plugins.tpl +++ b/src/views/admin/extend/plugins.tpl @@ -1,7 +1,16 @@
    -
  • [[admin/extend/plugins:installed]]
    • -
  • [[admin/extend/plugins:active]]
    • -
  • [[admin/extend/plugins:inactive]]
    • +
  • + [[admin/extend/plugins:installed]] + {installedCount} +
    • +
  • + [[admin/extend/plugins:active]] + {activeCount} +
    • +
  • + [[admin/extend/plugins:inactive]] + {inactiveCount} +
  • [[admin/extend/plugins:out-of-date]] {upgradeCount} From 98b0bdc7e10dcaa524ca9476ee5262242d2a6ebc Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 21 Feb 2018 14:13:20 -0500 Subject: [PATCH 20/23] added helmet for better standard of protection across the board --- install/package.json | 1 + src/middleware/headers.js | 1 - src/webserver.js | 3 +++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 82f349de5e..7e769d5f4b 100644 --- a/install/package.json +++ b/install/package.json @@ -43,6 +43,7 @@ "express-session": "^1.15.6", "express-useragent": "1.0.8", "graceful-fs": "^4.1.11", + "helmet": "^3.11.0", "html-to-text": "3.3.0", "ipaddr.js": "^1.5.4", "jimp": "0.2.28", diff --git a/src/middleware/headers.js b/src/middleware/headers.js index d63f163d7c..035608eab6 100644 --- a/src/middleware/headers.js +++ b/src/middleware/headers.js @@ -11,7 +11,6 @@ module.exports = function (middleware) { 'X-Frame-Options': meta.config['allow-from-uri'] ? 'ALLOW-FROM ' + encodeURI(meta.config['allow-from-uri']) : 'SAMEORIGIN', 'Access-Control-Allow-Methods': encodeURI(meta.config['access-control-allow-methods'] || ''), 'Access-Control-Allow-Headers': encodeURI(meta.config['access-control-allow-headers'] || ''), - 'Referrer-Policy': 'strict-origin-when-cross-origin', // consider using helmet? }; if (meta.config['access-control-allow-origin']) { diff --git a/src/webserver.js b/src/webserver.js index c4c97fd058..639f2af667 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -17,6 +17,7 @@ var cookieParser = require('cookie-parser'); var session = require('express-session'); var useragent = require('express-useragent'); var favicon = require('serve-favicon'); +var helmet = require('helmet'); var db = require('./database'); var file = require('./file'); @@ -171,6 +172,8 @@ function setupExpressApp(app, callback) { saveUninitialized: true, })); + app.use(helmet()); + app.use(helmet.referrerPolicy({ policy: 'strict-origin-when-cross-origin' })); app.use(middleware.addHeaders); app.use(middleware.processRender); auth.initialize(app, middleware); From 4686b32c5451a98d48b5a7805004b7fbed9e76db Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Thu, 22 Feb 2018 09:25:06 +0000 Subject: [PATCH 21/23] Latest translations and fallbacks --- public/language/ru/notifications.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json index 6ee7b75b4d..f1a6ed7b93 100644 --- a/public/language/ru/notifications.json +++ b/public/language/ru/notifications.json @@ -54,9 +54,9 @@ "notificationType_upvote": "Когда кто-то проголосовал за ваше сообщение", "notificationType_new-topic": "Отслеживать сообщения в вашей теме", "notificationType_new-reply": "When a new reply is posted in a topic you are watching", - "notificationType_follow": "When someone starts following you", - "notificationType_new-chat": "When you receive a chat message", - "notificationType_group-invite": "When you receive a group invite", + "notificationType_follow": "Когда кто-то подписался на ваши обновления", + "notificationType_new-chat": "Когда вы получили сообщение", + "notificationType_group-invite": "Когда вы получили приглашение в группу", "notificationType_new-register": "When someone gets added to registration queue", "notificationType_post-queue": "When a new post is queued", "notificationType_new-post-flag": "When a post is flagged", From 937f37de1ea401d39525be3649e369aa3bdf5f75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 22 Feb 2018 18:03:36 -0500 Subject: [PATCH 22/23] up persona --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 7e769d5f4b..f979e5f0a9 100644 --- a/install/package.json +++ b/install/package.json @@ -71,7 +71,7 @@ "nodebb-plugin-spam-be-gone": "0.5.3", "nodebb-rewards-essentials": "0.0.11", "nodebb-theme-lavender": "5.0.3", - "nodebb-theme-persona": "7.2.23", + "nodebb-theme-persona": "7.2.24", "nodebb-theme-slick": "1.1.4", "nodebb-theme-vanilla": "8.1.10", "nodebb-widget-essentials": "4.0.2", From d65ce418792f314a9b239e15a493dd8eb6cb374e Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Fri, 23 Feb 2018 09:25:22 +0000 Subject: [PATCH 23/23] Latest translations and fallbacks --- public/language/ar/admin/extend/widgets.json | 5 ++++- public/language/ar/admin/general/dashboard.json | 7 ++++--- public/language/ar/admin/general/navigation.json | 3 --- public/language/ar/admin/manage/categories.json | 4 +++- public/language/ar/admin/manage/ip-blacklist.json | 3 ++- public/language/ar/admin/menu.json | 1 + public/language/ar/admin/settings/user.json | 3 ++- public/language/ar/error.json | 1 + public/language/ar/topic.json | 3 +++ public/language/ar/user.json | 1 + public/language/bg/admin/extend/widgets.json | 5 ++++- public/language/bg/admin/general/dashboard.json | 7 ++++--- public/language/bg/admin/general/navigation.json | 3 --- public/language/bg/admin/manage/categories.json | 4 +++- public/language/bg/admin/manage/ip-blacklist.json | 3 ++- public/language/bg/admin/menu.json | 1 + public/language/bg/admin/settings/user.json | 3 ++- public/language/bg/error.json | 1 + public/language/bg/topic.json | 3 +++ public/language/bg/user.json | 1 + public/language/bn/admin/extend/widgets.json | 5 ++++- public/language/bn/admin/general/dashboard.json | 7 ++++--- public/language/bn/admin/general/navigation.json | 3 --- public/language/bn/admin/manage/categories.json | 4 +++- public/language/bn/admin/manage/ip-blacklist.json | 3 ++- public/language/bn/admin/menu.json | 1 + public/language/bn/admin/settings/user.json | 3 ++- public/language/bn/error.json | 1 + public/language/bn/topic.json | 3 +++ public/language/bn/user.json | 1 + public/language/cs/admin/extend/widgets.json | 5 ++++- public/language/cs/admin/general/dashboard.json | 7 ++++--- public/language/cs/admin/general/navigation.json | 3 --- public/language/cs/admin/manage/categories.json | 4 +++- public/language/cs/admin/manage/ip-blacklist.json | 3 ++- public/language/cs/admin/menu.json | 1 + public/language/cs/admin/settings/user.json | 3 ++- public/language/cs/error.json | 1 + public/language/cs/topic.json | 3 +++ public/language/cs/user.json | 1 + public/language/da/admin/extend/widgets.json | 5 ++++- public/language/da/admin/general/dashboard.json | 7 ++++--- public/language/da/admin/general/navigation.json | 3 --- public/language/da/admin/manage/categories.json | 4 +++- public/language/da/admin/manage/ip-blacklist.json | 3 ++- public/language/da/admin/menu.json | 1 + public/language/da/admin/settings/user.json | 3 ++- public/language/da/error.json | 1 + public/language/da/topic.json | 3 +++ public/language/da/user.json | 1 + public/language/de/admin/extend/widgets.json | 5 ++++- public/language/de/admin/general/dashboard.json | 7 ++++--- public/language/de/admin/general/navigation.json | 3 --- public/language/de/admin/manage/categories.json | 4 +++- public/language/de/admin/manage/ip-blacklist.json | 3 ++- public/language/de/admin/menu.json | 1 + public/language/de/admin/settings/user.json | 3 ++- public/language/de/error.json | 1 + public/language/de/topic.json | 3 +++ public/language/de/user.json | 1 + public/language/el/admin/extend/widgets.json | 5 ++++- public/language/el/admin/general/dashboard.json | 7 ++++--- public/language/el/admin/general/navigation.json | 3 --- public/language/el/admin/manage/categories.json | 4 +++- public/language/el/admin/manage/ip-blacklist.json | 3 ++- public/language/el/admin/menu.json | 1 + public/language/el/admin/settings/user.json | 3 ++- public/language/el/error.json | 1 + public/language/el/topic.json | 3 +++ public/language/el/user.json | 1 + public/language/en-US/admin/extend/widgets.json | 5 ++++- public/language/en-US/admin/general/dashboard.json | 7 ++++--- public/language/en-US/admin/general/navigation.json | 3 --- public/language/en-US/admin/manage/categories.json | 4 +++- public/language/en-US/admin/manage/ip-blacklist.json | 3 ++- public/language/en-US/admin/menu.json | 1 + public/language/en-US/admin/settings/user.json | 3 ++- public/language/en-US/error.json | 1 + public/language/en-US/topic.json | 3 +++ public/language/en-US/user.json | 1 + public/language/en-x-pirate/admin/extend/widgets.json | 5 ++++- public/language/en-x-pirate/admin/general/dashboard.json | 7 ++++--- public/language/en-x-pirate/admin/general/navigation.json | 3 --- public/language/en-x-pirate/admin/manage/categories.json | 4 +++- public/language/en-x-pirate/admin/manage/ip-blacklist.json | 3 ++- public/language/en-x-pirate/admin/menu.json | 1 + public/language/en-x-pirate/admin/settings/user.json | 3 ++- public/language/en-x-pirate/error.json | 1 + public/language/en-x-pirate/topic.json | 3 +++ public/language/en-x-pirate/user.json | 1 + public/language/es/admin/extend/widgets.json | 5 ++++- public/language/es/admin/general/dashboard.json | 7 ++++--- public/language/es/admin/general/navigation.json | 3 --- public/language/es/admin/manage/categories.json | 4 +++- public/language/es/admin/manage/ip-blacklist.json | 3 ++- public/language/es/admin/menu.json | 1 + public/language/es/admin/settings/user.json | 3 ++- public/language/es/error.json | 1 + public/language/es/topic.json | 3 +++ public/language/es/user.json | 1 + public/language/et/admin/extend/widgets.json | 5 ++++- public/language/et/admin/general/dashboard.json | 7 ++++--- public/language/et/admin/general/navigation.json | 3 --- public/language/et/admin/manage/categories.json | 4 +++- public/language/et/admin/manage/ip-blacklist.json | 3 ++- public/language/et/admin/menu.json | 1 + public/language/et/admin/settings/user.json | 3 ++- public/language/et/error.json | 1 + public/language/et/topic.json | 3 +++ public/language/et/user.json | 1 + public/language/fa-IR/admin/extend/widgets.json | 5 ++++- public/language/fa-IR/admin/general/dashboard.json | 7 ++++--- public/language/fa-IR/admin/general/navigation.json | 3 --- public/language/fa-IR/admin/manage/categories.json | 4 +++- public/language/fa-IR/admin/manage/ip-blacklist.json | 3 ++- public/language/fa-IR/admin/menu.json | 1 + public/language/fa-IR/admin/settings/user.json | 3 ++- public/language/fa-IR/error.json | 1 + public/language/fa-IR/topic.json | 3 +++ public/language/fa-IR/user.json | 1 + public/language/fi/admin/extend/widgets.json | 5 ++++- public/language/fi/admin/general/dashboard.json | 7 ++++--- public/language/fi/admin/general/navigation.json | 3 --- public/language/fi/admin/manage/categories.json | 4 +++- public/language/fi/admin/manage/ip-blacklist.json | 3 ++- public/language/fi/admin/menu.json | 1 + public/language/fi/admin/settings/user.json | 3 ++- public/language/fi/error.json | 1 + public/language/fi/topic.json | 3 +++ public/language/fi/user.json | 1 + public/language/fr/admin/extend/widgets.json | 5 ++++- public/language/fr/admin/general/dashboard.json | 7 ++++--- public/language/fr/admin/general/navigation.json | 3 --- public/language/fr/admin/manage/categories.json | 4 +++- public/language/fr/admin/manage/ip-blacklist.json | 3 ++- public/language/fr/admin/menu.json | 1 + public/language/fr/admin/settings/user.json | 3 ++- public/language/fr/error.json | 1 + public/language/fr/topic.json | 3 +++ public/language/fr/user.json | 1 + public/language/gl/admin/extend/widgets.json | 5 ++++- public/language/gl/admin/general/dashboard.json | 7 ++++--- public/language/gl/admin/general/navigation.json | 3 --- public/language/gl/admin/manage/categories.json | 4 +++- public/language/gl/admin/manage/ip-blacklist.json | 3 ++- public/language/gl/admin/menu.json | 1 + public/language/gl/admin/settings/user.json | 3 ++- public/language/gl/error.json | 1 + public/language/gl/topic.json | 3 +++ public/language/gl/user.json | 1 + public/language/he/admin/extend/widgets.json | 5 ++++- public/language/he/admin/general/dashboard.json | 7 ++++--- public/language/he/admin/general/navigation.json | 3 --- public/language/he/admin/manage/categories.json | 4 +++- public/language/he/admin/manage/ip-blacklist.json | 3 ++- public/language/he/admin/menu.json | 1 + public/language/he/admin/settings/user.json | 3 ++- public/language/he/error.json | 1 + public/language/he/topic.json | 3 +++ public/language/he/user.json | 1 + public/language/hr/admin/extend/widgets.json | 5 ++++- public/language/hr/admin/general/dashboard.json | 7 ++++--- public/language/hr/admin/general/navigation.json | 3 --- public/language/hr/admin/manage/categories.json | 4 +++- public/language/hr/admin/manage/ip-blacklist.json | 3 ++- public/language/hr/admin/menu.json | 1 + public/language/hr/admin/settings/user.json | 3 ++- public/language/hr/error.json | 1 + public/language/hr/topic.json | 3 +++ public/language/hr/user.json | 1 + public/language/hu/admin/extend/widgets.json | 5 ++++- public/language/hu/admin/general/dashboard.json | 7 ++++--- public/language/hu/admin/general/navigation.json | 3 --- public/language/hu/admin/manage/categories.json | 4 +++- public/language/hu/admin/manage/ip-blacklist.json | 3 ++- public/language/hu/admin/menu.json | 1 + public/language/hu/admin/settings/user.json | 3 ++- public/language/hu/error.json | 1 + public/language/hu/topic.json | 3 +++ public/language/hu/user.json | 1 + public/language/id/admin/extend/widgets.json | 5 ++++- public/language/id/admin/general/dashboard.json | 7 ++++--- public/language/id/admin/general/navigation.json | 3 --- public/language/id/admin/manage/categories.json | 4 +++- public/language/id/admin/manage/ip-blacklist.json | 3 ++- public/language/id/admin/menu.json | 1 + public/language/id/admin/settings/user.json | 3 ++- public/language/id/error.json | 1 + public/language/id/topic.json | 3 +++ public/language/id/user.json | 1 + public/language/it/admin/extend/widgets.json | 5 ++++- public/language/it/admin/general/dashboard.json | 7 ++++--- public/language/it/admin/general/navigation.json | 3 --- public/language/it/admin/manage/categories.json | 4 +++- public/language/it/admin/manage/ip-blacklist.json | 3 ++- public/language/it/admin/menu.json | 1 + public/language/it/admin/settings/user.json | 3 ++- public/language/it/error.json | 1 + public/language/it/topic.json | 3 +++ public/language/it/user.json | 1 + public/language/ja/admin/extend/widgets.json | 5 ++++- public/language/ja/admin/general/dashboard.json | 7 ++++--- public/language/ja/admin/general/navigation.json | 3 --- public/language/ja/admin/manage/categories.json | 4 +++- public/language/ja/admin/manage/ip-blacklist.json | 3 ++- public/language/ja/admin/menu.json | 1 + public/language/ja/admin/settings/user.json | 3 ++- public/language/ja/error.json | 1 + public/language/ja/topic.json | 3 +++ public/language/ja/user.json | 1 + public/language/ko/admin/extend/widgets.json | 5 ++++- public/language/ko/admin/general/dashboard.json | 7 ++++--- public/language/ko/admin/general/navigation.json | 3 --- public/language/ko/admin/manage/categories.json | 4 +++- public/language/ko/admin/manage/ip-blacklist.json | 3 ++- public/language/ko/admin/menu.json | 1 + public/language/ko/admin/settings/user.json | 3 ++- public/language/ko/error.json | 1 + public/language/ko/topic.json | 3 +++ public/language/ko/user.json | 1 + public/language/lt/admin/extend/widgets.json | 5 ++++- public/language/lt/admin/general/dashboard.json | 7 ++++--- public/language/lt/admin/general/navigation.json | 3 --- public/language/lt/admin/manage/categories.json | 4 +++- public/language/lt/admin/manage/ip-blacklist.json | 3 ++- public/language/lt/admin/menu.json | 1 + public/language/lt/admin/settings/user.json | 3 ++- public/language/lt/error.json | 1 + public/language/lt/topic.json | 3 +++ public/language/lt/user.json | 1 + public/language/ms/admin/extend/widgets.json | 5 ++++- public/language/ms/admin/general/dashboard.json | 7 ++++--- public/language/ms/admin/general/navigation.json | 3 --- public/language/ms/admin/manage/categories.json | 4 +++- public/language/ms/admin/manage/ip-blacklist.json | 3 ++- public/language/ms/admin/menu.json | 1 + public/language/ms/admin/settings/user.json | 3 ++- public/language/ms/error.json | 1 + public/language/ms/topic.json | 3 +++ public/language/ms/user.json | 1 + public/language/nb/admin/extend/widgets.json | 5 ++++- public/language/nb/admin/general/dashboard.json | 7 ++++--- public/language/nb/admin/general/navigation.json | 3 --- public/language/nb/admin/manage/categories.json | 4 +++- public/language/nb/admin/manage/ip-blacklist.json | 3 ++- public/language/nb/admin/menu.json | 1 + public/language/nb/admin/settings/user.json | 3 ++- public/language/nb/error.json | 1 + public/language/nb/topic.json | 3 +++ public/language/nb/user.json | 1 + public/language/nl/admin/extend/widgets.json | 5 ++++- public/language/nl/admin/general/dashboard.json | 7 ++++--- public/language/nl/admin/general/navigation.json | 3 --- public/language/nl/admin/manage/categories.json | 4 +++- public/language/nl/admin/manage/ip-blacklist.json | 3 ++- public/language/nl/admin/menu.json | 1 + public/language/nl/admin/settings/user.json | 3 ++- public/language/nl/error.json | 1 + public/language/nl/topic.json | 3 +++ public/language/nl/user.json | 1 + public/language/pl/admin/extend/widgets.json | 5 ++++- public/language/pl/admin/general/dashboard.json | 7 ++++--- public/language/pl/admin/general/navigation.json | 3 --- public/language/pl/admin/manage/categories.json | 4 +++- public/language/pl/admin/manage/ip-blacklist.json | 3 ++- public/language/pl/admin/menu.json | 1 + public/language/pl/admin/settings/user.json | 3 ++- public/language/pl/error.json | 1 + public/language/pl/topic.json | 3 +++ public/language/pl/user.json | 1 + public/language/pt-BR/admin/extend/widgets.json | 5 ++++- public/language/pt-BR/admin/general/dashboard.json | 7 ++++--- public/language/pt-BR/admin/general/navigation.json | 3 --- public/language/pt-BR/admin/manage/categories.json | 4 +++- public/language/pt-BR/admin/manage/ip-blacklist.json | 3 ++- public/language/pt-BR/admin/menu.json | 1 + public/language/pt-BR/admin/settings/user.json | 3 ++- public/language/pt-BR/error.json | 1 + public/language/pt-BR/topic.json | 3 +++ public/language/pt-BR/user.json | 1 + public/language/pt-PT/admin/extend/widgets.json | 5 ++++- public/language/pt-PT/admin/general/dashboard.json | 7 ++++--- public/language/pt-PT/admin/general/navigation.json | 3 --- public/language/pt-PT/admin/manage/categories.json | 4 +++- public/language/pt-PT/admin/manage/ip-blacklist.json | 3 ++- public/language/pt-PT/admin/menu.json | 1 + public/language/pt-PT/admin/settings/user.json | 3 ++- public/language/pt-PT/error.json | 1 + public/language/pt-PT/topic.json | 3 +++ public/language/pt-PT/user.json | 1 + public/language/ro/admin/extend/widgets.json | 5 ++++- public/language/ro/admin/general/dashboard.json | 7 ++++--- public/language/ro/admin/general/navigation.json | 3 --- public/language/ro/admin/manage/categories.json | 4 +++- public/language/ro/admin/manage/ip-blacklist.json | 3 ++- public/language/ro/admin/menu.json | 1 + public/language/ro/admin/settings/user.json | 3 ++- public/language/ro/error.json | 1 + public/language/ro/topic.json | 3 +++ public/language/ro/user.json | 1 + public/language/ru/admin/extend/widgets.json | 5 ++++- public/language/ru/admin/general/dashboard.json | 7 ++++--- public/language/ru/admin/general/navigation.json | 3 --- public/language/ru/admin/manage/categories.json | 4 +++- public/language/ru/admin/manage/ip-blacklist.json | 3 ++- public/language/ru/admin/menu.json | 1 + public/language/ru/admin/settings/user.json | 3 ++- public/language/ru/error.json | 1 + public/language/ru/topic.json | 3 +++ public/language/ru/user.json | 1 + public/language/rw/admin/extend/widgets.json | 5 ++++- public/language/rw/admin/general/dashboard.json | 7 ++++--- public/language/rw/admin/general/navigation.json | 3 --- public/language/rw/admin/manage/categories.json | 4 +++- public/language/rw/admin/manage/ip-blacklist.json | 3 ++- public/language/rw/admin/menu.json | 1 + public/language/rw/admin/settings/user.json | 3 ++- public/language/rw/error.json | 1 + public/language/rw/topic.json | 3 +++ public/language/rw/user.json | 1 + public/language/sc/admin/extend/widgets.json | 5 ++++- public/language/sc/admin/general/dashboard.json | 7 ++++--- public/language/sc/admin/general/navigation.json | 3 --- public/language/sc/admin/manage/categories.json | 4 +++- public/language/sc/admin/manage/ip-blacklist.json | 3 ++- public/language/sc/admin/menu.json | 1 + public/language/sc/admin/settings/user.json | 3 ++- public/language/sc/error.json | 1 + public/language/sc/topic.json | 3 +++ public/language/sc/user.json | 1 + public/language/sk/admin/extend/widgets.json | 5 ++++- public/language/sk/admin/general/dashboard.json | 7 ++++--- public/language/sk/admin/general/navigation.json | 3 --- public/language/sk/admin/manage/categories.json | 4 +++- public/language/sk/admin/manage/ip-blacklist.json | 3 ++- public/language/sk/admin/menu.json | 1 + public/language/sk/admin/settings/user.json | 3 ++- public/language/sk/error.json | 1 + public/language/sk/topic.json | 3 +++ public/language/sk/user.json | 1 + public/language/sl/admin/extend/widgets.json | 5 ++++- public/language/sl/admin/general/dashboard.json | 7 ++++--- public/language/sl/admin/general/navigation.json | 3 --- public/language/sl/admin/manage/categories.json | 4 +++- public/language/sl/admin/manage/ip-blacklist.json | 3 ++- public/language/sl/admin/menu.json | 1 + public/language/sl/admin/settings/user.json | 3 ++- public/language/sl/error.json | 1 + public/language/sl/topic.json | 3 +++ public/language/sl/user.json | 1 + public/language/sr/admin/extend/widgets.json | 5 ++++- public/language/sr/admin/general/dashboard.json | 7 ++++--- public/language/sr/admin/general/navigation.json | 3 --- public/language/sr/admin/manage/categories.json | 4 +++- public/language/sr/admin/manage/ip-blacklist.json | 3 ++- public/language/sr/admin/menu.json | 1 + public/language/sr/admin/settings/user.json | 3 ++- public/language/sr/error.json | 1 + public/language/sr/topic.json | 3 +++ public/language/sr/user.json | 1 + public/language/sv/admin/extend/widgets.json | 5 ++++- public/language/sv/admin/general/dashboard.json | 7 ++++--- public/language/sv/admin/general/navigation.json | 3 --- public/language/sv/admin/manage/categories.json | 4 +++- public/language/sv/admin/manage/ip-blacklist.json | 3 ++- public/language/sv/admin/menu.json | 1 + public/language/sv/admin/settings/user.json | 3 ++- public/language/sv/error.json | 1 + public/language/sv/topic.json | 3 +++ public/language/sv/user.json | 1 + public/language/th/admin/extend/widgets.json | 5 ++++- public/language/th/admin/general/dashboard.json | 7 ++++--- public/language/th/admin/general/navigation.json | 3 --- public/language/th/admin/manage/categories.json | 4 +++- public/language/th/admin/manage/ip-blacklist.json | 3 ++- public/language/th/admin/menu.json | 1 + public/language/th/admin/settings/user.json | 3 ++- public/language/th/error.json | 1 + public/language/th/topic.json | 3 +++ public/language/th/user.json | 1 + public/language/tr/admin/extend/widgets.json | 5 ++++- public/language/tr/admin/general/dashboard.json | 7 ++++--- public/language/tr/admin/general/navigation.json | 3 --- public/language/tr/admin/manage/categories.json | 4 +++- public/language/tr/admin/manage/ip-blacklist.json | 3 ++- public/language/tr/admin/menu.json | 1 + public/language/tr/admin/settings/user.json | 3 ++- public/language/tr/error.json | 1 + public/language/tr/topic.json | 3 +++ public/language/tr/user.json | 1 + public/language/uk/admin/extend/widgets.json | 5 ++++- public/language/uk/admin/general/dashboard.json | 7 ++++--- public/language/uk/admin/general/navigation.json | 3 --- public/language/uk/admin/manage/categories.json | 4 +++- public/language/uk/admin/manage/ip-blacklist.json | 3 ++- public/language/uk/admin/menu.json | 1 + public/language/uk/admin/settings/user.json | 3 ++- public/language/uk/error.json | 1 + public/language/uk/topic.json | 3 +++ public/language/uk/user.json | 1 + public/language/vi/admin/extend/widgets.json | 5 ++++- public/language/vi/admin/general/dashboard.json | 7 ++++--- public/language/vi/admin/general/navigation.json | 3 --- public/language/vi/admin/manage/categories.json | 4 +++- public/language/vi/admin/manage/ip-blacklist.json | 3 ++- public/language/vi/admin/menu.json | 1 + public/language/vi/admin/settings/user.json | 3 ++- public/language/vi/error.json | 1 + public/language/vi/topic.json | 3 +++ public/language/vi/user.json | 1 + public/language/zh-CN/admin/extend/widgets.json | 5 ++++- public/language/zh-CN/admin/general/dashboard.json | 7 ++++--- public/language/zh-CN/admin/general/navigation.json | 3 --- public/language/zh-CN/admin/manage/categories.json | 4 +++- public/language/zh-CN/admin/manage/ip-blacklist.json | 3 ++- public/language/zh-CN/admin/menu.json | 1 + public/language/zh-CN/admin/settings/user.json | 3 ++- public/language/zh-CN/error.json | 1 + public/language/zh-CN/topic.json | 3 +++ public/language/zh-CN/user.json | 1 + public/language/zh-TW/admin/extend/widgets.json | 5 ++++- public/language/zh-TW/admin/general/dashboard.json | 7 ++++--- public/language/zh-TW/admin/general/navigation.json | 3 --- public/language/zh-TW/admin/manage/categories.json | 4 +++- public/language/zh-TW/admin/manage/ip-blacklist.json | 3 ++- public/language/zh-TW/admin/menu.json | 1 + public/language/zh-TW/admin/settings/user.json | 3 ++- public/language/zh-TW/error.json | 1 + public/language/zh-TW/topic.json | 3 +++ public/language/zh-TW/user.json | 1 + 430 files changed, 903 insertions(+), 430 deletions(-) diff --git a/public/language/ar/admin/extend/widgets.json b/public/language/ar/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/ar/admin/extend/widgets.json +++ b/public/language/ar/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/ar/admin/general/dashboard.json b/public/language/ar/admin/general/dashboard.json index e9fd0fddec..64d71be0d9 100644 --- a/public/language/ar/admin/general/dashboard.json +++ b/public/language/ar/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "نصب إضافة البحث من صفحة الإضافات البرمجية لتنشيط وظيفة البحث", "control-panel": "التحكم بالنظام", - "reload": "إعادة تحمبل", - "restart": "إعادة تشغيل", - "restart-warning": "إعادة تحميل او تشغيل NodeBB سوف يؤدي لقطع جميع الإتصالات لبضع ثواني.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "وضع الصيانة", "maintenance-mode-title": "انقر هنا لإعداد وضع الصيانة لـNodeBB", "realtime-chart-updates": "التحديث الفوري للرسم البياني", diff --git a/public/language/ar/admin/general/navigation.json b/public/language/ar/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/ar/admin/general/navigation.json +++ b/public/language/ar/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/ar/admin/manage/categories.json b/public/language/ar/admin/manage/categories.json index 9d006cd5c9..1547469aa2 100644 --- a/public/language/ar/admin/manage/categories.json +++ b/public/language/ar/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/ar/admin/manage/ip-blacklist.json b/public/language/ar/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/ar/admin/manage/ip-blacklist.json +++ b/public/language/ar/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/ar/admin/menu.json b/public/language/ar/admin/menu.json index 870ae082a6..cb02303182 100644 --- a/public/language/ar/admin/menu.json +++ b/public/language/ar/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "قائمة انتظار المشاركة", "manage/groups": "المجموعات", "manage/ip-blacklist": "قائمة حظر عناوين IP", + "manage/uploads": "Uploads", "section-settings": "إعدادات", "settings/general": "عامة", diff --git a/public/language/ar/admin/settings/user.json b/public/language/ar/admin/settings/user.json index 3d53253014..445a94a6b0 100644 --- a/public/language/ar/admin/settings/user.json +++ b/public/language/ar/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/ar/error.json b/public/language/ar/error.json index d5c859f886..696e6a18dc 100644 --- a/public/language/ar/error.json +++ b/public/language/ar/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "الرجاء استعمال بريدك اﻹلكتروني للدخول", "wrong-login-type-username": "الرجاء استعمال اسم المستخدم الخاص بك للدخول", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "لقد قمت بدعوة الحد الأقصى من الأشخاص (%1 من %2)", "no-session-found": "لم دخول مسجل!", "not-in-room": "المستخدم غير موجود في الغرفة.", diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json index 0bae0650fb..1b3fdc37cc 100644 --- a/public/language/ar/topic.json +++ b/public/language/ar/topic.json @@ -30,8 +30,11 @@ "locked": "مقفل", "pinned": "مثبت", "moved": "منقول", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "اضغط هنا للعودة لأخر مشاركة مقروءة في الموضوع", "flag_title": "إشعار بمشاركة مخلة.", + "merged_message": "This topic has been merged into %2", "deleted_message": "هذه المشاركة محذوفة. فقط من لهم صلاحية الإشراف على ا لمشاركات يمكنهم معاينتها.", "following_topic.message": "ستستلم تنبيها عند كل مشاركة جديدة في هذا الموضوع.", "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.", diff --git a/public/language/ar/user.json b/public/language/ar/user.json index 75e875acbc..d01b7e7e50 100644 --- a/public/language/ar/user.json +++ b/public/language/ar/user.json @@ -95,6 +95,7 @@ "topics_per_page": "المواضيع في كل صفحة", "posts_per_page": "الردود في كل صفحة", "max_items_per_page": "أقصى %1", + "acp_language": "Admin Page Language", "notification_sounds": "تشغيل صوت عند تلقي تنبيه", "notifications_and_sounds": "التنبيهات والأصوات", "incoming-message-sound": "صوت الرسالة الواردة", diff --git a/public/language/bg/admin/extend/widgets.json b/public/language/bg/admin/extend/widgets.json index 5ba011aed6..3d031fca86 100644 --- a/public/language/bg/admin/extend/widgets.json +++ b/public/language/bg/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Налични джаджи", "explanation": "Изберете джаджа от падащото меню, а след това я завлачете и пуснете в областта за джаджи в някой от шаблоните вляво.", "none-installed": "Няма намерени джаджи! Включете добавката с основните джаджи в контролния панел за добавките.", + "clone-from": "Клониране на джаджите от", "containers.available": "Налични контейнери", "containers.explanation": "Завлачете и пуснете върху някоя активна джаджа", "containers.none": "Няма", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Наистина ли искате да изтриете джаджата?", "alert.updated": "Джаджите са обновени", - "alert.update-success": "Джаджите са обновени успешно" + "alert.update-success": "Джаджите са обновени успешно", + "alert.clone-success": "Джаджите са клонирани успешно", + "error.select-clone": "Изберете страница, от която да клонирате" } \ No newline at end of file diff --git a/public/language/bg/admin/general/dashboard.json b/public/language/bg/admin/general/dashboard.json index f1d5630c12..419120ef5b 100644 --- a/public/language/bg/admin/general/dashboard.json +++ b/public/language/bg/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Инсталирайте добавка за търсене от страницата с добавките, за да включите функционалността за търсене", "control-panel": "Системен контрол", - "reload": "Презареждане", - "restart": "Рестартиране", - "restart-warning": "Презареждането и рестартирането на NodeBB ще прекъсне всички връзки за няколко секунди.", + "reload": "Рестартиране", + "restart": "Повторно изграждане и рестартиране", + "restart-warning": "Повторното изграждане и рестартирането на NodeBB ще прекъснат всички връзки за няколко секунди.", + "restart-disabled": "Възможностите за повторно изграждане и рестартиране на NodeBB са изключени, тъй като изглежда, че NodeBB не се изпълнява чрез подходящия демон.", "maintenance-mode": "Режим на профилактика", "maintenance-mode-title": "Щракнете тук, за да зададете режим на профилактика на NodeBB", "realtime-chart-updates": "Актуализации на таблиците в реално време", diff --git a/public/language/bg/admin/general/navigation.json b/public/language/bg/admin/general/navigation.json index baffb3e7b7..21160bd8b7 100644 --- a/public/language/bg/admin/general/navigation.json +++ b/public/language/bg/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Да е видимо само за гостите", "open-new-window": "Отваряне в нов прозорец", - "installed-plugins-required": "Нужни инсталирани добавки:", - "search-plugin": "Търсене на добавката", - "btn.delete": "Изтриване", "btn.disable": "Изключване", "btn.enable": "Включване", diff --git a/public/language/bg/admin/manage/categories.json b/public/language/bg/admin/manage/categories.json index bd503559f6..27780cdbcc 100644 --- a/public/language/bg/admin/manage/categories.json +++ b/public/language/bg/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Търсене на потребител", "alert.user-search": "Потърсете потребител тук…", "alert.find-group": "Търсене на група", - "alert.group-search": "Потърсете група тук…" + "alert.group-search": "Потърсете група тук…", + "collapse-all": "Свиване на всички", + "expand-all": "Разгъване на всички" } \ No newline at end of file diff --git a/public/language/bg/admin/manage/ip-blacklist.json b/public/language/bg/admin/manage/ip-blacklist.json index 532fe66493..ce6401534c 100644 --- a/public/language/bg/admin/manage/ip-blacklist.json +++ b/public/language/bg/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Черният списък е приложен", "analytics.blacklist-hourly": "Фигура 1 – Попадения в черния списък за час", - "analytics.blacklist-daily": "Фигура 2 – Попадения в черния списък за ден" + "analytics.blacklist-daily": "Фигура 2 – Попадения в черния списък за ден", + "ip-banned": "Блокиран IP адрес" } \ No newline at end of file diff --git a/public/language/bg/admin/menu.json b/public/language/bg/admin/menu.json index b7e9726fea..3fdd7636a1 100644 --- a/public/language/bg/admin/menu.json +++ b/public/language/bg/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Опашка за публикации", "manage/groups": "Групи", "manage/ip-blacklist": "Черен списък за IP адреси", + "manage/uploads": "Качвания", "section-settings": "Настройки", "settings/general": "Общи", diff --git a/public/language/bg/admin/settings/user.json b/public/language/bg/admin/settings/user.json index a43f032ac5..c11bf8345f 100644 --- a/public/language/bg/admin/settings/user.json +++ b/public/language/bg/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Изпращане на е-писмо, ако получа ново съобщение в разговор, а не съм на линия", "email-post-notif": "Изпращане на е-писмо, когато се появи отговор в темите, за които съм абониран(а).", "follow-created-topics": "Следване на темите, които създавате", - "follow-replied-topics": "Следване на темите, на които отговаряте" + "follow-replied-topics": "Следване на темите, на които отговаряте", + "default-notification-settings": "Настройки по подразбиране за известията" } \ No newline at end of file diff --git a/public/language/bg/error.json b/public/language/bg/error.json index bebe6bb668..169934ac72 100644 --- a/public/language/bg/error.json +++ b/public/language/bg/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Моля, използвайте е-пощата си, за да се впишете", "wrong-login-type-username": "Моля, използвайте потребителското си име, за да се впишете", "sso-registration-disabled": "Регистрацията за акаунти от %1 беше забранена, моля, регистрирайте се първо с е-поща", + "sso-multiple-association": "Не можете да свържете повече от един акаунт от тази услуга с акаунта си в NodeBB. Моля, премахнете връзката със съществуващия акаунт и опитайте отново.", "invite-maximum-met": "Вие сте поканили максимално позволения брой хора (%1 от %2).", "no-session-found": "Няма намерена сесия на вписване!", "not-in-room": "Потребителят не е в стаята", diff --git a/public/language/bg/topic.json b/public/language/bg/topic.json index e401c016bb..9a0942a6de 100644 --- a/public/language/bg/topic.json +++ b/public/language/bg/topic.json @@ -30,8 +30,11 @@ "locked": "Заключена", "pinned": "Закачена", "moved": "Преместена", + "copy-ip": "Копиране на IP адреса", + "ban-ip": "Блокиране на IP адреса", "bookmark_instructions": "Щракнете тук, за да се върнете към последно прочетената публикация в тази тема.", "flag_title": "Докладване на тази публикация до модератор", + "merged_message": "Тази тема беше слята в %2", "deleted_message": "Темата е изтрита. Само потребители с права за управление на темите могат да я видят.", "following_topic.message": "Вече ще получавате известия когато някой публикува коментар в тази тема.", "not_following_topic.message": "Ще виждате тази тема в списъка с непрочетени теми, но няма да получавате известия, когато хората публикуват нещо в нея.", diff --git a/public/language/bg/user.json b/public/language/bg/user.json index c1d6f314e7..7b4f947147 100644 --- a/public/language/bg/user.json +++ b/public/language/bg/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Теми на страница", "posts_per_page": "Публикации на страница", "max_items_per_page": "Най-много %1", + "acp_language": "Език на администраторската страница", "notification_sounds": "Изпълняване на звук, когато получите известие", "notifications_and_sounds": "Известия и звуци", "incoming-message-sound": "Звук за входящо съобщение", diff --git a/public/language/bn/admin/extend/widgets.json b/public/language/bn/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/bn/admin/extend/widgets.json +++ b/public/language/bn/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/bn/admin/general/dashboard.json b/public/language/bn/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/bn/admin/general/dashboard.json +++ b/public/language/bn/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/bn/admin/general/navigation.json b/public/language/bn/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/bn/admin/general/navigation.json +++ b/public/language/bn/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/bn/admin/manage/categories.json b/public/language/bn/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/bn/admin/manage/categories.json +++ b/public/language/bn/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/bn/admin/manage/ip-blacklist.json b/public/language/bn/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/bn/admin/manage/ip-blacklist.json +++ b/public/language/bn/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/bn/admin/menu.json b/public/language/bn/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/bn/admin/menu.json +++ b/public/language/bn/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/bn/admin/settings/user.json b/public/language/bn/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/bn/admin/settings/user.json +++ b/public/language/bn/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/bn/error.json b/public/language/bn/error.json index 1131b63773..6ff19e7d3b 100644 --- a/public/language/bn/error.json +++ b/public/language/bn/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Please use your email to login", "wrong-login-type-username": "Please use your username to login", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).", "no-session-found": "No login session found!", "not-in-room": "User not in room", diff --git a/public/language/bn/topic.json b/public/language/bn/topic.json index a3af72df7e..ddb32e457b 100644 --- a/public/language/bn/topic.json +++ b/public/language/bn/topic.json @@ -30,8 +30,11 @@ "locked": "বন্ধ", "pinned": "Pinned", "moved": "Moved", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Click here to return to the last read post in this thread.", "flag_title": "মডারেশনের জন্য এই পোস্টটি ফ্ল্যাগ করুন", + "merged_message": "This topic has been merged into %2", "deleted_message": "এই টপিকটি মুছে ফেলা হয়েছে। শুধুমাত্র টপিক ব্যবস্থাপনার ক্ষমতাপ্রাপ্ত সদস্যগণ এটি দেখতে পারবেন।", "following_topic.message": "এখন থেকে এই টপিকে অন্যকেউ পোস্ট করলে আপনি নোটিফিকেশন পাবেন।", "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.", diff --git a/public/language/bn/user.json b/public/language/bn/user.json index ad611b4642..d6014f6fe5 100644 --- a/public/language/bn/user.json +++ b/public/language/bn/user.json @@ -95,6 +95,7 @@ "topics_per_page": "প্রতি পেজে কতগুলো টপিক থাকবে", "posts_per_page": "প্রতি পেইজে কতগুলো পোষ্ট থাকবে", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "নোটিফিকেশনের জন্য নোটিফিকেশন সাউন্ড এনাবল করুন", "notifications_and_sounds": "Notifications & Sounds", "incoming-message-sound": "Incoming message sound", diff --git a/public/language/cs/admin/extend/widgets.json b/public/language/cs/admin/extend/widgets.json index 17935c1920..c1d78f2d9d 100644 --- a/public/language/cs/admin/extend/widgets.json +++ b/public/language/cs/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Dostupné miniaplikace", "explanation": "Vyberte si miniaplikaci z vysouvací nabídky a přetáhněte ji do oblasti šablony miniaplikace nalevo.", "none-installed": "Nebyly nalezeny žádné miniaplikace. Aktivujte rozšíření základních miniaplikací v ovládacím panelu Rozšíření.", + "clone-from": "Clone widgets from", "containers.available": "Dostupné moduly", "containers.explanation": "Přetáhněte na jakoukoliv aktivní miniaplikaci", "containers.none": "Nic", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Jste si jist/a, že chcete smazat tuto miniaplikaci?", "alert.updated": "Miniaplikace byly aktualizovány", - "alert.update-success": "Miniaplikace byly úspěšně aktualizovány" + "alert.update-success": "Miniaplikace byly úspěšně aktualizovány", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/cs/admin/general/dashboard.json b/public/language/cs/admin/general/dashboard.json index 04c1199ae7..37236c992b 100644 --- a/public/language/cs/admin/general/dashboard.json +++ b/public/language/cs/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Pro aktivování funkce vyhledávání, nainstalujte rozšíření pro hledání ze stránky rozšíření.", "control-panel": "Ovládání systému", - "reload": "Znovu načíst", - "restart": "Restartovat", - "restart-warning": "Znovu načtení nebo restartování NodeBB odpojí na pár vteřin všechna stávající připojení.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Režim údržby", "maintenance-mode-title": "Pro nastavení režimu údržby NodeBB, klikněte zde", "realtime-chart-updates": "Aktualizace grafů v reálném čase", diff --git a/public/language/cs/admin/general/navigation.json b/public/language/cs/admin/general/navigation.json index c8e001b955..3a4284d9d8 100644 --- a/public/language/cs/admin/general/navigation.json +++ b/public/language/cs/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Zobrazit jen hostům", "open-new-window": "Otevřít v novém okně", - "installed-plugins-required": "Vyžadovaná nainstalovaná rozšíření:", - "search-plugin": "Hledat rozšíření", - "btn.delete": "Odstranit", "btn.disable": "Zakázat", "btn.enable": "Povolit", diff --git a/public/language/cs/admin/manage/categories.json b/public/language/cs/admin/manage/categories.json index 76a013444c..6ec96686e8 100644 --- a/public/language/cs/admin/manage/categories.json +++ b/public/language/cs/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Najít uživatele", "alert.user-search": "Najít uživatele…", "alert.find-group": "Najít skupinu", - "alert.group-search": "Hledat skupinu…" + "alert.group-search": "Hledat skupinu…", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/cs/admin/manage/ip-blacklist.json b/public/language/cs/admin/manage/ip-blacklist.json index 5ada5d444f..ae619eff5a 100644 --- a/public/language/cs/admin/manage/ip-blacklist.json +++ b/public/language/cs/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Černá listina byla použita", "analytics.blacklist-hourly": "Postava 1 – záznamů v černé listině/hodinu", - "analytics.blacklist-daily": "Postava 2 – záznamů v černé listině/den" + "analytics.blacklist-daily": "Postava 2 – záznamů v černé listině/den", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/cs/admin/menu.json b/public/language/cs/admin/menu.json index 65b9ee394d..1bb28dd6be 100644 --- a/public/language/cs/admin/menu.json +++ b/public/language/cs/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Fronta příspěvků", "manage/groups": "Skupiny", "manage/ip-blacklist": "Černá listina IP", + "manage/uploads": "Uploads", "section-settings": "Nastavení", "settings/general": "Všeobecné", diff --git a/public/language/cs/admin/settings/user.json b/public/language/cs/admin/settings/user.json index e683492860..5560fc5e73 100644 --- a/public/language/cs/admin/settings/user.json +++ b/public/language/cs/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Nejsem-li online zaslat e-mail, dorazí-li nová zpráva z chatu", "email-post-notif": "Zaslat e-mail, objeví-li se odpovědi v tématu, který sleduji", "follow-created-topics": "Sledovat mnou vytvořená témata", - "follow-replied-topics": "Sledovat témata, na které jste odpověděl" + "follow-replied-topics": "Sledovat témata, na které jste odpověděl", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/cs/error.json b/public/language/cs/error.json index 01ff27c810..ada3d778eb 100644 --- a/public/language/cs/error.json +++ b/public/language/cs/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Pro přihlášení použijte vaši e-mailovou adresu", "wrong-login-type-username": "Pro přihlášení použijte vaše uživatelské jméno", "sso-registration-disabled": "Registrace byla zakázána pro účty - %1. Nejprve si zaregistrujte e-mailovou adresu", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Již jste pozval/a maximálně možný počet lidí (%1 z %2).", "no-session-found": "Nebyla nalezena relace s přihlášením.", "not-in-room": "Uživatel není přítomen v místnosti", diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json index e9b469c64c..e0538662fb 100644 --- a/public/language/cs/topic.json +++ b/public/language/cs/topic.json @@ -30,8 +30,11 @@ "locked": "Uzamčeno", "pinned": "Připnuto", "moved": "Přesunuto", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Pro návrat k poslednímu čtenému příspěvku v tématu, klikněte zde.", "flag_title": "Označit tento příspěvek k moderování", + "merged_message": "This topic has been merged into %2", "deleted_message": "Toto téma bylo odstraněno. Jen uživatelé s oprávněním správy témat ho mohou vidět.", "following_topic.message": "Nyní budete dostávat upozornění, jakmile někdo přidá příspěvek do tohoto tématu.", "not_following_topic.message": " Toto téma uvidíte v seznamu nepřečtených témat, ale neobdržíte upozornění, přidá-li někdo nový příspěvek.", diff --git a/public/language/cs/user.json b/public/language/cs/user.json index 8fce80c61c..9e59e61899 100644 --- a/public/language/cs/user.json +++ b/public/language/cs/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Témat na stránce", "posts_per_page": "Příspěvků na stránce", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Přehrát zvuk, obdržíte-li oznámení", "notifications_and_sounds": "Upozornění a zvuky", "incoming-message-sound": "Zvuk příchozí zprávy", diff --git a/public/language/da/admin/extend/widgets.json b/public/language/da/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/da/admin/extend/widgets.json +++ b/public/language/da/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/da/admin/general/dashboard.json b/public/language/da/admin/general/dashboard.json index a17c206c59..4c27113bef 100644 --- a/public/language/da/admin/general/dashboard.json +++ b/public/language/da/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Kontrol", - "reload": "Genindlæs", - "restart": "Genstart", - "restart-warning": "At genindlæse eller genstarte din NodeBB vil droppe alle eksisterende forbindelser i et par sekunder.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/da/admin/general/navigation.json b/public/language/da/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/da/admin/general/navigation.json +++ b/public/language/da/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/da/admin/manage/categories.json b/public/language/da/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/da/admin/manage/categories.json +++ b/public/language/da/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/da/admin/manage/ip-blacklist.json b/public/language/da/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/da/admin/manage/ip-blacklist.json +++ b/public/language/da/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/da/admin/menu.json b/public/language/da/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/da/admin/menu.json +++ b/public/language/da/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/da/admin/settings/user.json b/public/language/da/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/da/admin/settings/user.json +++ b/public/language/da/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/da/error.json b/public/language/da/error.json index 0e54298890..7790f82c26 100644 --- a/public/language/da/error.json +++ b/public/language/da/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Brug venligt din email til login", "wrong-login-type-username": "Brug venligt dit brugernavn til login", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Du har inviteret det maksimale antal personer (%1 ud af %2)", "no-session-found": "Ingen login session kan findes!", "not-in-room": "Bruger er ikke i rummet", diff --git a/public/language/da/topic.json b/public/language/da/topic.json index 2421769556..2f6bff40e4 100644 --- a/public/language/da/topic.json +++ b/public/language/da/topic.json @@ -30,8 +30,11 @@ "locked": "Låst", "pinned": "Pinned", "moved": "Flyttet", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Klik her for at vende tilbage til den sidst læste indlæg i denne tråd.", "flag_title": "Meld dette indlæg til moderation", + "merged_message": "This topic has been merged into %2", "deleted_message": "Denne tråd er blevet slettet. Kun brugere med emne behandlings privilegier kan se den.", "following_topic.message": "Du vil nu modtage notifikationer når nogle skriver et indlæg i dette emne.", "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.", diff --git a/public/language/da/user.json b/public/language/da/user.json index 58936317a2..d212e4be4c 100644 --- a/public/language/da/user.json +++ b/public/language/da/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Emner per side", "posts_per_page": "Indlæg per side", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Afspil en lyd når du modtager en notifikation", "notifications_and_sounds": "Underretninger & Lyde", "incoming-message-sound": "Indgående besked lyd", diff --git a/public/language/de/admin/extend/widgets.json b/public/language/de/admin/extend/widgets.json index b633981898..d6f99eb489 100644 --- a/public/language/de/admin/extend/widgets.json +++ b/public/language/de/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Verfügbare Widgets", "explanation": "Widget vom Dropdown-Menu auswählen und anschließend links in den Widget-Bereich einer Vorlage ziehen.", "none-installed": "Keine Widgets gefunden! Aktiviere das \"Essential Widgets\"-Plugin in den Plugin-Einstellungen.", + "clone-from": "Clone widgets from", "containers.available": "Verfügbare Container", "containers.explanation": "Auf ein beliebiges aktives Widget ziehen", "containers.none": "Nichts", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Sind Sie sicher, dass Sie dieses Widget löschen wollen?", "alert.updated": "Widgets aktualisiert", - "alert.update-success": "Widgets erfolgreich aktualisiert" + "alert.update-success": "Widgets erfolgreich aktualisiert", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/de/admin/general/dashboard.json b/public/language/de/admin/general/dashboard.json index 0ac3cfb243..ac9967cb1d 100644 --- a/public/language/de/admin/general/dashboard.json +++ b/public/language/de/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Installiere ein Such-Plugin auf der Plugin-Seite um die Such-Funktionalität zu aktivieren", "control-panel": "Systemsteuerung", - "reload": "Reload", - "restart": "Neustart", - "restart-warning": "Ein Reload oder Neustart trennt die Verbindung für ein paar Sekunden.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Wartungsmodus", "maintenance-mode-title": "Hier klicken um NodeBB in den Wartungsmodus zu versetzen", "realtime-chart-updates": "Echtzeit Chartaktualisierung", diff --git a/public/language/de/admin/general/navigation.json b/public/language/de/admin/general/navigation.json index 6c2f32fe58..74c34aee83 100644 --- a/public/language/de/admin/general/navigation.json +++ b/public/language/de/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Nur Gästen anzeigen", "open-new-window": "In neuem Fenster öffnen", - "installed-plugins-required": "Benötigte installierte Plugins:", - "search-plugin": "Such-Plugin", - "btn.delete": "Löschen", "btn.disable": "Deaktivieren", "btn.enable": "Aktivieren", diff --git a/public/language/de/admin/manage/categories.json b/public/language/de/admin/manage/categories.json index 74ad8d0e9b..0d1abfa49b 100644 --- a/public/language/de/admin/manage/categories.json +++ b/public/language/de/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Benutzer finden", "alert.user-search": "Hier nach einem Benutzer suchen...", "alert.find-group": "Gruppe finden", - "alert.group-search": "Hier nach einer Gruppe suchen..." + "alert.group-search": "Hier nach einer Gruppe suchen...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/de/admin/manage/ip-blacklist.json b/public/language/de/admin/manage/ip-blacklist.json index f259d9db68..e868786453 100644 --- a/public/language/de/admin/manage/ip-blacklist.json +++ b/public/language/de/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist angewandt", "analytics.blacklist-hourly": "Figur 1 – Blacklist-Treffer pro Stunde", - "analytics.blacklist-daily": " Figur 2 – Blacklist-Treffer pro Tag" + "analytics.blacklist-daily": " Figur 2 – Blacklist-Treffer pro Tag", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/de/admin/menu.json b/public/language/de/admin/menu.json index 748b72092a..c7b65d9d14 100644 --- a/public/language/de/admin/menu.json +++ b/public/language/de/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Beitragswarteschlange", "manage/groups": "Gruppen", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Einstellungen", "settings/general": "Allgemein", diff --git a/public/language/de/admin/settings/user.json b/public/language/de/admin/settings/user.json index 316a66ffae..8dc54b472a 100644 --- a/public/language/de/admin/settings/user.json +++ b/public/language/de/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Sende eine E-Mail, wenn eine neue Chat-Nachricht eingeht und ich nicht online bin", "email-post-notif": "Sende eine E-Mail wenn auf Themen die ich abonniert habe geantwortet wird", "follow-created-topics": "Themen folgen, die du erstellst", - "follow-replied-topics": "Themen folgen, auf die du antwortest" + "follow-replied-topics": "Themen folgen, auf die du antwortest", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/de/error.json b/public/language/de/error.json index c2d8071ec5..688b9fedc9 100644 --- a/public/language/de/error.json +++ b/public/language/de/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Bitte nutze deine E-Mail-Adresse zum einloggen", "wrong-login-type-username": "Bitte nutze deinen Benutzernamen zum einloggen", "sso-registration-disabled": "Das Registrieren mit %1-Accounts wurde deaktiviert, bitte registriere dich zuerst mit einer Email-Adresse", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Du hast bereits die maximale Anzahl an Personen eingeladen (%1 von %2).", "no-session-found": "Keine Login-Sitzung gefunden!", "not-in-room": "Benutzer nicht im Raum", diff --git a/public/language/de/topic.json b/public/language/de/topic.json index 7299da70c8..feb62dcf67 100644 --- a/public/language/de/topic.json +++ b/public/language/de/topic.json @@ -30,8 +30,11 @@ "locked": "Gesperrt", "pinned": "Angeheftet", "moved": "Verschoben", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Klicke hier, um zum letzten gelesenen Beitrag des Themas zurückzukehren.", "flag_title": "Diesen Beitrag zur Moderation markieren", + "merged_message": "This topic has been merged into %2", "deleted_message": "Dieses Thema wurde gelöscht. Nur Nutzer mit entsprechenden Rechten können es sehen.", "following_topic.message": "Du erhältst nun eine Benachrichtigung, wenn jemand einen Beitrag zu diesem Thema verfasst.", "not_following_topic.message": "Ungelesene Beiträge in diesem Thema werden angezeigt, aber du erhältst keine Benachrichtigung wenn jemand einen Beitrag zu diesem Thema verfasst.", diff --git a/public/language/de/user.json b/public/language/de/user.json index 38a7934f42..4404ff6e9c 100644 --- a/public/language/de/user.json +++ b/public/language/de/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Themen pro Seite", "posts_per_page": "Beiträge pro Seite", "max_items_per_page": "Maximal %1", + "acp_language": "Admin Page Language", "notification_sounds": "Ton abspielen, wenn du eine Benachrichtigung erhältst", "notifications_and_sounds": "Benachrichtigungen & Klänge", "incoming-message-sound": "Ton bei empfangener Nachricht", diff --git a/public/language/el/admin/extend/widgets.json b/public/language/el/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/el/admin/extend/widgets.json +++ b/public/language/el/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/el/admin/general/dashboard.json b/public/language/el/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/el/admin/general/dashboard.json +++ b/public/language/el/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/el/admin/general/navigation.json b/public/language/el/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/el/admin/general/navigation.json +++ b/public/language/el/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/el/admin/manage/categories.json b/public/language/el/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/el/admin/manage/categories.json +++ b/public/language/el/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/el/admin/manage/ip-blacklist.json b/public/language/el/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/el/admin/manage/ip-blacklist.json +++ b/public/language/el/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/el/admin/menu.json b/public/language/el/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/el/admin/menu.json +++ b/public/language/el/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/el/admin/settings/user.json b/public/language/el/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/el/admin/settings/user.json +++ b/public/language/el/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/el/error.json b/public/language/el/error.json index a8eba7a27d..389e4b231c 100644 --- a/public/language/el/error.json +++ b/public/language/el/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Please use your email to login", "wrong-login-type-username": "Please use your username to login", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).", "no-session-found": "No login session found!", "not-in-room": "User not in room", diff --git a/public/language/el/topic.json b/public/language/el/topic.json index a6dc48be4c..a5f407f66f 100644 --- a/public/language/el/topic.json +++ b/public/language/el/topic.json @@ -30,8 +30,11 @@ "locked": "Κλειδωμένο", "pinned": "Pinned", "moved": "Moved", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Click here to return to the last read post in this thread.", "flag_title": "Επισήμανση αυτής της δημοσίευσης για συντονισμό", + "merged_message": "This topic has been merged into %2", "deleted_message": "Το θέμα αυτό έχει διαγραφεί. Μόνο οι χρήστες με δικαιώματα διαχειριστή θεμάτων μπορούν να το δουν.", "following_topic.message": "Θα λαμβάνεις ειδοποιήσεις όποτε κάποιος δημοσιεύει κάτι σε αυτό το θέμα.", "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.", diff --git a/public/language/el/user.json b/public/language/el/user.json index 242f7e1080..0a0adce8f6 100644 --- a/public/language/el/user.json +++ b/public/language/el/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Θέματα ανά σελίδα", "posts_per_page": "Δημοσιεύσεις ανά σελίδα", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Play a sound when you receive a notification", "notifications_and_sounds": "Notifications & Sounds", "incoming-message-sound": "Incoming message sound", diff --git a/public/language/en-US/admin/extend/widgets.json b/public/language/en-US/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/en-US/admin/extend/widgets.json +++ b/public/language/en-US/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/en-US/admin/general/dashboard.json b/public/language/en-US/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/en-US/admin/general/dashboard.json +++ b/public/language/en-US/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/en-US/admin/general/navigation.json b/public/language/en-US/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/en-US/admin/general/navigation.json +++ b/public/language/en-US/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/en-US/admin/manage/categories.json b/public/language/en-US/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/en-US/admin/manage/categories.json +++ b/public/language/en-US/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/en-US/admin/manage/ip-blacklist.json b/public/language/en-US/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/en-US/admin/manage/ip-blacklist.json +++ b/public/language/en-US/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/en-US/admin/menu.json b/public/language/en-US/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/en-US/admin/menu.json +++ b/public/language/en-US/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/en-US/admin/settings/user.json b/public/language/en-US/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/en-US/admin/settings/user.json +++ b/public/language/en-US/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/en-US/error.json b/public/language/en-US/error.json index 282b07f9e1..9ed1e2470e 100644 --- a/public/language/en-US/error.json +++ b/public/language/en-US/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Please use your email to login", "wrong-login-type-username": "Please use your username to login", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).", "no-session-found": "No login session found!", "not-in-room": "User not in room", diff --git a/public/language/en-US/topic.json b/public/language/en-US/topic.json index 7b5ccbe8da..f244da67eb 100644 --- a/public/language/en-US/topic.json +++ b/public/language/en-US/topic.json @@ -30,8 +30,11 @@ "locked": "Locked", "pinned": "Pinned", "moved": "Moved", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Click here to return to the last read post in this thread.", "flag_title": "Flag this post for moderation", + "merged_message": "This topic has been merged into %2", "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.", "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.", "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.", diff --git a/public/language/en-US/user.json b/public/language/en-US/user.json index f92b22c3d5..173c0c8560 100644 --- a/public/language/en-US/user.json +++ b/public/language/en-US/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Topics per Page", "posts_per_page": "Posts per Page", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Play a sound when you receive a notification", "notifications_and_sounds": "Notifications & Sounds", "incoming-message-sound": "Incoming message sound", diff --git a/public/language/en-x-pirate/admin/extend/widgets.json b/public/language/en-x-pirate/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/en-x-pirate/admin/extend/widgets.json +++ b/public/language/en-x-pirate/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/en-x-pirate/admin/general/dashboard.json b/public/language/en-x-pirate/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/en-x-pirate/admin/general/dashboard.json +++ b/public/language/en-x-pirate/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/en-x-pirate/admin/general/navigation.json b/public/language/en-x-pirate/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/en-x-pirate/admin/general/navigation.json +++ b/public/language/en-x-pirate/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/en-x-pirate/admin/manage/categories.json b/public/language/en-x-pirate/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/en-x-pirate/admin/manage/categories.json +++ b/public/language/en-x-pirate/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/en-x-pirate/admin/manage/ip-blacklist.json b/public/language/en-x-pirate/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/en-x-pirate/admin/manage/ip-blacklist.json +++ b/public/language/en-x-pirate/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/en-x-pirate/admin/menu.json b/public/language/en-x-pirate/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/en-x-pirate/admin/menu.json +++ b/public/language/en-x-pirate/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/en-x-pirate/admin/settings/user.json b/public/language/en-x-pirate/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/en-x-pirate/admin/settings/user.json +++ b/public/language/en-x-pirate/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/en-x-pirate/error.json b/public/language/en-x-pirate/error.json index 282b07f9e1..9ed1e2470e 100644 --- a/public/language/en-x-pirate/error.json +++ b/public/language/en-x-pirate/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Please use your email to login", "wrong-login-type-username": "Please use your username to login", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).", "no-session-found": "No login session found!", "not-in-room": "User not in room", diff --git a/public/language/en-x-pirate/topic.json b/public/language/en-x-pirate/topic.json index 7b5ccbe8da..f244da67eb 100644 --- a/public/language/en-x-pirate/topic.json +++ b/public/language/en-x-pirate/topic.json @@ -30,8 +30,11 @@ "locked": "Locked", "pinned": "Pinned", "moved": "Moved", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Click here to return to the last read post in this thread.", "flag_title": "Flag this post for moderation", + "merged_message": "This topic has been merged into %2", "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.", "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.", "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.", diff --git a/public/language/en-x-pirate/user.json b/public/language/en-x-pirate/user.json index 477d4992f5..bd9b75ffba 100644 --- a/public/language/en-x-pirate/user.json +++ b/public/language/en-x-pirate/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Topics per Page", "posts_per_page": "Posts per Page", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Play a sound when you receive a notification", "notifications_and_sounds": "Notifications & Sounds", "incoming-message-sound": "Incoming message sound", diff --git a/public/language/es/admin/extend/widgets.json b/public/language/es/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/es/admin/extend/widgets.json +++ b/public/language/es/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/es/admin/general/dashboard.json b/public/language/es/admin/general/dashboard.json index 8e03c66fdb..f526e5865c 100644 --- a/public/language/es/admin/general/dashboard.json +++ b/public/language/es/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Instala el plug-in de búsqueda desde la pagina de plugins para activar esta funcionalidad.", "control-panel": "Control del Systema", - "reload": "Recargar", - "restart": "Reiniciar", - "restart-warning": "Recargar o Reiniciar tu NodeBB va a tumbar todas las conexiones existentes por algunos segundos.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Modo de Mantenimiento", "maintenance-mode-title": "Haz clic aquí para activar el modo de mantenimiento de NodeBB", "realtime-chart-updates": "Actualizar el Grafo en Tiempo Real", diff --git a/public/language/es/admin/general/navigation.json b/public/language/es/admin/general/navigation.json index 053ea92283..d15217485e 100644 --- a/public/language/es/admin/general/navigation.json +++ b/public/language/es/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/es/admin/manage/categories.json b/public/language/es/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/es/admin/manage/categories.json +++ b/public/language/es/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/es/admin/manage/ip-blacklist.json b/public/language/es/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/es/admin/manage/ip-blacklist.json +++ b/public/language/es/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/es/admin/menu.json b/public/language/es/admin/menu.json index eca88aed87..694c11aed4 100644 --- a/public/language/es/admin/menu.json +++ b/public/language/es/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Grupos", "manage/ip-blacklist": "Lista negra de IP", + "manage/uploads": "Uploads", "section-settings": "Opciones", "settings/general": "General", diff --git a/public/language/es/admin/settings/user.json b/public/language/es/admin/settings/user.json index 6147c898a3..41bc360f7d 100644 --- a/public/language/es/admin/settings/user.json +++ b/public/language/es/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/es/error.json b/public/language/es/error.json index 112c6530da..44d197b548 100644 --- a/public/language/es/error.json +++ b/public/language/es/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Por favor emplea tu email para acceder", "wrong-login-type-username": "Por favor introduce tu nombre de usuario para acceder", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Has alcanzado el número máximo de personas invitadas (%1 de %2).", "no-session-found": "¡No se ha encontrado ningún inicio de sesión!", "not-in-room": "El usuario no está en la sala", diff --git a/public/language/es/topic.json b/public/language/es/topic.json index 0b9b511889..f9c7c75613 100644 --- a/public/language/es/topic.json +++ b/public/language/es/topic.json @@ -30,8 +30,11 @@ "locked": "Cerrado", "pinned": "Fijo", "moved": "Movido", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Haz click aquí para volver a tu último mensaje leído en este tema", "flag_title": "Reportar este mensaje", + "merged_message": "This topic has been merged into %2", "deleted_message": "Este tema ha sido borrado. Solo los usuarios que tengan privilegios de administración de temas pueden verlo.", "following_topic.message": "Ahora recibiras notificaciones cuando alguien publique en este tema.", "not_following_topic.message": "Podras ver este tema en la lista de no leidos, pero no recibirás notificaciones cuando alguien escriba en él.", diff --git a/public/language/es/user.json b/public/language/es/user.json index 87d86d5e66..55b9b5f83a 100644 --- a/public/language/es/user.json +++ b/public/language/es/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Temas por página", "posts_per_page": "Post por página", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Reproducir un sonido al recibir una notificación", "notifications_and_sounds": "Notificaciones y Sonidos", "incoming-message-sound": "Sonido del mensaje entrante", diff --git a/public/language/et/admin/extend/widgets.json b/public/language/et/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/et/admin/extend/widgets.json +++ b/public/language/et/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/et/admin/general/dashboard.json b/public/language/et/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/et/admin/general/dashboard.json +++ b/public/language/et/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/et/admin/general/navigation.json b/public/language/et/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/et/admin/general/navigation.json +++ b/public/language/et/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/et/admin/manage/categories.json b/public/language/et/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/et/admin/manage/categories.json +++ b/public/language/et/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/et/admin/manage/ip-blacklist.json b/public/language/et/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/et/admin/manage/ip-blacklist.json +++ b/public/language/et/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/et/admin/menu.json b/public/language/et/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/et/admin/menu.json +++ b/public/language/et/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/et/admin/settings/user.json b/public/language/et/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/et/admin/settings/user.json +++ b/public/language/et/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/et/error.json b/public/language/et/error.json index 13f12ff67d..521e026787 100644 --- a/public/language/et/error.json +++ b/public/language/et/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Sisse logimiseks kasuta oma emaili", "wrong-login-type-username": "Sisse logimiseks kasuta oma kasutajanime", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Sa oled kutsunud maksimaalse lubatud inimeste arvu (%1 %2 'st).", "no-session-found": "Sisse logimis sessiooni ei leitud!", "not-in-room": "Kasutaja pole ruumis", diff --git a/public/language/et/topic.json b/public/language/et/topic.json index 676203f566..4a285b1104 100644 --- a/public/language/et/topic.json +++ b/public/language/et/topic.json @@ -30,8 +30,11 @@ "locked": "Lukustatud", "pinned": "Märgistatud", "moved": "Liigutatud", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Vajuta siia, et tagasi minna viimati loetud postituse juurde siin teemas.", "flag_title": "Märgista see postitus modereerimiseks", + "merged_message": "This topic has been merged into %2", "deleted_message": "See teema on kustutatud. Ainult kasutajad kellel on piisavalt õigusi saavad seda näha.", "following_topic.message": "Sulle ei edastata enam teateid uutest postitustest kui keegi postitab siia teemasse.", "not_following_topic.message": "Sa näed seda postitust lugemata postituste nimekirjas, kuid sa ei näe selle kohta teateid, kui keegi sinna postitab.", diff --git a/public/language/et/user.json b/public/language/et/user.json index b1523455f9..04914640d0 100644 --- a/public/language/et/user.json +++ b/public/language/et/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Teemasi ühe lehekülje kohta", "posts_per_page": "Postitusi ühe lehekülje kohta", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Mängi heli, kui teade saabub.", "notifications_and_sounds": "Notifications & Sounds", "incoming-message-sound": "Incoming message sound", diff --git a/public/language/fa-IR/admin/extend/widgets.json b/public/language/fa-IR/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/fa-IR/admin/extend/widgets.json +++ b/public/language/fa-IR/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/fa-IR/admin/general/dashboard.json b/public/language/fa-IR/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/fa-IR/admin/general/dashboard.json +++ b/public/language/fa-IR/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/fa-IR/admin/general/navigation.json b/public/language/fa-IR/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/fa-IR/admin/general/navigation.json +++ b/public/language/fa-IR/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/fa-IR/admin/manage/categories.json b/public/language/fa-IR/admin/manage/categories.json index 6b021ca095..302dcca66e 100644 --- a/public/language/fa-IR/admin/manage/categories.json +++ b/public/language/fa-IR/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/fa-IR/admin/manage/ip-blacklist.json b/public/language/fa-IR/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/fa-IR/admin/manage/ip-blacklist.json +++ b/public/language/fa-IR/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/fa-IR/admin/menu.json b/public/language/fa-IR/admin/menu.json index e40edd8692..4c1cb49408 100644 --- a/public/language/fa-IR/admin/menu.json +++ b/public/language/fa-IR/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/fa-IR/admin/settings/user.json b/public/language/fa-IR/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/fa-IR/admin/settings/user.json +++ b/public/language/fa-IR/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/fa-IR/error.json b/public/language/fa-IR/error.json index 77f96f9920..2807a30398 100644 --- a/public/language/fa-IR/error.json +++ b/public/language/fa-IR/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "لطفا از ایمیل خود برای ورود استفاده کنید", "wrong-login-type-username": "لطفا از نام کاربری خود برای ورود استفاده کنید", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "ظرفیت دعوت شما تکمیل شده است (%1 از %2)", "no-session-found": "هیچ session ورودی یافت نشد!", "not-in-room": "هیچ کاربری در این گفتگو نیست", diff --git a/public/language/fa-IR/topic.json b/public/language/fa-IR/topic.json index e74177d09b..c8c87466df 100644 --- a/public/language/fa-IR/topic.json +++ b/public/language/fa-IR/topic.json @@ -30,8 +30,11 @@ "locked": "قفل شده است", "pinned": "سنجاق شده", "moved": "منتقل شده", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "برای بازگشت به آخرین پست در این موضوع اینجا را کلیک کنید.", "flag_title": "پرچم‌گذاری این موضوع برای بررسی ناظران", + "merged_message": "This topic has been merged into %2", "deleted_message": "این موضوع پاک شده است. تنها کاربرانِ با حق مدیریت موضوع می‌توانند آن را ببینند.", "following_topic.message": "از این پس اگر کسی در این موضوع پست بگذارد، شما آگاه خواهید شد.", "not_following_topic.message": "شما این موضوع را تو فهرست موضوعات خوانده نشده می‌بینید، اما وقتی پست جدیدی ارسال می‌شود آگاه‌سازی دریافت نمی‌کنید.", diff --git a/public/language/fa-IR/user.json b/public/language/fa-IR/user.json index 54cd114210..b20043d152 100644 --- a/public/language/fa-IR/user.json +++ b/public/language/fa-IR/user.json @@ -95,6 +95,7 @@ "topics_per_page": "شمار موضوع ها در هر برگه", "posts_per_page": "شمار پست‌ها در هر برگه", "max_items_per_page": "حداکثر %1", + "acp_language": "Admin Page Language", "notification_sounds": "پخش صدا زمانی که یک اطلاعیه دریافت میکنید", "notifications_and_sounds": "آگاه‌سازی‌ها و صدا‌ها", "incoming-message-sound": "صدای پیام دریافتی", diff --git a/public/language/fi/admin/extend/widgets.json b/public/language/fi/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/fi/admin/extend/widgets.json +++ b/public/language/fi/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/fi/admin/general/dashboard.json b/public/language/fi/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/fi/admin/general/dashboard.json +++ b/public/language/fi/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/fi/admin/general/navigation.json b/public/language/fi/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/fi/admin/general/navigation.json +++ b/public/language/fi/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/fi/admin/manage/categories.json b/public/language/fi/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/fi/admin/manage/categories.json +++ b/public/language/fi/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/fi/admin/manage/ip-blacklist.json b/public/language/fi/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/fi/admin/manage/ip-blacklist.json +++ b/public/language/fi/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/fi/admin/menu.json b/public/language/fi/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/fi/admin/menu.json +++ b/public/language/fi/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/fi/admin/settings/user.json b/public/language/fi/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/fi/admin/settings/user.json +++ b/public/language/fi/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/fi/error.json b/public/language/fi/error.json index dced600b52..46ab358acb 100644 --- a/public/language/fi/error.json +++ b/public/language/fi/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Please use your email to login", "wrong-login-type-username": "Please use your username to login", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).", "no-session-found": "No login session found!", "not-in-room": "Käyttäjä ei ole huoneessa", diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json index e1d5c523a3..00f9587140 100644 --- a/public/language/fi/topic.json +++ b/public/language/fi/topic.json @@ -30,8 +30,11 @@ "locked": "Lukittu", "pinned": "Pinned", "moved": "Moved", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Click here to return to the last read post in this thread.", "flag_title": "Ilmianna tämä viesti moderaattoreille", + "merged_message": "This topic has been merged into %2", "deleted_message": "Tämä aihe on poistettu. Vain käyttäjät, joilla on aiheen hallintaoikeudet, voivat nähdä sen.", "following_topic.message": "Saat nyt ilmoituksen, kun joku kirjoittaa tähän aiheeseen.", "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.", diff --git a/public/language/fi/user.json b/public/language/fi/user.json index b15d2c3492..78a2b63458 100644 --- a/public/language/fi/user.json +++ b/public/language/fi/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Aihetta per sivu", "posts_per_page": "Viestiä per sivu", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Play a sound when you receive a notification", "notifications_and_sounds": "Notifications & Sounds", "incoming-message-sound": "Incoming message sound", diff --git a/public/language/fr/admin/extend/widgets.json b/public/language/fr/admin/extend/widgets.json index e7ee436949..287e44f1d7 100644 --- a/public/language/fr/admin/extend/widgets.json +++ b/public/language/fr/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Widgets disponibles", "explanation": "Sélectionnez un widget depuis le menu puis glissez-déposez le dans une zone template du widget à gauche.", "none-installed": "Aucun widget trouvé ! Activez le plugin widgets essentiels dans le panneau de contrôle plugins.", + "clone-from": "Clone widgets from", "containers.available": "Conteneurs disponibles", "containers.explanation": "Glissez-déposez sur n'importe quel widget actif", "containers.none": "Aucun", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Êtes-vous sûr de vouloir supprimer ce widget ?", "alert.updated": "Widgets mis à jour", - "alert.update-success": "Widgets mis à jour avec succès" + "alert.update-success": "Widgets mis à jour avec succès", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/fr/admin/general/dashboard.json b/public/language/fr/admin/general/dashboard.json index 6bb5c222e3..ec011f5d59 100644 --- a/public/language/fr/admin/general/dashboard.json +++ b/public/language/fr/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Installer un plugin de recherche depuis la page des plugins pour activer la fonctionnalité de recherche", "control-panel": "Contrôle du système", - "reload": "Recharger", - "restart": "Redémarrer", - "restart-warning": "Recharger ou redémarrer NodeBB coupera toutes les connexions existantes pendant quelques secondes.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Mode maintenance", "maintenance-mode-title": "Cliquez ici pour passer NodeBB en mode maintenance", "realtime-chart-updates": "Mises à jour des graphiques en temps réel", diff --git a/public/language/fr/admin/general/navigation.json b/public/language/fr/admin/general/navigation.json index ca237eaf49..7bc4b5d8d0 100644 --- a/public/language/fr/admin/general/navigation.json +++ b/public/language/fr/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "N’afficher qu’aux utilisateurs invités", "open-new-window": "Ouvrir dans une nouvelle fenêtre", - "installed-plugins-required": "Plugins installés requis :", - "search-plugin": "Rechercher un plugin", - "btn.delete": "Supprimer", "btn.disable": "Désactiver", "btn.enable": "Activer", diff --git a/public/language/fr/admin/manage/categories.json b/public/language/fr/admin/manage/categories.json index 0d6ace6124..fbf7585b60 100644 --- a/public/language/fr/admin/manage/categories.json +++ b/public/language/fr/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Trouver un utilisateur", "alert.user-search": "Chercher un utilisateur ici...", "alert.find-group": "Trouver un groupe", - "alert.group-search": "Chercher un groupe ici..." + "alert.group-search": "Chercher un groupe ici...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/fr/admin/manage/ip-blacklist.json b/public/language/fr/admin/manage/ip-blacklist.json index 77f17c6694..1c057100ec 100644 --- a/public/language/fr/admin/manage/ip-blacklist.json +++ b/public/language/fr/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Liste noire appliquée", "analytics.blacklist-hourly": "Figure 1 – Nombre de visites de la liste noire par heure", - "analytics.blacklist-daily": "Figure 2 – Nombre de visites de la liste noire par jour" + "analytics.blacklist-daily": "Figure 2 – Nombre de visites de la liste noire par jour", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/fr/admin/menu.json b/public/language/fr/admin/menu.json index 7431d1ea06..641a7f9f20 100644 --- a/public/language/fr/admin/menu.json +++ b/public/language/fr/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "File d’attente des messages", "manage/groups": "Groupes", "manage/ip-blacklist": "Liste noire d'IPs", + "manage/uploads": "Uploads", "section-settings": "Réglages", "settings/general": "Général", diff --git a/public/language/fr/admin/settings/user.json b/public/language/fr/admin/settings/user.json index f85d264465..04cd6e7296 100644 --- a/public/language/fr/admin/settings/user.json +++ b/public/language/fr/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Envoyer un e-mail si un nouveau message de chat arrive lorsque je ne suis pas en ligne", "email-post-notif": "Envoyer un email lors de réponses envoyées aux sujets auxquels je suis abonné", "follow-created-topics": "S'abonner aux sujets que vous créez", - "follow-replied-topics": "S'abonner aux sujets auxquels vous répondez" + "follow-replied-topics": "S'abonner aux sujets auxquels vous répondez", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/fr/error.json b/public/language/fr/error.json index bb61a8a95b..99d8b67311 100644 --- a/public/language/fr/error.json +++ b/public/language/fr/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Veuillez utiliser votre adresse email pour vous connecter", "wrong-login-type-username": "Veuillez utiliser votre identifiant pour vous connecter", "sso-registration-disabled": "L'enregistrement a été désactivé pour les comptes %1, merci de vous enregistrer avec une adresse mail avant", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Vous avez invité la quantité maximale de personnes (%1 sur %2).", "no-session-found": "Pas de session de connexion trouvée !", "not-in-room": "L'utilisateur n'est pas dans cette salle", diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json index 058744dcd0..42b6a1ddc0 100644 --- a/public/language/fr/topic.json +++ b/public/language/fr/topic.json @@ -30,8 +30,11 @@ "locked": "Verrouillé", "pinned": "Épinglé", "moved": "Déplacé", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Cliquez ici pour retourner au dernier message lu de ce fil.", "flag_title": "Signaler ce message à la modération", + "merged_message": "This topic has been merged into %2", "deleted_message": "Ce sujet a été supprimé. Seuls les utilisateurs avec les droits d'administration peuvent le voir.", "following_topic.message": "Vous recevrez désormais des notifications lorsque quelqu'un postera dans ce sujet.", "not_following_topic.message": "Vous verrez ce sujet dans la liste des sujets non-lus, mais vous ne recevrez pas de notification lorsque quelqu'un postera dans ce sujet.", diff --git a/public/language/fr/user.json b/public/language/fr/user.json index 9f1e086bb7..d3af911300 100644 --- a/public/language/fr/user.json +++ b/public/language/fr/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Sujets par page", "posts_per_page": "Messages par page", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Émettre un son lors de la réception de notifications", "notifications_and_sounds": "Notifications & Sons", "incoming-message-sound": "Son pour les messages entrants", diff --git a/public/language/gl/admin/extend/widgets.json b/public/language/gl/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/gl/admin/extend/widgets.json +++ b/public/language/gl/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/gl/admin/general/dashboard.json b/public/language/gl/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/gl/admin/general/dashboard.json +++ b/public/language/gl/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/gl/admin/general/navigation.json b/public/language/gl/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/gl/admin/general/navigation.json +++ b/public/language/gl/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/gl/admin/manage/categories.json b/public/language/gl/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/gl/admin/manage/categories.json +++ b/public/language/gl/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/gl/admin/manage/ip-blacklist.json b/public/language/gl/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/gl/admin/manage/ip-blacklist.json +++ b/public/language/gl/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/gl/admin/menu.json b/public/language/gl/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/gl/admin/menu.json +++ b/public/language/gl/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/gl/admin/settings/user.json b/public/language/gl/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/gl/admin/settings/user.json +++ b/public/language/gl/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/gl/error.json b/public/language/gl/error.json index 5e049957ba..3a908e158a 100644 --- a/public/language/gl/error.json +++ b/public/language/gl/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Por favor, emprega o teu correo para contectarte", "wrong-login-type-username": "Por favor, usa o teu nome de usuario para conectarte", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Convidaches á cantidade máxima de persoas (%1 de %2).", "no-session-found": "Non se atopou ningún inicio de sesión!", "not-in-room": "O usuario non se atopa nesta sala", diff --git a/public/language/gl/topic.json b/public/language/gl/topic.json index db4fea6201..59b51fabb2 100644 --- a/public/language/gl/topic.json +++ b/public/language/gl/topic.json @@ -30,8 +30,11 @@ "locked": "Pechado", "pinned": "Fixo", "moved": "Movido", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Pica aquí para volver á última mensaxe lida neste tema ", "flag_title": "Reportar esta mensaxe", + "merged_message": "This topic has been merged into %2", "deleted_message": "Este tema foi borrado. Só os usuarios con privilexios administrativos poden velo.", "following_topic.message": "Agora recibirás notificacións cando alguén publique neste tema.", "not_following_topic.message": "Poderás ver este tema na lista de No Lidos, pero non recibirás notificacións cando alguén escriba nel.", diff --git a/public/language/gl/user.json b/public/language/gl/user.json index b9b1948287..6adff82676 100644 --- a/public/language/gl/user.json +++ b/public/language/gl/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Temas por páxina", "posts_per_page": "Mensaxes por páxina", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Reproducir un son cando recibes unha notificación.", "notifications_and_sounds": "Notificacións e Sons", "incoming-message-sound": "Son da mensaxe entrante", diff --git a/public/language/he/admin/extend/widgets.json b/public/language/he/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/he/admin/extend/widgets.json +++ b/public/language/he/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/he/admin/general/dashboard.json b/public/language/he/admin/general/dashboard.json index 12c373602f..42d81471c0 100644 --- a/public/language/he/admin/general/dashboard.json +++ b/public/language/he/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "רענן", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/he/admin/general/navigation.json b/public/language/he/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/he/admin/general/navigation.json +++ b/public/language/he/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/he/admin/manage/categories.json b/public/language/he/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/he/admin/manage/categories.json +++ b/public/language/he/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/he/admin/manage/ip-blacklist.json b/public/language/he/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/he/admin/manage/ip-blacklist.json +++ b/public/language/he/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/he/admin/menu.json b/public/language/he/admin/menu.json index f2d823ecc9..4cc4a3571a 100644 --- a/public/language/he/admin/menu.json +++ b/public/language/he/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/he/admin/settings/user.json b/public/language/he/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/he/admin/settings/user.json +++ b/public/language/he/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/he/error.json b/public/language/he/error.json index b1968ec11b..1b28221034 100644 --- a/public/language/he/error.json +++ b/public/language/he/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "בבקשה השתמש בכתובת המייל שלך להתחברות", "wrong-login-type-username": "בבקשה השתמש בשם המשתמש שלך להתחברות", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "הזמנת את הכמות המירבית של אנשים (%1 מתוך %2).", "no-session-found": "לא נמצאו סשני התחברות!", "not-in-room": "משתמש זה לא בצ'אט", diff --git a/public/language/he/topic.json b/public/language/he/topic.json index 41442aeb9f..8458a123a9 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -30,8 +30,11 @@ "locked": "נעול", "pinned": "נעוץ", "moved": "הועבר", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "לחץ כאן לחזור לפוסט האחרון שקראת בנושא הזה.", "flag_title": "דווח על פוסט זה למנהל", + "merged_message": "This topic has been merged into %2", "deleted_message": "נושא זה נמחק. רק משתמשים עם ההרשאות המתאימות יכולים לצפות בו.", "following_topic.message": "מעתה, תקבל הודעות כאשר מישהו יעלה פוסט לנושא זה.", "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.", diff --git a/public/language/he/user.json b/public/language/he/user.json index bb1b1a092f..051a59e68c 100644 --- a/public/language/he/user.json +++ b/public/language/he/user.json @@ -95,6 +95,7 @@ "topics_per_page": "כמות נושאים בעמוד", "posts_per_page": "כמות פוסטים בעמוד", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "נגן סאונד כשמתקבלת התראה", "notifications_and_sounds": "התראות וצלילים", "incoming-message-sound": "צליל הודעה נכנסת", diff --git a/public/language/hr/admin/extend/widgets.json b/public/language/hr/admin/extend/widgets.json index 72362aafa0..0518ac7d6d 100644 --- a/public/language/hr/admin/extend/widgets.json +++ b/public/language/hr/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Dostupni dodatci", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Dostupni kontejneri", "containers.explanation": "Povucite i ispustite na vrhu bilo kojeg aktivnog widgeta", "containers.none": "Ništa", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Sigurni ste da želite obrisati ovaj widget?", "alert.updated": "Widgeti ažurirani", - "alert.update-success": "Uspješno promijenjeni widgeti" + "alert.update-success": "Uspješno promijenjeni widgeti", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/hr/admin/general/dashboard.json b/public/language/hr/admin/general/dashboard.json index 72ed344b28..a99edff6ff 100644 --- a/public/language/hr/admin/general/dashboard.json +++ b/public/language/hr/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Instalirajte dodatak za pretragu sa stranice za upravljanje dodatcima da aktivirate mogućnost pretrage foruma.", "control-panel": "Kontrola sistema", - "reload": "Ponovno učitaj", - "restart": "Pokreni ponovno", - "restart-warning": "Ponovno pokretanje NodeBB će odbaciti sve uspostavljene veze na par sekundi.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Održavanje", "maintenance-mode-title": "Postavite mod za održavanje foruma", "realtime-chart-updates": "Ažuriranja u stvarnom vremenu", diff --git a/public/language/hr/admin/general/navigation.json b/public/language/hr/admin/general/navigation.json index c4bfd88a68..cc9760b897 100644 --- a/public/language/hr/admin/general/navigation.json +++ b/public/language/hr/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Otvori u novom prozoru", - "installed-plugins-required": "Potrebni su instalirani dodatci:", - "search-plugin": "Dodatak pretrage", - "btn.delete": "Obriši", "btn.disable": "Onemogući", "btn.enable": "Omogući", diff --git a/public/language/hr/admin/manage/categories.json b/public/language/hr/admin/manage/categories.json index 69ca196181..499ef11ba3 100644 --- a/public/language/hr/admin/manage/categories.json +++ b/public/language/hr/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Pronađi korisnika", "alert.user-search": "Pretraži korisnika ovdje ...", "alert.find-group": "Pronađi grupu", - "alert.group-search": "Pretraži grupu ovdje ..." + "alert.group-search": "Pretraži grupu ovdje ...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/hr/admin/manage/ip-blacklist.json b/public/language/hr/admin/manage/ip-blacklist.json index 47d58a64d2..6da34bc7a1 100644 --- a/public/language/hr/admin/manage/ip-blacklist.json +++ b/public/language/hr/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blokiranje omogućeno", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/hr/admin/menu.json b/public/language/hr/admin/menu.json index 59e0a5edf2..bd1bd8ecad 100644 --- a/public/language/hr/admin/menu.json +++ b/public/language/hr/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Grupe", "manage/ip-blacklist": "IP blokade", + "manage/uploads": "Uploads", "section-settings": "Postavke", "settings/general": "Generalno", diff --git a/public/language/hr/admin/settings/user.json b/public/language/hr/admin/settings/user.json index 442abf0ec3..76adc8150e 100644 --- a/public/language/hr/admin/settings/user.json +++ b/public/language/hr/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Pošalji email ukoliko stigne nova poruka dok nisam na mreži", "email-post-notif": "Pošalji email pri odgovoru u teme na koje pratim", "follow-created-topics": "Prati teme koje kreiram", - "follow-replied-topics": "Prati teme na koje odgovorim" + "follow-replied-topics": "Prati teme na koje odgovorim", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/hr/error.json b/public/language/hr/error.json index 1943cb89c6..7d4adb6957 100644 --- a/public/language/hr/error.json +++ b/public/language/hr/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Upišite Vaš email za prijavu", "wrong-login-type-username": "Upišite Vaše korisničko ime za prijavu", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Pozvali ste maksimalan broj ljudi (%1 od %2).", "no-session-found": "Nije pronađena sesija prijave!", "not-in-room": "Korisnik nije u sobi", diff --git a/public/language/hr/topic.json b/public/language/hr/topic.json index 8a48decc6c..0d8e5e9951 100644 --- a/public/language/hr/topic.json +++ b/public/language/hr/topic.json @@ -30,8 +30,11 @@ "locked": "Zaključano", "pinned": "Zakačeno", "moved": "Premješteno", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Klikni ovdje za povratak na zadnji pročitani post.", "flag_title": "Označi ovaj post za zastavom za moderaciju", + "merged_message": "This topic has been merged into %2", "deleted_message": "Ova tema je obrisana. Samo korisnici sa privilegijom upravljanja tema je mogu vidjeti.", "following_topic.message": "Od sada ćete primati obavijesti kada netko objavi objavu u ovoj temi.", "not_following_topic.message": "Od sada ćete vidjeti ovu temu u popisu nepročitanih tema,ali nećete dobivati obavijesti kada netko objavi objavu u temi.", diff --git a/public/language/hr/user.json b/public/language/hr/user.json index e3c8e767fe..df844e0537 100644 --- a/public/language/hr/user.json +++ b/public/language/hr/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Teme po stranici", "posts_per_page": "Objave po stranici", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Sviraj zvuk kada primim obavijest", "notifications_and_sounds": "Obavijesti i zvukovi", "incoming-message-sound": "Zvuk nadolazećih poruka", diff --git a/public/language/hu/admin/extend/widgets.json b/public/language/hu/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/hu/admin/extend/widgets.json +++ b/public/language/hu/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/hu/admin/general/dashboard.json b/public/language/hu/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/hu/admin/general/dashboard.json +++ b/public/language/hu/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/hu/admin/general/navigation.json b/public/language/hu/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/hu/admin/general/navigation.json +++ b/public/language/hu/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/hu/admin/manage/categories.json b/public/language/hu/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/hu/admin/manage/categories.json +++ b/public/language/hu/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/hu/admin/manage/ip-blacklist.json b/public/language/hu/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/hu/admin/manage/ip-blacklist.json +++ b/public/language/hu/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/hu/admin/menu.json b/public/language/hu/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/hu/admin/menu.json +++ b/public/language/hu/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/hu/admin/settings/user.json b/public/language/hu/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/hu/admin/settings/user.json +++ b/public/language/hu/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/hu/error.json b/public/language/hu/error.json index ccfb9d1c6d..14eddd84fe 100644 --- a/public/language/hu/error.json +++ b/public/language/hu/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Kérlek az e-mail címedet használd a belépéshez", "wrong-login-type-username": "Kérlek a felhasználónevedet használd a belépéshez", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).", "no-session-found": "No login session found!", "not-in-room": "User not in room", diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json index 939f51ac5d..24f3561c37 100644 --- a/public/language/hu/topic.json +++ b/public/language/hu/topic.json @@ -30,8 +30,11 @@ "locked": "Locked", "pinned": "Pinned", "moved": "Moved", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Click here to return to the last read post in this thread.", "flag_title": "A hozzászólás jelentése a moderátoroknál", + "merged_message": "This topic has been merged into %2", "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.", "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.", "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.", diff --git a/public/language/hu/user.json b/public/language/hu/user.json index 68cc1adcb3..6cd0779dee 100644 --- a/public/language/hu/user.json +++ b/public/language/hu/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Téma oldalanként", "posts_per_page": "Hozzászólás oldalanként", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Hang lejátszása, mikor értesítést kapsz", "notifications_and_sounds": "Értesítések és hangok", "incoming-message-sound": "Beérkező üzenet hangja", diff --git a/public/language/id/admin/extend/widgets.json b/public/language/id/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/id/admin/extend/widgets.json +++ b/public/language/id/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/id/admin/general/dashboard.json b/public/language/id/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/id/admin/general/dashboard.json +++ b/public/language/id/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/id/admin/general/navigation.json b/public/language/id/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/id/admin/general/navigation.json +++ b/public/language/id/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/id/admin/manage/categories.json b/public/language/id/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/id/admin/manage/categories.json +++ b/public/language/id/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/id/admin/manage/ip-blacklist.json b/public/language/id/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/id/admin/manage/ip-blacklist.json +++ b/public/language/id/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/id/admin/menu.json b/public/language/id/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/id/admin/menu.json +++ b/public/language/id/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/id/admin/settings/user.json b/public/language/id/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/id/admin/settings/user.json +++ b/public/language/id/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/id/error.json b/public/language/id/error.json index 2fef7a6be6..b0a5eb951d 100644 --- a/public/language/id/error.json +++ b/public/language/id/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Please use your email to login", "wrong-login-type-username": "Please use your username to login", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).", "no-session-found": "No login session found!", "not-in-room": "User not in room", diff --git a/public/language/id/topic.json b/public/language/id/topic.json index 27fff558f2..d0ec648f01 100644 --- a/public/language/id/topic.json +++ b/public/language/id/topic.json @@ -30,8 +30,11 @@ "locked": "Terkunci", "pinned": "Pinned", "moved": "Moved", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Click here to return to the last read post in this thread.", "flag_title": "Tandai posting ini untuk moderasi", + "merged_message": "This topic has been merged into %2", "deleted_message": "Topik ini telah dihapus. Hanya pengguna dengan hak manajemen topik yang dapat melihatnya.", "following_topic.message": "Saat ini kamu akan menerima pemberitahuan saat seseorang membuat posting di dalam topik ini.", "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.", diff --git a/public/language/id/user.json b/public/language/id/user.json index 7f2b874e76..358dcd42df 100644 --- a/public/language/id/user.json +++ b/public/language/id/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Topik per Halaman", "posts_per_page": "Posting per Halaman", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Play a sound when you receive a notification", "notifications_and_sounds": "Notifications & Sounds", "incoming-message-sound": "Incoming message sound", diff --git a/public/language/it/admin/extend/widgets.json b/public/language/it/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/it/admin/extend/widgets.json +++ b/public/language/it/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/it/admin/general/dashboard.json b/public/language/it/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/it/admin/general/dashboard.json +++ b/public/language/it/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/it/admin/general/navigation.json b/public/language/it/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/it/admin/general/navigation.json +++ b/public/language/it/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/it/admin/manage/categories.json b/public/language/it/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/it/admin/manage/categories.json +++ b/public/language/it/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/it/admin/manage/ip-blacklist.json b/public/language/it/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/it/admin/manage/ip-blacklist.json +++ b/public/language/it/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/it/admin/menu.json b/public/language/it/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/it/admin/menu.json +++ b/public/language/it/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/it/admin/settings/user.json b/public/language/it/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/it/admin/settings/user.json +++ b/public/language/it/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/it/error.json b/public/language/it/error.json index 4c4770fd8f..60762dfbf5 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Per favore usa la tua email per accedere", "wrong-login-type-username": "Per favore usa il tuo nome utente per accedere", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Hai invitato il massimo numero di persone possibili (%1 su %2).", "no-session-found": "Nessuna sessione valida di login trovata!", "not-in-room": "L'utente non è in questa stanza", diff --git a/public/language/it/topic.json b/public/language/it/topic.json index 1684b7db6e..fdfbe37c8a 100644 --- a/public/language/it/topic.json +++ b/public/language/it/topic.json @@ -30,8 +30,11 @@ "locked": "Bloccato", "pinned": "Appeso", "moved": "Spostato", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Clicca qui per tornare all'ultimo post letto in questa discussione.", "flag_title": "Segnala questo post per la moderazione", + "merged_message": "This topic has been merged into %2", "deleted_message": "Questa discussione è stata cancellata. Solo gli utenti con diritti di gestione possono vederla.", "following_topic.message": "Da ora riceverai notifiche quando qualcuno posterà in questa discussione.", "not_following_topic.message": "Vedrai questa discussione nella lista delle discussioni non lette, ma non riceverai notifiche quando qualcuno risponde a questa discussione.", diff --git a/public/language/it/user.json b/public/language/it/user.json index d3b66bfa4a..f9de1f2377 100644 --- a/public/language/it/user.json +++ b/public/language/it/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Discussioni per Pagina", "posts_per_page": "Post per Pagina", "max_items_per_page": "Massimo %1", + "acp_language": "Admin Page Language", "notification_sounds": "Riproduci un suono quando si riceve una notifica", "notifications_and_sounds": "Notifiche e Suoni", "incoming-message-sound": "Suono messaggio in entrata", diff --git a/public/language/ja/admin/extend/widgets.json b/public/language/ja/admin/extend/widgets.json index 7ef7635e65..7340de799d 100644 --- a/public/language/ja/admin/extend/widgets.json +++ b/public/language/ja/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "利用可能なウィジェット", "explanation": "ドロップダウンメニューからウィジェットを選択し、左のテンプレートのウィジェットエリアにドラッグ&ドロップします。", "none-installed": "ウィジェットがありません!必須のウィジェットプラグインをプラグインのコントロールパネルで有効にしてください。", + "clone-from": "Clone widgets from", "containers.available": "利用可能なコンテナ", "containers.explanation": "アクティブなウィジェットの上にドラッグアンドドロップしてください", "containers.none": "なし", @@ -14,6 +15,8 @@ "alert.confirm-delete": "このウィジェットを削除してもよろしいですか？", "alert.updated": "ウィジェットが更新されました。", - "alert.update-success": "ウィジェットを保存しました" + "alert.update-success": "ウィジェットを保存しました", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/ja/admin/general/dashboard.json b/public/language/ja/admin/general/dashboard.json index a4057bd2e1..ad906bb52b 100644 --- a/public/language/ja/admin/general/dashboard.json +++ b/public/language/ja/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "検索機能を有効にするには、プラグインページから検索プラグインをインストールしてください", "control-panel": "システムコントロール", - "reload": "再読み込み", - "restart": "再起動", - "restart-warning": "NodeBBを再読み込み、または再起動すると、数秒間既存の接続がすべて破棄されます。", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "メンテナンスモード", "maintenance-mode-title": "NodeBBのメンテナンスモードを設定するには、ここをクリックしてください", "realtime-chart-updates": "リアルタイムチャートの更新", diff --git a/public/language/ja/admin/general/navigation.json b/public/language/ja/admin/general/navigation.json index 411bcb7367..d65314ccdf 100644 --- a/public/language/ja/admin/general/navigation.json +++ b/public/language/ja/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "ゲストにのみ表示する", "open-new-window": "新しいウィンドウで開く", - "installed-plugins-required": "インストール済みのプラグインが必要です:", - "search-plugin": "検索プラグイン", - "btn.delete": "削除", "btn.disable": "無効", "btn.enable": "有効", diff --git a/public/language/ja/admin/manage/categories.json b/public/language/ja/admin/manage/categories.json index 0147d1a656..0933cfd4ba 100644 --- a/public/language/ja/admin/manage/categories.json +++ b/public/language/ja/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "ユーザーの検索", "alert.user-search": "ここでユーザーを検索...", "alert.find-group": "グループを探す", - "alert.group-search": "ここでグループを検索する..." + "alert.group-search": "ここでグループを検索する...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/ja/admin/manage/ip-blacklist.json b/public/language/ja/admin/manage/ip-blacklist.json index 754d32e1ed..2bcc4d5b9a 100644 --- a/public/language/ja/admin/manage/ip-blacklist.json +++ b/public/language/ja/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "ブラックリストに適用されました", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/ja/admin/menu.json b/public/language/ja/admin/menu.json index 2328fb951b..261aff699b 100644 --- a/public/language/ja/admin/menu.json +++ b/public/language/ja/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "投稿キュー", "manage/groups": "グループ", "manage/ip-blacklist": "IPブラックリスト", + "manage/uploads": "Uploads", "section-settings": "設定", "settings/general": "一般", diff --git a/public/language/ja/admin/settings/user.json b/public/language/ja/admin/settings/user.json index b8f3bc16f0..1cf45f51ef 100644 --- a/public/language/ja/admin/settings/user.json +++ b/public/language/ja/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "オンラインではない時に新しいチャットメッセージを受信した場合、通知メールを送信する。", "email-post-notif": "購読中のスレッドに返信があった場合、メールで通知する。", "follow-created-topics": "投稿したスレッドをフォローします", - "follow-replied-topics": "返信したスレッドをフォローします" + "follow-replied-topics": "返信したスレッドをフォローします", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/ja/error.json b/public/language/ja/error.json index a9ade29e12..04ad421401 100644 --- a/public/language/ja/error.json +++ b/public/language/ja/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Please use your email to login", "wrong-login-type-username": "Please use your username to login", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).", "no-session-found": "No login session found!", "not-in-room": "ユーザーが部屋にいません", diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json index 35bbaf6644..6d5a3f7ac0 100644 --- a/public/language/ja/topic.json +++ b/public/language/ja/topic.json @@ -30,8 +30,11 @@ "locked": "ロック", "pinned": "ピンされた", "moved": "移動しました", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "ここをクリックすると、このスレッドの最後に読んでいた投稿へ移動します。", "flag_title": "問題を報告する", + "merged_message": "This topic has been merged into %2", "deleted_message": "このスレッドが削除されました。スレッド管理権を持っているユーザーにしか読めません。", "following_topic.message": "このスレッドが更新された際に通知を受け取ります。", "not_following_topic.message": "あなたはスレッド一覧を未読にすると、このスレッドを参照できます。ただし誰かがこのスレッドに投稿したときは通知を受信できません。", diff --git a/public/language/ja/user.json b/public/language/ja/user.json index a9e5689f76..8b85ec188d 100644 --- a/public/language/ja/user.json +++ b/public/language/ja/user.json @@ -95,6 +95,7 @@ "topics_per_page": "ページごとのスレッド数", "posts_per_page": "ページごとの投稿数", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "通知の時に音を鳴らします", "notifications_and_sounds": "通知 & サウンド", "incoming-message-sound": "受信メッセージの音", diff --git a/public/language/ko/admin/extend/widgets.json b/public/language/ko/admin/extend/widgets.json index 135d0bc43b..fa36795498 100644 --- a/public/language/ko/admin/extend/widgets.json +++ b/public/language/ko/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "사용 가능 위젯", "explanation": "드롭다운 메뉴에서 위젯을 고르고 왼쪽에 있는 템플렛의 위젯 위치로 드래그하여 옮기십시오.", "none-installed": "위젯을 찾을 수 없습니다! 필수 위젯 플러그인들을 플러그인 제어판에서 활성화하세요.", + "clone-from": "Clone widgets from", "containers.available": "사용 가능한 컨테이너", "containers.explanation": "아무 활성화된 위젯 위로 드래그해서 옮겨주십시오.", "containers.none": "없음", @@ -14,6 +15,8 @@ "alert.confirm-delete": "정말 이 위젯을 삭제하시겠습니까?", "alert.updated": "위젯 업데이트 됨", - "alert.update-success": "성공적으로 업데이트 된 위젯" + "alert.update-success": "성공적으로 업데이트 된 위젯", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/ko/admin/general/dashboard.json b/public/language/ko/admin/general/dashboard.json index d56ec7fb1b..4202595668 100644 --- a/public/language/ko/admin/general/dashboard.json +++ b/public/language/ko/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "검색 기능을 활성화하시려면 플러그인 페이지에서 검색 플러그인을 설치하세요.", "control-panel": "시스템 제어", - "reload": "리로드", - "restart": "재시작", - "restart-warning": "NodeBB 앱을 리로드하거나 재시작할 경우에는 기존의 연결이 몇 초 동안 끊어집니다.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "점검 모드", "maintenance-mode-title": "NodeBB 점검 모드를 설정하시려면 이곳을 클릭하세요.", "realtime-chart-updates": "실시간 차트 업데이트", diff --git a/public/language/ko/admin/general/navigation.json b/public/language/ko/admin/general/navigation.json index 81ad60c94c..1cd23ddc5b 100644 --- a/public/language/ko/admin/general/navigation.json +++ b/public/language/ko/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "게스트에게만 보이기", "open-new-window": "새 창에서 열기", - "installed-plugins-required": "설치된 플러그인 필수:", - "search-plugin": "검색 플러그인", - "btn.delete": "삭제", "btn.disable": "비활성화", "btn.enable": "활성화", diff --git a/public/language/ko/admin/manage/categories.json b/public/language/ko/admin/manage/categories.json index f5971d9b3e..015d9ddbb1 100644 --- a/public/language/ko/admin/manage/categories.json +++ b/public/language/ko/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "사용자 검색", "alert.user-search": "여기서 사용자를 검색하십시오...", "alert.find-group": "그룹 검색", - "alert.group-search": "여기서 그룹을 검색하십시오..." + "alert.group-search": "여기서 그룹을 검색하십시오...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/ko/admin/manage/ip-blacklist.json b/public/language/ko/admin/manage/ip-blacklist.json index 12582231c7..85ee1607f0 100644 --- a/public/language/ko/admin/manage/ip-blacklist.json +++ b/public/language/ko/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "블랙리스트 적용됨", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/ko/admin/menu.json b/public/language/ko/admin/menu.json index 9abc46605e..b3a30e673b 100644 --- a/public/language/ko/admin/menu.json +++ b/public/language/ko/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "게시 대기열", "manage/groups": "그룹", "manage/ip-blacklist": "IP 블랙리스트", + "manage/uploads": "Uploads", "section-settings": "설정", "settings/general": "일반", diff --git a/public/language/ko/admin/settings/user.json b/public/language/ko/admin/settings/user.json index 5b803b612e..de9ca6f34f 100644 --- a/public/language/ko/admin/settings/user.json +++ b/public/language/ko/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "오프라인일 때 채팅 메시지가 도착하면 알림 메일 보내기", "email-post-notif": "내가 구독한 주제에 답글이 달리면 메일 보내기", "follow-created-topics": "작성한 게시물 팔로우", - "follow-replied-topics": "답글 단 게시물을 팔로우" + "follow-replied-topics": "답글 단 게시물을 팔로우", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/ko/error.json b/public/language/ko/error.json index 65d648c2d6..55a120e2d1 100644 --- a/public/language/ko/error.json +++ b/public/language/ko/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "이메일 주소를 통해 로그인하세요.", "wrong-login-type-username": "사용자명을 통해 로그인하세요.", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "초대 한도 만큼의 사용자를 초대했습니다. (%2명 중 %1을 초대)", "no-session-found": "로그인 세션을 찾을 수 없습니다.", "not-in-room": "없는 사용자입니다.", diff --git a/public/language/ko/topic.json b/public/language/ko/topic.json index d2a2627464..404f164e45 100644 --- a/public/language/ko/topic.json +++ b/public/language/ko/topic.json @@ -30,8 +30,11 @@ "locked": "잠긴 게시물", "pinned": "고정된 게시물", "moved": "이동된 게시물", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "이 스레드에서 읽은 마지막 포스트로 이동하시려면 여기를 클릭 하세요.", "flag_title": "이 포스트를 신고", + "merged_message": "This topic has been merged into %2", "deleted_message": "이 게시물은 삭제됐습니다. 게시물 관리 권한이 있는 사용자만 볼 수 있습니다.", "following_topic.message": "이제 이 게시물에 새 답글이 달리면 알림을 받습니다.", "not_following_topic.message": "이 게시물을 아직 읽지 않은 게시물 목록에서 볼 수 있지만, 이 주제에 달린 포스트에 대해서는 알림을 받지 않습니다.", diff --git a/public/language/ko/user.json b/public/language/ko/user.json index a06592b287..f2a59dd2bc 100644 --- a/public/language/ko/user.json +++ b/public/language/ko/user.json @@ -95,6 +95,7 @@ "topics_per_page": "페이지 당 게시물 수", "posts_per_page": "페이지 당 포스트 수", "max_items_per_page": "최대 %1 ", + "acp_language": "Admin Page Language", "notification_sounds": "알림 수신시 소리로 알려주기", "notifications_and_sounds": "알림 / 알림음 설정", "incoming-message-sound": "수신 메시지 알림음", diff --git a/public/language/lt/admin/extend/widgets.json b/public/language/lt/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/lt/admin/extend/widgets.json +++ b/public/language/lt/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/lt/admin/general/dashboard.json b/public/language/lt/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/lt/admin/general/dashboard.json +++ b/public/language/lt/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/lt/admin/general/navigation.json b/public/language/lt/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/lt/admin/general/navigation.json +++ b/public/language/lt/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/lt/admin/manage/categories.json b/public/language/lt/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/lt/admin/manage/categories.json +++ b/public/language/lt/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/lt/admin/manage/ip-blacklist.json b/public/language/lt/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/lt/admin/manage/ip-blacklist.json +++ b/public/language/lt/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/lt/admin/menu.json b/public/language/lt/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/lt/admin/menu.json +++ b/public/language/lt/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/lt/admin/settings/user.json b/public/language/lt/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/lt/admin/settings/user.json +++ b/public/language/lt/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/lt/error.json b/public/language/lt/error.json index 49e5b36a56..b3688f2b43 100644 --- a/public/language/lt/error.json +++ b/public/language/lt/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Prisijungimui prašom naudoti jūsų el. adresą", "wrong-login-type-username": "Prisijungimui prašome naudoti vartotojo vardą", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).", "no-session-found": "No login session found!", "not-in-room": "User not in room", diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json index e55d88cc5c..515c975e44 100644 --- a/public/language/lt/topic.json +++ b/public/language/lt/topic.json @@ -30,8 +30,11 @@ "locked": "Užrakinta", "pinned": "Pinned", "moved": "Moved", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Click here to return to the last read post in this thread.", "flag_title": "Pažymėti ši pranešimą moderatoriams", + "merged_message": "This topic has been merged into %2", "deleted_message": "Ši tema buvo ištrinta. Tik Vartotojai su temos redagavimo privilegijomis gali matyti ja", "following_topic.message": "Dabar jūs gausite pranešimus kai kas nors atrašys šioje temoje.", "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.", diff --git a/public/language/lt/user.json b/public/language/lt/user.json index 9e440fb137..617f4ed59e 100644 --- a/public/language/lt/user.json +++ b/public/language/lt/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Temų puslapyje", "posts_per_page": "Pranešimų puslapyje", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Paleisti garsą kai jūs gaunate pranešimą", "notifications_and_sounds": "Pranešimai ir garsai", "incoming-message-sound": "Gaunamos žinutės garsas", diff --git a/public/language/ms/admin/extend/widgets.json b/public/language/ms/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/ms/admin/extend/widgets.json +++ b/public/language/ms/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/ms/admin/general/dashboard.json b/public/language/ms/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/ms/admin/general/dashboard.json +++ b/public/language/ms/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/ms/admin/general/navigation.json b/public/language/ms/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/ms/admin/general/navigation.json +++ b/public/language/ms/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/ms/admin/manage/categories.json b/public/language/ms/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/ms/admin/manage/categories.json +++ b/public/language/ms/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/ms/admin/manage/ip-blacklist.json b/public/language/ms/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/ms/admin/manage/ip-blacklist.json +++ b/public/language/ms/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/ms/admin/menu.json b/public/language/ms/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/ms/admin/menu.json +++ b/public/language/ms/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/ms/admin/settings/user.json b/public/language/ms/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/ms/admin/settings/user.json +++ b/public/language/ms/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/ms/error.json b/public/language/ms/error.json index 49b4eff2f7..8c0153efbc 100644 --- a/public/language/ms/error.json +++ b/public/language/ms/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Sila guna emel anda untuk log masuk", "wrong-login-type-username": "Sila guna nama pengguna anda untuk log masuk", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Anda telah menjemput semaksima jumlah orang (%1 daripada %2).", "no-session-found": "Tiada sesyen log masuk dijumpai", "not-in-room": "Pengguna tiada dalam bilik", diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json index aec78e7e27..3ff6d04c2c 100644 --- a/public/language/ms/topic.json +++ b/public/language/ms/topic.json @@ -30,8 +30,11 @@ "locked": "Kunci", "pinned": "Pinned", "moved": "Moved", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Click here to return to the last read post in this thread.", "flag_title": "Tanda kiriman ini untuk diselia", + "merged_message": "This topic has been merged into %2", "deleted_message": "Topik ini telah dipadam. Hanya pengguna dengan kuasa pengurusan boleh melihatnya.", "following_topic.message": "Anda akan menerima makluman apabila ada kiriman ke dalam topik ini", "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.", diff --git a/public/language/ms/user.json b/public/language/ms/user.json index e202ac1921..26732c865a 100644 --- a/public/language/ms/user.json +++ b/public/language/ms/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Topik setiap muka", "posts_per_page": "Kiriman setiap muka", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Mainkan bunyi apabila anda mendapat pemberitahuan", "notifications_and_sounds": "Notifications & Sounds", "incoming-message-sound": "Incoming message sound", diff --git a/public/language/nb/admin/extend/widgets.json b/public/language/nb/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/nb/admin/extend/widgets.json +++ b/public/language/nb/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/nb/admin/general/dashboard.json b/public/language/nb/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/nb/admin/general/dashboard.json +++ b/public/language/nb/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/nb/admin/general/navigation.json b/public/language/nb/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/nb/admin/general/navigation.json +++ b/public/language/nb/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/nb/admin/manage/categories.json b/public/language/nb/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/nb/admin/manage/categories.json +++ b/public/language/nb/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/nb/admin/manage/ip-blacklist.json b/public/language/nb/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/nb/admin/manage/ip-blacklist.json +++ b/public/language/nb/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/nb/admin/menu.json b/public/language/nb/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/nb/admin/menu.json +++ b/public/language/nb/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/nb/admin/settings/user.json b/public/language/nb/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/nb/admin/settings/user.json +++ b/public/language/nb/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/nb/error.json b/public/language/nb/error.json index 6ee7a60e37..83beb3f379 100644 --- a/public/language/nb/error.json +++ b/public/language/nb/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Vennligst benytt e-posten din for å logge inn", "wrong-login-type-username": "Vennligst benytt brukernavnet ditt for å logge inn", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).", "no-session-found": "No login session found!", "not-in-room": "User not in room", diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json index 18914ac170..54a7e86e56 100644 --- a/public/language/nb/topic.json +++ b/public/language/nb/topic.json @@ -30,8 +30,11 @@ "locked": "Låst", "pinned": "Pinned", "moved": "Moved", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Click here to return to the last read post in this thread.", "flag_title": "Rapporter dette innlegget for granskning", + "merged_message": "This topic has been merged into %2", "deleted_message": "Dette emnet har blitt slettet. Bare brukere med emnehåndterings-privilegier kan se den.", "following_topic.message": "Du vil nå motta varsler når noen skriver i denne tråden.", "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.", diff --git a/public/language/nb/user.json b/public/language/nb/user.json index 67b8e22f12..8bb82f8a53 100644 --- a/public/language/nb/user.json +++ b/public/language/nb/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Tråd per side", "posts_per_page": "Innlegg per side", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Spill en lyd når du mottar et varsel", "notifications_and_sounds": "Notifications & Sounds", "incoming-message-sound": "Incoming message sound", diff --git a/public/language/nl/admin/extend/widgets.json b/public/language/nl/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/nl/admin/extend/widgets.json +++ b/public/language/nl/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/nl/admin/general/dashboard.json b/public/language/nl/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/nl/admin/general/dashboard.json +++ b/public/language/nl/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/nl/admin/general/navigation.json b/public/language/nl/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/nl/admin/general/navigation.json +++ b/public/language/nl/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/nl/admin/manage/categories.json b/public/language/nl/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/nl/admin/manage/categories.json +++ b/public/language/nl/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/nl/admin/manage/ip-blacklist.json b/public/language/nl/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/nl/admin/manage/ip-blacklist.json +++ b/public/language/nl/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/nl/admin/menu.json b/public/language/nl/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/nl/admin/menu.json +++ b/public/language/nl/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/nl/admin/settings/user.json b/public/language/nl/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/nl/admin/settings/user.json +++ b/public/language/nl/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/nl/error.json b/public/language/nl/error.json index 9606aebb8c..291902bbc5 100644 --- a/public/language/nl/error.json +++ b/public/language/nl/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Gebruik je e-mailadres om in te loggen", "wrong-login-type-username": "Gebruik je gebruikersnaam om in te loggen", "sso-registration-disabled": "Registratie is uitgeschakeld voor %1 accounts, registreer eerst met een e-mailadres", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Je heb het maximum aantal mensen uitgenodigd (%1 van de %2).", "no-session-found": "Geen login sessie gevonden!", "not-in-room": "Gebruiker niet in de chat", diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json index d92195b74d..cf29812f5e 100644 --- a/public/language/nl/topic.json +++ b/public/language/nl/topic.json @@ -30,8 +30,11 @@ "locked": "Gesloten", "pinned": "Pinned", "moved": "Verplaatst", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Klik hier om terug te keren naar de laatst gelezen post in deze thread.", "flag_title": "Bericht aan beheerders melden", + "merged_message": "This topic has been merged into %2", "deleted_message": "Dit onderwerp is verwijderd. Alleen gebruikers met beheerrechten op onderwerpniveau kunnen dit inzien.", "following_topic.message": "Vanaf nu worden meldingen ontvangen zodra iemand een reactie op dit onderwerp geeft.", "not_following_topic.message": "Dit onderwerp zal verschijnen in de lijst van ongelezen onderwerpen, maar er zullen geen meldingen ontvangen zodra iemand een reactie op dit onderwerp geeft.", diff --git a/public/language/nl/user.json b/public/language/nl/user.json index edcfb9bffb..954f3c374f 100644 --- a/public/language/nl/user.json +++ b/public/language/nl/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Onderwerpen per pagina", "posts_per_page": "Berichten per pagina", "max_items_per_page": "Maximaal %1", + "acp_language": "Admin Page Language", "notification_sounds": "Speel een geluid af wanneer ik een notificatie ontvang", "notifications_and_sounds": "Notificaties & Geluiden", "incoming-message-sound": "Inkomend bericht geluid", diff --git a/public/language/pl/admin/extend/widgets.json b/public/language/pl/admin/extend/widgets.json index ba96b6ae66..cd646570b1 100644 --- a/public/language/pl/admin/extend/widgets.json +++ b/public/language/pl/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Dostępne Widgety", "explanation": "Wybierz widget z menu rozwijalnego i przeciągnij go na wybrane pole z lewej strony.", "none-installed": "Nie odnaleziono widżetów! Aktywuj wtyczkę \"essential widgets\" w panelu sterowania wtyczek.", + "clone-from": "Clone widgets from", "containers.available": "Dostępne kontenery", "containers.explanation": "Przeciągnij i upuść na dowolnym, aktywnym widżecie", "containers.none": "Żadna", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Czy na pewno chcesz usunąć ten widget?", "alert.updated": "Widżety zaktualizowane", - "alert.update-success": "Widżety zostały pomyślnie zaktualizowane" + "alert.update-success": "Widżety zostały pomyślnie zaktualizowane", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/pl/admin/general/dashboard.json b/public/language/pl/admin/general/dashboard.json index 7db543684b..1bd9dafd21 100644 --- a/public/language/pl/admin/general/dashboard.json +++ b/public/language/pl/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Zainstaluj wtyczkę wyszukiwania ze strony wtyczek, aby aktywować funkcję szukania", "control-panel": "Zarządzanie systemem", - "reload": "Odśwież", - "restart": "Restart", - "restart-warning": "Przeładowanie lub restart NodeBB spowoduje przerwanie wszystkich istniejących połączeń na kilka sekund.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Tryb konserwacji", "maintenance-mode-title": "Kliknij tutaj aby skonfigurować tryb konserwacji dla NodeBB", "realtime-chart-updates": "Wykresy aktualizowane na żywo", diff --git a/public/language/pl/admin/general/navigation.json b/public/language/pl/admin/general/navigation.json index 2221aad700..bafece4fc9 100644 --- a/public/language/pl/admin/general/navigation.json +++ b/public/language/pl/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Pokazuj tylko gościom", "open-new-window": "Otwórz w nowym oknie", - "installed-plugins-required": "Wymagane zainstalowane wtyczki:", - "search-plugin": "Wyszukiwarka", - "btn.delete": "Usuń", "btn.disable": "Wyłącz", "btn.enable": "Włącz", diff --git a/public/language/pl/admin/manage/categories.json b/public/language/pl/admin/manage/categories.json index e0a9b99993..b248d2a803 100644 --- a/public/language/pl/admin/manage/categories.json +++ b/public/language/pl/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Znajdź użytkownika", "alert.user-search": "Wyszukaj użytkownika tutaj...", "alert.find-group": "Znajdź grupę", - "alert.group-search": "Wyszukaj grupę tutaj..." + "alert.group-search": "Wyszukaj grupę tutaj...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/pl/admin/manage/ip-blacklist.json b/public/language/pl/admin/manage/ip-blacklist.json index 397e258fb7..18f6c0277a 100644 --- a/public/language/pl/admin/manage/ip-blacklist.json +++ b/public/language/pl/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Zastosowano czarną listę", "analytics.blacklist-hourly": "Ilustracja 1 – Wpisy z czarnej listy na godzinę", - "analytics.blacklist-daily": "Ilustracja 2 – Wpisy z czarnej listy na dzień" + "analytics.blacklist-daily": "Ilustracja 2 – Wpisy z czarnej listy na dzień", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/pl/admin/menu.json b/public/language/pl/admin/menu.json index 209876ed64..b3c3a33ab8 100644 --- a/public/language/pl/admin/menu.json +++ b/public/language/pl/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Kolejka postów", "manage/groups": "Grupy", "manage/ip-blacklist": "Czarna lista IP", + "manage/uploads": "Uploads", "section-settings": "Ustawienia", "settings/general": "Ogólne", diff --git a/public/language/pl/admin/settings/user.json b/public/language/pl/admin/settings/user.json index d1c5e7f713..c37731f65a 100644 --- a/public/language/pl/admin/settings/user.json +++ b/public/language/pl/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Wyślij powiadomienie email, jeśli dostanę nową wiadomość, a nie jestem on-line", "email-post-notif": "Wyślij wiadomość email, kiedy w tematach, które subskrybuję, pojawią się odpowiedzi", "follow-created-topics": "Śledź tematy, które stworzyłeś", - "follow-replied-topics": "Śledź tematy, w których się wypowiedziałeś " + "follow-replied-topics": "Śledź tematy, w których się wypowiedziałeś ", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/pl/error.json b/public/language/pl/error.json index 1d1e69cc59..643a0c4bfc 100644 --- a/public/language/pl/error.json +++ b/public/language/pl/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Zaloguj się, używając adresu email", "wrong-login-type-username": "Zaloguj się używając nazwy użytkownika", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Zaprosiłeś maksymalną liczba osób (%1 z %2).", "no-session-found": "Nie znaleziono sesji logowania", "not-in-room": "Użytkownik nie jest w pokoju", diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json index 29c06c285d..321cc4dfc2 100644 --- a/public/language/pl/topic.json +++ b/public/language/pl/topic.json @@ -30,8 +30,11 @@ "locked": "Zablokowany", "pinned": "Przypięte", "moved": "Przeniesione", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Kliknij tutaj, by powrócić do ostatniego przeczytanego postu w tym temacie.", "flag_title": "Zgłoś post do moderacji", + "merged_message": "This topic has been merged into %2", "deleted_message": "Ten temat został skasowany. Tylko użytkownicy z uprawnieniami do zarządzania mogą go zobaczyć.", "following_topic.message": "Będziesz od teraz otrzymywał powiadomienia, gdy ktoś odpowie w tym temacie.", "not_following_topic.message": "Zobaczysz ten temat na liście nieprzeczytanych, ale nie otrzymasz żadnego powiadomienia dotyczącego tego tematu.", diff --git a/public/language/pl/user.json b/public/language/pl/user.json index 6ad02f18e7..3a9ff274af 100644 --- a/public/language/pl/user.json +++ b/public/language/pl/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Tematów na stronę", "posts_per_page": "Postów na stronę", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Odtwarzaj dźwięk, gdy otrzymujesz powiadomienie", "notifications_and_sounds": "Powiadomienia i dźwięki", "incoming-message-sound": "Dźwięk przychodzącej wiadomości", diff --git a/public/language/pt-BR/admin/extend/widgets.json b/public/language/pt-BR/admin/extend/widgets.json index 101c63cf29..e7e2bba297 100644 --- a/public/language/pt-BR/admin/extend/widgets.json +++ b/public/language/pt-BR/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Widgets Disponíveis", "explanation": "Escolha um widget do menu de dropdown e então arraste e solte numa área de widget do template à esquerda.", "none-installed": "Nenhum widget encontrado! Ative o plugin de widgets padrão no painel de controle de plugins. ", + "clone-from": "Clone widgets from", "containers.available": "Contâineres Disponíveis", "containers.explanation": "Arrastar e soltar em cima de qualquer widget ativo", "containers.none": "Nenhum", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Tem certeza que deseja excluir este widget?", "alert.updated": "Widgets Atualizados", - "alert.update-success": "Widgets atualizados com sucesso" + "alert.update-success": "Widgets atualizados com sucesso", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/pt-BR/admin/general/dashboard.json b/public/language/pt-BR/admin/general/dashboard.json index c15201b07c..d693668844 100644 --- a/public/language/pt-BR/admin/general/dashboard.json +++ b/public/language/pt-BR/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Instale um plugin de pesquisa da página de plugins de modo à ativar a funcionalidade de pesquisa", "control-panel": "Controle do Sistema", - "reload": "Recarregar", - "restart": "Reiniciar", - "restart-warning": "Recarregar ou Reiniciar o seu NodeBB derrubará todas as conexão existentes por alguns segundos.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Modo de Manutenção", "maintenance-mode-title": "Clique aqui para colocar o modo de manutenção no NodeBB", "realtime-chart-updates": "Atualização de Gráfico em Tempo Real", diff --git a/public/language/pt-BR/admin/general/navigation.json b/public/language/pt-BR/admin/general/navigation.json index a4a2d7b7b0..99d6417285 100644 --- a/public/language/pt-BR/admin/general/navigation.json +++ b/public/language/pt-BR/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Mostrar apenas para visitantes", "open-new-window": "Abrir em uma nova janela", - "installed-plugins-required": "Plugins Instalados Necessários:", - "search-plugin": "Plugin de pesquisa", - "btn.delete": "Deletar", "btn.disable": "Desligar", "btn.enable": "Ligar", diff --git a/public/language/pt-BR/admin/manage/categories.json b/public/language/pt-BR/admin/manage/categories.json index f63e2d327d..50a5c56238 100644 --- a/public/language/pt-BR/admin/manage/categories.json +++ b/public/language/pt-BR/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Encontrar um Usuário", "alert.user-search": "Procure por um usuário aqui...", "alert.find-group": "Encontre um Grupo", - "alert.group-search": "Pesquise por um grupo aqui..." + "alert.group-search": "Pesquise por um grupo aqui...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/pt-BR/admin/manage/ip-blacklist.json b/public/language/pt-BR/admin/manage/ip-blacklist.json index 20e19eea58..98fb26ff43 100644 --- a/public/language/pt-BR/admin/manage/ip-blacklist.json +++ b/public/language/pt-BR/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Lista Negra Aplicada", "analytics.blacklist-hourly": "Figura 1 – Acessos na lista de bloqueio pot hora", - "analytics.blacklist-daily": "Figura 2 – Acessos na lista de bloqueio por dia" + "analytics.blacklist-daily": "Figura 2 – Acessos na lista de bloqueio por dia", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/pt-BR/admin/menu.json b/public/language/pt-BR/admin/menu.json index a200fa4bd4..d80117c046 100644 --- a/public/language/pt-BR/admin/menu.json +++ b/public/language/pt-BR/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Fileira da Posts", "manage/groups": "Grupos", "manage/ip-blacklist": "Lista Negra de IPs", + "manage/uploads": "Uploads", "section-settings": "Configurações", "settings/general": "Geral", diff --git a/public/language/pt-BR/admin/settings/user.json b/public/language/pt-BR/admin/settings/user.json index c695659f1b..994809215f 100644 --- a/public/language/pt-BR/admin/settings/user.json +++ b/public/language/pt-BR/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Envie um email se uma nova mensagem de chat chegar e eu não estiver online", "email-post-notif": "Enviar um email quando respostas forem dadas à tópicos que estou inscrito", "follow-created-topics": "Seguir tópicos que você criar", - "follow-replied-topics": "Seguir os tópicos que você responder" + "follow-replied-topics": "Seguir os tópicos que você responder", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/pt-BR/error.json b/public/language/pt-BR/error.json index 5f7373fb2a..98f15d7338 100644 --- a/public/language/pt-BR/error.json +++ b/public/language/pt-BR/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Por favor use seu email para fazer login", "wrong-login-type-username": "Por favor use o seu nome de usuário para fazer login", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Você já convidou o número máximo de pessoas (%1 de %2).", "no-session-found": "Nenhuma sessão de login encontrada!", "not-in-room": "O usuário não está na sala", diff --git a/public/language/pt-BR/topic.json b/public/language/pt-BR/topic.json index fde744a9de..8d03867c0c 100644 --- a/public/language/pt-BR/topic.json +++ b/public/language/pt-BR/topic.json @@ -30,8 +30,11 @@ "locked": "Trancado", "pinned": "Afixado", "moved": "Movido", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Clique aqui para retornar ao último post lido neste tópico.", "flag_title": "Sinalizar este post para moderação", + "merged_message": "This topic has been merged into %2", "deleted_message": "Este tópico foi deletado. Apenas usuários com privilégios de moderação de tópico podem vê-lo.", "following_topic.message": "Agora você receberá notificações quando alguém responder este tópico.", "not_following_topic.message": "Você verá este tópico na lista de tópicos não-lidos, mas você não receberá notificações quendo alguém posta no tópico.", diff --git a/public/language/pt-BR/user.json b/public/language/pt-BR/user.json index 3a5ff85a58..5ebf4696b3 100644 --- a/public/language/pt-BR/user.json +++ b/public/language/pt-BR/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Tópicos por Página", "posts_per_page": "Posts por Página", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Tocar um som quando você receber uma notificação.", "notifications_and_sounds": "Notificações & Sons", "incoming-message-sound": "Som de recebimento de mensagem", diff --git a/public/language/pt-PT/admin/extend/widgets.json b/public/language/pt-PT/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/pt-PT/admin/extend/widgets.json +++ b/public/language/pt-PT/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/pt-PT/admin/general/dashboard.json b/public/language/pt-PT/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/pt-PT/admin/general/dashboard.json +++ b/public/language/pt-PT/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/pt-PT/admin/general/navigation.json b/public/language/pt-PT/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/pt-PT/admin/general/navigation.json +++ b/public/language/pt-PT/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/pt-PT/admin/manage/categories.json b/public/language/pt-PT/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/pt-PT/admin/manage/categories.json +++ b/public/language/pt-PT/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/pt-PT/admin/manage/ip-blacklist.json b/public/language/pt-PT/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/pt-PT/admin/manage/ip-blacklist.json +++ b/public/language/pt-PT/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/pt-PT/admin/menu.json b/public/language/pt-PT/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/pt-PT/admin/menu.json +++ b/public/language/pt-PT/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/pt-PT/admin/settings/user.json b/public/language/pt-PT/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/pt-PT/admin/settings/user.json +++ b/public/language/pt-PT/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/pt-PT/error.json b/public/language/pt-PT/error.json index 75c51cdf54..331d897d8d 100644 --- a/public/language/pt-PT/error.json +++ b/public/language/pt-PT/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Por favor utiliza o teu e-mail para efetuares o login", "wrong-login-type-username": "Por favor utiliza o teu nome de utilizador para efetuares o login", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Convidaste o máximo de pessoas (%1 em %2).", "no-session-found": "Não encontramos sessões de login!", "not-in-room": "Utilizador não se encontra na sala", diff --git a/public/language/pt-PT/topic.json b/public/language/pt-PT/topic.json index a625959969..c0773c59bc 100644 --- a/public/language/pt-PT/topic.json +++ b/public/language/pt-PT/topic.json @@ -30,8 +30,11 @@ "locked": "Bloqueado", "pinned": "Afixado", "moved": "Movido", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Carrega aqui para voltares à última publicação lide assunto.", "flag_title": "Sinaliza esta publicação para moderação", + "merged_message": "This topic has been merged into %2", "deleted_message": "Este tópico foi eliminado. Somente utilizadores com privilégios de manutenção do tópico podem vê-lo.", "following_topic.message": "A partir de agora receberás uma notificação sempre que alguém publicar neste tópico.", "not_following_topic.message": "Verás este tópico na lista de tópicos por ler mas não irás receber notificações quando alguém publicar neste tópico.", diff --git a/public/language/pt-PT/user.json b/public/language/pt-PT/user.json index 2c21950e37..f034a45064 100644 --- a/public/language/pt-PT/user.json +++ b/public/language/pt-PT/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Tópicos por página", "posts_per_page": "Publicações por página", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Tocar um som quando uma notificação for recebida", "notifications_and_sounds": "Notificações & Sons", "incoming-message-sound": "Som de mensagem recebida", diff --git a/public/language/ro/admin/extend/widgets.json b/public/language/ro/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/ro/admin/extend/widgets.json +++ b/public/language/ro/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/ro/admin/general/dashboard.json b/public/language/ro/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/ro/admin/general/dashboard.json +++ b/public/language/ro/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/ro/admin/general/navigation.json b/public/language/ro/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/ro/admin/general/navigation.json +++ b/public/language/ro/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/ro/admin/manage/categories.json b/public/language/ro/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/ro/admin/manage/categories.json +++ b/public/language/ro/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/ro/admin/manage/ip-blacklist.json b/public/language/ro/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/ro/admin/manage/ip-blacklist.json +++ b/public/language/ro/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/ro/admin/menu.json b/public/language/ro/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/ro/admin/menu.json +++ b/public/language/ro/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/ro/admin/settings/user.json b/public/language/ro/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/ro/admin/settings/user.json +++ b/public/language/ro/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/ro/error.json b/public/language/ro/error.json index f32d8fd74f..b912cdbf70 100644 --- a/public/language/ro/error.json +++ b/public/language/ro/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Please use your email to login", "wrong-login-type-username": "Please use your username to login", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).", "no-session-found": "No login session found!", "not-in-room": "User not in room", diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json index e198cacc69..946e19840b 100644 --- a/public/language/ro/topic.json +++ b/public/language/ro/topic.json @@ -30,8 +30,11 @@ "locked": "Închis", "pinned": "Pinned", "moved": "Moved", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Click here to return to the last read post in this thread.", "flag_title": "Semnalizează acest mesaj pentru moderare", + "merged_message": "This topic has been merged into %2", "deleted_message": "Acest subiect a fost șters. Doar utilizatorii cu privilegii pentru moderarea subiectelor îl poate vedea.", "following_topic.message": "Vei primi notificări când cineva va posta un nou mesaj in acest subiect.", "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.", diff --git a/public/language/ro/user.json b/public/language/ro/user.json index 1a0d1d47e1..a988b79d03 100644 --- a/public/language/ro/user.json +++ b/public/language/ro/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Subiecte pe pagină", "posts_per_page": "Mesaje pe pagină", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Play a sound when you receive a notification", "notifications_and_sounds": "Notifications & Sounds", "incoming-message-sound": "Incoming message sound", diff --git a/public/language/ru/admin/extend/widgets.json b/public/language/ru/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/ru/admin/extend/widgets.json +++ b/public/language/ru/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/ru/admin/general/dashboard.json b/public/language/ru/admin/general/dashboard.json index 042cbe83b9..8adf24e073 100644 --- a/public/language/ru/admin/general/dashboard.json +++ b/public/language/ru/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "Управление", - "reload": "Перезапустить", - "restart": "Перезагрузить", - "restart-warning": "Перезапуск системы сбросит все соединения на несколько секунд.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Режим тех обслуживания", "maintenance-mode-title": "Нажмите, чтобы включить режим тех обслуживания", "realtime-chart-updates": "Обновление графиков в реальном времени", diff --git a/public/language/ru/admin/general/navigation.json b/public/language/ru/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/ru/admin/general/navigation.json +++ b/public/language/ru/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/ru/admin/manage/categories.json b/public/language/ru/admin/manage/categories.json index c88a402511..e303fb5729 100644 --- a/public/language/ru/admin/manage/categories.json +++ b/public/language/ru/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/ru/admin/manage/ip-blacklist.json b/public/language/ru/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/ru/admin/manage/ip-blacklist.json +++ b/public/language/ru/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/ru/admin/menu.json b/public/language/ru/admin/menu.json index fa747687f6..07f9fcd865 100644 --- a/public/language/ru/admin/menu.json +++ b/public/language/ru/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Группы", "manage/ip-blacklist": "Блокировка IP", + "manage/uploads": "Uploads", "section-settings": "Настройки", "settings/general": "Главные", diff --git a/public/language/ru/admin/settings/user.json b/public/language/ru/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/ru/admin/settings/user.json +++ b/public/language/ru/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/ru/error.json b/public/language/ru/error.json index e46a905f5e..10b4d4b5a9 100644 --- a/public/language/ru/error.json +++ b/public/language/ru/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Пожалуйста, для входа используйте адрес своей электронной почты.", "wrong-login-type-username": "Пожалуйста, для входа используйте имя пользователя.", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Вы пригласили %1 людей из %2 возможных.", "no-session-found": "Сессия входа не найдена!", "not-in-room": "Пользователь отсутствует в этой комнате", diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json index 2563f68277..bd9a01a825 100644 --- a/public/language/ru/topic.json +++ b/public/language/ru/topic.json @@ -30,8 +30,11 @@ "locked": "Закрыт", "pinned": "Прикреплена", "moved": "Перемещена", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Нажмите здесь, чтобы вернуться к последнему прочитанному сообщению в этой теме.", "flag_title": "Отметить сообщение для модерирования", + "merged_message": "This topic has been merged into %2", "deleted_message": "Эта тема была удалена. Только пользователи с правами управления темами могут ее видеть.", "following_topic.message": "Теперь вы будете получать уведомления при обновлении этой темы.", "not_following_topic.message": "Вы увидите эту тему в списке непрочитанных тем, но Вы не будете получать уведомления, когда кто-то напишет сообщение в эту тему.", diff --git a/public/language/ru/user.json b/public/language/ru/user.json index a30280a04e..fbb0148d9d 100644 --- a/public/language/ru/user.json +++ b/public/language/ru/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Тем на странице", "posts_per_page": "Записей на странице", "max_items_per_page": "Максимум %1", + "acp_language": "Admin Page Language", "notification_sounds": "Воспроизводить звук во время получения уведомления", "notifications_and_sounds": "Уведомления и звуки", "incoming-message-sound": "Звук входящего сообщения", diff --git a/public/language/rw/admin/extend/widgets.json b/public/language/rw/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/rw/admin/extend/widgets.json +++ b/public/language/rw/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/rw/admin/general/dashboard.json b/public/language/rw/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/rw/admin/general/dashboard.json +++ b/public/language/rw/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/rw/admin/general/navigation.json b/public/language/rw/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/rw/admin/general/navigation.json +++ b/public/language/rw/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/rw/admin/manage/categories.json b/public/language/rw/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/rw/admin/manage/categories.json +++ b/public/language/rw/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/rw/admin/manage/ip-blacklist.json b/public/language/rw/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/rw/admin/manage/ip-blacklist.json +++ b/public/language/rw/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/rw/admin/menu.json b/public/language/rw/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/rw/admin/menu.json +++ b/public/language/rw/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/rw/admin/settings/user.json b/public/language/rw/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/rw/admin/settings/user.json +++ b/public/language/rw/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/rw/error.json b/public/language/rw/error.json index 6424d2514e..87ef11ffbb 100644 --- a/public/language/rw/error.json +++ b/public/language/rw/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Koresha email yawe kugirango winjiremo", "wrong-login-type-username": "Koresha izina ry'umukoresha ryawe kugirango winjiremo", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).", "no-session-found": "No login session found!", "not-in-room": "User not in room", diff --git a/public/language/rw/topic.json b/public/language/rw/topic.json index c05b47832d..a1fd342ea6 100644 --- a/public/language/rw/topic.json +++ b/public/language/rw/topic.json @@ -30,8 +30,11 @@ "locked": "Birafungiranye", "pinned": "Pinned", "moved": "Moved", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Click here to return to the last read post in this thread.", "flag_title": "Bimenyeshe ubuyobozi", + "merged_message": "This topic has been merged into %2", "deleted_message": "Iki kiganiro cyamaze gukurwaho. Abantu babifitiye uburenganzira ni bo bonyine bashobora kukibona. ", "following_topic.message": "Ntabwo uzongera kubimenyeshwa nihagira umuntu ugira icyo yandika kuri iki kiganiro. ", "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.", diff --git a/public/language/rw/user.json b/public/language/rw/user.json index ed5bd999d7..b739a78108 100644 --- a/public/language/rw/user.json +++ b/public/language/rw/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Ibiganiro kuri Buri Paji", "posts_per_page": "Ibyashyizweho kuri Buri Paji", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Hajye humvikana ijwi rikumenyesha ko haje itangazo rishya", "notifications_and_sounds": "Notifications & Sounds", "incoming-message-sound": "Incoming message sound", diff --git a/public/language/sc/admin/extend/widgets.json b/public/language/sc/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/sc/admin/extend/widgets.json +++ b/public/language/sc/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/sc/admin/general/dashboard.json b/public/language/sc/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/sc/admin/general/dashboard.json +++ b/public/language/sc/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/sc/admin/general/navigation.json b/public/language/sc/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/sc/admin/general/navigation.json +++ b/public/language/sc/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/sc/admin/manage/categories.json b/public/language/sc/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/sc/admin/manage/categories.json +++ b/public/language/sc/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/sc/admin/manage/ip-blacklist.json b/public/language/sc/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/sc/admin/manage/ip-blacklist.json +++ b/public/language/sc/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/sc/admin/menu.json b/public/language/sc/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/sc/admin/menu.json +++ b/public/language/sc/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/sc/admin/settings/user.json b/public/language/sc/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/sc/admin/settings/user.json +++ b/public/language/sc/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/sc/error.json b/public/language/sc/error.json index 282b07f9e1..9ed1e2470e 100644 --- a/public/language/sc/error.json +++ b/public/language/sc/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Please use your email to login", "wrong-login-type-username": "Please use your username to login", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "You have invited the maximum amount of people (%1 out of %2).", "no-session-found": "No login session found!", "not-in-room": "User not in room", diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json index d49f721672..c8b853170c 100644 --- a/public/language/sc/topic.json +++ b/public/language/sc/topic.json @@ -30,8 +30,11 @@ "locked": "Locked", "pinned": "Pinned", "moved": "Moved", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Click here to return to the last read post in this thread.", "flag_title": "Signala custu arresonu pro sa moderatzione", + "merged_message": "This topic has been merged into %2", "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.", "following_topic.message": "As a retzire notìficas si calincunu pùblica in custa arresonada.", "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.", diff --git a/public/language/sc/user.json b/public/language/sc/user.json index d22c0e62c3..7eb7ce2571 100644 --- a/public/language/sc/user.json +++ b/public/language/sc/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Arresonadas pro Pàgina", "posts_per_page": "Arresonos pro Pàgina", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Play a sound when you receive a notification", "notifications_and_sounds": "Notifications & Sounds", "incoming-message-sound": "Incoming message sound", diff --git a/public/language/sk/admin/extend/widgets.json b/public/language/sk/admin/extend/widgets.json index 5b2da907fe..9732674533 100644 --- a/public/language/sk/admin/extend/widgets.json +++ b/public/language/sk/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Dostupné miniaplikácie", "explanation": "V rozbaľovacej ponuke vyberte miniaplikáciu a potom ju presuňte do oblasti miniaplikácií šablóny.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/sk/admin/general/dashboard.json b/public/language/sk/admin/general/dashboard.json index 029eb972a7..2b462d3ae2 100644 --- a/public/language/sk/admin/general/dashboard.json +++ b/public/language/sk/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Obnoviť", - "restart": "Reštartovať", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/sk/admin/general/navigation.json b/public/language/sk/admin/general/navigation.json index 77a6f45927..c2820d5480 100644 --- a/public/language/sk/admin/general/navigation.json +++ b/public/language/sk/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/sk/admin/manage/categories.json b/public/language/sk/admin/manage/categories.json index 6536bf3580..963b51f570 100644 --- a/public/language/sk/admin/manage/categories.json +++ b/public/language/sk/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/sk/admin/manage/ip-blacklist.json b/public/language/sk/admin/manage/ip-blacklist.json index ba8ddea2ae..689ac91ee0 100644 --- a/public/language/sk/admin/manage/ip-blacklist.json +++ b/public/language/sk/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/sk/admin/menu.json b/public/language/sk/admin/menu.json index d0beeda98e..171c31d47a 100644 --- a/public/language/sk/admin/menu.json +++ b/public/language/sk/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/sk/admin/settings/user.json b/public/language/sk/admin/settings/user.json index 369bbf7e8a..5f2201cd69 100644 --- a/public/language/sk/admin/settings/user.json +++ b/public/language/sk/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/sk/error.json b/public/language/sk/error.json index f180ed7cac..aae4045893 100644 --- a/public/language/sk/error.json +++ b/public/language/sk/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Prosím použite svoj e-mail, k prihláseniu", "wrong-login-type-username": "Použite svoje užívateľské meno pre prihlásenie", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Pozvali ste maximálny počet ľudí (%1 z %2).", "no-session-found": "Žiadne prihlásenie sa do relácií nenájdené!", "not-in-room": "Užívateľ nie je v miestnosti", diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json index 2ca0a2b657..58f62d39de 100644 --- a/public/language/sk/topic.json +++ b/public/language/sk/topic.json @@ -30,8 +30,11 @@ "locked": "Uzamknuté", "pinned": "Pripnuté", "moved": "Presunuté", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Kliknite sem pre návrat k poslednému prečítanému príspevku vo vlákne.", "flag_title": "Označiť príspevok pre zmiernenie", + "merged_message": "This topic has been merged into %2", "deleted_message": "Táto téma bola odstránená. Iba užívatelia s výsadami správcu ju môžu vidieť.", "following_topic.message": "Odteraz budete prijímať oznámenia, keď niekto prispeje do tejto témy.", "not_following_topic.message": "Uvidíte túto tému v zozname neprečítaných tém, ale nebudete dostávať oznámenia, keď niekto pridá príspevok do tejto témy.", diff --git a/public/language/sk/user.json b/public/language/sk/user.json index 43c94065e4..ce66908c0c 100644 --- a/public/language/sk/user.json +++ b/public/language/sk/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Témy na stranu", "posts_per_page": "Príspevkov na stranu", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Prehrať zvuk ak obdržíte oznámenie", "notifications_and_sounds": "Oznámenia & Zvuky", "incoming-message-sound": "Prichádzajúci zvuk správy", diff --git a/public/language/sl/admin/extend/widgets.json b/public/language/sl/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/sl/admin/extend/widgets.json +++ b/public/language/sl/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/sl/admin/general/dashboard.json b/public/language/sl/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/sl/admin/general/dashboard.json +++ b/public/language/sl/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/sl/admin/general/navigation.json b/public/language/sl/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/sl/admin/general/navigation.json +++ b/public/language/sl/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/sl/admin/manage/categories.json b/public/language/sl/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/sl/admin/manage/categories.json +++ b/public/language/sl/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/sl/admin/manage/ip-blacklist.json b/public/language/sl/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/sl/admin/manage/ip-blacklist.json +++ b/public/language/sl/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/sl/admin/menu.json b/public/language/sl/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/sl/admin/menu.json +++ b/public/language/sl/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/sl/admin/settings/user.json b/public/language/sl/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/sl/admin/settings/user.json +++ b/public/language/sl/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/sl/error.json b/public/language/sl/error.json index fc6a67f629..31b3755d84 100644 --- a/public/language/sl/error.json +++ b/public/language/sl/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Uporabite svoj e-poštni naslov za prijavo.", "wrong-login-type-username": "Uporabite svoje uporabniško ime za prijavo.", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Povabili ste največje dovoljeno število ljudi (%1 od %2).", "no-session-found": "Prijavne seje ni mogoče najti!", "not-in-room": "Uporabnika ni v sobi.", diff --git a/public/language/sl/topic.json b/public/language/sl/topic.json index 53e33e52d1..b5fb82aa0d 100644 --- a/public/language/sl/topic.json +++ b/public/language/sl/topic.json @@ -30,8 +30,11 @@ "locked": "Zaklenjeno", "pinned": "Pripeto", "moved": "Premaknjeno", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Klikni tukaj za vrnitev na zadnje prebrano objavo v tej niti", "flag_title": "Označi to objavo za vodenje", + "merged_message": "This topic has been merged into %2", "deleted_message": "Ta tema je bila izbrisana. Le uporabniki s pravicami upravljanja tem jo lahko vidijo.", "following_topic.message": "Če nekdo objavi v to temo, boste od sedaj dobivali obvestila. ", "not_following_topic.message": "To temo boste videli v seznamu neprebranih tem. Ne boste pa dobili obvestila, če bo nekdo objavil v tej temi. ", diff --git a/public/language/sl/user.json b/public/language/sl/user.json index b6eeb8763d..8b7b866777 100644 --- a/public/language/sl/user.json +++ b/public/language/sl/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Število tem na stran", "posts_per_page": "Število objav na stran", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Zvočno me opozori, ko prejmem obvestilo", "notifications_and_sounds": "Obvestila in zvoki", "incoming-message-sound": "Zvok za prejeto sporočilo", diff --git a/public/language/sr/admin/extend/widgets.json b/public/language/sr/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/sr/admin/extend/widgets.json +++ b/public/language/sr/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/sr/admin/general/dashboard.json b/public/language/sr/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/sr/admin/general/dashboard.json +++ b/public/language/sr/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/sr/admin/general/navigation.json b/public/language/sr/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/sr/admin/general/navigation.json +++ b/public/language/sr/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/sr/admin/manage/categories.json b/public/language/sr/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/sr/admin/manage/categories.json +++ b/public/language/sr/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/sr/admin/manage/ip-blacklist.json b/public/language/sr/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/sr/admin/manage/ip-blacklist.json +++ b/public/language/sr/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/sr/admin/menu.json b/public/language/sr/admin/menu.json index eff3e6f694..f6aec18dfc 100644 --- a/public/language/sr/admin/menu.json +++ b/public/language/sr/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Grupe", "manage/ip-blacklist": "Crna Lista IP adresa", + "manage/uploads": "Uploads", "section-settings": "Podešavanja", "settings/general": "Uopšteno", diff --git a/public/language/sr/admin/settings/user.json b/public/language/sr/admin/settings/user.json index 17e529bd4d..bd068e9b7c 100644 --- a/public/language/sr/admin/settings/user.json +++ b/public/language/sr/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Pošalji email ako nova chat poruka stigne dok nisam online", "email-post-notif": "Pošalji email kada odgovori su načinjeni u temu u kojoj sam ja pretplaćen", "follow-created-topics": "Prati teme koje si ti napravio", - "follow-replied-topics": "Prati teme na koje si ti odgovorio" + "follow-replied-topics": "Prati teme na koje si ti odgovorio", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/sr/error.json b/public/language/sr/error.json index d6caec4f13..a05bf94737 100644 --- a/public/language/sr/error.json +++ b/public/language/sr/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Користите вашу е-пошту за пријављивање", "wrong-login-type-username": "Користите ваше корисничко име за пријављивање", "sso-registration-disabled": "Регистрација је онемогућена за %1 налога, региструјте се са адресом е-поште прво", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Позвали сте максимални број особа (%1 од %2).", "no-session-found": "Није пронађена сесија пријављивања!", "not-in-room": "Корисник није у соби", diff --git a/public/language/sr/topic.json b/public/language/sr/topic.json index 44766303f3..b2c93c2d41 100644 --- a/public/language/sr/topic.json +++ b/public/language/sr/topic.json @@ -30,8 +30,11 @@ "locked": "Закључано", "pinned": "Закачено", "moved": "Премештено", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Кликните овде за повратак на последњу прочитану поруку у овој теми.", "flag_title": "Означи ову поруку за модерацију", + "merged_message": "This topic has been merged into %2", "deleted_message": "Ова тема је избрисана. Само корисници са привилегијама управљања темама је могу видети.", "following_topic.message": "Од сада ће те примати обавештења када неко одговори у овој теми.", "not_following_topic.message": "Видећете ову тему у списку непрочитаних тема али нећете примати обавештења када неко одговори у њој.", diff --git a/public/language/sr/user.json b/public/language/sr/user.json index 961ddef916..e1720899de 100644 --- a/public/language/sr/user.json +++ b/public/language/sr/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Тема по страници", "posts_per_page": "Порука по страници", "max_items_per_page": "Највише %1", + "acp_language": "Admin Page Language", "notification_sounds": "Репродукуј звук приликом примања обавештења", "notifications_and_sounds": "Обавештења и звуци", "incoming-message-sound": "Звук долазне поруке", diff --git a/public/language/sv/admin/extend/widgets.json b/public/language/sv/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/sv/admin/extend/widgets.json +++ b/public/language/sv/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/sv/admin/general/dashboard.json b/public/language/sv/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/sv/admin/general/dashboard.json +++ b/public/language/sv/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/sv/admin/general/navigation.json b/public/language/sv/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/sv/admin/general/navigation.json +++ b/public/language/sv/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/sv/admin/manage/categories.json b/public/language/sv/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/sv/admin/manage/categories.json +++ b/public/language/sv/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/sv/admin/manage/ip-blacklist.json b/public/language/sv/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/sv/admin/manage/ip-blacklist.json +++ b/public/language/sv/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/sv/admin/menu.json b/public/language/sv/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/sv/admin/menu.json +++ b/public/language/sv/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/sv/admin/settings/user.json b/public/language/sv/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/sv/admin/settings/user.json +++ b/public/language/sv/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/sv/error.json b/public/language/sv/error.json index 0c0f9284e0..a58c5fd3c0 100644 --- a/public/language/sv/error.json +++ b/public/language/sv/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Använd din e-postadress för att logga in", "wrong-login-type-username": "Använd ditt användarnamn för att logga in", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Du har bjudit in det maximala antalet användare (%1 av %2)", "no-session-found": "Ingen login-session hittades!", "not-in-room": "Användaren finns inte i rummet", diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json index eb3a78b313..bca374bb29 100644 --- a/public/language/sv/topic.json +++ b/public/language/sv/topic.json @@ -30,8 +30,11 @@ "locked": "Låst", "pinned": "Fäst", "moved": "Flyttad", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Klicka här för att återgå till senast lästa inlägg i detta ämne.", "flag_title": "Rapportera detta inlägg för granskning", + "merged_message": "This topic has been merged into %2", "deleted_message": "Det här ämnet har raderats. Endast användare med ämneshanterings-privilegier kan se det.", "following_topic.message": "Du kommer nu få notiser när någon gör inlägg i detta ämne.", "not_following_topic.message": "Du kommer att se det här ämnet i listan olästa ämnen, men du kommer inte att få meddelande när någon gör inlägg till detta ämne.", diff --git a/public/language/sv/user.json b/public/language/sv/user.json index 2cb295f536..b363bca076 100644 --- a/public/language/sv/user.json +++ b/public/language/sv/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Ämnen per sida", "posts_per_page": "Inlägg per sida", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Spela ett ljud när du får en notis", "notifications_and_sounds": "Meddelanden och ljud", "incoming-message-sound": "Inkommande meddelande ljud", diff --git a/public/language/th/admin/extend/widgets.json b/public/language/th/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/th/admin/extend/widgets.json +++ b/public/language/th/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/th/admin/general/dashboard.json b/public/language/th/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/th/admin/general/dashboard.json +++ b/public/language/th/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/th/admin/general/navigation.json b/public/language/th/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/th/admin/general/navigation.json +++ b/public/language/th/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/th/admin/manage/categories.json b/public/language/th/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/th/admin/manage/categories.json +++ b/public/language/th/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/th/admin/manage/ip-blacklist.json b/public/language/th/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/th/admin/manage/ip-blacklist.json +++ b/public/language/th/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/th/admin/menu.json b/public/language/th/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/th/admin/menu.json +++ b/public/language/th/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/th/admin/settings/user.json b/public/language/th/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/th/admin/settings/user.json +++ b/public/language/th/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/th/error.json b/public/language/th/error.json index 87514dedca..945f7be822 100644 --- a/public/language/th/error.json +++ b/public/language/th/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "กรุณาใช้อีเมล์ของคุณในการเข้าสู่ระบบ", "wrong-login-type-username": "กรุณาใช้ชื่อผู้ใช้ของคุณในการเข้าสู่ระบบ", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "คุณได้ทำการเชิญผู้คนจำนวนมากที่สุด (%1 out of %2).", "no-session-found": "ไม่พบการเข้าสู่ระบบ", "not-in-room": "ผู้ใช้ไม่อยู่ในห้อง", diff --git a/public/language/th/topic.json b/public/language/th/topic.json index c232094959..58bd731052 100644 --- a/public/language/th/topic.json +++ b/public/language/th/topic.json @@ -30,8 +30,11 @@ "locked": "ถูกล็อก", "pinned": "ถูกปักหมุด", "moved": "ถูกย้าย", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "คลิกที่นี่เพื่อกลับไปยังโพสต์ล่าสุดในหัวข้อนี้", "flag_title": "ปักธงโพสต์นี้เพื่อดำเนินการ", + "merged_message": "This topic has been merged into %2", "deleted_message": "Topic นี้ถูกลบไปแล้ว เฉพาะผู้ใช้งานที่มีสิทธิ์ในการจัดการ Topic เท่านั้นที่จะมีสิทธิ์ในการเข้าชม", "following_topic.message": "คุณจะได้รับการแจ้งเตือนเมื่อมีคนโพสต์ในกระทู้นี้", "not_following_topic.message": "คุณจะเห็นกระทู้นี้ในรายการของกระทู้ที่ยังไม่ได้อ่าน แต่คุณจะไม่ได้รับการแจ้งเตือนเมื่่อมีคนตอบกระทู้นี้", diff --git a/public/language/th/user.json b/public/language/th/user.json index 0da95b8fa9..c663455f28 100644 --- a/public/language/th/user.json +++ b/public/language/th/user.json @@ -95,6 +95,7 @@ "topics_per_page": "จำนวนกระทู้ต่อหน้า", "posts_per_page": "จำนวนข้อความต่อหน้า", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "เล่นเสียงเมื่อมีการแจ้งเตือน", "notifications_and_sounds": "เสียงและการแจ้งเตือน", "incoming-message-sound": "เสียงข้อความเข้า", diff --git a/public/language/tr/admin/extend/widgets.json b/public/language/tr/admin/extend/widgets.json index d17f7f9dfb..a18bb803ce 100644 --- a/public/language/tr/admin/extend/widgets.json +++ b/public/language/tr/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Kullanılabilir Bileşenler", "explanation": "Açılır menüden bir bileşen seçin ve sol taraftaki bir şablonun bileşen alanına sürükleyip bırakın.", "none-installed": "Bileşen bulunamadı! Gerekli bileşenleri eklentiler kontrol panelinden aktifleştirin.", + "clone-from": "Clone widgets from", "containers.available": "Kullanılabilir Konteynırlar", "containers.explanation": "Aktif olan herhangi bir bileşenin üzerine sürükleyin ve bırakın", "containers.none": "Hiçbiri", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Bu bileşeni silmek istediğinizden emin misiniz?", "alert.updated": "Bileşenler Güncellendi", - "alert.update-success": "Bileşenler başarıyla güncellendi" + "alert.update-success": "Bileşenler başarıyla güncellendi", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/tr/admin/general/dashboard.json b/public/language/tr/admin/general/dashboard.json index 664b90bd98..f38bd0b3ec 100644 --- a/public/language/tr/admin/general/dashboard.json +++ b/public/language/tr/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Arama işlevselliğini etkinleştirmek için eklenti sayfasından bir arama eklentisi kurun", "control-panel": "Sistem Kontrol", - "reload": "Yeniden Yükle", - "restart": "Yeniden Başlat", - "restart-warning": "NodeBB'yi yeniden yüklemek veya yeniden başlatmak, mevcut tüm bağlantıları birkaç saniye için sonlandırır.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Bakım Modu", "maintenance-mode-title": "NodeBB için bakım modunu ayarlamak için buraya tıklayın", "realtime-chart-updates": "Gerçek Zamanlı Grafik Güncellemeleri", diff --git a/public/language/tr/admin/general/navigation.json b/public/language/tr/admin/general/navigation.json index 8607f3ae93..d390950e42 100644 --- a/public/language/tr/admin/general/navigation.json +++ b/public/language/tr/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Yalnızca ziyaretçiler görüntüleyebilir", "open-new-window": "Yeni pencerede aç", - "installed-plugins-required": "Yüklü Eklentilerin Gereksinimleri:", - "search-plugin": "Eklenti ara", - "btn.delete": "Sil", "btn.disable": "Devre dışı", "btn.enable": "Etkin", diff --git a/public/language/tr/admin/manage/categories.json b/public/language/tr/admin/manage/categories.json index e0f8324a24..b1884332f5 100644 --- a/public/language/tr/admin/manage/categories.json +++ b/public/language/tr/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Bir Kullanıcı Ara", "alert.user-search": "Search for a user here...", "alert.find-group": "Bir Grup Ara", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/tr/admin/manage/ip-blacklist.json b/public/language/tr/admin/manage/ip-blacklist.json index d2ba669a5b..f003c194ee 100644 --- a/public/language/tr/admin/manage/ip-blacklist.json +++ b/public/language/tr/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Kara Liste Uygulandı", "analytics.blacklist-hourly": "Şekil 1 Saatlik kara liste isabeti", - "analytics.blacklist-daily": "Şekil 2 Günlük kara liste isabeti" + "analytics.blacklist-daily": "Şekil 2 Günlük kara liste isabeti", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/tr/admin/menu.json b/public/language/tr/admin/menu.json index e467376a69..ca925cdc4b 100644 --- a/public/language/tr/admin/menu.json +++ b/public/language/tr/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "İleti Kuyruğu", "manage/groups": "Gruplar", "manage/ip-blacklist": "IP Kara Listesi", + "manage/uploads": "Uploads", "section-settings": "Ayarlar", "settings/general": "General", diff --git a/public/language/tr/admin/settings/user.json b/public/language/tr/admin/settings/user.json index 610de51ebf..df586d1202 100644 --- a/public/language/tr/admin/settings/user.json +++ b/public/language/tr/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Çevrimiçi değilken gelen mesajları e-posta olarak gönder", "email-post-notif": "Abone olduğum konulara cevap gelince bana e-posta gönder", "follow-created-topics": "Kendi konularımı takip et", - "follow-replied-topics": "Cevap verdiğim konuları takip et" + "follow-replied-topics": "Cevap verdiğim konuları takip et", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/tr/error.json b/public/language/tr/error.json index cbe8b8f393..20d8e3ee72 100644 --- a/public/language/tr/error.json +++ b/public/language/tr/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Lütfen giriş için e-posta adresinizi kullanın", "wrong-login-type-username": "Lütfen giriş için kullanıcı adınızı kullanın", "sso-registration-disabled": "%1 hesap için kayıt işlemi devre dışı bırakıldı, lütfen öncelikle bir eposta adresi ile kayıt olun", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Sen maksimum miktarda insanı davet ettin (%2 üzerinden %1).", "no-session-found": "Giriş yapılmış bir oturum bulunamadı!", "not-in-room": "Odada kullanıcı yok", diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json index c97b9b6033..755831072a 100644 --- a/public/language/tr/topic.json +++ b/public/language/tr/topic.json @@ -30,8 +30,11 @@ "locked": "Kilitli", "pinned": "İğnelendi", "moved": "Taşındı", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Bu başlıkta en son kaldığın yere dönmek için tıklayın.", "flag_title": "Bu iletiyi moderatöre haber et", + "merged_message": "This topic has been merged into %2", "deleted_message": "Bu başlık silindi. Sadece başlık düzenleme yetkisi olan kullanıcılar görebilir.", "following_topic.message": "Artık bir kullanıcı bu başlığa ileti gönderdiğinde bildirim alacaksınız.", "not_following_topic.message": "Bu başlığı okunmamışlarda göreceksiniz ama biri bir şey yazdığında bildirim gelmeyecek.", diff --git a/public/language/tr/user.json b/public/language/tr/user.json index 477dd4d27e..775cd08f69 100644 --- a/public/language/tr/user.json +++ b/public/language/tr/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Sayfa başına Konular", "posts_per_page": "Sayfa başına İletiler", "max_items_per_page": "Maksimum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Uyarı alındığında ses çal", "notifications_and_sounds": "Bildirimler & Sesler", "incoming-message-sound": "Gelen mesaj sesi", diff --git a/public/language/uk/admin/extend/widgets.json b/public/language/uk/admin/extend/widgets.json index f22f8b9f17..84480a82c9 100644 --- a/public/language/uk/admin/extend/widgets.json +++ b/public/language/uk/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Доступні віджети", "explanation": "Оберіть віджет із випадаючого меню і перетягніть його в область зліва.", "none-installed": "Віджетів не знайдено! Активуйте необхідний плагін віджетів в панелі керування плагінами.", + "clone-from": "Clone widgets from", "containers.available": "Доступні контейнери", "containers.explanation": "Перетягніть поверх будь-якого активного віджету", "containers.none": "Ніякий", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Ви впевнені, що бажаєте видалити цей віджет?", "alert.updated": "Віджети оновлено", - "alert.update-success": "Віджети успішно оновлено" + "alert.update-success": "Віджети успішно оновлено", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/uk/admin/general/dashboard.json b/public/language/uk/admin/general/dashboard.json index baec2ccbee..e223a90143 100644 --- a/public/language/uk/admin/general/dashboard.json +++ b/public/language/uk/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Встановіть пошуковий плагін зі сторінки плагінів, що активувати пошуковий функціонал", "control-panel": "Керування системою", - "reload": "Перевантажити", - "restart": "Перезавантажити", - "restart-warning": "Перевантажування або перезавантаження вашого NodeBB скине всі існуючі з`єднання на декілька секунд.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Режим обслуговування", "maintenance-mode-title": "Натисніть тут, щоб налаштувати режим обслуговування NodeBB", "realtime-chart-updates": "Оновлення графіків в реальному часі", diff --git a/public/language/uk/admin/general/navigation.json b/public/language/uk/admin/general/navigation.json index a35043682e..34fcf447cc 100644 --- a/public/language/uk/admin/general/navigation.json +++ b/public/language/uk/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Показувати тільки гостям", "open-new-window": "Відкривати у новому вікні", - "installed-plugins-required": "Необхідні встановлені плагіни:", - "search-plugin": "Пошуковий плагін", - "btn.delete": "Видалити", "btn.disable": "Вимкнути", "btn.enable": "Увімкнути", diff --git a/public/language/uk/admin/manage/categories.json b/public/language/uk/admin/manage/categories.json index 845e60c9bf..1676c20579 100644 --- a/public/language/uk/admin/manage/categories.json +++ b/public/language/uk/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Знайти користувача", "alert.user-search": "Шукайте користувача тут...", "alert.find-group": "Знайти групу", - "alert.group-search": "Шукайте групу тут..." + "alert.group-search": "Шукайте групу тут...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/uk/admin/manage/ip-blacklist.json b/public/language/uk/admin/manage/ip-blacklist.json index e0182a956d..da30c5283b 100644 --- a/public/language/uk/admin/manage/ip-blacklist.json +++ b/public/language/uk/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Чорний список примінено", "analytics.blacklist-hourly": "Графік 1 – Внесення до чорного списку за годину", - "analytics.blacklist-daily": "Графік 2 – Внесення до чорного списку за день" + "analytics.blacklist-daily": "Графік 2 – Внесення до чорного списку за день", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/uk/admin/menu.json b/public/language/uk/admin/menu.json index f780d2be2f..266c961572 100644 --- a/public/language/uk/admin/menu.json +++ b/public/language/uk/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Черга Постів", "manage/groups": "Групи", "manage/ip-blacklist": "Чорний список IP-адрес", + "manage/uploads": "Uploads", "section-settings": "Налаштування", "settings/general": "Загальні", diff --git a/public/language/uk/admin/settings/user.json b/public/language/uk/admin/settings/user.json index 9bae26eb89..80b8e54787 100644 --- a/public/language/uk/admin/settings/user.json +++ b/public/language/uk/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Надсилати листа, коли я не в мережі, якщо приходить чат повідомлення", "email-post-notif": "Надсилати листа, коли в темах на які я підписаний з'являються відповіді", "follow-created-topics": "Стежити за темами які ви створюєте", - "follow-replied-topics": "Стежити за темами в котрих ви відповідаєте" + "follow-replied-topics": "Стежити за темами в котрих ви відповідаєте", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/uk/error.json b/public/language/uk/error.json index 7895056bb5..a2102595b6 100644 --- a/public/language/uk/error.json +++ b/public/language/uk/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Будь ласка, використайте вашу електронну пошту для входу", "wrong-login-type-username": "Будь ласка, використайте ваше ім'я для входу", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Ви запросили максимальну кілкість людей (%1 з %2).", "no-session-found": "Жодної сесії не знайдено!", "not-in-room": "Користувача немає в кімнаті", diff --git a/public/language/uk/topic.json b/public/language/uk/topic.json index defbf5c79a..def229c0f8 100644 --- a/public/language/uk/topic.json +++ b/public/language/uk/topic.json @@ -30,8 +30,11 @@ "locked": "Заблокована", "pinned": "Закріплена", "moved": "Переміщена", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Натисніть тут, щоб повернутися до останнього прочитаного посту у цій темі.", "flag_title": "Поскаржитись на цей пост модератору", + "merged_message": "This topic has been merged into %2", "deleted_message": "Цю тему було видалено. Лише користувачі з правом керування темами можуть її бачити.", "following_topic.message": "Відтепер ви будете отримувати сповіщення коли хтось постить в цю тему.", "not_following_topic.message": "Ви будете бачити цю тему в списку непрочитаних, але ви не будете отримувати сповіщень, коли хтось постить до неї.", diff --git a/public/language/uk/user.json b/public/language/uk/user.json index c07eeb52f4..d84dcde222 100644 --- a/public/language/uk/user.json +++ b/public/language/uk/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Тем на сторінку", "posts_per_page": "Постів на сторінку", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "Програвати звук, коли ви отримуєте сповіщення", "notifications_and_sounds": "Сповіщення та звуки", "incoming-message-sound": "Звук вхідного повідомлення", diff --git a/public/language/vi/admin/extend/widgets.json b/public/language/vi/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/vi/admin/extend/widgets.json +++ b/public/language/vi/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/vi/admin/general/dashboard.json b/public/language/vi/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/vi/admin/general/dashboard.json +++ b/public/language/vi/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/vi/admin/general/navigation.json b/public/language/vi/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/vi/admin/general/navigation.json +++ b/public/language/vi/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/vi/admin/manage/categories.json b/public/language/vi/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/vi/admin/manage/categories.json +++ b/public/language/vi/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/vi/admin/manage/ip-blacklist.json b/public/language/vi/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/vi/admin/manage/ip-blacklist.json +++ b/public/language/vi/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/vi/admin/menu.json b/public/language/vi/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/vi/admin/menu.json +++ b/public/language/vi/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/vi/admin/settings/user.json b/public/language/vi/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/vi/admin/settings/user.json +++ b/public/language/vi/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/vi/error.json b/public/language/vi/error.json index 1dafaeed1f..819a7deccf 100644 --- a/public/language/vi/error.json +++ b/public/language/vi/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "Xin vui lòng sửa dụng email của bạn để đăng nhập", "wrong-login-type-username": "Vui lòng sử dụng tên đăng nhập của bạn để đăng nhập", "sso-registration-disabled": "Không thể đăng ký với tài khoản %1, vui lòng đăng ký với địa chỉ email của bạn", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "Bạn đã sử dụng hết số lượng lời mời bạn có thể gửi (%1 đã gửi trên tổng số %2 được cho phép)", "no-session-found": "Không tìm thấy phiên đăng nhập!", "not-in-room": "Thành viên không có trong phòng", diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json index cb48aab895..c1237fdbae 100644 --- a/public/language/vi/topic.json +++ b/public/language/vi/topic.json @@ -30,8 +30,11 @@ "locked": "Khóa", "pinned": "Đã ghim", "moved": "Chuyển đi", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "Bấm vào đây để quay về đọc bài viết mới nhất trong chủ đề này.", "flag_title": "Flag bài viết này để chỉnh sửa", + "merged_message": "This topic has been merged into %2", "deleted_message": "Chủ đề này đã bị xóa. Chỉ ban quản trị mới xem được.", "following_topic.message": "Từ giờ bạn sẽ nhận được thông báo khi có ai đó gửi bài viết trong chủ đề này", "not_following_topic.message": "Bạn có thể xem chủ đề này trong danh sách chủ đề chưa xem, nhưng bạn sẽ không nhận thông báo khi có ai đó đăng bài viết trong chủ đề này", diff --git a/public/language/vi/user.json b/public/language/vi/user.json index 03fb99398e..953fc425bc 100644 --- a/public/language/vi/user.json +++ b/public/language/vi/user.json @@ -95,6 +95,7 @@ "topics_per_page": "Số chủ đề trong một trang", "posts_per_page": "Số bài viết trong một trang", "max_items_per_page": "Tối đa %1", + "acp_language": "Admin Page Language", "notification_sounds": "Phát âm thanh khi bạn nhận được thông báo mới", "notifications_and_sounds": "Thông báo & Âm thanh", "incoming-message-sound": "Âm báo tin nhắn tới", diff --git a/public/language/zh-CN/admin/extend/widgets.json b/public/language/zh-CN/admin/extend/widgets.json index 36c987b0f9..75dcdf7ba0 100644 --- a/public/language/zh-CN/admin/extend/widgets.json +++ b/public/language/zh-CN/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "可用的窗口部件", "explanation": "从下拉菜单中选择一个窗口部件并拖放到模板左边的窗口部件区域。", "none-installed": "未发现窗口部件！请在插件控制面板中启用必要的窗口部件插件。", + "clone-from": "Clone widgets from", "containers.available": "可用的容器", "containers.explanation": "拖放到任意生效中的窗口部件上", "containers.none": "无", @@ -14,6 +15,8 @@ "alert.confirm-delete": "确认删除此窗口部件？", "alert.updated": "窗口部件更新", - "alert.update-success": "已成功更新窗口部件" + "alert.update-success": "已成功更新窗口部件", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/zh-CN/admin/general/dashboard.json b/public/language/zh-CN/admin/general/dashboard.json index f263627aa2..6f8d876136 100644 --- a/public/language/zh-CN/admin/general/dashboard.json +++ b/public/language/zh-CN/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "在插件页面安装搜索插件来激活搜索功能", "control-panel": "系统控制", - "reload": "重载", - "restart": "重启", - "restart-warning": "重载或重启 NodeBB 会丢失数秒内所有的连接。", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "维护模式", "maintenance-mode-title": "点击此处设置 NodeBB 的维护模式", "realtime-chart-updates": "实时图表更新", diff --git a/public/language/zh-CN/admin/general/navigation.json b/public/language/zh-CN/admin/general/navigation.json index 0be0b9ddb5..669b0dd402 100644 --- a/public/language/zh-CN/admin/general/navigation.json +++ b/public/language/zh-CN/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "仅对游客展示", "open-new-window": "在新窗口中打开", - "installed-plugins-required": "需要已安装的插件：", - "search-plugin": "搜索插件", - "btn.delete": "删除", "btn.disable": "关闭", "btn.enable": "激活", diff --git a/public/language/zh-CN/admin/manage/categories.json b/public/language/zh-CN/admin/manage/categories.json index 11b0edf6fc..d33b4a98ee 100644 --- a/public/language/zh-CN/admin/manage/categories.json +++ b/public/language/zh-CN/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "查找用户", "alert.user-search": "在这里查找用户…", "alert.find-group": "查找群组", - "alert.group-search": "在此处搜索群组..." + "alert.group-search": "在此处搜索群组...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/zh-CN/admin/manage/ip-blacklist.json b/public/language/zh-CN/admin/manage/ip-blacklist.json index 531a048006..6d4351f09e 100644 --- a/public/language/zh-CN/admin/manage/ip-blacklist.json +++ b/public/language/zh-CN/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "黑名单生效", "analytics.blacklist-hourly": "图 1 – 每小时触发黑名单数", - "analytics.blacklist-daily": "图 2– 每日触发黑名单数" + "analytics.blacklist-daily": "图 2– 每日触发黑名单数", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/zh-CN/admin/menu.json b/public/language/zh-CN/admin/menu.json index a44c8d9f94..6e775a4d16 100644 --- a/public/language/zh-CN/admin/menu.json +++ b/public/language/zh-CN/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "提交列表", "manage/groups": "群组", "manage/ip-blacklist": "IP 黑名单", + "manage/uploads": "Uploads", "section-settings": "设置", "settings/general": "通用", diff --git a/public/language/zh-CN/admin/settings/user.json b/public/language/zh-CN/admin/settings/user.json index 113bfec19d..10fce0f822 100644 --- a/public/language/zh-CN/admin/settings/user.json +++ b/public/language/zh-CN/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "当我不在线并收到新的聊天消息时，给我发送邮件通知", "email-post-notif": "当我订阅的主题有新回复时，给我发送邮件通知", "follow-created-topics": "关注您创建的主题", - "follow-replied-topics": "关注您回复的主题" + "follow-replied-topics": "关注您回复的主题", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/zh-CN/error.json b/public/language/zh-CN/error.json index 9c5344881a..10916d74e8 100644 --- a/public/language/zh-CN/error.json +++ b/public/language/zh-CN/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "请输入您的电子邮箱地址登录", "wrong-login-type-username": "请输入您的用户名登录", "sso-registration-disabled": "已经禁止注册注册 %1 账户, 请使用邮箱地址注册", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "您的邀请人数超出了上限 (%1 超过了 %2)。", "no-session-found": "未登录!", "not-in-room": "用户已不在聊天室中", diff --git a/public/language/zh-CN/topic.json b/public/language/zh-CN/topic.json index 6f9f559818..481f00e979 100644 --- a/public/language/zh-CN/topic.json +++ b/public/language/zh-CN/topic.json @@ -30,8 +30,11 @@ "locked": "已锁定", "pinned": "已固定", "moved": "已移动", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "点击阅读本主题帖中的最新回复", "flag_title": "举报此帖", + "merged_message": "This topic has been merged into %2", "deleted_message": "此主题已被删除。只有拥有主题管理权限的用户可以查看。", "following_topic.message": "当有人回复此主题时，您会收到通知。", "not_following_topic.message": "您将在未读主题列表中看到这个主题，但您不会在帖子被回复时收到通知。", diff --git a/public/language/zh-CN/user.json b/public/language/zh-CN/user.json index 170700628e..36e75072b5 100644 --- a/public/language/zh-CN/user.json +++ b/public/language/zh-CN/user.json @@ -95,6 +95,7 @@ "topics_per_page": "每页主题数", "posts_per_page": "每页帖子数", "max_items_per_page": "最大值 %1", + "acp_language": "Admin Page Language", "notification_sounds": "收到通知时播放提示音", "notifications_and_sounds": "通知 & 提示音", "incoming-message-sound": "消息到达提示音", diff --git a/public/language/zh-TW/admin/extend/widgets.json b/public/language/zh-TW/admin/extend/widgets.json index 477bb15e56..025f48b327 100644 --- a/public/language/zh-TW/admin/extend/widgets.json +++ b/public/language/zh-TW/admin/extend/widgets.json @@ -2,6 +2,7 @@ "available": "Available Widgets", "explanation": "Select a widget from the dropdown menu and then drag and drop it into a template's widget area on the left.", "none-installed": "No widgets found! Activate the essential widgets plugin in the plugins control panel.", + "clone-from": "Clone widgets from", "containers.available": "Available Containers", "containers.explanation": "Drag and drop on top of any active widget", "containers.none": "None", @@ -14,6 +15,8 @@ "alert.confirm-delete": "Are you sure you wish to delete this widget?", "alert.updated": "Widgets Updated", - "alert.update-success": "Successfully updated widgets" + "alert.update-success": "Successfully updated widgets", + "alert.clone-success": "Successfully cloned widgets", + "error.select-clone": "Please select a page to clone from" } \ No newline at end of file diff --git a/public/language/zh-TW/admin/general/dashboard.json b/public/language/zh-TW/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/zh-TW/admin/general/dashboard.json +++ b/public/language/zh-TW/admin/general/dashboard.json @@ -36,9 +36,10 @@ "search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality", "control-panel": "System Control", - "reload": "Reload", - "restart": "Restart", - "restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.", + "reload": "Restart", + "restart": "Rebuild & Restart", + "restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.", + "restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.", "maintenance-mode": "Maintenance Mode", "maintenance-mode-title": "Click here to set up maintenance mode for NodeBB", "realtime-chart-updates": "Realtime Chart Updates", diff --git a/public/language/zh-TW/admin/general/navigation.json b/public/language/zh-TW/admin/general/navigation.json index 9abf7f58cc..a199668ae2 100644 --- a/public/language/zh-TW/admin/general/navigation.json +++ b/public/language/zh-TW/admin/general/navigation.json @@ -14,9 +14,6 @@ "only-guest": "Only display to guests", "open-new-window": "Open in a new window", - "installed-plugins-required": "Installed Plugins Required:", - "search-plugin": "Search plugin", - "btn.delete": "Delete", "btn.disable": "Disable", "btn.enable": "Enable", diff --git a/public/language/zh-TW/admin/manage/categories.json b/public/language/zh-TW/admin/manage/categories.json index 871affe560..6aa607612d 100644 --- a/public/language/zh-TW/admin/manage/categories.json +++ b/public/language/zh-TW/admin/manage/categories.json @@ -65,5 +65,7 @@ "alert.find-user": "Find a User", "alert.user-search": "Search for a user here...", "alert.find-group": "Find a Group", - "alert.group-search": "Search for a group here..." + "alert.group-search": "Search for a group here...", + "collapse-all": "Collapse All", + "expand-all": "Expand All" } \ No newline at end of file diff --git a/public/language/zh-TW/admin/manage/ip-blacklist.json b/public/language/zh-TW/admin/manage/ip-blacklist.json index cd79294266..588fbd62b6 100644 --- a/public/language/zh-TW/admin/manage/ip-blacklist.json +++ b/public/language/zh-TW/admin/manage/ip-blacklist.json @@ -14,5 +14,6 @@ "alerts.applied-success": "Blacklist Applied", "analytics.blacklist-hourly": "Figure 1 – Blacklist hits per hour", - "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day" + "analytics.blacklist-daily": "Figure 2 – Blacklist hits per day", + "ip-banned": "IP banned" } \ No newline at end of file diff --git a/public/language/zh-TW/admin/menu.json b/public/language/zh-TW/admin/menu.json index 8f44bcd304..51099e9af4 100644 --- a/public/language/zh-TW/admin/menu.json +++ b/public/language/zh-TW/admin/menu.json @@ -17,6 +17,7 @@ "manage/post-queue": "Post Queue", "manage/groups": "Groups", "manage/ip-blacklist": "IP Blacklist", + "manage/uploads": "Uploads", "section-settings": "Settings", "settings/general": "General", diff --git a/public/language/zh-TW/admin/settings/user.json b/public/language/zh-TW/admin/settings/user.json index cbdd4ee91c..664bff67f7 100644 --- a/public/language/zh-TW/admin/settings/user.json +++ b/public/language/zh-TW/admin/settings/user.json @@ -62,5 +62,6 @@ "email-chat-notifs": "Send an email if a new chat message arrives and I am not online", "email-post-notif": "Send an email when replies are made to topics I am subscribed to", "follow-created-topics": "Follow topics you create", - "follow-replied-topics": "Follow topics that you reply to" + "follow-replied-topics": "Follow topics that you reply to", + "default-notification-settings": "Default notification settings" } \ No newline at end of file diff --git a/public/language/zh-TW/error.json b/public/language/zh-TW/error.json index 325fa6d8f5..adf948e1af 100644 --- a/public/language/zh-TW/error.json +++ b/public/language/zh-TW/error.json @@ -132,6 +132,7 @@ "wrong-login-type-email": "請使用你的電子郵件進行登入", "wrong-login-type-username": "請使用你的帳號進行登入", "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first", + "sso-multiple-association": "You cannot associate multiple accounts from this service to your NodeBB account. Please dissociate your existing account and try again.", "invite-maximum-met": "你已經邀請最多可邀請的人數限制 (%1 於 %2)。", "no-session-found": "沒有找到登入的連線階段!", "not-in-room": "使用者沒有在聊天室中", diff --git a/public/language/zh-TW/topic.json b/public/language/zh-TW/topic.json index 1257151fbf..7a28c95076 100644 --- a/public/language/zh-TW/topic.json +++ b/public/language/zh-TW/topic.json @@ -30,8 +30,11 @@ "locked": "已鎖定", "pinned": "釘住", "moved": "移動", + "copy-ip": "Copy IP", + "ban-ip": "Ban IP", "bookmark_instructions": "點擊這裡返回到這個討論串的最後一篇張貼文", "flag_title": "檢舉這篇文章, 交給仲裁者來審閱.", + "merged_message": "This topic has been merged into %2", "deleted_message": "此主題已被刪除。只有具有主題管理權限的使用者才能看到它。", "following_topic.message": "有人貼文回覆主題時, 你將會收到新通知.", "not_following_topic.message": "你將會看到這個主題在未讀主題列表中出現，但你將不會在其他人張貼到這個主題時接收到通知。", diff --git a/public/language/zh-TW/user.json b/public/language/zh-TW/user.json index 0455cb32b7..1b18927b7f 100644 --- a/public/language/zh-TW/user.json +++ b/public/language/zh-TW/user.json @@ -95,6 +95,7 @@ "topics_per_page": "每頁的主題數", "posts_per_page": "每頁的文章數", "max_items_per_page": "Maximum %1", + "acp_language": "Admin Page Language", "notification_sounds": "當你接收到通知時撥放音效", "notifications_and_sounds": "通知&音效", "incoming-message-sound": "收到訊息音效",