From f122327f87f9f18af500877c568825617c527089 Mon Sep 17 00:00:00 2001 From: Andrew Rodrigues Date: Wed, 17 Jan 2018 11:44:49 -0500 Subject: [PATCH 01/24] bump rewards --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index e06f51139e..f2ca43c0ac 100644 --- a/install/package.json +++ b/install/package.json @@ -67,7 +67,7 @@ "nodebb-plugin-mentions": "2.2.2", "nodebb-plugin-soundpack-default": "1.0.0", "nodebb-plugin-spam-be-gone": "0.5.1", - "nodebb-rewards-essentials": "0.0.9", + "nodebb-rewards-essentials": "0.0.10", "nodebb-theme-lavender": "5.0.0", "nodebb-theme-persona": "7.2.16", "nodebb-theme-slick": "1.1.2", From 61e408b4a2d2735060979f0157568d5e414425f7 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Wed, 17 Jan 2018 12:25:08 -0500 Subject: [PATCH 02/24] closes #6253 --- src/socket.io/user/profile.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/socket.io/user/profile.js b/src/socket.io/user/profile.js index 792b55200d..d9c89df6a0 100644 --- a/src/socket.io/user/profile.js +++ b/src/socket.io/user/profile.js @@ -15,7 +15,7 @@ module.exports = function (SocketUser) { async.waterfall([ function (next) { - isAdminOrSelfAndPasswordMatch(socket.uid, data, next); + isPrivilegedOrSelfAndPasswordMatch(socket.uid, data, next); }, function (next) { SocketUser.updateProfile(socket, data, next); @@ -29,7 +29,7 @@ module.exports = function (SocketUser) { } async.waterfall([ function (next) { - user.isAdminOrSelf(socket.uid, data.uid, next); + user.isAdminOrGlobalModOrSelf(socket.uid, data.uid, next); }, function (next) { user.updateCoverPicture(data, next); @@ -43,7 +43,7 @@ module.exports = function (SocketUser) { } async.waterfall([ function (next) { - user.isAdminOrSelf(socket.uid, data.uid, next); + user.isAdminOrGlobalModOrSelf(socket.uid, data.uid, next); }, function (next) { user.uploadCroppedPicture(data, next); @@ -58,7 +58,7 @@ module.exports = function (SocketUser) { async.waterfall([ function (next) { - user.isAdminOrSelf(socket.uid, data.uid, next); + user.isAdminOrGlobalModOrSelf(socket.uid, data.uid, next); }, function (next) { user.removeCoverPicture(data, next); @@ -66,11 +66,13 @@ module.exports = function (SocketUser) { ], callback); }; - function isAdminOrSelfAndPasswordMatch(uid, data, callback) { + function isPrivilegedOrSelfAndPasswordMatch(uid, data, callback) { async.waterfall([ function (next) { async.parallel({ isAdmin: async.apply(user.isAdministrator, uid), + isTargetAdmin: async.apply(user.isAdministrator, data.uid), + isGlobalMod: async.apply(user.isGlobalModerator, uid), hasPassword: async.apply(user.hasPassword, data.uid), passwordMatch: function (next) { if (data.password) { @@ -84,7 +86,11 @@ module.exports = function (SocketUser) { function (results, next) { var isSelf = parseInt(uid, 10) === parseInt(data.uid, 10); - if (!results.isAdmin && !isSelf) { + if (results.isTargetAdmin && !results.isAdmin) { + return next(new Error('[[error:no-privileges]]')); + } + + if ((!results.isAdmin || !results.isGlobalMod) && !isSelf) { return next(new Error('[[error:no-privileges]]')); } From 049b2737faad626671d1f1bfa4132287d79cb29e Mon Sep 17 00:00:00 2001 From: Andrew Rodrigues Date: Wed, 17 Jan 2018 12:40:52 -0500 Subject: [PATCH 03/24] bump rewards --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index f2ca43c0ac..2b4a10b578 100644 --- a/install/package.json +++ b/install/package.json @@ -67,7 +67,7 @@ "nodebb-plugin-mentions": "2.2.2", "nodebb-plugin-soundpack-default": "1.0.0", "nodebb-plugin-spam-be-gone": "0.5.1", - "nodebb-rewards-essentials": "0.0.10", + "nodebb-rewards-essentials": "0.0.11", "nodebb-theme-lavender": "5.0.0", "nodebb-theme-persona": "7.2.16", "nodebb-theme-slick": "1.1.2", From b89dd7c5b53786e532ce8ec6d590e66a79a24c0e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 17 Jan 2018 14:02:54 -0500 Subject: [PATCH 04/24] bump slick @pichalite --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 2b4a10b578..e84b38a508 100644 --- a/install/package.json +++ b/install/package.json @@ -70,7 +70,7 @@ "nodebb-rewards-essentials": "0.0.11", "nodebb-theme-lavender": "5.0.0", "nodebb-theme-persona": "7.2.16", - "nodebb-theme-slick": "1.1.2", + "nodebb-theme-slick": "1.1.4", "nodebb-theme-vanilla": "8.1.7", "nodebb-widget-essentials": "4.0.1", "nodemailer": "4.4.1", From 4fbec0265b6bcc5168ec707d2b7dd34bfc2766f3 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Wed, 17 Jan 2018 14:03:37 -0500 Subject: [PATCH 05/24] closes #6254 --- install/package.json | 4 +-- public/src/client/topic/move-post.js | 54 ++++++++++++---------------- 2 files changed, 25 insertions(+), 33 deletions(-) diff --git a/install/package.json b/install/package.json index f2ca43c0ac..39dc439a44 100644 --- a/install/package.json +++ b/install/package.json @@ -69,9 +69,9 @@ "nodebb-plugin-spam-be-gone": "0.5.1", "nodebb-rewards-essentials": "0.0.10", "nodebb-theme-lavender": "5.0.0", - "nodebb-theme-persona": "7.2.16", + "nodebb-theme-persona": "7.2.17", "nodebb-theme-slick": "1.1.2", - "nodebb-theme-vanilla": "8.1.7", + "nodebb-theme-vanilla": "8.1.8", "nodebb-widget-essentials": "4.0.1", "nodemailer": "4.4.1", "passport": "^0.4.0", diff --git a/public/src/client/topic/move-post.js b/public/src/client/topic/move-post.js index bd9d542ead..91ea917f69 100644 --- a/public/src/client/topic/move-post.js +++ b/public/src/client/topic/move-post.js @@ -4,45 +4,37 @@ define('forum/topic/move-post', [], function () { var MovePost = {}; - MovePost.openMovePostModal = function (button) { app.parseAndTranslate('partials/move_post_modal', {}, function (html) { - var moveModal = $(html); - - var moveBtn = moveModal.find('#move_post_commit'); - var topicId = moveModal.find('#topicId'); - - moveModal.on('hidden.bs.modal', function () { - moveModal.remove(); - }); - - showMoveModal(moveModal); - - moveModal.find('.close, #move_post_cancel').on('click', function () { - moveModal.addClass('hide'); - }); - - topicId.on('keyup change', function () { - moveBtn.attr('disabled', !topicId.val()); + var dialog = bootbox.dialog({ + title: '[[topic:move_post]]', + message: html, + show: true, + buttons: { + submit: { + label: '[[topic:confirm_move]]', + className: 'btn-primary submit-btn', + callback: function () { + var topicIdEl = dialog.find('#topicId'); + if (!topicIdEl.val()) { + return; + } + + movePost(button.parents('[data-pid]'), button.parents('[data-pid]').attr('data-pid'), topicIdEl.val(), function () { + topicId.val(''); + }); + }, + }, + }, }); + dialog.find('.submit-btn').attr('disabled', true); - moveBtn.on('click', function () { - movePost(button.parents('[data-pid]'), button.parents('[data-pid]').attr('data-pid'), topicId.val(), function () { - moveModal.modal('hide'); - topicId.val(''); - }); + dialog.find('#topicId').on('keyup change', function () { + dialog.find('.submit-btn').attr('disabled', !dialog.find('#topicId').val()); }); }); }; - function showMoveModal(modal) { - modal.modal('show') - .css('position', 'fixed') - .css('left', Math.max(0, (($(window).width() - modal.outerWidth()) / 2) + $(window).scrollLeft()) + 'px') - .css('top', '0px') - .css('z-index', '2000'); - } - function movePost(post, pid, tid, callback) { socket.emit('posts.movePost', { pid: pid, tid: tid }, function (err) { if (err) { From a6b96b67728ea6545f4fffc9284166cbd2dea0e0 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Wed, 17 Jan 2018 14:37:21 -0500 Subject: [PATCH 06/24] fix undef var --- public/src/client/topic/move-post.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/topic/move-post.js b/public/src/client/topic/move-post.js index 91ea917f69..0c08e030da 100644 --- a/public/src/client/topic/move-post.js +++ b/public/src/client/topic/move-post.js @@ -21,7 +21,7 @@ define('forum/topic/move-post', [], function () { } movePost(button.parents('[data-pid]'), button.parents('[data-pid]').attr('data-pid'), topicIdEl.val(), function () { - topicId.val(''); + topicIdEl.val(''); }); }, }, From f948ecef0791c89c35f9af377db54ee3a2d56e1f Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Thu, 18 Jan 2018 09:25:13 +0000 Subject: [PATCH 07/24] Latest translations and fallbacks --- public/language/zh-CN/admin/manage/users.json | 12 +++++------ public/language/zh-CN/admin/menu.json | 4 ++-- .../language/zh-CN/admin/settings/chat.json | 4 ++-- .../language/zh-CN/admin/settings/post.json | 20 +++++++++---------- public/language/zh-CN/pages.json | 2 +- public/language/zh-CN/topic.json | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/public/language/zh-CN/admin/manage/users.json b/public/language/zh-CN/admin/manage/users.json index 4538b91287..0f40eb3e68 100644 --- a/public/language/zh-CN/admin/manage/users.json +++ b/public/language/zh-CN/admin/manage/users.json @@ -74,12 +74,12 @@ "alerts.make-admin-success": "用户已成为管理员", "alerts.confirm-remove-admin": "真的想要删除这个管理员？", "alerts.remove-admin-success": "此用户不再是管理员", - "alerts.make-global-mod-success": "User is now global moderator.", - "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", - "alerts.make-moderator-success": "User is now moderator.", - "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", - "alerts.remove-moderator-success": "User is no longer moderator.", + "alerts.make-global-mod-success": " 该用户已成为管理员", + "alerts.confirm-remove-global-mod": "您确定要删除此管理员？", + "alerts.remove-global-mod-success": "该用户不再是管理员了", + "alerts.make-moderator-success": " 该用户已成为管理员", + "alerts.confirm-remove-moderator": "您确定要删除此管理员？", + "alerts.remove-moderator-success": "该用户不再是管理员了", "alerts.confirm-validate-email": "你确定要验证这些用户的电子邮箱吗？", "alerts.validate-email-success": "电子邮箱已验证", "alerts.password-reset-confirm": "你确定要向这些用户发送密码重置邮件吗？", diff --git a/public/language/zh-CN/admin/menu.json b/public/language/zh-CN/admin/menu.json index 91f24b525b..a44c8d9f94 100644 --- a/public/language/zh-CN/admin/menu.json +++ b/public/language/zh-CN/admin/menu.json @@ -9,10 +9,10 @@ "section-manage": "管理", "manage/categories": "版块", - "manage/privileges": "Privileges", + "manage/privileges": "权限", "manage/tags": "话题", "manage/users": "用户", - "manage/admins-mods": "Admins & Mods", + "manage/admins-mods": "管理员插件", "manage/registration": "注册申请", "manage/post-queue": "提交列表", "manage/groups": "群组", diff --git a/public/language/zh-CN/admin/settings/chat.json b/public/language/zh-CN/admin/settings/chat.json index 558758befb..6228ed8410 100644 --- a/public/language/zh-CN/admin/settings/chat.json +++ b/public/language/zh-CN/admin/settings/chat.json @@ -6,6 +6,6 @@ "max-length": "聊天信息的最大长度", "max-room-size": "聊天室的最多用户数", "delay": "聊天信息间的毫秒数", - "restrictions.seconds-edit-after": "Number of seconds before users are allowed to edit chat messages after posting. (0 disabled)", - "restrictions.seconds-delete-after": "Number of seconds before users are allowed to delete chat messages after posting. (0 disabled)" + "restrictions.seconds-edit-after": "用户在发布后允许编辑帖子的时间（0为禁用，单位：秒）", + "restrictions.seconds-delete-after": "用户在发布后允许删除帖子的时间（0为禁用，单位：秒）" } \ No newline at end of file diff --git a/public/language/zh-CN/admin/settings/post.json b/public/language/zh-CN/admin/settings/post.json index 69717bb2fc..02761f9ad7 100644 --- a/public/language/zh-CN/admin/settings/post.json +++ b/public/language/zh-CN/admin/settings/post.json @@ -6,25 +6,25 @@ "sorting.most-votes": "最多投票", "sorting.most-posts": "最多回复", "sorting.topic-default": "默认主题排序", - "length": "Post Length", + "length": "帖子长度", "restrictions": "发帖限制", - "restrictions-new": "New User Restrictions", + "restrictions-new": "新用户限制", "restrictions.post-queue": "启用发布队列", - "restrictions-new.post-queue": "Enable new user restrictions", + "restrictions-new.post-queue": "启用新的用户限制", "restrictions.post-queue-help": "启用发布队列将会使新用户的发布内容进入批准队列", - "restrictions-new.post-queue-help": "Enabling new user restrictions will set restrictions on posts created by new users.", - "restrictions.seconds-between": "Seconds between posts", - "restrictions.seconds-between-new": "Seconds between posts for new users", - "restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted", + "restrictions-new.post-queue-help": "启用新的用户限制将对新用户创建的帖子设置限制。", + "restrictions.seconds-between": "秒之间的帖子", + "restrictions.seconds-between-new": "新用户发帖间隔（单位：秒）", + "restrictions.rep-threshold": "取消发帖限制所需的声望值", "restrictions.seconds-defore-new": "见习时间（单位：秒）", - "restrictions.seconds-edit-after": "Number of seconds before users are allowed to edit posts after posting. (0 disabled)", - "restrictions.seconds-delete-after": "Number of seconds before users are allowed to delete posts after posting. (0 disabled)", + "restrictions.seconds-edit-after": "用户在发布后允许编辑帖子的时间（0为禁用，单位：秒）", + "restrictions.seconds-delete-after": "用户在发布后允许编辑帖子的时间（0为禁用，单位：秒）", "restrictions.replies-no-delete": "在用户被禁止删除自己的主题后的回复数。 (0为禁用) ", "restrictions.min-title-length": "最小标题长度", "restrictions.max-title-length": "最大标题长度", "restrictions.min-post-length": "最小帖子长度", "restrictions.max-post-length": "最大帖子长度", - "restrictions.days-until-stale": "Days until topic is considered stale", + "restrictions.days-until-stale": "天，直到话题被视为失效", "restrictions.stale-help": "如果某个主题被视为“过时”，则会向尝试回复该主题的用户显示警告。", "timestamp": "时间戳", "timestamp.cut-off": "日期截止日期（单位：天）", diff --git a/public/language/zh-CN/pages.json b/public/language/zh-CN/pages.json index 950334ccfb..d79b7111f3 100644 --- a/public/language/zh-CN/pages.json +++ b/public/language/zh-CN/pages.json @@ -6,7 +6,7 @@ "popular-month": "当月热门话题", "popular-alltime": "热门主题", "recent": "最新主题", - "top": "Top Voted Topics", + "top": "票数最高的主题", "moderator-tools": "版主工具", "flagged-content": "已举报的内容", "ip-blacklist": "IP 黑名单", diff --git a/public/language/zh-CN/topic.json b/public/language/zh-CN/topic.json index 039964e1d6..6f9f559818 100644 --- a/public/language/zh-CN/topic.json +++ b/public/language/zh-CN/topic.json @@ -52,7 +52,7 @@ "not-watching.description": "不要在有新回复时通知我。
如果这个版块未被忽略则在未读主题中显示。", "ignoring.description": "不要在有新回复时通知我。
不要在未读主题中显示该主题。", "thread_tools.title": "主题工具", - "thread_tools.markAsUnreadForAll": "Mark Unread For All", + "thread_tools.markAsUnreadForAll": "标记全部为未读", "thread_tools.pin": "置顶主题", "thread_tools.unpin": "取消置顶主题", "thread_tools.lock": "锁定主题", From 7f67528280a6068b9e88493a1238e1ec6ff39e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 18 Jan 2018 12:48:42 -0500 Subject: [PATCH 08/24] change parallel to series in flag creation --- src/flags.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/flags.js b/src/flags.js index f906954318..7bbb5168f8 100644 --- a/src/flags.js +++ b/src/flags.js @@ -387,7 +387,7 @@ Flags.create = function (type, id, uid, reason, timestamp, callback) { tasks.push(async.apply(Flags.update, flagId, uid, { state: 'open' })); } - async.parallel(tasks, function (err) { + async.series(tasks, function (err) { next(err, flagId); }); }, From d8b5d40668c6fac1aa7de64ba379bf0cf0ee8f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 18 Jan 2018 13:33:06 -0500 Subject: [PATCH 09/24] closes #6242 --- src/user/reset.js | 7 +++++-- test/user.js | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/src/user/reset.js b/src/user/reset.js index fd0b5daa53..5b6e183b27 100644 --- a/src/user/reset.js +++ b/src/user/reset.js @@ -119,7 +119,7 @@ UserReset.commit = function (code, password, callback) { user.hashPassword(password, next); }, function (hash, next) { - async.parallel([ + async.series([ async.apply(user.setUserFields, uid, { password: hash, 'email:confirmed': 1 }), async.apply(db.deleteObjectField, 'reset:uid', code), async.apply(db.sortedSetRemove, 'reset:issueDate', code), @@ -128,7 +128,10 @@ UserReset.commit = function (code, password, callback) { async.apply(user.auth.resetLockout, uid), async.apply(db.delete, 'uid:' + uid + ':confirm:email:sent'), async.apply(db.sortedSetRemove, 'users:notvalidated', uid), - ], next); + async.apply(UserReset.cleanByUid, uid), + ], function (err) { + next(err); + }); }, ], callback); }; diff --git a/test/user.js b/test/user.js index 9a098f4708..8de7491761 100644 --- a/test/user.js +++ b/test/user.js @@ -471,6 +471,40 @@ describe('User', function () { }); }); }); + + it('.commit() should invalidate old codes', function (done) { + var code1; + var code2; + var uid; + async.waterfall([ + function (next) { + User.create({ username: 'doublereseter', email: 'sorry@forgot.com', password: '123456' }, next); + }, + function (_uid, next) { + uid = _uid; + User.reset.generate(uid, next); + }, + function (code, next) { + code1 = code; + User.reset.generate(uid, next); + }, + function (code, next) { + code2 = code; + User.reset.validate(code1, next); + }, + function (isValid, next) { + assert(isValid); + User.reset.commit(code2, 'newPwd123', next); + }, + function (next) { + User.reset.validate(code1, next); + }, + function (isValid, next) { + assert(!isValid); + next(); + }, + ], done); + }); }); describe('hash methods', function () { From 1b8ff1f6a2c8408714b83379a5aab72a21aa5a5f Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Fri, 19 Jan 2018 09:25:11 +0000 Subject: [PATCH 10/24] Latest translations and fallbacks --- .../language/de/admin/appearance/customise.json | 6 +++--- public/language/nl/error.json | 6 +++--- public/language/nl/global.json | 2 +- public/language/nl/pages.json | 2 +- .../language/ru/admin/appearance/customise.json | 2 +- .../language/ru/admin/manage/registration.json | 16 ++++++++-------- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/public/language/de/admin/appearance/customise.json b/public/language/de/admin/appearance/customise.json index 342552e881..48d0377d01 100644 --- a/public/language/de/admin/appearance/customise.json +++ b/public/language/de/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Benutzerdefiniertes CSS", - "custom-css.description": "Füge hier deine eigenen CSS-Eigenschaften ein, sie werden als letztes angewendet.", - "custom-css.enable": "Benutzerdefiniertes CSS aktivieren", + "custom-css": "Benutzerdefiniertes CSS/LESS", + "custom-css.description": "Füge hier deine eigenen CSS/LESS-Eigenschaften ein, sie werden als letztes angewendet.", + "custom-css.enable": "Benutzerdefiniertes CSS/LESS aktivieren", "custom-js": "Benutzerdefiniertes Javascript", "custom-js.description": "Füge dein eigenes Javascipt hier ein.\nEs wird ausgeführt nachdem die Seite komplett geladen wurde.", diff --git a/public/language/nl/error.json b/public/language/nl/error.json index 04c4c76285..0c62777a3e 100644 --- a/public/language/nl/error.json +++ b/public/language/nl/error.json @@ -17,7 +17,7 @@ "invalid-login-credentials": "Ongeldige aanmeldingsreferenties", "invalid-username-or-password": "Geef zowel een gebruikersnaam als wachtwoord op", "invalid-search-term": "Ongeldig zoekterm", - "invalid-url": "Invalid URL", + "invalid-url": "Ongeldig web adres", "csrf-invalid": "We konden u niet aanmelden, waarschijnlijk door een verlopen sessie. Probeer het a.u.b. nogmaals.", "invalid-pagination-value": "Invalide paginering waarde. De waarde moet op z'n minst %1 zijn en niet hoger dan %2 zijn.", "username-taken": "Gebruikersnaam is al in gebruik ", @@ -114,8 +114,8 @@ "cant-edit-chat-message": "Het is niet toegestaan om dit bericht aan te passen", "cant-remove-last-user": "Je kan de laatste gebruiker niet verwijderen", "cant-delete-chat-message": "Het is niet toegestaan om dit bericht te verwijderen", - "chat-edit-duration-expired": "You are only allowed to edit chat messages for %1 second(s) after posting", - "chat-delete-duration-expired": "You are only allowed to delete chat messages for %1 second(s) after posting", + "chat-edit-duration-expired": "Het is slechts toegestaan om binnen %1 seconde(n) na plaatsen van het chat bericht, deze te bewerken.", + "chat-delete-duration-expired": "Het is slechts toegestaan om binnen %1 seconde(n) na plaatsen van het chat bericht, deze te verwijderen.", "already-voting-for-this-post": "Je hebt al gestemd voor deze post.", "reputation-system-disabled": "Reputatie systeem is uitgeschakeld.", "downvoting-disabled": "Negatief stemmen is uitgeschakeld", diff --git a/public/language/nl/global.json b/public/language/nl/global.json index dd3388647c..c1723a527d 100644 --- a/public/language/nl/global.json +++ b/public/language/nl/global.json @@ -53,7 +53,7 @@ "topics": "Onderwerpen", "posts": "Berichten", "best": "Beste", - "votes": "Votes", + "votes": "Stemmen", "upvoters": "Positieve stemmers", "upvoted": "Omhoog gestemd", "downvoters": "Negatieve stemmers", diff --git a/public/language/nl/pages.json b/public/language/nl/pages.json index b7f61dc33e..f7d9059c8c 100644 --- a/public/language/nl/pages.json +++ b/public/language/nl/pages.json @@ -6,7 +6,7 @@ "popular-month": "De populaire onderwerpen van deze maand", "popular-alltime": "De populaire onderwerpen", "recent": "Recente onderwerpen", - "top": "Top Voted Topics", + "top": "Meest gestemde onderwerpen", "moderator-tools": "Moderator gereedschappen", "flagged-content": "Gemarkeerde content", "ip-blacklist": "IP zwarte lijst", diff --git a/public/language/ru/admin/appearance/customise.json b/public/language/ru/admin/appearance/customise.json index 4ae01c2012..a5f4192172 100644 --- a/public/language/ru/admin/appearance/customise.json +++ b/public/language/ru/admin/appearance/customise.json @@ -3,7 +3,7 @@ "custom-css.description": "Введите свои собственные данные CSS здесь, которые будут применяться после всех других стилей.", "custom-css.enable": "Включить пользовательский CSS", - "custom-js": "Custom Javascript", + "custom-js": "Каcтомный 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", diff --git a/public/language/ru/admin/manage/registration.json b/public/language/ru/admin/manage/registration.json index feb44fc50a..d066d7090c 100644 --- a/public/language/ru/admin/manage/registration.json +++ b/public/language/ru/admin/manage/registration.json @@ -1,20 +1,20 @@ { "queue": "Queue", - "description": "There are no users in the registration queue.
To enable this feature, go to Settings → User → User Registration and set Registration Type to \"Admin Approval\".", + "description": "В очереди регистраций нет пользователей.
Чтобы включить эту возможность перейдите в Настройки &arr; Пользователь &arr; Регистрация пользователя и задайте Тип регистрации как \"Подтверждение администратором\"", - "list.name": "Name", + "list.name": "Имя", "list.email": "Email", "list.ip": "IP", - "list.time": "Time", + "list.time": "Время", "list.username-spam": "Frequency: %1 Appears: %2 Confidence: %3", "list.email-spam": "Frequency: %1 Appears: %2", "list.ip-spam": "Frequency: %1 Appears: %2", - "invitations": "Invitations", + "invitations": "Приглашения", "invitations.description": "Ниже приведен полный список отправленных приглашений. Для поиска по списку по электронной почте или имени пользователя используйте сочетание клавиш CTRL+F . < br > < br > Имена пользователей, которые приняли приглашение, будут отображаться справа от электронной почты.", - "invitations.inviter-username": "Inviter Username", - "invitations.invitee-email": "Invitee Email", - "invitations.invitee-username": "Invitee Username (if registered)", + "invitations.inviter-username": "Имя пользователя приглашенного", + "invitations.invitee-email": "Email приглашенного", + "invitations.invitee-username": "Имя пользователя приглашенного (если зарегистрирован)", - "invitations.confirm-delete": "Are you sure you wish to delete this invitation?" + "invitations.confirm-delete": "Вы уверены, что хотите удалить это приглашение" } \ No newline at end of file From f6ad344ac6fd1bd98777ad48398334f64130341b Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 19 Jan 2018 11:39:32 -0500 Subject: [PATCH 11/24] Fixes #6259 Fixed issue that would cause the upgrade script to completely wipe your customJS. This was caused by meta.config not being populated during upgrade scripts (but only when run with ./nodebb upgrade... odd.) --- src/upgrades/1.7.0/generate-custom-html.js | 48 +++++++++++++--------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/src/upgrades/1.7.0/generate-custom-html.js b/src/upgrades/1.7.0/generate-custom-html.js index 5de0238920..914454a4c2 100644 --- a/src/upgrades/1.7.0/generate-custom-html.js +++ b/src/upgrades/1.7.0/generate-custom-html.js @@ -1,37 +1,45 @@ 'use strict'; +var db = require('../../database'); var meta = require('../../meta'); module.exports = { name: 'Generate customHTML block from old customJS setting', timestamp: Date.UTC(2017, 9, 12), method: function (callback) { - var newHTML = meta.config.customJS; - var newJS = []; + db.getObjectField('config', 'customJS', function (err, newHTML) { + if (err) { + return callback(err); + } + + var newJS = []; + + // Forgive me for parsing HTML with regex... + var scriptMatch = /^([\s\S]+?)<\/script>/m; + var match = scriptMatch.exec(newHTML); - // Forgive me for parsing HTML with regex... - var scriptMatch = /^([\s\S]+?)<\/script>/m; - var match = scriptMatch.exec(newHTML); + while (match) { + if (match[1]) { + // Append to newJS array + newJS.push(match[1].trim()); - while (match) { - if (match[1]) { - // Append to newJS array - newJS.push(match[1].trim()); + // Remove the match from the existing value + newHTML = ((match.index > 0 ? newHTML.slice(0, match.index) : '') + newHTML.slice(match.index + match[0].length)).trim(); + } - // Remove the match from the existing value - newHTML = ((match.index > 0 ? newHTML.slice(0, match.index) : '') + newHTML.slice(match.index + match[0].length)).trim(); + match = scriptMatch.exec(newHTML); } - match = scriptMatch.exec(newHTML); - } + // Combine newJS array + newJS = newJS.join('\n\n'); - // Combine newJS array - newJS = newJS.join('\n\n'); + console.log('wut', newJS, 'and', newHTML); - // Write both values to config - meta.configs.setMultiple({ - customHTML: newHTML, - customJS: newJS, - }, callback); + // Write both values to config + meta.configs.setMultiple({ + customHTML: newHTML, + customJS: newJS, + }, callback); + }); }, }; From 947c81adf0fffcac506097c8119976f00c46a21d Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 19 Jan 2018 13:00:10 -0500 Subject: [PATCH 12/24] @pitaj wut --- src/upgrades/1.7.0/generate-custom-html.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/upgrades/1.7.0/generate-custom-html.js b/src/upgrades/1.7.0/generate-custom-html.js index 914454a4c2..58ac2adf61 100644 --- a/src/upgrades/1.7.0/generate-custom-html.js +++ b/src/upgrades/1.7.0/generate-custom-html.js @@ -33,8 +33,6 @@ module.exports = { // Combine newJS array newJS = newJS.join('\n\n'); - console.log('wut', newJS, 'and', newHTML); - // Write both values to config meta.configs.setMultiple({ customHTML: newHTML, From ac2e185e34a024f6aefd8064fb11e4d17cb3dc7f Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 19 Jan 2018 13:24:00 -0500 Subject: [PATCH 13/24] Fixes #6261 If a connection to the parent process is not detected, disable the restart and reload buttons (as they won't work anyway). --- public/language/en-GB/admin/general/dashboard.json | 7 ++++--- src/controllers/admin/dashboard.js | 1 + src/views/admin/general/dashboard.tpl | 12 +++++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/public/language/en-GB/admin/general/dashboard.json b/public/language/en-GB/admin/general/dashboard.json index 9f1c6d8a4e..3b4ed54444 100644 --- a/public/language/en-GB/admin/general/dashboard.json +++ b/public/language/en-GB/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/src/controllers/admin/dashboard.js b/src/controllers/admin/dashboard.js index 8b1751d2a6..b5ae760727 100644 --- a/src/controllers/admin/dashboard.js +++ b/src/controllers/admin/dashboard.js @@ -48,6 +48,7 @@ dashboardController.get = function (req, res, next) { version: nconf.get('version'), notices: results.notices, stats: results.stats, + canRestart: !!process.send, }); }, ], next); diff --git a/src/views/admin/general/dashboard.tpl b/src/views/admin/general/dashboard.tpl index 46f7e236dd..3090e2dc8b 100644 --- a/src/views/admin/general/dashboard.tpl +++ b/src/views/admin/general/dashboard.tpl @@ -101,13 +101,15 @@
[[admin/general/dashboard:control-panel]]

-

- - -
+ +

-

+

+ [[admin/general/dashboard:restart-warning]] + + [[admin/general/dashboard:restart-disabled]] +

[[admin/general/dashboard:maintenance-mode]] From 73d31576359c18666ccacec5a6c448a8194ca506 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 19 Jan 2018 13:24:27 -0500 Subject: [PATCH 14/24] Remove keybindings in ACP as nobody uses them anymore. If you do, let me know, heh. --- public/src/admin/admin.js | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js index 3dc22afd62..be224d2812 100644 --- a/public/src/admin/admin.js +++ b/public/src/admin/admin.js @@ -31,8 +31,6 @@ } $(document).ready(function () { - setupKeybindings(); - if (!/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) { require(['admin/modules/search'], function (search) { search.init(); @@ -63,24 +61,6 @@ }); } - function setupKeybindings() { - require(['mousetrap', 'admin/modules/instance'], function (mousetrap, instance) { - mousetrap.bind('ctrl+shift+a r', function () { - instance.reload(); - }); - - mousetrap.bind('ctrl+shift+a R', function () { - socket.emit('admin.restart'); - }); - - mousetrap.bind('/', function () { - $('#acp-search input').focus(); - - return false; - }); - }); - } - function selectMenuItem(url) { require(['translator'], function (translator) { url = url From 598675d5976bd879402cd14e70524dd6d79919cd Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 19 Jan 2018 13:27:09 -0500 Subject: [PATCH 15/24] outputting friendly warning if build target contains commas --- src/meta/build.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/meta/build.js b/src/meta/build.js index 552c9aa55c..52037b702c 100644 --- a/src/meta/build.js +++ b/src/meta/build.js @@ -143,6 +143,11 @@ function build(targets, callback) { target = target.toLowerCase().replace(/-/g, ''); if (!aliases[target]) { winston.warn('[build] Unknown target: ' + target); + if (target.indexOf(',') !== -1) { + winston.warn('[build] Are you specifying multiple targets? Separate them with spaces:'); + winston.warn('[build] e.g. `./nodebb build adminjs tpl`'); + } + return false; } From ae6a1b975dbced42f78f766cbf617146d8a49320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 19 Jan 2018 14:00:52 -0500 Subject: [PATCH 16/24] #6255 fix editing OP was causing title change event to be logged eventhough title didn't change --- src/posts/edit.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/posts/edit.js b/src/posts/edit.js index 991639af40..8780fa6016 100644 --- a/src/posts/edit.js +++ b/src/posts/edit.js @@ -12,6 +12,7 @@ var plugins = require('../plugins'); var cache = require('./cache'); var pubsub = require('../pubsub'); var utils = require('../utils'); +var translator = require('../translator'); module.exports = function (Posts) { pubsub.on('post:edit', function (pid) { @@ -149,6 +150,7 @@ module.exports = function (Posts) { topicData.tags = data.tags; topicData.oldTitle = results.topic.title; topicData.timestamp = results.topic.timestamp; + var renamed = translator.escape(validator.escape(String(title))) !== results.topic.title; plugins.fireHook('action:topic.edit', { topic: topicData, uid: data.uid }); next(null, { tid: tid, @@ -158,7 +160,7 @@ module.exports = function (Posts) { oldTitle: results.topic.title, slug: topicData.slug, isMainPost: true, - renamed: title !== results.topic.title, + renamed: renamed, tags: tags, }); }, From 9df3c0d2d672b047190a8271eafb6707db71a20d Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Sat, 20 Jan 2018 09:24:49 +0000 Subject: [PATCH 17/24] Latest translations and fallbacks --- .../ar/admin/appearance/customise.json | 6 +++--- public/language/ar/admin/manage/tags.json | 1 + public/language/ar/admin/manage/users.json | 2 +- .../language/ar/admin/settings/reputation.json | 5 ++++- public/language/ar/error.json | 3 +++ public/language/ar/pages.json | 2 +- .../bg/admin/appearance/customise.json | 6 +++--- public/language/bg/admin/manage/tags.json | 1 + public/language/bg/admin/manage/users.json | 2 +- .../language/bg/admin/settings/reputation.json | 5 ++++- public/language/bg/error.json | 3 +++ public/language/bg/pages.json | 2 +- .../bn/admin/appearance/customise.json | 6 +++--- public/language/bn/admin/manage/tags.json | 1 + public/language/bn/admin/manage/users.json | 2 +- .../language/bn/admin/settings/reputation.json | 5 ++++- public/language/bn/error.json | 3 +++ public/language/bn/pages.json | 2 +- .../cs/admin/appearance/customise.json | 6 +++--- public/language/cs/admin/manage/tags.json | 1 + public/language/cs/admin/manage/users.json | 2 +- .../language/cs/admin/settings/reputation.json | 5 ++++- public/language/cs/error.json | 3 +++ public/language/cs/pages.json | 2 +- .../da/admin/appearance/customise.json | 6 +++--- public/language/da/admin/manage/tags.json | 1 + public/language/da/admin/manage/users.json | 2 +- .../language/da/admin/settings/reputation.json | 5 ++++- public/language/da/error.json | 3 +++ public/language/da/pages.json | 2 +- .../de/admin/appearance/customise.json | 4 ++-- public/language/de/admin/manage/tags.json | 1 + public/language/de/admin/manage/users.json | 2 +- .../language/de/admin/settings/reputation.json | 5 ++++- public/language/de/error.json | 3 +++ public/language/de/pages.json | 2 +- .../el/admin/appearance/customise.json | 6 +++--- public/language/el/admin/manage/tags.json | 1 + public/language/el/admin/manage/users.json | 2 +- .../language/el/admin/settings/reputation.json | 5 ++++- public/language/el/error.json | 3 +++ public/language/el/pages.json | 2 +- .../en-US/admin/appearance/customise.json | 6 +++--- public/language/en-US/admin/manage/tags.json | 1 + public/language/en-US/admin/manage/users.json | 2 +- .../en-US/admin/settings/reputation.json | 5 ++++- public/language/en-US/error.json | 3 +++ public/language/en-US/pages.json | 2 +- .../admin/appearance/customise.json | 6 +++--- .../en-x-pirate/admin/manage/tags.json | 1 + .../en-x-pirate/admin/manage/users.json | 2 +- .../en-x-pirate/admin/settings/reputation.json | 5 ++++- public/language/en-x-pirate/error.json | 3 +++ public/language/en-x-pirate/pages.json | 2 +- .../es/admin/appearance/customise.json | 6 +++--- public/language/es/admin/manage/tags.json | 1 + public/language/es/admin/manage/users.json | 2 +- .../language/es/admin/settings/reputation.json | 5 ++++- public/language/es/error.json | 3 +++ public/language/es/pages.json | 2 +- .../et/admin/appearance/customise.json | 6 +++--- public/language/et/admin/manage/tags.json | 1 + public/language/et/admin/manage/users.json | 2 +- .../language/et/admin/settings/reputation.json | 5 ++++- public/language/et/error.json | 3 +++ public/language/et/pages.json | 2 +- .../fa-IR/admin/appearance/customise.json | 6 +++--- public/language/fa-IR/admin/manage/tags.json | 1 + public/language/fa-IR/admin/manage/users.json | 2 +- .../fa-IR/admin/settings/reputation.json | 5 ++++- public/language/fa-IR/error.json | 3 +++ public/language/fa-IR/pages.json | 2 +- .../fi/admin/appearance/customise.json | 6 +++--- public/language/fi/admin/manage/tags.json | 1 + public/language/fi/admin/manage/users.json | 2 +- .../language/fi/admin/settings/reputation.json | 5 ++++- public/language/fi/error.json | 3 +++ public/language/fi/pages.json | 2 +- .../fr/admin/appearance/customise.json | 6 +++--- public/language/fr/admin/manage/tags.json | 1 + public/language/fr/admin/manage/users.json | 2 +- .../language/fr/admin/settings/reputation.json | 5 ++++- public/language/fr/error.json | 3 +++ public/language/fr/pages.json | 2 +- .../gl/admin/appearance/customise.json | 6 +++--- public/language/gl/admin/manage/tags.json | 1 + public/language/gl/admin/manage/users.json | 2 +- .../language/gl/admin/settings/reputation.json | 5 ++++- public/language/gl/error.json | 3 +++ public/language/gl/pages.json | 2 +- .../he/admin/appearance/customise.json | 6 +++--- public/language/he/admin/manage/tags.json | 1 + public/language/he/admin/manage/users.json | 2 +- .../language/he/admin/settings/reputation.json | 5 ++++- public/language/he/error.json | 3 +++ public/language/he/pages.json | 2 +- .../hr/admin/appearance/customise.json | 6 +++--- public/language/hr/admin/manage/tags.json | 1 + public/language/hr/admin/manage/users.json | 2 +- .../language/hr/admin/settings/reputation.json | 5 ++++- public/language/hr/error.json | 3 +++ public/language/hr/pages.json | 2 +- .../hu/admin/appearance/customise.json | 6 +++--- public/language/hu/admin/manage/tags.json | 1 + public/language/hu/admin/manage/users.json | 2 +- .../language/hu/admin/settings/reputation.json | 5 ++++- public/language/hu/error.json | 3 +++ public/language/hu/pages.json | 2 +- .../id/admin/appearance/customise.json | 6 +++--- public/language/id/admin/manage/tags.json | 1 + public/language/id/admin/manage/users.json | 2 +- .../language/id/admin/settings/reputation.json | 5 ++++- public/language/id/error.json | 3 +++ public/language/id/pages.json | 2 +- .../it/admin/appearance/customise.json | 6 +++--- public/language/it/admin/manage/tags.json | 1 + public/language/it/admin/manage/users.json | 2 +- .../language/it/admin/settings/reputation.json | 5 ++++- public/language/it/error.json | 3 +++ public/language/it/pages.json | 2 +- .../ja/admin/appearance/customise.json | 6 +++--- public/language/ja/admin/manage/tags.json | 1 + public/language/ja/admin/manage/users.json | 2 +- .../language/ja/admin/settings/reputation.json | 5 ++++- public/language/ja/error.json | 3 +++ public/language/ja/pages.json | 2 +- .../ko/admin/appearance/customise.json | 6 +++--- public/language/ko/admin/manage/tags.json | 1 + public/language/ko/admin/manage/users.json | 2 +- .../language/ko/admin/settings/reputation.json | 5 ++++- public/language/ko/error.json | 3 +++ public/language/ko/pages.json | 2 +- .../lt/admin/appearance/customise.json | 6 +++--- public/language/lt/admin/manage/tags.json | 1 + public/language/lt/admin/manage/users.json | 2 +- .../language/lt/admin/settings/reputation.json | 5 ++++- public/language/lt/error.json | 3 +++ public/language/lt/pages.json | 2 +- .../ms/admin/appearance/customise.json | 6 +++--- public/language/ms/admin/manage/tags.json | 1 + public/language/ms/admin/manage/users.json | 2 +- .../language/ms/admin/settings/reputation.json | 5 ++++- public/language/ms/error.json | 3 +++ public/language/ms/pages.json | 2 +- .../nb/admin/appearance/customise.json | 6 +++--- public/language/nb/admin/manage/tags.json | 1 + public/language/nb/admin/manage/users.json | 2 +- .../language/nb/admin/settings/reputation.json | 5 ++++- public/language/nb/error.json | 3 +++ public/language/nb/pages.json | 2 +- .../nl/admin/appearance/customise.json | 6 +++--- public/language/nl/admin/manage/tags.json | 1 + public/language/nl/admin/manage/users.json | 2 +- .../language/nl/admin/settings/reputation.json | 5 ++++- public/language/nl/error.json | 3 +++ public/language/nl/pages.json | 2 +- .../pl/admin/appearance/customise.json | 6 +++--- public/language/pl/admin/manage/tags.json | 1 + public/language/pl/admin/manage/users.json | 2 +- .../language/pl/admin/settings/reputation.json | 5 ++++- public/language/pl/error.json | 3 +++ public/language/pl/pages.json | 2 +- .../pt-BR/admin/appearance/customise.json | 6 +++--- public/language/pt-BR/admin/manage/tags.json | 1 + public/language/pt-BR/admin/manage/users.json | 2 +- .../pt-BR/admin/settings/reputation.json | 5 ++++- public/language/pt-BR/error.json | 3 +++ public/language/pt-BR/pages.json | 2 +- .../pt-PT/admin/appearance/customise.json | 6 +++--- public/language/pt-PT/admin/manage/tags.json | 1 + public/language/pt-PT/admin/manage/users.json | 2 +- .../pt-PT/admin/settings/reputation.json | 5 ++++- public/language/pt-PT/error.json | 3 +++ public/language/pt-PT/pages.json | 2 +- .../ro/admin/appearance/customise.json | 6 +++--- public/language/ro/admin/manage/tags.json | 1 + public/language/ro/admin/manage/users.json | 2 +- .../language/ro/admin/settings/reputation.json | 5 ++++- public/language/ro/error.json | 3 +++ public/language/ro/pages.json | 2 +- .../ru/admin/appearance/customise.json | 6 +++--- public/language/ru/admin/manage/tags.json | 1 + public/language/ru/admin/manage/users.json | 2 +- .../language/ru/admin/settings/reputation.json | 5 ++++- public/language/ru/error.json | 3 +++ public/language/ru/pages.json | 2 +- .../rw/admin/appearance/customise.json | 6 +++--- public/language/rw/admin/manage/tags.json | 1 + public/language/rw/admin/manage/users.json | 2 +- .../language/rw/admin/settings/reputation.json | 5 ++++- public/language/rw/error.json | 3 +++ public/language/rw/pages.json | 2 +- .../sc/admin/appearance/customise.json | 6 +++--- public/language/sc/admin/manage/tags.json | 1 + public/language/sc/admin/manage/users.json | 2 +- .../language/sc/admin/settings/reputation.json | 5 ++++- public/language/sc/error.json | 3 +++ public/language/sc/pages.json | 2 +- .../sk/admin/appearance/customise.json | 6 +++--- public/language/sk/admin/manage/tags.json | 1 + public/language/sk/admin/manage/users.json | 2 +- .../language/sk/admin/settings/reputation.json | 5 ++++- public/language/sk/error.json | 3 +++ public/language/sk/pages.json | 2 +- .../sl/admin/appearance/customise.json | 6 +++--- public/language/sl/admin/manage/tags.json | 1 + public/language/sl/admin/manage/users.json | 2 +- .../language/sl/admin/settings/reputation.json | 5 ++++- public/language/sl/error.json | 3 +++ public/language/sl/pages.json | 2 +- .../sr/admin/appearance/customise.json | 6 +++--- public/language/sr/admin/manage/tags.json | 1 + public/language/sr/admin/manage/users.json | 2 +- .../language/sr/admin/settings/reputation.json | 5 ++++- public/language/sr/error.json | 3 +++ public/language/sr/pages.json | 2 +- .../sv/admin/appearance/customise.json | 6 +++--- public/language/sv/admin/manage/tags.json | 1 + public/language/sv/admin/manage/users.json | 2 +- .../language/sv/admin/settings/reputation.json | 5 ++++- public/language/sv/error.json | 3 +++ public/language/sv/pages.json | 2 +- .../th/admin/appearance/customise.json | 6 +++--- public/language/th/admin/manage/tags.json | 1 + public/language/th/admin/manage/users.json | 2 +- .../language/th/admin/settings/reputation.json | 5 ++++- public/language/th/error.json | 3 +++ public/language/th/pages.json | 2 +- .../tr/admin/appearance/customise.json | 6 +++--- public/language/tr/admin/manage/tags.json | 1 + public/language/tr/admin/manage/users.json | 2 +- .../language/tr/admin/settings/reputation.json | 5 ++++- public/language/tr/error.json | 3 +++ public/language/tr/pages.json | 2 +- .../uk/admin/appearance/customise.json | 6 +++--- public/language/uk/admin/manage/tags.json | 1 + public/language/uk/admin/manage/users.json | 2 +- .../language/uk/admin/settings/reputation.json | 5 ++++- public/language/uk/error.json | 3 +++ public/language/uk/pages.json | 2 +- .../vi/admin/appearance/customise.json | 6 +++--- public/language/vi/admin/manage/tags.json | 1 + public/language/vi/admin/manage/users.json | 2 +- .../language/vi/admin/settings/reputation.json | 5 ++++- public/language/vi/error.json | 3 +++ public/language/vi/pages.json | 2 +- .../zh-CN/admin/appearance/customise.json | 6 +++--- .../zh-CN/admin/manage/categories.json | 2 +- public/language/zh-CN/admin/manage/groups.json | 6 +++--- public/language/zh-CN/admin/manage/tags.json | 1 + public/language/zh-CN/admin/manage/users.json | 18 +++++++++--------- .../zh-CN/admin/settings/reputation.json | 5 ++++- public/language/zh-CN/error.json | 9 ++++++--- public/language/zh-CN/global.json | 2 +- public/language/zh-CN/pages.json | 2 +- public/language/zh-CN/unread.json | 2 +- .../language/zh-TW/admin/advanced/errors.json | 2 +- .../language/zh-TW/admin/advanced/events.json | 8 ++++---- public/language/zh-TW/admin/advanced/logs.json | 10 +++++----- .../zh-TW/admin/appearance/customise.json | 14 +++++++------- public/language/zh-TW/admin/manage/tags.json | 1 + public/language/zh-TW/admin/manage/users.json | 2 +- .../zh-TW/admin/settings/reputation.json | 5 ++++- public/language/zh-TW/error.json | 3 +++ public/language/zh-TW/pages.json | 2 +- 265 files changed, 589 insertions(+), 288 deletions(-) diff --git a/public/language/ar/admin/appearance/customise.json b/public/language/ar/admin/appearance/customise.json index 94280603a6..4e292f0792 100644 --- a/public/language/ar/admin/appearance/customise.json +++ b/public/language/ar/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "CSS مخصص", - "custom-css.description": "أدخل CSS الخاصة بك هنا، والتي سيتم تطبيقها بعد كل القوالب الأخرى.", - "custom-css.enable": "تفعيل CSS المخصص", + "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-js": "Javascript مخصصة", "custom-js.description": "أدخل Javascript الخاص بك هنا. سيتم تنفيذها بعد تحميل الصفحة بالكامل.", diff --git a/public/language/ar/admin/manage/tags.json b/public/language/ar/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/ar/admin/manage/tags.json +++ b/public/language/ar/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/ar/admin/manage/users.json b/public/language/ar/admin/manage/users.json index 4df3674ed7..d56c204f29 100644 --- a/public/language/ar/admin/manage/users.json +++ b/public/language/ar/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/ar/admin/settings/reputation.json b/public/language/ar/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/ar/admin/settings/reputation.json +++ b/public/language/ar/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/ar/error.json b/public/language/ar/error.json index 8d34c96ef1..d5c859f886 100644 --- a/public/language/ar/error.json +++ b/public/language/ar/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "التصويتات السلبية معطلة", "not-enough-reputation-to-downvote": "ليس لديك سمعة تكفي لإضافة صوت سلبي لهذا الموضوع", "not-enough-reputation-to-flag": "ليس لديك سمعة تكفي للإشعار بموضوع مخل", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "لقد بلغت عن هذه المشاركة من قبل.", "self-vote": "You cannot vote on your own post", "reload-failed": "المنتدى واجه مشكلة أثناء إعادة التحميل: \"%1\". سيواصل المنتدى خدمة العملاء السابقين لكن يجب عليك إلغاء أي تغيير قمت به قبل إعادة التحميل.", diff --git a/public/language/ar/pages.json b/public/language/ar/pages.json index 4f05a1e562..ce00bd2515 100644 --- a/public/language/ar/pages.json +++ b/public/language/ar/pages.json @@ -20,7 +20,7 @@ "users/search": "بحث عن مستخدم", "notifications": "التنبيهات", "tags": "الكلمات الدلالية", - "tag": "المواضيع المرتبطة بالوسم %1", + "tag": "Topics tagged under "%1"", "register": "تسجيل حساب", "registration-complete": "Registration complete", "login": "سجل الدخول الى حسابك", diff --git a/public/language/bg/admin/appearance/customise.json b/public/language/bg/admin/appearance/customise.json index 5f6214b70e..f36cbd8fb0 100644 --- a/public/language/bg/admin/appearance/customise.json +++ b/public/language/bg/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Персонализиран CSS", - "custom-css.description": "Въведете своите собствени декларации за стилове, те ще бъдат приложени след всички останали стилове.", - "custom-css.enable": "Включване на персонализиран CSS", + "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-js": "Персонализиран код на Javascript", "custom-js.description": "Въведете свой собствен код на javascript тук. Той ще бъде изпълнен след като страницата се зареди напълно.", diff --git a/public/language/bg/admin/manage/tags.json b/public/language/bg/admin/manage/tags.json index 71680917df..bcfcd9395e 100644 --- a/public/language/bg/admin/manage/tags.json +++ b/public/language/bg/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Изберете етикетите чрез щракване и/или влачене. Използвайте „Shift“, за да изберете няколко етикета.", "create": "Създаване на етикет", "modify": "Редактиране на етикети", + "rename": "Rename Tags", "delete": "Изтриване на избраните етикети", "search": "Търсене на етикети…", "settings": "Натиснете тук, за да отворите страницата с настройки на етикета.", diff --git a/public/language/bg/admin/manage/users.json b/public/language/bg/admin/manage/users.json index ba1ad5bd26..618fce3735 100644 --- a/public/language/bg/admin/manage/users.json +++ b/public/language/bg/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "Потребителят вече няма да бъде администратор.", "alerts.make-global-mod-success": "Потребителят вече ще бъде глобален модератор.", "alerts.confirm-remove-global-mod": "Наистина ли искате да премахнете този глобален модератор?", - "alerts.remove-global-mod-success": "Потребителят вече няма да бъде глобален модератор.", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "Потребителят вече ще бъде модератор.", "alerts.confirm-remove-moderator": "Наистина ли искате да премахнете този модератор?", "alerts.remove-moderator-success": "Потребителят вече ще бъде модератор.", diff --git a/public/language/bg/admin/settings/reputation.json b/public/language/bg/admin/settings/reputation.json index 2b52ff3de9..d4e0681d31 100644 --- a/public/language/bg/admin/settings/reputation.json +++ b/public/language/bg/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "Всички гласувания са публични", "thresholds": "Ограничения на дейността", "min-rep-downvote": "Минимална репутация, необходима за отрицателно гласуване за публикации", - "min-rep-flag": "Минимална репутация, необходима за докладване на публикации" + "min-rep-flag": "Минимална репутация, необходима за докладване на публикации", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/bg/error.json b/public/language/bg/error.json index 8d87acdfb0..f95c55fcc7 100644 --- a/public/language/bg/error.json +++ b/public/language/bg/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Отрицателното гласуване е изключено", "not-enough-reputation-to-downvote": "Нямате достатъчно репутация, за да гласувате отрицателно за тази публикация", "not-enough-reputation-to-flag": "Нямате достатъчно репутация, за да докладвате тази публикация", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Вече сте докладвали тази публикация", "self-vote": "Не можете да гласувате за собствената си публикация", "reload-failed": "NodeBB срещна проблем при презареждането: „%1“. NodeBB ще продължи да поддържа съществуващите клиентски ресурси, но Вие трябва да отмените последните си действия преди презареждането.", diff --git a/public/language/bg/pages.json b/public/language/bg/pages.json index 2816890524..e5ecc460f0 100644 --- a/public/language/bg/pages.json +++ b/public/language/bg/pages.json @@ -20,7 +20,7 @@ "users/search": "Търсене на потребители", "notifications": "Известия", "tags": "Етикети", - "tag": "Теми, отбелязани като „%1“", + "tag": "Topics tagged under "%1"", "register": "Регистриране на акаунт", "registration-complete": "Регистрацията е завършена", "login": "Впишете се в акаунта си", diff --git a/public/language/bn/admin/appearance/customise.json b/public/language/bn/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/bn/admin/appearance/customise.json +++ b/public/language/bn/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/bn/admin/manage/tags.json b/public/language/bn/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/bn/admin/manage/tags.json +++ b/public/language/bn/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/bn/admin/manage/users.json b/public/language/bn/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/bn/admin/manage/users.json +++ b/public/language/bn/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/bn/admin/settings/reputation.json b/public/language/bn/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/bn/admin/settings/reputation.json +++ b/public/language/bn/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/bn/error.json b/public/language/bn/error.json index 558a2a8a8b..1131b63773 100644 --- a/public/language/bn/error.json +++ b/public/language/bn/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "ঋণাত্মক ভোট নিস্ক্রীয় রাখা হয়েছে।", "not-enough-reputation-to-downvote": "আপনার এই পোস্ট downvote করার জন্য পর্যাপ্ত সম্মাননা নেই", "not-enough-reputation-to-flag": "এই পোষ্টকে ফ্লাগ করার জন্য আপনার পর্যাপ্ত সম্মাননা নেই", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "You have already flagged this post", "self-vote": "You cannot vote on your own post", "reload-failed": "\"%1\" রিলোড করতে সমস্যা হয়েছে। রিলোডের পূর্বে যা করা হয়েছিল সেটি আনডু করা সমীচীন। ", diff --git a/public/language/bn/pages.json b/public/language/bn/pages.json index dfc58ac646..e8e9e8b1dc 100644 --- a/public/language/bn/pages.json +++ b/public/language/bn/pages.json @@ -20,7 +20,7 @@ "users/search": "User Search", "notifications": "বিজ্ঞপ্তি", "tags": "ট্যাগসমূহ", - "tag": "Topics tagged under \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Register an account", "registration-complete": "Registration complete", "login": "Login to your account", diff --git a/public/language/cs/admin/appearance/customise.json b/public/language/cs/admin/appearance/customise.json index 0cd4e0f8da..6fa4cbfbca 100644 --- a/public/language/cs/admin/appearance/customise.json +++ b/public/language/cs/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Uživatelský CSS", - "custom-css.description": "Zadejte vlastní deklarace CSS, které budou použity na všechny ostatních styly.", - "custom-css.enable": "Povolit uživatelské CSS", + "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-js": "Uživatelský Javascript", "custom-js.description": "Zadejte zde váš javascriptový kód. Bude spuštěn, jakmile se stránka plně načte.", diff --git a/public/language/cs/admin/manage/tags.json b/public/language/cs/admin/manage/tags.json index 910febd31e..8c4fb5a127 100644 --- a/public/language/cs/admin/manage/tags.json +++ b/public/language/cs/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Vyberte značky pomocí kliknutí a/nebo přetažením, pro vícenásobný výběr, použijte klávesu Shift.", "create": "Vytvořit značku", "modify": "Upravit značky", + "rename": "Rename Tags", "delete": "Odstranit vybrané značky", "search": "Hledat značky...", "settings": "Pro přejití na stránku s nastavením značek, klikněte zde.", diff --git a/public/language/cs/admin/manage/users.json b/public/language/cs/admin/manage/users.json index fcc00513bc..fe95fa070e 100644 --- a/public/language/cs/admin/manage/users.json +++ b/public/language/cs/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/cs/admin/settings/reputation.json b/public/language/cs/admin/settings/reputation.json index db452a9345..7339496268 100644 --- a/public/language/cs/admin/settings/reputation.json +++ b/public/language/cs/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "Všechna hlasování jsou veřejná", "thresholds": "Omezení aktivity", "min-rep-downvote": "Minimální reputace pro vyjádření nesouhlasu s příspěvkem", - "min-rep-flag": "Minimální reputace pro označení příspěvků" + "min-rep-flag": "Minimální reputace pro označení příspěvků", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/cs/error.json b/public/language/cs/error.json index aea65b2c2e..6ad76f1ca6 100644 --- a/public/language/cs/error.json +++ b/public/language/cs/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Systém nesouhlasu je zakázán", "not-enough-reputation-to-downvote": "Nemáte dostatečnou reputaci pro vyjádření nesouhlasu u tohoto příspěvku", "not-enough-reputation-to-flag": "Pro označení tohoto příspěvku nemáte dostatečnou reputaci", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Tento příspěvek jste již označil", "self-vote": "U svého vlastního příspěvku nemůžete hlasovat", "reload-failed": "Vyskytla se chyba v NodeBB při znovu načtení: \"%1\". NodeBB bude pokračovat v běhu na straně klienta, nicméně byste měl/a přenastavit zpět to, co jste udělal/a před opětovným načtením.", diff --git a/public/language/cs/pages.json b/public/language/cs/pages.json index e1770b140e..151b0a0a4a 100644 --- a/public/language/cs/pages.json +++ b/public/language/cs/pages.json @@ -20,7 +20,7 @@ "users/search": "Hledat uživatele", "notifications": "Upozornění", "tags": "Značky", - "tag": "Téma označeno pod \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Zaregistrovat účet", "registration-complete": "Registrace dokončena", "login": "Přihlásit se ke svému účtu", diff --git a/public/language/da/admin/appearance/customise.json b/public/language/da/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/da/admin/appearance/customise.json +++ b/public/language/da/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/da/admin/manage/tags.json b/public/language/da/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/da/admin/manage/tags.json +++ b/public/language/da/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/da/admin/manage/users.json b/public/language/da/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/da/admin/manage/users.json +++ b/public/language/da/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/da/admin/settings/reputation.json b/public/language/da/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/da/admin/settings/reputation.json +++ b/public/language/da/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/da/error.json b/public/language/da/error.json index 1104056793..0e54298890 100644 --- a/public/language/da/error.json +++ b/public/language/da/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Nedvurdering er slået fra", "not-enough-reputation-to-downvote": "Du har ikke nok omdømme til at nedstemme dette indlæg", "not-enough-reputation-to-flag": "Du har ikke nok omdømme til at vurdere dette indlæg", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Du har allerede vurderet dette indlæg", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB stødte på et problem under genindlæsningen : \"%1\". NodeBB vil fortsætte med en ældre version, og det er nok god ide at genoptage fra lige før du genindlæste siden.", diff --git a/public/language/da/pages.json b/public/language/da/pages.json index 7d721215bc..769ca2a363 100644 --- a/public/language/da/pages.json +++ b/public/language/da/pages.json @@ -20,7 +20,7 @@ "users/search": "Bruger søgning", "notifications": "Notifikationer", "tags": "Tags", - "tag": "Tråde tagget under \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Registre en konto", "registration-complete": "Registration complete", "login": "Login til din konto", diff --git a/public/language/de/admin/appearance/customise.json b/public/language/de/admin/appearance/customise.json index 48d0377d01..c7df96d996 100644 --- a/public/language/de/admin/appearance/customise.json +++ b/public/language/de/admin/appearance/customise.json @@ -1,7 +1,7 @@ { "custom-css": "Benutzerdefiniertes CSS/LESS", - "custom-css.description": "Füge hier deine eigenen CSS/LESS-Eigenschaften ein, sie werden als letztes angewendet.", - "custom-css.enable": "Benutzerdefiniertes CSS/LESS aktivieren", + "custom-css.description": "Füge deine eigenen CSS/LESS deklarationen hier ein, die nach allen anderen Styles angewandt werden.", + "custom-css.enable": "Aktiviere benutzerdefiniertes CSS/LESS", "custom-js": "Benutzerdefiniertes Javascript", "custom-js.description": "Füge dein eigenes Javascipt hier ein.\nEs wird ausgeführt nachdem die Seite komplett geladen wurde.", diff --git a/public/language/de/admin/manage/tags.json b/public/language/de/admin/manage/tags.json index be8bdd9650..490b424c40 100644 --- a/public/language/de/admin/manage/tags.json +++ b/public/language/de/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Tags auswählen indem Du klickst und/oder ziehst, drücke die SHIFT-Taste, um mehrere auszuwählen", "create": "Tag erstellen", "modify": "Tag bearbeiten", + "rename": "Tags umbenennen", "delete": "Ausgewählte Tags entfernen", "search": "Nach Tags suchen", "settings": "Klicke hier, um die Tag-Einstellungsseite zu öffnen.", diff --git a/public/language/de/admin/manage/users.json b/public/language/de/admin/manage/users.json index e4857f610d..20a4d58a15 100644 --- a/public/language/de/admin/manage/users.json +++ b/public/language/de/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "Der Benutzer ist kein Administrator mehr", "alerts.make-global-mod-success": "Der Benutzer ist nun ein globaler Moderator", "alerts.confirm-remove-global-mod": "Willst du wirklich diesen globalen Moderator entfernen?", - "alerts.remove-global-mod-success": "Der Benutzer ist kein globaler Moderator mehr", + "alerts.remove-global-mod-success": "Der Benutzer ist kein globaler Moderator mehr.", "alerts.make-moderator-success": "Der Benutzer ist nun ein Moderator", "alerts.confirm-remove-moderator": "Willst du wirklich diesen Moderator entfernen?", "alerts.remove-moderator-success": "Der Benutzer ist kein Moderator mehr", diff --git a/public/language/de/admin/settings/reputation.json b/public/language/de/admin/settings/reputation.json index 373a3dadae..4f0a54cae6 100644 --- a/public/language/de/admin/settings/reputation.json +++ b/public/language/de/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "Alle Bewertungen sind öffentlich", "thresholds": "Aktivitätsschwelle", "min-rep-downvote": "Minimales Ansehen um Beiträge negativ zu bewerten", - "min-rep-flag": "Minimales Ansehen und Beiträge zu melden" + "min-rep-flag": "Minimales Ansehen und Beiträge zu melden", + "min-rep-website": "Erforderliche Reputation um eine \"Website\" zum Benutzerprofil hinzuzufügen", + "min-rep-aboutme": "Erforderliche Reputation um eine \"Über mich\"-Sektion zum Benutzerprofil hinzuzufügen", + "min-rep-signature": "Erforderliche Reputation um eine \"Signatur\" zum Benutzerprofil hinzuzufügen" } \ No newline at end of file diff --git a/public/language/de/error.json b/public/language/de/error.json index ddd24e8144..c2d8071ec5 100644 --- a/public/language/de/error.json +++ b/public/language/de/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Downvotes sind deaktiviert.", "not-enough-reputation-to-downvote": "Dein Ansehen ist zu niedrig, um diesen Beitrag negativ zu bewerten.", "not-enough-reputation-to-flag": "Dein Ansehen ist zu niedrig, um diesen Beitrag zu melden", + "not-enough-reputation-min-rep-website": "Deine Reputation um eine \"Website\" zum Benutzerprofil hinzuzufügen ist zu niedrig", + "not-enough-reputation-min-rep-aboutme": "Deine Reputation um eine \"Über mich\"-Sektion zum Benutzerprofil hinzuzufügen ist zu niedrig", + "not-enough-reputation-min-rep-signature": "Deine Reputation um eine \"Signatur\" zum Benutzerprofil hinzuzufügen ist zu niedrig", "already-flagged": "Du hast diesen Beitrag bereits gemeldet", "self-vote": "Du kannst deine eigenen Beiträge nicht bewerten", "reload-failed": "Es ist ein Problem während des Reloads von NodeBB aufgetreten: \"%1\". NodeBB wird weiterhin clientseitige Assets bereitstellen, allerdings solltest du das, was du vor dem Reload gemacht hast, rückgängig machen.", diff --git a/public/language/de/pages.json b/public/language/de/pages.json index a8ddb4f7ae..a24ada37f9 100644 --- a/public/language/de/pages.json +++ b/public/language/de/pages.json @@ -20,7 +20,7 @@ "users/search": "Benutzer Suche", "notifications": "Benachrichtigungen", "tags": "Markierungen", - "tag": "Themen markiert unter \"%1\"", + "tag": "Unter \"%1\" getaggte Themen", "register": "Einen Benutzer erstellen", "registration-complete": "Registration abgeschlossen", "login": "Einloggen", diff --git a/public/language/el/admin/appearance/customise.json b/public/language/el/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/el/admin/appearance/customise.json +++ b/public/language/el/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/el/admin/manage/tags.json b/public/language/el/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/el/admin/manage/tags.json +++ b/public/language/el/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/el/admin/manage/users.json b/public/language/el/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/el/admin/manage/users.json +++ b/public/language/el/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/el/admin/settings/reputation.json b/public/language/el/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/el/admin/settings/reputation.json +++ b/public/language/el/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/el/error.json b/public/language/el/error.json index e92911066c..a8eba7a27d 100644 --- a/public/language/el/error.json +++ b/public/language/el/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Η καταψήφιση έχει απενεργοποιηθεί", "not-enough-reputation-to-downvote": "Δεν έχεις αρκετή φήμη για να καταψηφίσεις αυτή την δημοσίευση", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "You have already flagged this post", "self-vote": "You cannot vote on your own post", "reload-failed": "Το NodeBB συνάντησε ένα πρόβλημα καθώς γινόταν η ανανέωση: \"%1\". Το NodeBB θα συνεχίσει να προσφέρει τα στοιχεία του χρήστη, αν και θα ήταν καλή ιδέα να επαναφέρεις ότι έκανες πριν την ανανέωση.", diff --git a/public/language/el/pages.json b/public/language/el/pages.json index 0e3ee4e356..ba3375416d 100644 --- a/public/language/el/pages.json +++ b/public/language/el/pages.json @@ -20,7 +20,7 @@ "users/search": "Αναζήτηση Χρήστη", "notifications": "Ειδοποιήσεις", "tags": "Ετικέτες", - "tag": "Topics tagged under \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Register an account", "registration-complete": "Registration complete", "login": "Login to your account", diff --git a/public/language/en-US/admin/appearance/customise.json b/public/language/en-US/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/en-US/admin/appearance/customise.json +++ b/public/language/en-US/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/en-US/admin/manage/tags.json b/public/language/en-US/admin/manage/tags.json index 9c4a0ca186..d265367756 100644 --- a/public/language/en-US/admin/manage/tags.json +++ b/public/language/en-US/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/en-US/admin/manage/users.json b/public/language/en-US/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/en-US/admin/manage/users.json +++ b/public/language/en-US/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/en-US/admin/settings/reputation.json b/public/language/en-US/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/en-US/admin/settings/reputation.json +++ b/public/language/en-US/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/en-US/error.json b/public/language/en-US/error.json index 9455f37138..282b07f9e1 100644 --- a/public/language/en-US/error.json +++ b/public/language/en-US/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "You have already flagged this post", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", diff --git a/public/language/en-US/pages.json b/public/language/en-US/pages.json index 396bea883d..c41cb6afbb 100644 --- a/public/language/en-US/pages.json +++ b/public/language/en-US/pages.json @@ -20,7 +20,7 @@ "users/search": "User Search", "notifications": "Notifications", "tags": "Tags", - "tag": "Topics tagged under \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Register an account", "registration-complete": "Registration complete", "login": "Login to your account", diff --git a/public/language/en-x-pirate/admin/appearance/customise.json b/public/language/en-x-pirate/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/en-x-pirate/admin/appearance/customise.json +++ b/public/language/en-x-pirate/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/en-x-pirate/admin/manage/tags.json b/public/language/en-x-pirate/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/en-x-pirate/admin/manage/tags.json +++ b/public/language/en-x-pirate/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/en-x-pirate/admin/manage/users.json b/public/language/en-x-pirate/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/en-x-pirate/admin/manage/users.json +++ b/public/language/en-x-pirate/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/en-x-pirate/admin/settings/reputation.json b/public/language/en-x-pirate/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/en-x-pirate/admin/settings/reputation.json +++ b/public/language/en-x-pirate/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ 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 9455f37138..282b07f9e1 100644 --- a/public/language/en-x-pirate/error.json +++ b/public/language/en-x-pirate/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "You have already flagged this post", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", diff --git a/public/language/en-x-pirate/pages.json b/public/language/en-x-pirate/pages.json index 396bea883d..c41cb6afbb 100644 --- a/public/language/en-x-pirate/pages.json +++ b/public/language/en-x-pirate/pages.json @@ -20,7 +20,7 @@ "users/search": "User Search", "notifications": "Notifications", "tags": "Tags", - "tag": "Topics tagged under \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Register an account", "registration-complete": "Registration complete", "login": "Login to your account", diff --git a/public/language/es/admin/appearance/customise.json b/public/language/es/admin/appearance/customise.json index 0f707eb156..eaaad5cfb7 100644 --- a/public/language/es/admin/appearance/customise.json +++ b/public/language/es/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "CSS personalizado", - "custom-css.description": "Introduce tus propias declaraciones CSS aquí, las cuales serán aplicadas después de otros estilos.", - "custom-css.enable": "Activar CSS personalizado", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/es/admin/manage/tags.json b/public/language/es/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/es/admin/manage/tags.json +++ b/public/language/es/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/es/admin/manage/users.json b/public/language/es/admin/manage/users.json index fb7ec46deb..9b7784debc 100644 --- a/public/language/es/admin/manage/users.json +++ b/public/language/es/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/es/admin/settings/reputation.json b/public/language/es/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/es/admin/settings/reputation.json +++ b/public/language/es/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/es/error.json b/public/language/es/error.json index 3838468a9d..112c6530da 100644 --- a/public/language/es/error.json +++ b/public/language/es/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "La votación negativa está deshabilitada.", "not-enough-reputation-to-downvote": "No tienes suficiente reputación para votar negativo este post", "not-enough-reputation-to-flag": "No tiene suficiente reputación para poner reportar esta publicación", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Ya reportaste este mensaje anteriormente", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB encontró un problema al refrescar: \"%1\". NodeBB intentará cargar el resto de contenido, aunque deberías deshacer lo que hiciste justo antes.", diff --git a/public/language/es/pages.json b/public/language/es/pages.json index 35c576e0de..05d414a6d7 100644 --- a/public/language/es/pages.json +++ b/public/language/es/pages.json @@ -20,7 +20,7 @@ "users/search": "Buscar", "notifications": "Notificaciones", "tags": "Etiquetas", - "tag": "Temas etiquetados en \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Registrar una cuenta", "registration-complete": "Registro completado", "login": "Acceder a tu cuenta", diff --git a/public/language/et/admin/appearance/customise.json b/public/language/et/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/et/admin/appearance/customise.json +++ b/public/language/et/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/et/admin/manage/tags.json b/public/language/et/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/et/admin/manage/tags.json +++ b/public/language/et/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/et/admin/manage/users.json b/public/language/et/admin/manage/users.json index aedf88134c..1ee2bdaf9e 100644 --- a/public/language/et/admin/manage/users.json +++ b/public/language/et/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/et/admin/settings/reputation.json b/public/language/et/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/et/admin/settings/reputation.json +++ b/public/language/et/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/et/error.json b/public/language/et/error.json index 852ee80f29..13f12ff67d 100644 --- a/public/language/et/error.json +++ b/public/language/et/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Negatiivsete häälte andmine ei ole võimaldatud", "not-enough-reputation-to-downvote": "Sul ei ole piisavalt reputatsiooni, et anda negatiivset hinnangut sellele postitusele.", "not-enough-reputation-to-flag": "Sul ei ole piisavalt reputatsiooni, et seda postitust raporteerida", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Te juba teatasite sellest postitusest.", "self-vote": "You cannot vote on your own post", "reload-failed": "\"%1\" värskendamisel tekkis süsteemne viga. Foorum ei lakka töötamast, kuid peaksid kindlasti eemaldama enne värskendamist tehtud muudatused.", diff --git a/public/language/et/pages.json b/public/language/et/pages.json index 1b9537836e..4fa6596398 100644 --- a/public/language/et/pages.json +++ b/public/language/et/pages.json @@ -20,7 +20,7 @@ "users/search": "Kasutajate otsing", "notifications": "Teated", "tags": "Märksõnad", - "tag": "Teemad märksõnadega \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Registreeri kasutaja", "registration-complete": "Registration complete", "login": "Logi oma kasutajasse sisse", diff --git a/public/language/fa-IR/admin/appearance/customise.json b/public/language/fa-IR/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/fa-IR/admin/appearance/customise.json +++ b/public/language/fa-IR/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/fa-IR/admin/manage/tags.json b/public/language/fa-IR/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/fa-IR/admin/manage/tags.json +++ b/public/language/fa-IR/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/fa-IR/admin/manage/users.json b/public/language/fa-IR/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/fa-IR/admin/manage/users.json +++ b/public/language/fa-IR/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/fa-IR/admin/settings/reputation.json b/public/language/fa-IR/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/fa-IR/admin/settings/reputation.json +++ b/public/language/fa-IR/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/fa-IR/error.json b/public/language/fa-IR/error.json index be28004051..77f96f9920 100644 --- a/public/language/fa-IR/error.json +++ b/public/language/fa-IR/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "رأی منفی غیر فعال شده است", "not-enough-reputation-to-downvote": "شما اعتبار کافی برای دادن رأی منفی به این پست را ندارید.", "not-enough-reputation-to-flag": "شما اعتبار کافی برای نشاندار کردن این پست ندارید", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "شما قبلا این پست را گزارش کرده اید", "self-vote": "شما نمی توانید به پست خود رای بدهید", "reload-failed": "NodeBB در هنگام بارگذاری مجدد با یک مشکل مواجه شده است: \"%1\". NodeBB سرویس رسانی به کلاینت های سرویس گیرنده را ادامه خواهد داد، اگرچه شما کاری را قبل از بارگیری مجدد انجام دادید بازگردانی کنید", diff --git a/public/language/fa-IR/pages.json b/public/language/fa-IR/pages.json index e34c3f6909..d674e78a07 100644 --- a/public/language/fa-IR/pages.json +++ b/public/language/fa-IR/pages.json @@ -20,7 +20,7 @@ "users/search": "جستجوی کاربر", "notifications": "آگاه‌سازی‌ها", "tags": "برچسب‌ها", - "tag": "موضوع های داری کلیدواژه \"%1\"", + "tag": "Topics tagged under "%1"", "register": "ثبت نام یک حساب", "registration-complete": "ثبت نام تکمیل شد", "login": "به حساب خوب وارد شوید", diff --git a/public/language/fi/admin/appearance/customise.json b/public/language/fi/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/fi/admin/appearance/customise.json +++ b/public/language/fi/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/fi/admin/manage/tags.json b/public/language/fi/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/fi/admin/manage/tags.json +++ b/public/language/fi/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/fi/admin/manage/users.json b/public/language/fi/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/fi/admin/manage/users.json +++ b/public/language/fi/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/fi/admin/settings/reputation.json b/public/language/fi/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/fi/admin/settings/reputation.json +++ b/public/language/fi/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/fi/error.json b/public/language/fi/error.json index 7a6bc3a904..dced600b52 100644 --- a/public/language/fi/error.json +++ b/public/language/fi/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "You have already flagged this post", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", diff --git a/public/language/fi/pages.json b/public/language/fi/pages.json index a23f5f3bba..5344d3cbab 100644 --- a/public/language/fi/pages.json +++ b/public/language/fi/pages.json @@ -20,7 +20,7 @@ "users/search": "User Search", "notifications": "Ilmoitukset", "tags": "Tunnisteet", - "tag": "Topics tagged under \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Luo käyttäjät", "registration-complete": "Registration complete", "login": "Kirjaudu käyttäjällesi", diff --git a/public/language/fr/admin/appearance/customise.json b/public/language/fr/admin/appearance/customise.json index 5fe7960ddb..d218fdbf1d 100644 --- a/public/language/fr/admin/appearance/customise.json +++ b/public/language/fr/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "CSS personnalisé", - "custom-css.description": "Entrez vos propres déclarations de CSS ici, elles seront appliquées après tous les autres styles.", - "custom-css.enable": "Activer les CSS personnalisés", + "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-js": "Javascript personnalisé", "custom-js.description": "Entrez votre Javascript ici. Celui-ci sera exécute après le chargement complet de la page.", diff --git a/public/language/fr/admin/manage/tags.json b/public/language/fr/admin/manage/tags.json index a057d63b05..1d644a4c7d 100644 --- a/public/language/fr/admin/manage/tags.json +++ b/public/language/fr/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Sélectionnez les mot-clés par clic ou glisser-déposer, maintenez shift pour en sélectionner plusieurs.", "create": "Créer le mot-clés", "modify": "Modifier le mot-clés", + "rename": "Rename Tags", "delete": "Supprimer les mots-clés sélectionnés", "search": "Chercher des mots-clés...", "settings": "Cliquez ici pour visiter la page de paramètres des mots clés.", diff --git a/public/language/fr/admin/manage/users.json b/public/language/fr/admin/manage/users.json index c867f25c02..2e798d184d 100644 --- a/public/language/fr/admin/manage/users.json +++ b/public/language/fr/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "L'utilisateur n'est plus administrateur", "alerts.make-global-mod-success": "L'utilisateur est maintenant modérateur global", "alerts.confirm-remove-global-mod": "Voulez-vous vraiment supprimer ce modérateur global?", - "alerts.remove-global-mod-success": "L'utilisateur n'est plus modérateur global", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "L'utilisateur est maintenant modérateur", "alerts.confirm-remove-moderator": "Voulez-vous vraiment supprimer ce modérateur?", "alerts.remove-moderator-success": "L'utilisateur n'est plus modérateur", diff --git a/public/language/fr/admin/settings/reputation.json b/public/language/fr/admin/settings/reputation.json index 21573e7f76..af1f293f50 100644 --- a/public/language/fr/admin/settings/reputation.json +++ b/public/language/fr/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "Tous les votes sont publics", "thresholds": "Seuils d'activité", "min-rep-downvote": "Réputation minimum pour les votes négatifs", - "min-rep-flag": "Réputation minimum pour signaler un message" + "min-rep-flag": "Réputation minimum pour signaler un message", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/fr/error.json b/public/language/fr/error.json index 39111ba8a8..1141fc7a88 100644 --- a/public/language/fr/error.json +++ b/public/language/fr/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Les votes négatifs ne sont pas autorisés", "not-enough-reputation-to-downvote": "Vous n'avez pas une réputation assez élevée pour noter négativement ce message", "not-enough-reputation-to-flag": "Vous n'avez pas une réputation assez élevée pour signaler ce message", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Vous avez déjà signalé ce message", "self-vote": "Vous ne pouvez pas voter sur votre propre message", "reload-failed": "NodeBB a rencontré un problème lors du rechargement : \"% 1\" . NodeBB continuera de fonctionner côté client, même si vous devez annuler ce que vous avez fait juste avant de recharger .", diff --git a/public/language/fr/pages.json b/public/language/fr/pages.json index db9905b0ba..98abe48bd2 100644 --- a/public/language/fr/pages.json +++ b/public/language/fr/pages.json @@ -20,7 +20,7 @@ "users/search": "Rechercher des utilisateurs", "notifications": "Notifications", "tags": "Mots-clés", - "tag": "Sujets ayant le mot-clé \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Créer un compte", "registration-complete": "Inscription terminée", "login": "Connectez-vous à votre compte", diff --git a/public/language/gl/admin/appearance/customise.json b/public/language/gl/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/gl/admin/appearance/customise.json +++ b/public/language/gl/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/gl/admin/manage/tags.json b/public/language/gl/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/gl/admin/manage/tags.json +++ b/public/language/gl/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/gl/admin/manage/users.json b/public/language/gl/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/gl/admin/manage/users.json +++ b/public/language/gl/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/gl/admin/settings/reputation.json b/public/language/gl/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/gl/admin/settings/reputation.json +++ b/public/language/gl/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/gl/error.json b/public/language/gl/error.json index aa724b155e..5e049957ba 100644 --- a/public/language/gl/error.json +++ b/public/language/gl/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Os votos negativos están deshabilitados", "not-enough-reputation-to-downvote": "Non tes reputación dabonda para esta acción", "not-enough-reputation-to-flag": "Non tes reputación dabondo para reportar esta mensaxe.", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Xa reportache-la mensaxe.", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB atopou un erro mentras recargaba: \"%1\". NodeBB seguirá a servir os activos dos clientes aínda que se deberá desfacer o que se fixo antes da descarga.", diff --git a/public/language/gl/pages.json b/public/language/gl/pages.json index 1905a7909a..492d5f9a68 100644 --- a/public/language/gl/pages.json +++ b/public/language/gl/pages.json @@ -20,7 +20,7 @@ "users/search": "Búsqueda de usuarios", "notifications": "Notificacións", "tags": "Etiquetas", - "tag": "Temas etiquetados con \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Rexistrar conta", "registration-complete": "Rexistro completado", "login": "Ingresa coa túa conta", diff --git a/public/language/he/admin/appearance/customise.json b/public/language/he/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/he/admin/appearance/customise.json +++ b/public/language/he/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/he/admin/manage/tags.json b/public/language/he/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/he/admin/manage/tags.json +++ b/public/language/he/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/he/admin/manage/users.json b/public/language/he/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/he/admin/manage/users.json +++ b/public/language/he/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/he/admin/settings/reputation.json b/public/language/he/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/he/admin/settings/reputation.json +++ b/public/language/he/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/he/error.json b/public/language/he/error.json index cacf6851f0..b1968ec11b 100644 --- a/public/language/he/error.json +++ b/public/language/he/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "היכולת להצביע נגד לא פעילה", "not-enough-reputation-to-downvote": "אין לך מספיק מוניטין כדי להוריד את הדירוג של פוסט זה", "not-enough-reputation-to-flag": "אין לך מוניטין מספק על מנת לסמן את הפוסט הזה", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "כבר סימנת את הפוסט הזה", "self-vote": "You cannot vote on your own post", "reload-failed": "אירעה תקלה ב NodeBB בזמן הטעינה של: \"%1\". המערכת תמשיך להגיש דפים קיימים, אבל כדאי שתשחזר את הפעולות שלך מהפעם האחרונה שהמערכת עבדה כראוי.", diff --git a/public/language/he/pages.json b/public/language/he/pages.json index 8c16d257f9..46a6a2e446 100644 --- a/public/language/he/pages.json +++ b/public/language/he/pages.json @@ -20,7 +20,7 @@ "users/search": "חיפוש משתמשים", "notifications": "התראות", "tags": "תגיות", - "tag": "נושאים שתוייגו תחת \"%1\"", + "tag": "Topics tagged under "%1"", "register": "יצירת חשבון", "registration-complete": "ההרשמה הושלמה", "login": "התחבר לחשבונך", diff --git a/public/language/hr/admin/appearance/customise.json b/public/language/hr/admin/appearance/customise.json index ea5d0d5cc2..edd491a29b 100644 --- a/public/language/hr/admin/appearance/customise.json +++ b/public/language/hr/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "CSS po narudžbi", - "custom-css.description": "Unesi CSS deklaracije koje će biti upisane poslije svih stilova.", - "custom-css.enable": "Omogući dodatni CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/hr/admin/manage/tags.json b/public/language/hr/admin/manage/tags.json index 9976f4d310..ade0f1ac05 100644 --- a/public/language/hr/admin/manage/tags.json +++ b/public/language/hr/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Odaberite oznake klikom ili povlačenjem, koristite SHIFT za višestruki odabir.", "create": "Napravi oznaku", "modify": "Uredi oznake", + "rename": "Rename Tags", "delete": "Obriši odabrane oznake", "search": "Pretraži za oznake ...", "settings": "Kliknite ovdje za posjetu postavki oznaka", diff --git a/public/language/hr/admin/manage/users.json b/public/language/hr/admin/manage/users.json index fd266338e1..3d5a11b6d9 100644 --- a/public/language/hr/admin/manage/users.json +++ b/public/language/hr/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/hr/admin/settings/reputation.json b/public/language/hr/admin/settings/reputation.json index 71e4fab8b6..4aa5d92059 100644 --- a/public/language/hr/admin/settings/reputation.json +++ b/public/language/hr/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "Svi glasovi su javni", "thresholds": "Prag aktivnosti", "min-rep-downvote": "Minimalna reputacija za glasanje protiv", - "min-rep-flag": "Minimalna reputacija za označavanje objava" + "min-rep-flag": "Minimalna reputacija za označavanje objava", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/hr/error.json b/public/language/hr/error.json index 1d63f786d5..1943cb89c6 100644 --- a/public/language/hr/error.json +++ b/public/language/hr/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Oduzimanje glasova je onemogućeno", "not-enough-reputation-to-downvote": "Nemate dovoljno reputacije da bi ste glasali", "not-enough-reputation-to-flag": "Nemate dovoljno reputacije da bi stavili zastavicu na ovu objavu", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Već ste označili zastavicom ovu objavu", "self-vote": "You cannot vote on your own post", "reload-failed": "Problem kod ponovnog podizanja: \"%1\" will continue to serve the existing client-side assets.", diff --git a/public/language/hr/pages.json b/public/language/hr/pages.json index 5006de943c..240df3bf74 100644 --- a/public/language/hr/pages.json +++ b/public/language/hr/pages.json @@ -20,7 +20,7 @@ "users/search": "Pretraga korisnika", "notifications": "Obavijesti", "tags": "Oznake", - "tag": "Teme označene pod \\\"%1\\\"", + "tag": "Topics tagged under "%1"", "register": "Registrirajte se", "registration-complete": "Registracija uspješna", "login": "Prijavite se na Vaš račun", diff --git a/public/language/hu/admin/appearance/customise.json b/public/language/hu/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/hu/admin/appearance/customise.json +++ b/public/language/hu/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/hu/admin/manage/tags.json b/public/language/hu/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/hu/admin/manage/tags.json +++ b/public/language/hu/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/hu/admin/manage/users.json b/public/language/hu/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/hu/admin/manage/users.json +++ b/public/language/hu/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/hu/admin/settings/reputation.json b/public/language/hu/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/hu/admin/settings/reputation.json +++ b/public/language/hu/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/hu/error.json b/public/language/hu/error.json index dee4a7f170..ccfb9d1c6d 100644 --- a/public/language/hu/error.json +++ b/public/language/hu/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Leszavazás funkció kikapcsolva", "not-enough-reputation-to-downvote": "Nem rendelkezel elég Hírnév ponttal, hogy leszavazhasd ezt a hozzászólást", "not-enough-reputation-to-flag": "Nem rendelkezel elég Hírnév ponttal, hogy jelentsd ezt a hozzászólást", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "You have already flagged this post", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB egy hibát észlelt újratöltés közben: \"% 1\". A fórum továbbra is kiszolgálja a kliens-oldali eszközöket, bár vissza kellene csinálnod amit az újratöltés előtt elállítottál.", diff --git a/public/language/hu/pages.json b/public/language/hu/pages.json index c95afcff69..277526db0a 100644 --- a/public/language/hu/pages.json +++ b/public/language/hu/pages.json @@ -20,7 +20,7 @@ "users/search": "User Search", "notifications": "Értesítések", "tags": "Tags", - "tag": "Topics tagged under \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Register an account", "registration-complete": "Registration complete", "login": "Login to your account", diff --git a/public/language/id/admin/appearance/customise.json b/public/language/id/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/id/admin/appearance/customise.json +++ b/public/language/id/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/id/admin/manage/tags.json b/public/language/id/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/id/admin/manage/tags.json +++ b/public/language/id/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/id/admin/manage/users.json b/public/language/id/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/id/admin/manage/users.json +++ b/public/language/id/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/id/admin/settings/reputation.json b/public/language/id/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/id/admin/settings/reputation.json +++ b/public/language/id/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/id/error.json b/public/language/id/error.json index dda6bc2a0c..2fef7a6be6 100644 --- a/public/language/id/error.json +++ b/public/language/id/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Downvoting ditiadakan", "not-enough-reputation-to-downvote": "Tidak cukup reputation untuk downvote post ini", "not-enough-reputation-to-flag": "Tidak cukup reputation untuk flag post ini", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "You have already flagged this post", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB mengalami masalah saat memuat \"%1\". NodeBB akan melanjutkan pemuatan, kamu harus membatalkan tindakanmu sebelum pemuatan kembali dilakukan.", diff --git a/public/language/id/pages.json b/public/language/id/pages.json index 4f31aa71db..abcc622749 100644 --- a/public/language/id/pages.json +++ b/public/language/id/pages.json @@ -20,7 +20,7 @@ "users/search": "User Search", "notifications": "Pemberitahuan", "tags": "Tags", - "tag": "Topics tagged under \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Register an account", "registration-complete": "Registration complete", "login": "Login to your account", diff --git a/public/language/it/admin/appearance/customise.json b/public/language/it/admin/appearance/customise.json index b07dc4bf4f..4577354b4b 100644 --- a/public/language/it/admin/appearance/customise.json +++ b/public/language/it/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "CSS Personalizzato", - "custom-css.description": "Inserisci le tue dichiarazioni CSS qui, verranno applicate dopo tutti gli altri stili.", - "custom-css.enable": "Abilita CSS Personalizzato", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/it/admin/manage/tags.json b/public/language/it/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/it/admin/manage/tags.json +++ b/public/language/it/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/it/admin/manage/users.json b/public/language/it/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/it/admin/manage/users.json +++ b/public/language/it/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/it/admin/settings/reputation.json b/public/language/it/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/it/admin/settings/reputation.json +++ b/public/language/it/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/it/error.json b/public/language/it/error.json index 7d7668562b..4c4770fd8f 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Il Downvoting è disabilitato", "not-enough-reputation-to-downvote": "Non hai i privilegi per votare negativamente questo post", "not-enough-reputation-to-flag": "Tu non hai abbastanza reputazione per segnalare questo Post", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Hai già messo marcato questo post", "self-vote": "Non puoi votare la tua stessa discussione", "reload-failed": "NodeBB ha incontrato un problema durante il ricaricamento: \"%1\". NodeBB continuerà a servire gli assets esistenti lato client, così puoi annullare quello che hai fatto prima di ricaricare.", diff --git a/public/language/it/pages.json b/public/language/it/pages.json index 8db6e38e0c..cfa614e1c8 100644 --- a/public/language/it/pages.json +++ b/public/language/it/pages.json @@ -20,7 +20,7 @@ "users/search": "Ricerca Utenti", "notifications": "Notifiche", "tags": "Tags", - "tag": "Discussioni taggate \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Registrati", "registration-complete": "Registrazione completata", "login": "Autenticati", diff --git a/public/language/ja/admin/appearance/customise.json b/public/language/ja/admin/appearance/customise.json index 1cfa0dea9d..6c94263d97 100644 --- a/public/language/ja/admin/appearance/customise.json +++ b/public/language/ja/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "カスタムCSS", - "custom-css.description": "あなたのCSS設定をこちらに追加すると他のすべてのスタイルの後に適用されます。", - "custom-css.enable": "カスタムCSSを有効にする", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/ja/admin/manage/tags.json b/public/language/ja/admin/manage/tags.json index 2639e71b65..ae2b595a81 100644 --- a/public/language/ja/admin/manage/tags.json +++ b/public/language/ja/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "クリックまたは、クリックしながらドラッグでタグを選択し、Shiftキーを使用して複数のタグを選択します。", "create": "タグを作成", "modify": "タグを変更", + "rename": "Rename Tags", "delete": "指定されたタグを削除", "search": "タグを検索します...", "settings": "こちらをクリックしてタグ設定ページにアクセスしてください。", diff --git a/public/language/ja/admin/manage/users.json b/public/language/ja/admin/manage/users.json index 4033399e20..6b8ce0f2dd 100644 --- a/public/language/ja/admin/manage/users.json +++ b/public/language/ja/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/ja/admin/settings/reputation.json b/public/language/ja/admin/settings/reputation.json index 55eb244b59..05cd26486b 100644 --- a/public/language/ja/admin/settings/reputation.json +++ b/public/language/ja/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "すべての投票は公開されています", "thresholds": "アクティビティのしきい値", "min-rep-downvote": "投稿をdownvoteするための最低評価", - "min-rep-flag": "フラグの投稿に低評価" + "min-rep-flag": "フラグの投稿に低評価", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/ja/error.json b/public/language/ja/error.json index 29005d349e..a9ade29e12 100644 --- a/public/language/ja/error.json +++ b/public/language/ja/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "You have already flagged this post", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", diff --git a/public/language/ja/pages.json b/public/language/ja/pages.json index 4c962012a0..39a573b6cd 100644 --- a/public/language/ja/pages.json +++ b/public/language/ja/pages.json @@ -20,7 +20,7 @@ "users/search": "ユーザーを検索", "notifications": "通知", "tags": "タグ", - "tag": "スレッドは\"%1\"の下にタグ付けされました", + "tag": "Topics tagged under "%1"", "register": "アカウントを登録", "registration-complete": "登録完了", "login": "あなたのアカウントでログイン", diff --git a/public/language/ko/admin/appearance/customise.json b/public/language/ko/admin/appearance/customise.json index 0c0b028b98..7fc83ddd50 100644 --- a/public/language/ko/admin/appearance/customise.json +++ b/public/language/ko/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "사용자 정의 CSS", - "custom-css.description": "사용자 정의 CSS를 이곳에 입력하세요. 이 스타일들은 맨 마지막에 적용됩니다.", - "custom-css.enable": "사용자 정의 CSS 허용", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/ko/admin/manage/tags.json b/public/language/ko/admin/manage/tags.json index 979a5a8af2..8e0fde510d 100644 --- a/public/language/ko/admin/manage/tags.json +++ b/public/language/ko/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "태그를 클릭하거나 드래그해서 선택하고, Shift 를 눌러 다중 선택하세요.", "create": "태그 생성", "modify": "태그 수정", + "rename": "Rename Tags", "delete": "선택된 태그 삭제", "search": "태그 검색", "settings": "태그 설정 페이지를 방문하시려면 클릭하세요", diff --git a/public/language/ko/admin/manage/users.json b/public/language/ko/admin/manage/users.json index 8f8be1bb9d..bac6329a8a 100644 --- a/public/language/ko/admin/manage/users.json +++ b/public/language/ko/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/ko/admin/settings/reputation.json b/public/language/ko/admin/settings/reputation.json index b6e5eea171..763ca5ed83 100644 --- a/public/language/ko/admin/settings/reputation.json +++ b/public/language/ko/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "모든 투표는 공개적입니다.", "thresholds": "포럼 활동 기준선", "min-rep-downvote": "평판이 낮아 이 게시물을 다운보트할 수 없습니다.", - "min-rep-flag": "평판이 낮아 이 게시물을 신고할 수 없습니다." + "min-rep-flag": "평판이 낮아 이 게시물을 신고할 수 없습니다.", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/ko/error.json b/public/language/ko/error.json index afd7a6971f..65d648c2d6 100644 --- a/public/language/ko/error.json +++ b/public/language/ko/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "비추천 기능이 비활성 상태입니다.", "not-enough-reputation-to-downvote": "인지도가 낮아 이 포스트를 비추천할 수 없습니다.", "not-enough-reputation-to-flag": "인지도가 낮아 이 포스트를 신고할 수 없습니다.", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "이미 이 게시물을 신고했습니다.", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB 서버를 다시 읽어들이는 중 다음과 같은 문제가 발생했으나 사용자측은 지속적으로 자원을 제공받습니다. 오류 문구: \"%1\" 문제를 해결하시려면 다시 읽어들이기 전의 수정사항을 원래대로 되돌려주세요. ", diff --git a/public/language/ko/pages.json b/public/language/ko/pages.json index 14ae3df009..2185d9af8f 100644 --- a/public/language/ko/pages.json +++ b/public/language/ko/pages.json @@ -20,7 +20,7 @@ "users/search": "사용자 검색", "notifications": "알림", "tags": "태그", - "tag": "\"%1\" 태그가 달린 게시물", + "tag": "Topics tagged under "%1"", "register": "회원가입", "registration-complete": "회원가입 완료", "login": "로그인", diff --git a/public/language/lt/admin/appearance/customise.json b/public/language/lt/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/lt/admin/appearance/customise.json +++ b/public/language/lt/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/lt/admin/manage/tags.json b/public/language/lt/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/lt/admin/manage/tags.json +++ b/public/language/lt/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/lt/admin/manage/users.json b/public/language/lt/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/lt/admin/manage/users.json +++ b/public/language/lt/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/lt/admin/settings/reputation.json b/public/language/lt/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/lt/admin/settings/reputation.json +++ b/public/language/lt/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/lt/error.json b/public/language/lt/error.json index 9b4417df2c..49e5b36a56 100644 --- a/public/language/lt/error.json +++ b/public/language/lt/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Downvoting yra išjungtas", "not-enough-reputation-to-downvote": "Jūs neturite pakankamai reputacijos balsuoti prieš šį pranešimą", "not-enough-reputation-to-flag": "Jūs neturite pakankamai reputacijos kad įspėti dėl šito pranešimo", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Jūs jau pranešėte apie šį pranešimą", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB susidūrė su problema persikraunant: \"%1\", NodeBB pratęs veikti su šiuo klientu. bet jums reiktu patikrinti ką jūs darėte prieš perkraunant NodeBB", diff --git a/public/language/lt/pages.json b/public/language/lt/pages.json index f9832ee4e8..17d6e79b1e 100644 --- a/public/language/lt/pages.json +++ b/public/language/lt/pages.json @@ -20,7 +20,7 @@ "users/search": "User Search", "notifications": "Pranešimai", "tags": "Žymos", - "tag": "Temos su šia žymą \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Register an account", "registration-complete": "Registration complete", "login": "Login to your account", diff --git a/public/language/ms/admin/appearance/customise.json b/public/language/ms/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/ms/admin/appearance/customise.json +++ b/public/language/ms/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/ms/admin/manage/tags.json b/public/language/ms/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/ms/admin/manage/tags.json +++ b/public/language/ms/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/ms/admin/manage/users.json b/public/language/ms/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/ms/admin/manage/users.json +++ b/public/language/ms/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/ms/admin/settings/reputation.json b/public/language/ms/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/ms/admin/settings/reputation.json +++ b/public/language/ms/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/ms/error.json b/public/language/ms/error.json index 6ee242d1e8..49b4eff2f7 100644 --- a/public/language/ms/error.json +++ b/public/language/ms/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Undi turun dilumpuhkan", "not-enough-reputation-to-downvote": "Anda tidak mempunyai reputasi mencukupi untuk mengundi turun kiriman ini", "not-enough-reputation-to-flag": "Anda tidak mempunyai reputasi mencukupi untuk menanda kiriman ini", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Anda telah menanda kiriman ini", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB menemui masalah ketika muat semula: \"%1\". NodeBB akan terus melayan aset pelanggan sedia ada, tapi anda seharusnya undur perbuatan yang dilakukan sebelum muat semula.", diff --git a/public/language/ms/pages.json b/public/language/ms/pages.json index e453c913b0..46ee974c6a 100644 --- a/public/language/ms/pages.json +++ b/public/language/ms/pages.json @@ -20,7 +20,7 @@ "users/search": "Carian Pengguna", "notifications": "Makluman", "tags": "Tag", - "tag": "Topik ditag di bawwah \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Daftar Akaun", "registration-complete": "Registration complete", "login": "Log Masuk Ke Akaun Anda", diff --git a/public/language/nb/admin/appearance/customise.json b/public/language/nb/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/nb/admin/appearance/customise.json +++ b/public/language/nb/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/nb/admin/manage/tags.json b/public/language/nb/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/nb/admin/manage/tags.json +++ b/public/language/nb/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/nb/admin/manage/users.json b/public/language/nb/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/nb/admin/manage/users.json +++ b/public/language/nb/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/nb/admin/settings/reputation.json b/public/language/nb/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/nb/admin/settings/reputation.json +++ b/public/language/nb/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/nb/error.json b/public/language/nb/error.json index ae75444c26..6ee7a60e37 100644 --- a/public/language/nb/error.json +++ b/public/language/nb/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Nedstemming er deaktivert", "not-enough-reputation-to-downvote": "Du har ikke nok rykte til å nedstemme det innlegget", "not-enough-reputation-to-flag": "Du har ikke nok rykte til å flagge dette innlegget", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Du har allerede flagget dette innlegget", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB støtte på et problem under lasting på nytt: \"%1\". NodeBB vil fortsette å servere eksisterende klientside ressurser, selv om du burde angre endringene du gjorde før du lastet på nytt.", diff --git a/public/language/nb/pages.json b/public/language/nb/pages.json index e474ed3462..3355803d11 100644 --- a/public/language/nb/pages.json +++ b/public/language/nb/pages.json @@ -20,7 +20,7 @@ "users/search": "Brukersøk", "notifications": "Varsler", "tags": "Emneord", - "tag": "Emner under emneord \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Registrer en konto", "registration-complete": "Registration complete", "login": "Logg inn på kontoen din", diff --git a/public/language/nl/admin/appearance/customise.json b/public/language/nl/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/nl/admin/appearance/customise.json +++ b/public/language/nl/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/nl/admin/manage/tags.json b/public/language/nl/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/nl/admin/manage/tags.json +++ b/public/language/nl/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/nl/admin/manage/users.json b/public/language/nl/admin/manage/users.json index fbfa4cebab..2b11bcf109 100644 --- a/public/language/nl/admin/manage/users.json +++ b/public/language/nl/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/nl/admin/settings/reputation.json b/public/language/nl/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/nl/admin/settings/reputation.json +++ b/public/language/nl/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/nl/error.json b/public/language/nl/error.json index 0c62777a3e..a35e67fa8a 100644 --- a/public/language/nl/error.json +++ b/public/language/nl/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Negatief stemmen is uitgeschakeld", "not-enough-reputation-to-downvote": "Je hebt onvoldoende reputatie om een negatieve stem uit te mogen brengen", "not-enough-reputation-to-flag": "Je hebt onvoldoende reputatie om dit bericht aan de beheerders te mogen melden", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Je hebt deze post al gerapporteerd", "self-vote": "Het is niet mogelijk om op je eigen bericht te stemmen", "reload-failed": "Tijdens het herladen van \"%1\" is NodeBB een fout of probleem tegengekomen. NodeBB blijft operationeel. Echter het is verstandig om de oorzaak te onderzoeken en wellicht de vorige actie, voor het herladen, ongedaan te maken.", diff --git a/public/language/nl/pages.json b/public/language/nl/pages.json index f7d9059c8c..e4b8d02d44 100644 --- a/public/language/nl/pages.json +++ b/public/language/nl/pages.json @@ -20,7 +20,7 @@ "users/search": "Zoek Gebruiker", "notifications": "Notificaties", "tags": "Tags", - "tag": "Onderwerpen geplaatst onder \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Registeer een gebruikersaccount", "registration-complete": "Registratie compleet", "login": "Login met u gebruikersaccount in", diff --git a/public/language/pl/admin/appearance/customise.json b/public/language/pl/admin/appearance/customise.json index 116fde835f..8cc162c784 100644 --- a/public/language/pl/admin/appearance/customise.json +++ b/public/language/pl/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Własny CSS", - "custom-css.description": "Wprowadź tu własne deklaracje CSS, będą one zastosowane po wszystkich innych stylach.", - "custom-css.enable": "Włącz własne style CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/pl/admin/manage/tags.json b/public/language/pl/admin/manage/tags.json index 5f03cfad07..76846c2318 100644 --- a/public/language/pl/admin/manage/tags.json +++ b/public/language/pl/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Wybierz tagi poprzez klikanie lub przeciąganie, użyj przycisku shift do zaznaczenia wielu.", "create": "Utwórz tag", "modify": "Modyfikuj tagi", + "rename": "Rename Tags", "delete": "Usuń zaznaczone tagi", "search": "Szukanie tagów...", "settings": "Kliknij tutaj, aby odwiedzić stronę zarządzania tagami.", diff --git a/public/language/pl/admin/manage/users.json b/public/language/pl/admin/manage/users.json index d1f2db41b5..11b8b82d2e 100644 --- a/public/language/pl/admin/manage/users.json +++ b/public/language/pl/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/pl/admin/settings/reputation.json b/public/language/pl/admin/settings/reputation.json index 7be597f408..3a094d358b 100644 --- a/public/language/pl/admin/settings/reputation.json +++ b/public/language/pl/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "Wszystkie głosy są publiczne", "thresholds": "Progi aktywności", "min-rep-downvote": "Minimalna reputacja, aby negatywnie oceniać posty", - "min-rep-flag": "Minimalna reputacja, aby flagować posty" + "min-rep-flag": "Minimalna reputacja, aby flagować posty", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/pl/error.json b/public/language/pl/error.json index 1588a4286b..1d1e69cc59 100644 --- a/public/language/pl/error.json +++ b/public/language/pl/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Negatywna ocena postów jest wyłączona", "not-enough-reputation-to-downvote": "Masz za mało reputacji, aby negatywnie ocenić ten post", "not-enough-reputation-to-flag": "Nie masz dość reputacji, by flagować ten post", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Ten post jest już przez Ciebie oznaczony", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB napotkało problem w czasie przeładowywania \"%1\". Forum będzie nadal dostarczać istniejące zasoby strony klienta, jednak powinieneś cofnąć ostatnią akcję.", diff --git a/public/language/pl/pages.json b/public/language/pl/pages.json index 164e7bc8b9..051ee072ff 100644 --- a/public/language/pl/pages.json +++ b/public/language/pl/pages.json @@ -20,7 +20,7 @@ "users/search": "Wyszukiwanie Użytkownków", "notifications": "Powiadomienia", "tags": "Tagi", - "tag": "Tematy oznaczone jako \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Utwórz konto", "registration-complete": "Rejestracja przebiegła pomyślnie", "login": "Zaloguj się na swoje konto", diff --git a/public/language/pt-BR/admin/appearance/customise.json b/public/language/pt-BR/admin/appearance/customise.json index df52770144..7a1a264dc1 100644 --- a/public/language/pt-BR/admin/appearance/customise.json +++ b/public/language/pt-BR/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "CSS Personalizado", - "custom-css.description": "Entre com as suas próprias declarações de CSS aqui, as quais serão aplicadas após todos os outros estilos.", - "custom-css.enable": "Habilitar CSS Personalizado", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/pt-BR/admin/manage/tags.json b/public/language/pt-BR/admin/manage/tags.json index 4bf5b27a3e..0238b8b673 100644 --- a/public/language/pt-BR/admin/manage/tags.json +++ b/public/language/pt-BR/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Escolha tags clicando e/ou arrastando, use shift para escolher diversas.", "create": "Criar Tag", "modify": "Modificar Tags", + "rename": "Rename Tags", "delete": "Excluir Tags Selecionadas", "search": "Pesquisar por tags...", "settings": "Clique aqui para visitar a página de configurações de tag.", diff --git a/public/language/pt-BR/admin/manage/users.json b/public/language/pt-BR/admin/manage/users.json index 47aceaae4e..dddb844840 100644 --- a/public/language/pt-BR/admin/manage/users.json +++ b/public/language/pt-BR/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/pt-BR/admin/settings/reputation.json b/public/language/pt-BR/admin/settings/reputation.json index 3dbd88f69b..d90317f1c8 100644 --- a/public/language/pt-BR/admin/settings/reputation.json +++ b/public/language/pt-BR/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "Todos os Votos São Públicos", "thresholds": "Limiares de Atividade", "min-rep-downvote": "Reputação mínima para votar negativamente em posts", - "min-rep-flag": "Reputação mínima para sinalizar posts" + "min-rep-flag": "Reputação mínima para sinalizar posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/pt-BR/error.json b/public/language/pt-BR/error.json index b9dde075aa..5f7373fb2a 100644 --- a/public/language/pt-BR/error.json +++ b/public/language/pt-BR/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Negativação está desabilitada", "not-enough-reputation-to-downvote": "Você não possui reputação suficiente para negativar este post", "not-enough-reputation-to-flag": "Você não possui reputação suficiente para sinalizar este post", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Você já sinalizou esse post", "self-vote": "You cannot vote on your own post", "reload-failed": "O NodeBB encontrou um problema ao recarregar: \"%1\". O NodeBB continuará a servir os assets existentes no lado do cliente, apesar de que você deve desfazer o que você fez antes de recarregar.", diff --git a/public/language/pt-BR/pages.json b/public/language/pt-BR/pages.json index ddc6f8ddba..79decd6e4f 100644 --- a/public/language/pt-BR/pages.json +++ b/public/language/pt-BR/pages.json @@ -20,7 +20,7 @@ "users/search": "Pesquisa de Usuários", "notifications": "Notificações", "tags": "Tags", - "tag": "Tópicos com a tag \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Registrar uma conta", "registration-complete": "Registro completado", "login": "Entrar na sua conta", diff --git a/public/language/pt-PT/admin/appearance/customise.json b/public/language/pt-PT/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/pt-PT/admin/appearance/customise.json +++ b/public/language/pt-PT/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/pt-PT/admin/manage/tags.json b/public/language/pt-PT/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/pt-PT/admin/manage/tags.json +++ b/public/language/pt-PT/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/pt-PT/admin/manage/users.json b/public/language/pt-PT/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/pt-PT/admin/manage/users.json +++ b/public/language/pt-PT/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/pt-PT/admin/settings/reputation.json b/public/language/pt-PT/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/pt-PT/admin/settings/reputation.json +++ b/public/language/pt-PT/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/pt-PT/error.json b/public/language/pt-PT/error.json index edee308307..75c51cdf54 100644 --- a/public/language/pt-PT/error.json +++ b/public/language/pt-PT/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Voto negativo desativado", "not-enough-reputation-to-downvote": "Não tens reputação suficiente para atribuir um voto negativo a esta publicação", "not-enough-reputation-to-flag": "Não tens reputação suficiente para sinalizar esta publicação", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Já sinalizaste esta publicação", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB encontrou um erro enquanto recarregava: \"%1\". NodeBB irá continuar a servir os ativos existentes do lado do utilizador. No entanto deverias desfazer o que fizeste mesmo antes de teres voltado a recarregar.", diff --git a/public/language/pt-PT/pages.json b/public/language/pt-PT/pages.json index b1c743cef2..635a2c7eb1 100644 --- a/public/language/pt-PT/pages.json +++ b/public/language/pt-PT/pages.json @@ -20,7 +20,7 @@ "users/search": "Pesquisa por utilizadores", "notifications": "Notificações", "tags": "Marcadores", - "tag": "Tópicos marcados sobre \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Registar uma conta", "registration-complete": "Registro completo", "login": "Faz login na tua conta", diff --git a/public/language/ro/admin/appearance/customise.json b/public/language/ro/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/ro/admin/appearance/customise.json +++ b/public/language/ro/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/ro/admin/manage/tags.json b/public/language/ro/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/ro/admin/manage/tags.json +++ b/public/language/ro/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/ro/admin/manage/users.json b/public/language/ro/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/ro/admin/manage/users.json +++ b/public/language/ro/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/ro/admin/settings/reputation.json b/public/language/ro/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/ro/admin/settings/reputation.json +++ b/public/language/ro/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/ro/error.json b/public/language/ro/error.json index b073fa351b..f32d8fd74f 100644 --- a/public/language/ro/error.json +++ b/public/language/ro/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Votarea negativă este dezactivată", "not-enough-reputation-to-downvote": "Nu ai destulă reputație pentru a vota negativ acest post.", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "You have already flagged this post", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB a întâmpinat o problemă la reîncarcare: \"%1\". NodeBB va continua să servească fișierele existente pentru partea-client, dar tu va trebuie să refaci modificările pe care le-ai facut înainte de reîncarcare.", diff --git a/public/language/ro/pages.json b/public/language/ro/pages.json index 08a8f44065..7324e850c5 100644 --- a/public/language/ro/pages.json +++ b/public/language/ro/pages.json @@ -20,7 +20,7 @@ "users/search": "User Search", "notifications": "Notificări", "tags": "Taguri", - "tag": "Topics tagged under \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Înregistrează un cont nou", "registration-complete": "Registration complete", "login": "Login to your account", diff --git a/public/language/ru/admin/appearance/customise.json b/public/language/ru/admin/appearance/customise.json index a5f4192172..275ad2b36c 100644 --- a/public/language/ru/admin/appearance/customise.json +++ b/public/language/ru/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Свой CSS", - "custom-css.description": "Введите свои собственные данные CSS здесь, которые будут применяться после всех других стилей.", - "custom-css.enable": "Включить пользовательский CSS", + "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-js": "Каcтомный Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/ru/admin/manage/tags.json b/public/language/ru/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/ru/admin/manage/tags.json +++ b/public/language/ru/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/ru/admin/manage/users.json b/public/language/ru/admin/manage/users.json index b9881c50d6..31ab48bbbb 100644 --- a/public/language/ru/admin/manage/users.json +++ b/public/language/ru/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/ru/admin/settings/reputation.json b/public/language/ru/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/ru/admin/settings/reputation.json +++ b/public/language/ru/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/ru/error.json b/public/language/ru/error.json index 53afa007f5..e46a905f5e 100644 --- a/public/language/ru/error.json +++ b/public/language/ru/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Понижение оценки отключено", "not-enough-reputation-to-downvote": "У вас недостаточно репутации для понижения оценки сообщения", "not-enough-reputation-to-flag": "У Вас недостаточно репутации, чтобы пометить это сообщение.", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Вы уже отметили это сообщение", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB обнаружил проблему при перезагрузке: \"%1\". NodeBB продолжит работать с существующими ресурсами клиента, но вы должны отменить то, что сделали перед перезагрузкой.", diff --git a/public/language/ru/pages.json b/public/language/ru/pages.json index 0085cab21e..7eabfad92f 100644 --- a/public/language/ru/pages.json +++ b/public/language/ru/pages.json @@ -20,7 +20,7 @@ "users/search": "Поиск участников", "notifications": "Уведомления", "tags": "Метки", - "tag": "Темы с меткой \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Зарегистрироваться", "registration-complete": "Регистрация завершена", "login": "Войти", diff --git a/public/language/rw/admin/appearance/customise.json b/public/language/rw/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/rw/admin/appearance/customise.json +++ b/public/language/rw/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/rw/admin/manage/tags.json b/public/language/rw/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/rw/admin/manage/tags.json +++ b/public/language/rw/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/rw/admin/manage/users.json b/public/language/rw/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/rw/admin/manage/users.json +++ b/public/language/rw/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/rw/admin/settings/reputation.json b/public/language/rw/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/rw/admin/settings/reputation.json +++ b/public/language/rw/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/rw/error.json b/public/language/rw/error.json index 904ba7c0e4..6424d2514e 100644 --- a/public/language/rw/error.json +++ b/public/language/rw/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Kwambura amanota ntibyemerewe", "not-enough-reputation-to-downvote": "Ntabwo ufite amanota ahagije ngo ube wakwemererwa kugira uwo wambura amanota", "not-enough-reputation-to-flag": "Ntabwo ufite amanota ahagije ngo ube wakwemererwa gutambikana uyu muntu", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Wari waramaze gutambikana ibi", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB yahuye n'ingorane mu gihe cy'ipakira: \"%1\". NodeBB irakomeza kuzana ibyo yari ifite ku ruhande rw'imbere nubwo ufite kuba wasubira inyuma ugafata ibyo wari wakoze mbere yo gupakira. ", diff --git a/public/language/rw/pages.json b/public/language/rw/pages.json index 14b11dbf8e..06c69fe27a 100644 --- a/public/language/rw/pages.json +++ b/public/language/rw/pages.json @@ -20,7 +20,7 @@ "users/search": "Gushaka Abantu", "notifications": "Amatangazo", "tags": "Ibimenyetso", - "tag": "Ibiganiro bifite ibimenyetso bya \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Fungura Konte", "registration-complete": "Registration complete", "login": "Injira muri konte yawe", diff --git a/public/language/sc/admin/appearance/customise.json b/public/language/sc/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/sc/admin/appearance/customise.json +++ b/public/language/sc/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/sc/admin/manage/tags.json b/public/language/sc/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/sc/admin/manage/tags.json +++ b/public/language/sc/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/sc/admin/manage/users.json b/public/language/sc/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/sc/admin/manage/users.json +++ b/public/language/sc/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/sc/admin/settings/reputation.json b/public/language/sc/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/sc/admin/settings/reputation.json +++ b/public/language/sc/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/sc/error.json b/public/language/sc/error.json index 9455f37138..282b07f9e1 100644 --- a/public/language/sc/error.json +++ b/public/language/sc/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Downvoting is disabled", "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post", "not-enough-reputation-to-flag": "You do not have enough reputation to flag this post", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "You have already flagged this post", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", diff --git a/public/language/sc/pages.json b/public/language/sc/pages.json index b874ae4816..52ce7479f6 100644 --- a/public/language/sc/pages.json +++ b/public/language/sc/pages.json @@ -20,7 +20,7 @@ "users/search": "User Search", "notifications": "Notìficas", "tags": "Tags", - "tag": "Topics tagged under \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Register an account", "registration-complete": "Registration complete", "login": "Login to your account", diff --git a/public/language/sk/admin/appearance/customise.json b/public/language/sk/admin/appearance/customise.json index 645165e105..56c11a2805 100644 --- a/public/language/sk/admin/appearance/customise.json +++ b/public/language/sk/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Vlastné CSS", - "custom-css.description": "Zadajte svoje vlastné deklarácie CSS, ktoré budú použité po všetkých ostatných štýloch.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/sk/admin/manage/tags.json b/public/language/sk/admin/manage/tags.json index c0a40543f2..e6167a6502 100644 --- a/public/language/sk/admin/manage/tags.json +++ b/public/language/sk/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Odstrániť vybraté značky", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/sk/admin/manage/users.json b/public/language/sk/admin/manage/users.json index c19bd6fae8..2637f3ca4a 100644 --- a/public/language/sk/admin/manage/users.json +++ b/public/language/sk/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/sk/admin/settings/reputation.json b/public/language/sk/admin/settings/reputation.json index 61086436b7..8f16ea635b 100644 --- a/public/language/sk/admin/settings/reputation.json +++ b/public/language/sk/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "Všetky hlasy sú verejné", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimálna reputácia pre označenie prízpevku" + "min-rep-flag": "Minimálna reputácia pre označenie prízpevku", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/sk/error.json b/public/language/sk/error.json index ec28687064..f180ed7cac 100644 --- a/public/language/sk/error.json +++ b/public/language/sk/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Hlasovanie proti je zablokované", "not-enough-reputation-to-downvote": "Nemáte dostatočnú reputáciu k odobratiu hlasu pre tento príspevok", "not-enough-reputation-to-flag": "Nemáte dostatočnú reputáciu na označenie tohto príspevku", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Už ste označili tento príspevok", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB narazil na problém pri načítaní: \"%1\". NodeBB bude pokračovať v službe existujúcej aktívnej klientskej strane, aj keď by ste mali vrátiť to, čo ste spravili tesne pred znovu načítaním.", diff --git a/public/language/sk/pages.json b/public/language/sk/pages.json index fc16e33e21..dcf241c9c9 100644 --- a/public/language/sk/pages.json +++ b/public/language/sk/pages.json @@ -20,7 +20,7 @@ "users/search": "Hľadanie užívateľov", "notifications": "Oznámenia", "tags": "Značky", - "tag": "Témy pod značkou \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Zaregistrovať účet", "registration-complete": "Registrácia úspešná", "login": "Prihlásiť sa do účtu", diff --git a/public/language/sl/admin/appearance/customise.json b/public/language/sl/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/sl/admin/appearance/customise.json +++ b/public/language/sl/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/sl/admin/manage/tags.json b/public/language/sl/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/sl/admin/manage/tags.json +++ b/public/language/sl/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/sl/admin/manage/users.json b/public/language/sl/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/sl/admin/manage/users.json +++ b/public/language/sl/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/sl/admin/settings/reputation.json b/public/language/sl/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/sl/admin/settings/reputation.json +++ b/public/language/sl/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/sl/error.json b/public/language/sl/error.json index 7cd9394991..fc6a67f629 100644 --- a/public/language/sl/error.json +++ b/public/language/sl/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Negativno glasovanje je onemogočeno.", "not-enough-reputation-to-downvote": "Nimate dovolj ugleda za negativno glasovanje.", "not-enough-reputation-to-flag": "Nimate dovolj ugleda za prijavo te objave.", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "To objavo ste že prijavili.", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB je zaznal težavo pri osveževanju: ", diff --git a/public/language/sl/pages.json b/public/language/sl/pages.json index 1c89d3d848..718c0c13dc 100644 --- a/public/language/sl/pages.json +++ b/public/language/sl/pages.json @@ -20,7 +20,7 @@ "users/search": "Iskanje uporabnikov", "notifications": "Obvestila", "tags": "Oznake", - "tag": "Teme označene kot \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Registriraj svoj račun.", "registration-complete": "Registracija končana", "login": "Prijavi se v svoj račun.", diff --git a/public/language/sr/admin/appearance/customise.json b/public/language/sr/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/sr/admin/appearance/customise.json +++ b/public/language/sr/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/sr/admin/manage/tags.json b/public/language/sr/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/sr/admin/manage/tags.json +++ b/public/language/sr/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/sr/admin/manage/users.json b/public/language/sr/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/sr/admin/manage/users.json +++ b/public/language/sr/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/sr/admin/settings/reputation.json b/public/language/sr/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/sr/admin/settings/reputation.json +++ b/public/language/sr/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/sr/error.json b/public/language/sr/error.json index 3ec59d1194..c376dcb952 100644 --- a/public/language/sr/error.json +++ b/public/language/sr/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Негативно гласање је онемогућено", "not-enough-reputation-to-downvote": "Немате довољно велики углед да бисте негативно гласали за ову поруку", "not-enough-reputation-to-flag": "Немате довољно велики углед да бисте означили заставицом ову поруку", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Већ сте означили заставицом ову поруку", "self-vote": "Не можете гласати за своју поруку", "reload-failed": "NodeBB је наишао на проблем док се поново учитавао: \"%1\". NodeBB ће наставити да опслужује постојећа клијентска средства , иако би требало да опозовете оно што сте урадили пре поновног учитавања.", diff --git a/public/language/sr/pages.json b/public/language/sr/pages.json index b7391c0af5..f0f5e3d24a 100644 --- a/public/language/sr/pages.json +++ b/public/language/sr/pages.json @@ -20,7 +20,7 @@ "users/search": "Претрага корисника", "notifications": "Обавештења", "tags": "Ознаке", - "tag": "Теме са ознаком „%1“", + "tag": "Topics tagged under "%1"", "register": "Региструј налог", "registration-complete": "Регистрација је комплетирана", "login": "Пријавите се на ваш налог", diff --git a/public/language/sv/admin/appearance/customise.json b/public/language/sv/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/sv/admin/appearance/customise.json +++ b/public/language/sv/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/sv/admin/manage/tags.json b/public/language/sv/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/sv/admin/manage/tags.json +++ b/public/language/sv/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/sv/admin/manage/users.json b/public/language/sv/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/sv/admin/manage/users.json +++ b/public/language/sv/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/sv/admin/settings/reputation.json b/public/language/sv/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/sv/admin/settings/reputation.json +++ b/public/language/sv/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/sv/error.json b/public/language/sv/error.json index 2b7d6a23fa..0c0f9284e0 100644 --- a/public/language/sv/error.json +++ b/public/language/sv/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Nedröstning är inaktiverat", "not-enough-reputation-to-downvote": "Du har inte tillräckligt förtroende för att rösta ner det här meddelandet", "not-enough-reputation-to-flag": "Du har inte tillräckligt förtroende för att flagga det här inlägget.", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Du har redan flaggat det här inlägget", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB stötte på problem med att ladda om: \"%1\". NodeBB kommer fortsätta servera befintliga resurser till klienten, men du borde återställa det du gjorde innan du försökte ladda om.", diff --git a/public/language/sv/pages.json b/public/language/sv/pages.json index ba7a8219f7..22c215fe94 100644 --- a/public/language/sv/pages.json +++ b/public/language/sv/pages.json @@ -20,7 +20,7 @@ "users/search": "Användar Sök", "notifications": "Notiser", "tags": "Etiketter", - "tag": "Ämnen märkta med \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Registrera ett konto", "registration-complete": "Registrering färdig", "login": "Logga in på ditt konto", diff --git a/public/language/th/admin/appearance/customise.json b/public/language/th/admin/appearance/customise.json index 2f715a9bfc..d56161484f 100644 --- a/public/language/th/admin/appearance/customise.json +++ b/public/language/th/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "ปรับแต่ง CSS", - "custom-css.description": "ใส่ CSS ของคุณที่นี่, มันจะถูกนำไปใช้ต่อจากสไตล์อื่นๆ", - "custom-css.enable": "เปิดการปรับแต่ง CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/th/admin/manage/tags.json b/public/language/th/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/th/admin/manage/tags.json +++ b/public/language/th/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/th/admin/manage/users.json b/public/language/th/admin/manage/users.json index b7cd34e4ff..cfee0ac620 100644 --- a/public/language/th/admin/manage/users.json +++ b/public/language/th/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/th/admin/settings/reputation.json b/public/language/th/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/th/admin/settings/reputation.json +++ b/public/language/th/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/th/error.json b/public/language/th/error.json index e084c9f572..87514dedca 100644 --- a/public/language/th/error.json +++ b/public/language/th/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "\"การโหวตลง\" ถูกปิดใช้งาน", "not-enough-reputation-to-downvote": "คุณไม่มีชื่อเสียงพอที่จะโหวตโพสต์นี้ลง", "not-enough-reputation-to-flag": "คุณไม่มีชื่อเสียงพอที่จะปักธงให้โพสต์นี้", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "คุณได้ปักธงให้โพสต์นี้แล้ว", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB encountered a problem while reloading: \"%1\". NodeBB will continue to serve the existing client-side assets, although you should undo what you did just prior to reloading.", diff --git a/public/language/th/pages.json b/public/language/th/pages.json index 307430b4ab..52b9a8a38e 100644 --- a/public/language/th/pages.json +++ b/public/language/th/pages.json @@ -20,7 +20,7 @@ "users/search": "ค้นหาผู้ใช้", "notifications": "การแจ้งเตือน", "tags": "แท็ก", - "tag": "กระทู้ที่ถูกติดแท็กภายใต้ \"%1\"", + "tag": "Topics tagged under "%1"", "register": "สมัครบัญชีผู้ใช้", "registration-complete": "สมัครสมาชิกสำเร็จเรียบร้อย", "login": "เข้าสู่ระบบบัญชีของคุณ", diff --git a/public/language/tr/admin/appearance/customise.json b/public/language/tr/admin/appearance/customise.json index ae428da7f4..0594c4b024 100644 --- a/public/language/tr/admin/appearance/customise.json +++ b/public/language/tr/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Özel CSS", - "custom-css.description": "Özel CSS kodlarınızı bu alana girin.", - "custom-css.enable": "Özel CSS Etkinleştir", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/tr/admin/manage/tags.json b/public/language/tr/admin/manage/tags.json index 12b5e6c305..401e0e7ffc 100644 --- a/public/language/tr/admin/manage/tags.json +++ b/public/language/tr/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Tıklayarak ve/veya sürükleyerek etiketleri seçin, birden çok seçmek için kaydırın.", "create": "Etiket Oluştur", "modify": "Etiketleri Düzenle", + "rename": "Rename Tags", "delete": "Seçili Etiketleri Sil", "search": "Etiketleri ara...", "settings": "Etiket yönetim sayfasını ziyaret etmek için buraya tıklayın.", diff --git a/public/language/tr/admin/manage/users.json b/public/language/tr/admin/manage/users.json index b5321d7291..f23517c351 100644 --- a/public/language/tr/admin/manage/users.json +++ b/public/language/tr/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/tr/admin/settings/reputation.json b/public/language/tr/admin/settings/reputation.json index 040bfab944..6af829a0c0 100644 --- a/public/language/tr/admin/settings/reputation.json +++ b/public/language/tr/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "Tüm Oylar Herkese Açık", "thresholds": "Activity Thresholds", "min-rep-downvote": "Eksilenen iletiler için minimum itibar", - "min-rep-flag": "Bayraklı iletiler için minimum itibar" + "min-rep-flag": "Bayraklı iletiler için minimum itibar", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/tr/error.json b/public/language/tr/error.json index 0d81a1b0de..fa7a6b6b8d 100644 --- a/public/language/tr/error.json +++ b/public/language/tr/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Aşagı oylama kapatılmış", "not-enough-reputation-to-downvote": "Bu iletiyi eksilemek için yeterince itibarınız yok.", "not-enough-reputation-to-flag": "Bu iletiyi bayraklamak için yeterince itibarınız yok", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Bu iletiyi zaten bayrakladınız", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB tekrar yüklenirken bir sorunla karşılaştı: “%1“. NodeBB varolan dosyaları servis etmeye devam edecek.", diff --git a/public/language/tr/pages.json b/public/language/tr/pages.json index 5056f72773..ad5a4dafb4 100644 --- a/public/language/tr/pages.json +++ b/public/language/tr/pages.json @@ -20,7 +20,7 @@ "users/search": "Kullanıcı Ara", "notifications": "Bildirimler", "tags": "Etiketler", - "tag": "“%1“ ile etiketlenmiş konular", + "tag": "Topics tagged under "%1"", "register": "Bir hesap aç", "registration-complete": "Kayıt tamamlandı", "login": "Hesabına giriş yap", diff --git a/public/language/uk/admin/appearance/customise.json b/public/language/uk/admin/appearance/customise.json index 20528f77e9..b85d6c8ecf 100644 --- a/public/language/uk/admin/appearance/customise.json +++ b/public/language/uk/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Користувацькі CSS", - "custom-css.description": "Уведіть власні CSS правила, що будуть примінені після всіх інших стилів.", - "custom-css.enable": "Увімкнути користувацькі CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/uk/admin/manage/tags.json b/public/language/uk/admin/manage/tags.json index 6638741f36..b47e84a1cf 100644 --- a/public/language/uk/admin/manage/tags.json +++ b/public/language/uk/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Виберіть теги тиснучи або перетягуючи. Використовуйте Shift, щоб обрати декілька.", "create": "Створити тег", "modify": "Змінити тег", + "rename": "Rename Tags", "delete": "Видалити вибрані теги", "search": "Пошук тегів...", "settings": "Натисніть тут щоб перейти на сторінку налаштування тегів.", diff --git a/public/language/uk/admin/manage/users.json b/public/language/uk/admin/manage/users.json index c83ff3959e..d061626f0e 100644 --- a/public/language/uk/admin/manage/users.json +++ b/public/language/uk/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/uk/admin/settings/reputation.json b/public/language/uk/admin/settings/reputation.json index d69bd9b0c8..40efe9e9cd 100644 --- a/public/language/uk/admin/settings/reputation.json +++ b/public/language/uk/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "Всі голоси публічні", "thresholds": "Допуски активності", "min-rep-downvote": "Мінімальна репутація для голосування проти постів", - "min-rep-flag": "Мінімальна репутація для подання скарг на пости" + "min-rep-flag": "Мінімальна репутація для подання скарг на пости", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/uk/error.json b/public/language/uk/error.json index 27e1d09984..7895056bb5 100644 --- a/public/language/uk/error.json +++ b/public/language/uk/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Голосування проти вимкнено", "not-enough-reputation-to-downvote": "У вас недостатньо репутації, щоб голосувати проти цього посту", "not-enough-reputation-to-flag": "У вас недостатньо репутації, щоб помітити цей пост", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Ви вже помітили цей пост", "self-vote": "You cannot vote on your own post", "reload-failed": "У NodeBB виникла проблема при перевантаженні: \"%1\". NodeBB продовжить надавати існуючі клієнтські ресурси, проте радимо вам скасувати те, що було зроблено до перевантаження.", diff --git a/public/language/uk/pages.json b/public/language/uk/pages.json index 291476c0af..656200c87e 100644 --- a/public/language/uk/pages.json +++ b/public/language/uk/pages.json @@ -20,7 +20,7 @@ "users/search": "Пошук користувача", "notifications": "Сповіщення", "tags": "Теги", - "tag": "Теми з тегом \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Зареєструвати акаунт", "registration-complete": "Реєстрацію завершено", "login": "Увійдіть в свій акаунт", diff --git a/public/language/vi/admin/appearance/customise.json b/public/language/vi/admin/appearance/customise.json index a1220ec96d..56c11a2805 100644 --- a/public/language/vi/admin/appearance/customise.json +++ b/public/language/vi/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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-js": "Custom Javascript", "custom-js.description": "Enter your own javascript here. It will be executed after the page is loaded completely.", diff --git a/public/language/vi/admin/manage/tags.json b/public/language/vi/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/vi/admin/manage/tags.json +++ b/public/language/vi/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/vi/admin/manage/users.json b/public/language/vi/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/vi/admin/manage/users.json +++ b/public/language/vi/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/vi/admin/settings/reputation.json b/public/language/vi/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/vi/admin/settings/reputation.json +++ b/public/language/vi/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/vi/error.json b/public/language/vi/error.json index a153763af8..1dafaeed1f 100644 --- a/public/language/vi/error.json +++ b/public/language/vi/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "Downvote đã bị tắt", "not-enough-reputation-to-downvote": "Bạn không có đủ phiếu tín nhiệm để downvote bài này", "not-enough-reputation-to-flag": "Bạn không đủ tín nhiệm để đánh dấu bài viết này", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "Bạn đã gắn cờ cho bài viết này", "self-vote": "Bạn không thể tự bầu cho bài đăng của mình", "reload-failed": "NodeBB gặp lỗi trong khi tải lại: \"%1\". NodeBB sẽ tiếp tục hoạt động với dữ liệu trước đó, tuy nhiên bạn nên tháo gỡ những gì bạn vừa thực hiện trước khi tải lại.", diff --git a/public/language/vi/pages.json b/public/language/vi/pages.json index 94b0ad46bd..aaaf1fa196 100644 --- a/public/language/vi/pages.json +++ b/public/language/vi/pages.json @@ -20,7 +20,7 @@ "users/search": "Tìm kiếm thành viên", "notifications": "Thông báo", "tags": "Tag", - "tag": "Chủ đề được gắn tag \"%1\"", + "tag": "Topics tagged under "%1"", "register": "Đăng ký một tài khoản mới", "registration-complete": "Đăng ký hoàn tất", "login": "Đăng nhập vào tài khoản của bạn", diff --git a/public/language/zh-CN/admin/appearance/customise.json b/public/language/zh-CN/admin/appearance/customise.json index 8dfb53f0b1..f6cebac470 100644 --- a/public/language/zh-CN/admin/appearance/customise.json +++ b/public/language/zh-CN/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "custom-css": "自定义 CSS", - "custom-css.description": "在这里输入自定义 CSS 变量声明，它们将被添加在样式中。", - "custom-css.enable": "启用自定义 CSS", + "custom-css": "自定义 CSS/LESS", + "custom-css.description": "在这里输入你想应用于所有其他风格的 CSS/LESS,", + "custom-css.enable": "启用自定义 CSS/LESS", "custom-js": "自定义 Javascript", "custom-js.description": "在这里输入你想在页面加载完成后执行的 Javascript 代码。", diff --git a/public/language/zh-CN/admin/manage/categories.json b/public/language/zh-CN/admin/manage/categories.json index 63f94bdebe..11b0edf6fc 100644 --- a/public/language/zh-CN/admin/manage/categories.json +++ b/public/language/zh-CN/admin/manage/categories.json @@ -10,7 +10,7 @@ "custom-class": "自定义 Class", "num-recent-replies": "最近回复数", "ext-link": "外部链接", - "is-section": "将该板块作为段落", + "is-section": "将该版块作为段落", "upload-image": "上传图片", "delete-image": "移除", "category-image": "版块图片", diff --git a/public/language/zh-CN/admin/manage/groups.json b/public/language/zh-CN/admin/manage/groups.json index dc2149046f..ece5256910 100644 --- a/public/language/zh-CN/admin/manage/groups.json +++ b/public/language/zh-CN/admin/manage/groups.json @@ -1,7 +1,7 @@ { "name": "群组名", "description": "群组描述", - "member-count": "成员数", + "member-count": "成员数量", "system": "系统群组", "edit": "编辑", "search-placeholder": "搜索", @@ -10,9 +10,9 @@ "create-button": "创建", "alerts.create-failure": "哦不！

创建您的群组时出现问题。 请稍后再试！

", - "alerts.confirm-delete": "确认要删除这个群组么？", + "alerts.confirm-delete": "你确定要删除此群组吗？", - "edit.name": "名字", + "edit.name": "名称", "edit.description": "描述", "edit.user-title": "成员标题", "edit.icon": "群组标志", diff --git a/public/language/zh-CN/admin/manage/tags.json b/public/language/zh-CN/admin/manage/tags.json index bef7caba4e..3c8394d360 100644 --- a/public/language/zh-CN/admin/manage/tags.json +++ b/public/language/zh-CN/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "通过点击或拖动选择话题，按住shift进行多选。", "create": "创建话题", "modify": "修改话题", + "rename": "重命名话题", "delete": "删除所选话题", "search": "搜索话题...", "settings": "点击此处 访问话题设置页面。", diff --git a/public/language/zh-CN/admin/manage/users.json b/public/language/zh-CN/admin/manage/users.json index 0f40eb3e68..1db4cafdc1 100644 --- a/public/language/zh-CN/admin/manage/users.json +++ b/public/language/zh-CN/admin/manage/users.json @@ -30,7 +30,7 @@ "search.uid": "通过用户名", "search.uid-placeholder": "搜索用户ID", "search.username": "通过用户名", - "search.username-placeholder": "输入你想找的用户名", + "search.username-placeholder": "输入你想查询的用户名", "search.email": "通过邮箱", "search.email-placeholder": "输入你想查询的邮箱地址", "search.ip": "通过IP地址", @@ -68,18 +68,18 @@ "alerts.ban-success": "用户已封禁！", "alerts.button-ban-x": "封禁 %1 名用户", "alerts.unban-success": "用户已解封!", - "alerts.lockout-reset-success": "闭锁已重置！", + "alerts.lockout-reset-success": "锁定已重置！", "alerts.flag-reset-success": "举报已重置！", "alerts.no-remove-yourself-admin": "你无法撤销自己的管理员身份！", - "alerts.make-admin-success": "用户已成为管理员", - "alerts.confirm-remove-admin": "真的想要删除这个管理员？", - "alerts.remove-admin-success": "此用户不再是管理员", + "alerts.make-admin-success": "该用户已成为管理员", + "alerts.confirm-remove-admin": "你确定要删除该管理员？", + "alerts.remove-admin-success": " 该用户不再是管理员", "alerts.make-global-mod-success": " 该用户已成为管理员", - "alerts.confirm-remove-global-mod": "您确定要删除此管理员？", - "alerts.remove-global-mod-success": "该用户不再是管理员了", + "alerts.confirm-remove-global-mod": "你确定要删除该管理员？", + "alerts.remove-global-mod-success": "该用户已不再是管理员", "alerts.make-moderator-success": " 该用户已成为管理员", - "alerts.confirm-remove-moderator": "您确定要删除此管理员？", - "alerts.remove-moderator-success": "该用户不再是管理员了", + "alerts.confirm-remove-moderator": "你确定要删除此管理员？", + "alerts.remove-moderator-success": "该用户已不再是管理员", "alerts.confirm-validate-email": "你确定要验证这些用户的电子邮箱吗？", "alerts.validate-email-success": "电子邮箱已验证", "alerts.password-reset-confirm": "你确定要向这些用户发送密码重置邮件吗？", diff --git a/public/language/zh-CN/admin/settings/reputation.json b/public/language/zh-CN/admin/settings/reputation.json index ec3f657d1e..775c975840 100644 --- a/public/language/zh-CN/admin/settings/reputation.json +++ b/public/language/zh-CN/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "所有投票是公开的", "thresholds": "活动闸值", "min-rep-downvote": "踩帖子所需要声望的最小值", - "min-rep-flag": "举报帖子需要的最小声望" + "min-rep-flag": "举报帖子需要的最小声望", + "min-rep-website": "设置网站所需要的最小声望", + "min-rep-aboutme": "设置关于我所需要的最小声望", + "min-rep-signature": "设置签名档所需要的最小声望" } \ No newline at end of file diff --git a/public/language/zh-CN/error.json b/public/language/zh-CN/error.json index 087018bcd3..9c5344881a 100644 --- a/public/language/zh-CN/error.json +++ b/public/language/zh-CN/error.json @@ -17,7 +17,7 @@ "invalid-login-credentials": "无效登录凭证", "invalid-username-or-password": "请确认用户名和密码", "invalid-search-term": "无效的搜索关键字", - "invalid-url": "Invalid URL", + "invalid-url": "无效的 URL", "csrf-invalid": "可能是由于会话过期，登录失败。请重试。", "invalid-pagination-value": "无效的分页数值，必须介于 %1 和 %2 之间", "username-taken": "此用户名已被占用", @@ -114,13 +114,16 @@ "cant-edit-chat-message": "您不能编辑这条信息", "cant-remove-last-user": "您不能移除这个用户", "cant-delete-chat-message": "您不允许删除这条消息", - "chat-edit-duration-expired": "You are only allowed to edit chat messages for %1 second(s) after posting", - "chat-delete-duration-expired": "You are only allowed to delete chat messages for %1 second(s) after posting", + "chat-edit-duration-expired": "您只能在发布 %1 秒后修改聊天信息", + "chat-delete-duration-expired": "您只能在发布 %1 秒后删除聊天信息", "already-voting-for-this-post": "您已为此帖回复投过票了。", "reputation-system-disabled": "声望系统已禁用。", "downvoting-disabled": "踩已被禁用", "not-enough-reputation-to-downvote": "您的声望不足以踩此帖", "not-enough-reputation-to-flag": "您的声望不足以举报此帖", + "not-enough-reputation-min-rep-website": "你的声望不足以设置网站", + "not-enough-reputation-min-rep-aboutme": "你的声望不足以设置关于我", + "not-enough-reputation-min-rep-signature": "你的声望不足以设置签名档", "already-flagged": "您已举报此帖", "self-vote": "你不能在您自己的帖子内投票", "reload-failed": "刷新 NodeBB 时遇到问题: \"%1\"。NodeBB 保持给已连接的客户端服务，您应该撤销刷新前做的更改。", diff --git a/public/language/zh-CN/global.json b/public/language/zh-CN/global.json index f0bff3fb22..7bc70157b7 100644 --- a/public/language/zh-CN/global.json +++ b/public/language/zh-CN/global.json @@ -53,7 +53,7 @@ "topics": "主题", "posts": "帖子", "best": "最佳", - "votes": "Votes", + "votes": "投票", "upvoters": "顶的人", "upvoted": "顶", "downvoters": "踩的人", diff --git a/public/language/zh-CN/pages.json b/public/language/zh-CN/pages.json index d79b7111f3..754ecf9eff 100644 --- a/public/language/zh-CN/pages.json +++ b/public/language/zh-CN/pages.json @@ -20,7 +20,7 @@ "users/search": "会员搜索", "notifications": "提醒", "tags": "话题", - "tag": "\"%1\" 下的主题", + "tag": "Topics tagged under "%1"", "register": "注册帐号", "registration-complete": "注册完成", "login": "登录帐号", diff --git a/public/language/zh-CN/unread.json b/public/language/zh-CN/unread.json index 54932aef1d..a1e5751a7c 100644 --- a/public/language/zh-CN/unread.json +++ b/public/language/zh-CN/unread.json @@ -9,7 +9,7 @@ "topics_marked_as_read.success": "主题被标为已读！", "all-topics": "全部主题", "new-topics": "新建主题", - "watched-topics": "看过的主题", + "watched-topics": "关注主题", "unreplied-topics": "未回复主题", "multiple-categories-selected": "多选" } \ No newline at end of file diff --git a/public/language/zh-TW/admin/advanced/errors.json b/public/language/zh-TW/admin/advanced/errors.json index a0fefb4190..1b29af32d4 100644 --- a/public/language/zh-TW/admin/advanced/errors.json +++ b/public/language/zh-TW/admin/advanced/errors.json @@ -8,7 +8,7 @@ "clear-error-log": "清除錯誤日誌", "route": "路由", "count": "計數", - "no-routes-not-found": "Hooray! No 404 errors!", + "no-routes-not-found": "萬歲！沒有404 錯誤！", "clear404-confirm": "您確定要清除404錯誤日誌嗎?", "clear404-success": "\"404 Not Found\" 錯誤已清除" } \ No newline at end of file diff --git a/public/language/zh-TW/admin/advanced/events.json b/public/language/zh-TW/admin/advanced/events.json index 766eb5e951..acbc890fb2 100644 --- a/public/language/zh-TW/admin/advanced/events.json +++ b/public/language/zh-TW/admin/advanced/events.json @@ -1,6 +1,6 @@ { - "events": "Events", - "no-events": "There are no events", - "control-panel": "Events Control Panel", - "delete-events": "Delete Events" + "events": "事件", + "no-events": "沒有事件", + "control-panel": "事件控制面板", + "delete-events": "刪除事件" } \ No newline at end of file diff --git a/public/language/zh-TW/admin/advanced/logs.json b/public/language/zh-TW/admin/advanced/logs.json index b9de400e1c..c01e1dce11 100644 --- a/public/language/zh-TW/admin/advanced/logs.json +++ b/public/language/zh-TW/admin/advanced/logs.json @@ -1,7 +1,7 @@ { - "logs": "Logs", - "control-panel": "Logs Control Panel", - "reload": "Reload Logs", - "clear": "Clear Logs", - "clear-success": "Logs Cleared!" + "logs": "日誌", + "control-panel": "日誌控制面板", + "reload": "重載日誌", + "clear": "清除日誌", + "clear-success": "清除日誌！" } \ No newline at end of file diff --git a/public/language/zh-TW/admin/appearance/customise.json b/public/language/zh-TW/admin/appearance/customise.json index a1220ec96d..c663326724 100644 --- a/public/language/zh-TW/admin/appearance/customise.json +++ b/public/language/zh-TW/admin/appearance/customise.json @@ -1,13 +1,13 @@ { - "custom-css": "Custom CSS", - "custom-css.description": "Enter your own CSS declarations here, which will be applied after all other styles.", - "custom-css.enable": "Enable Custom CSS", + "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", + "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.enable": "Enable Custom Header", diff --git a/public/language/zh-TW/admin/manage/tags.json b/public/language/zh-TW/admin/manage/tags.json index db40e9f098..df597a6166 100644 --- a/public/language/zh-TW/admin/manage/tags.json +++ b/public/language/zh-TW/admin/manage/tags.json @@ -6,6 +6,7 @@ "description": "Select tags via clicking and/or dragging, use shift to select multiple.", "create": "Create Tag", "modify": "Modify Tags", + "rename": "Rename Tags", "delete": "Delete Selected Tags", "search": "Search for tags...", "settings": "Click here to visit the tag settings page.", diff --git a/public/language/zh-TW/admin/manage/users.json b/public/language/zh-TW/admin/manage/users.json index 9dcc1a0f32..2e4cfa2a5c 100644 --- a/public/language/zh-TW/admin/manage/users.json +++ b/public/language/zh-TW/admin/manage/users.json @@ -76,7 +76,7 @@ "alerts.remove-admin-success": "User is no longer administrator.", "alerts.make-global-mod-success": "User is now global moderator.", "alerts.confirm-remove-global-mod": "Do you really want to remove this global moderator?", - "alerts.remove-global-mod-success": "User is no longer global noderator", + "alerts.remove-global-mod-success": "User is no longer global moderator.", "alerts.make-moderator-success": "User is now moderator.", "alerts.confirm-remove-moderator": "Do you really want to remove this moderator?", "alerts.remove-moderator-success": "User is no longer moderator.", diff --git a/public/language/zh-TW/admin/settings/reputation.json b/public/language/zh-TW/admin/settings/reputation.json index f0e59e8db9..c698592cff 100644 --- a/public/language/zh-TW/admin/settings/reputation.json +++ b/public/language/zh-TW/admin/settings/reputation.json @@ -5,5 +5,8 @@ "votes-are-public": "All Votes Are Public", "thresholds": "Activity Thresholds", "min-rep-downvote": "Minimum reputation to downvote posts", - "min-rep-flag": "Minimum reputation to flag posts" + "min-rep-flag": "Minimum reputation to flag posts", + "min-rep-website": "Minimum reputation to add \"Website\" to user profile", + "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", + "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" } \ No newline at end of file diff --git a/public/language/zh-TW/error.json b/public/language/zh-TW/error.json index 07bfbb39ed..325fa6d8f5 100644 --- a/public/language/zh-TW/error.json +++ b/public/language/zh-TW/error.json @@ -121,6 +121,9 @@ "downvoting-disabled": "反向投票已停用", "not-enough-reputation-to-downvote": "你沒有足夠的信譽可以對這個張貼進行反向投票", "not-enough-reputation-to-flag": "你沒有足夠的信譽來舉報這個帖子", + "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", + "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", + "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", "already-flagged": "你已經對這個張貼標記過了", "self-vote": "You cannot vote on your own post", "reload-failed": "NodeBB重載\"%1\"時遇到了問題。 NodeBB將繼續提供現有的客戶端資源，但請你撤消重載前的動作。", diff --git a/public/language/zh-TW/pages.json b/public/language/zh-TW/pages.json index b512e4c36a..43749be35d 100644 --- a/public/language/zh-TW/pages.json +++ b/public/language/zh-TW/pages.json @@ -20,7 +20,7 @@ "users/search": "使用者搜尋", "notifications": "新訊息通知", "tags": "標籤", - "tag": "有\"%1\"標籤的主題", + "tag": "Topics tagged under "%1"", "register": "註冊帳號", "registration-complete": "Registration complete", "login": "登入帳號", From da981c8d74a568fc8a08b948a3652c71eac648a2 Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Sun, 21 Jan 2018 09:24:36 +0000 Subject: [PATCH 18/24] Latest translations and fallbacks --- .../bg/admin/appearance/customise.json | 6 +-- public/language/bg/admin/manage/tags.json | 2 +- public/language/bg/admin/manage/users.json | 4 +- .../bg/admin/settings/reputation.json | 6 +-- public/language/bg/error.json | 6 +-- public/language/bg/pages.json | 2 +- public/language/it/flags.json | 44 +++++++++---------- public/language/it/pages.json | 6 +-- .../tr/admin/appearance/customise.json | 4 +- public/language/tr/admin/manage/users.json | 2 +- .../language/tr/admin/settings/general.json | 2 +- public/language/tr/error.json | 22 +++++----- public/language/tr/global.json | 2 +- public/language/tr/notifications.json | 30 ++++++------- public/language/tr/pages.json | 2 +- public/language/tr/topic.json | 6 +-- public/language/zh-CN/pages.json | 2 +- 17 files changed, 74 insertions(+), 74 deletions(-) diff --git a/public/language/bg/admin/appearance/customise.json b/public/language/bg/admin/appearance/customise.json index f36cbd8fb0..ddc5aa4354 100644 --- a/public/language/bg/admin/appearance/customise.json +++ b/public/language/bg/admin/appearance/customise.json @@ -1,7 +1,7 @@ { - "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": "Персонализиран код на Javascript", "custom-js.description": "Въведете свой собствен код на javascript тук. Той ще бъде изпълнен след като страницата се зареди напълно.", diff --git a/public/language/bg/admin/manage/tags.json b/public/language/bg/admin/manage/tags.json index bcfcd9395e..b9131ee925 100644 --- a/public/language/bg/admin/manage/tags.json +++ b/public/language/bg/admin/manage/tags.json @@ -6,7 +6,7 @@ "description": "Изберете етикетите чрез щракване и/или влачене. Използвайте „Shift“, за да изберете няколко етикета.", "create": "Създаване на етикет", "modify": "Редактиране на етикети", - "rename": "Rename Tags", + "rename": "Преименуване на етикети", "delete": "Изтриване на избраните етикети", "search": "Търсене на етикети…", "settings": "Натиснете тук, за да отворите страницата с настройки на етикета.", diff --git a/public/language/bg/admin/manage/users.json b/public/language/bg/admin/manage/users.json index 618fce3735..07f066ae64 100644 --- a/public/language/bg/admin/manage/users.json +++ b/public/language/bg/admin/manage/users.json @@ -76,10 +76,10 @@ "alerts.remove-admin-success": "Потребителят вече няма да бъде администратор.", "alerts.make-global-mod-success": "Потребителят вече ще бъде глобален модератор.", "alerts.confirm-remove-global-mod": "Наистина ли искате да премахнете този глобален модератор?", - "alerts.remove-global-mod-success": "User is no longer global moderator.", + "alerts.remove-global-mod-success": "Потребителят вече няма да бъде глобален модератор.", "alerts.make-moderator-success": "Потребителят вече ще бъде модератор.", "alerts.confirm-remove-moderator": "Наистина ли искате да премахнете този модератор?", - "alerts.remove-moderator-success": "Потребителят вече ще бъде модератор.", + "alerts.remove-moderator-success": "Потребителят вече няма да бъде модератор.", "alerts.confirm-validate-email": "Искате ли да проверите е-пощата/ите на този/тези потребител(и)?", "alerts.validate-email-success": "Е-пощите са проверени", "alerts.password-reset-confirm": "Искате ли да изпратите е-писмо/а за възстановяване на паролата на този/тези потребител(и)?", diff --git a/public/language/bg/admin/settings/reputation.json b/public/language/bg/admin/settings/reputation.json index d4e0681d31..7a75a46352 100644 --- a/public/language/bg/admin/settings/reputation.json +++ b/public/language/bg/admin/settings/reputation.json @@ -6,7 +6,7 @@ "thresholds": "Ограничения на дейността", "min-rep-downvote": "Минимална репутация, необходима за отрицателно гласуване за публикации", "min-rep-flag": "Минимална репутация, необходима за докладване на публикации", - "min-rep-website": "Minimum reputation to add \"Website\" to user profile", - "min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile", - "min-rep-signature": "Minimum reputation to add \"Signature\" to user profile" + "min-rep-website": "Минимална репутация, необходима за добавяне на полето „Уебсайт“ към профила на потребителя", + "min-rep-aboutme": "Минимална репутация, необходима за добавяне на полето „За мен“ към профила на потребителя", + "min-rep-signature": "Минимална репутация, необходима за добавяне на полето „Подпис“ към профила на потребителя" } \ No newline at end of file diff --git a/public/language/bg/error.json b/public/language/bg/error.json index f95c55fcc7..bebe6bb668 100644 --- a/public/language/bg/error.json +++ b/public/language/bg/error.json @@ -121,9 +121,9 @@ "downvoting-disabled": "Отрицателното гласуване е изключено", "not-enough-reputation-to-downvote": "Нямате достатъчно репутация, за да гласувате отрицателно за тази публикация", "not-enough-reputation-to-flag": "Нямате достатъчно репутация, за да докладвате тази публикация", - "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", - "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", - "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", + "not-enough-reputation-min-rep-website": "Нямате достатъчно репутация, за да добавите уеб сайт", + "not-enough-reputation-min-rep-aboutme": "Нямате достатъчно репутация, за да добавите информация за себе си", + "not-enough-reputation-min-rep-signature": "Нямате достатъчно репутация, за да добавите подпис", "already-flagged": "Вече сте докладвали тази публикация", "self-vote": "Не можете да гласувате за собствената си публикация", "reload-failed": "NodeBB срещна проблем при презареждането: „%1“. NodeBB ще продължи да поддържа съществуващите клиентски ресурси, но Вие трябва да отмените последните си действия преди презареждането.", diff --git a/public/language/bg/pages.json b/public/language/bg/pages.json index e5ecc460f0..1a1fcae72c 100644 --- a/public/language/bg/pages.json +++ b/public/language/bg/pages.json @@ -20,7 +20,7 @@ "users/search": "Търсене на потребители", "notifications": "Известия", "tags": "Етикети", - "tag": "Topics tagged under "%1"", + "tag": "Теми отбелязани като „%1“", "register": "Регистриране на акаунт", "registration-complete": "Регистрацията е завършена", "login": "Впишете се в акаунта си", diff --git a/public/language/it/flags.json b/public/language/it/flags.json index 14aaf7af02..e6b7a013d5 100644 --- a/public/language/it/flags.json +++ b/public/language/it/flags.json @@ -2,53 +2,53 @@ "state": "State", "reporter": "Reporter", "reported-at": "Reported At", - "description": "Description", - "no-flags": "Hooray! No flags found.", + "description": "Descrizione", + "no-flags": "Hurra! nessun flag trovato", "assignee": "Assignee", - "update": "Update", - "updated": "Updated", + "update": "Aggiornamento", + "updated": "Aggiornato", "target-purged": "The content this flag referred to has been purged and is no longer available.", - "quick-filters": "Quick Filters", - "filter-active": "There are one or more filters active in this list of flags", - "filter-reset": "Remove Filters", - "filters": "Filter Options", + "quick-filters": "Filtri rapidi", + "filter-active": "Ci sono uno o più filtri attivi in questa lista di flag", + "filter-reset": "Rimuovi filtri", + "filters": "Opzioni filtri", "filter-reporterId": "Reporter UID", "filter-targetUid": "Flagged UID", "filter-type": "Flag Type", - "filter-type-all": "All Content", + "filter-type-all": "Tutto il contenuto", "filter-type-post": "Post", "filter-state": "State", "filter-assignee": "Assignee UID", - "filter-cid": "Category", - "filter-quick-mine": "Assigned to me", - "filter-cid-all": "All categories", - "apply-filters": "Apply Filters", + "filter-cid": "Categoria", + "filter-quick-mine": "Assegnato a me", + "filter-cid-all": "Tutte le categorie", + "apply-filters": "Applica filtri", - "quick-links": "Quick Links", + "quick-links": "Collegamenti veloci", "flagged-user": "Flagged User", "view-profile": "Vedi Profilo", - "start-new-chat": "Start New Chat", + "start-new-chat": "Inizia una nuova chat", "go-to-target": "View Flag Target", "user-view": "Vedi Profilo", "user-edit": "Modifica Profilo", "notes": "Flag Notes", - "add-note": "Add Note", - "no-notes": "No shared notes.", + "add-note": "Aggiungi nota", + "no-notes": "Nessuna nota condivisa", - "history": "Flag History", + "history": "Cronologia flag", "back": "Back to Flags List", - "no-history": "No flag history.", + "no-history": "Nessuna cronologia flag", "state-all": "All states", - "state-open": "New/Open", + "state-open": "Nuovo/Apri", "state-wip": "Lavori in Corso", "state-resolved": "Risolto", - "state-rejected": "Rejected", + "state-rejected": "Rifiutato", "no-assignee": "Non Assegnato", - "note-added": "Note Added", + "note-added": "Nota aggiunta", "modal-title": "Segnala Contenuto Inappropriato", "modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.", diff --git a/public/language/it/pages.json b/public/language/it/pages.json index cfa614e1c8..1e7676ffdf 100644 --- a/public/language/it/pages.json +++ b/public/language/it/pages.json @@ -6,11 +6,11 @@ "popular-month": "Discussioni popolari questo mese", "popular-alltime": "Discussioni più popolari di sempre", "recent": "Discussioni Recenti", - "top": "Top Voted Topics", - "moderator-tools": "Moderator Tools", + "top": "Discussioni più votate", + "moderator-tools": "Strumenti di moderazione", "flagged-content": "Contenuti Segnalati", "ip-blacklist": "Lista nera degli IP", - "post-queue": "Post Queue", + "post-queue": "Post in coda", "users/online": "Utenti Online", "users/latest": "Ultimi Utenti", "users/sort-posts": "Utenti maggiori contributori", diff --git a/public/language/tr/admin/appearance/customise.json b/public/language/tr/admin/appearance/customise.json index 0594c4b024..a561e58641 100644 --- a/public/language/tr/admin/appearance/customise.json +++ b/public/language/tr/admin/appearance/customise.json @@ -1,9 +1,9 @@ { - "custom-css": "Custom CSS/LESS", + "custom-css": "Özel 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-js": "Custom Javascript", + "custom-js": "Özel 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", diff --git a/public/language/tr/admin/manage/users.json b/public/language/tr/admin/manage/users.json index f23517c351..735d97bef8 100644 --- a/public/language/tr/admin/manage/users.json +++ b/public/language/tr/admin/manage/users.json @@ -6,7 +6,7 @@ "validate-email": "E-postayı Doğrula", "send-validation-email": "Onay E-postası Gönder", "password-reset-email": "E-posta Sıfırlaması için Parola Gönder", - "ban": "Ban User(s)", + "ban": "Yasaklı Kullanıcı(lar)", "temp-ban": "Ban User(s) Temporarily", "unban": "Unban User(s)", "reset-lockout": "Reset Lockout", diff --git a/public/language/tr/admin/settings/general.json b/public/language/tr/admin/settings/general.json index 1854a05187..d876543e42 100644 --- a/public/language/tr/admin/settings/general.json +++ b/public/language/tr/admin/settings/general.json @@ -1,7 +1,7 @@ { "site-settings": "Site Ayarları", "title": "Site Başlığı", - "title.url": "URL", + "title.url": "Bağlantı", "title.url-placeholder": "The URL of the site title", "title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.", "title.name": "Topluluk İsmi", diff --git a/public/language/tr/error.json b/public/language/tr/error.json index fa7a6b6b8d..cbe8b8f393 100644 --- a/public/language/tr/error.json +++ b/public/language/tr/error.json @@ -11,13 +11,13 @@ "invalid-uid": "Geçersiz Kullanıcı ID", "invalid-username": "Geçersiz Kullanıcı İsmi", "invalid-email": "Geçersiz E-posta", - "invalid-title": "Invalid title", + "invalid-title": "Geçersiz başlık", "invalid-user-data": "Geçersiz Kullancı Verisi", "invalid-password": "Geçersiz Şifre", "invalid-login-credentials": "Geçersiz kimlik bilgileri", "invalid-username-or-password": "Lütfen kullanıcı ismi ve parola girin.", "invalid-search-term": "Geçersiz arama", - "invalid-url": "Invalid URL", + "invalid-url": "Geçersiz bağlantı", "csrf-invalid": "Büyük olasılıkla süresi dolmuş oturum nedeniyle girişinizi geçersiz kıldık. Lütfen tekrar deneyiniz.", "invalid-pagination-value": "Geçersiz sayfalama değeri, en az %1 ve en fazla %2 olabilir", "username-taken": "Kullanıcı İsmi Alınmış", @@ -82,7 +82,7 @@ "cant-ban-other-admins": "Başka yöneticileri yasaklayamazsınız!", "cant-remove-last-admin": "Tek yönetici sizsiniz. Kendinizi adminlikten çıkarmadan önce başka bir kullanıcıyı admin olarak ekleyiniz", "cant-delete-admin": "Öncelikle yönetici izinlerini kaldırman gerekiyor.", - "invalid-image": "Invalid image", + "invalid-image": "Geçersiz görsel", "invalid-image-type": "Geçersiz resim uzantısı. Izin verilen uzantılar: %1", "invalid-image-extension": "Geçersiz resim uzantısı", "invalid-file-type": "Geçersiz dosya türü. İzin verilenler şunlar : %1", @@ -114,24 +114,24 @@ "cant-edit-chat-message": "Bu mesajı düzenlemek için izin verilmez", "cant-remove-last-user": "Son kullanıcıyı silemezsiniz", "cant-delete-chat-message": "Bu mesajı silmek için izin verilmez", - "chat-edit-duration-expired": "You are only allowed to edit chat messages for %1 second(s) after posting", - "chat-delete-duration-expired": "You are only allowed to delete chat messages for %1 second(s) after posting", + "chat-edit-duration-expired": "Gönderildikten sonra yalnızca %1 saniye mesajı(ları) düzenlemene izin verilir", + "chat-delete-duration-expired": "Gönderildikten sonra yalnızca %1 saniye mesajı(ları) silmene izin verilir", "already-voting-for-this-post": "Bu gönderi için zaten oy verdin.", "reputation-system-disabled": "İtibar sistemi devre dışı.", "downvoting-disabled": "Aşagı oylama kapatılmış", "not-enough-reputation-to-downvote": "Bu iletiyi eksilemek için yeterince itibarınız yok.", "not-enough-reputation-to-flag": "Bu iletiyi bayraklamak için yeterince itibarınız yok", - "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", - "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", - "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", + "not-enough-reputation-min-rep-website": "Bir website eklemek için yeterli saygınlığa sahip değilsin", + "not-enough-reputation-min-rep-aboutme": "Hakkında kısmını doldurabilmek için yeterli saygınlığa sahip değilsin", + "not-enough-reputation-min-rep-signature": "İmza eklemek için yeterli saygınlığa sahip değilsin", "already-flagged": "Bu iletiyi zaten bayrakladınız", - "self-vote": "You cannot vote on your own post", + "self-vote": "Kendi iletinize oy veremezsiniz", "reload-failed": "NodeBB tekrar yüklenirken bir sorunla karşılaştı: “%1“. NodeBB varolan dosyaları servis etmeye devam edecek.", "registration-error": "Kayıt Hatası", "parse-error": "Sunucu yanıtı çözümlemesi sırasında bir şeyler ters gitti", "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": "Registration has been disabled for %1 accounts, please register with an email address first", + "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", "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", @@ -141,5 +141,5 @@ "invalid-home-page-route": "Geçersiz anasayfa yolu", "invalid-session": "Oturum Uyuşmazlığı", "invalid-session-text": "Senin giriş oturumun pek aktif gözükmüyor, ya da sunucu ile eşleşmiyor. Lütfen sayfayı yenileyiniz.", - "no-topics-selected": "No topics selected!" + "no-topics-selected": "Hiçbir başlık seçilmedi!" } \ No newline at end of file diff --git a/public/language/tr/global.json b/public/language/tr/global.json index 2600f7683e..74d70305d3 100644 --- a/public/language/tr/global.json +++ b/public/language/tr/global.json @@ -58,7 +58,7 @@ "upvoted": "Artı", "downvoters": "Eksi", "downvoted": "Eksi", - "views": "Görüntülenme", + "views": "Bakış", "reputation": "İtibar", "read_more": "daha fazla oku", "more": "Daha Fazla", diff --git a/public/language/tr/notifications.json b/public/language/tr/notifications.json index 5cb4e12e66..ba9761b8f3 100644 --- a/public/language/tr/notifications.json +++ b/public/language/tr/notifications.json @@ -9,7 +9,7 @@ "continue_to": "Devam et", "return_to": "Geri dön.", "new_notification": "Yeni bildirim", - "new_notification_from": "You have a new Notification from %1", + "new_notification_from": "Yenir bir bildiriminiz var %1", "you_have_unread_notifications": "Okunmamış bildirimleriniz var.", "all": "Hepsi", "topics": "Başlıklar", @@ -47,18 +47,18 @@ "email-confirmed-message": "E-postanızı onaylandığınız için teşekkürler. Hesabınız tamamen aktif edildi.", "email-confirm-error-message": "E-posta adresinizi onaylarken bir hata oluştu. Kodunuz geçersiz ya da eski olabilir.", "email-confirm-sent": "Onay e-postası gönderildi.", - "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", - "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_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", - "notificationType_new-user-flag": "When a user is flagged" + "none": "Hiçbiri", + "notification_only": "Sadece Bildirim", + "email_only": "Sadece E-posta", + "notification_and_email": "Bildirim & E-posta", + "notificationType_upvote": "Birisi senin iletine artı oy verdiğinde", + "notificationType_new-topic": "Takip ettiğiniz birisi bir başlık gönderdiğinde", + "notificationType_new-reply": "İzlediğiniz bir başlığa yeni bir ileti gönderildiğinde", + "notificationType_follow": "Birisi seni takip etmeye başlayınca", + "notificationType_new-chat": "Bir sohbet mesajı aldığınızda", + "notificationType_group-invite": "Bir grup davetiyesi aldığınızda", + "notificationType_new-register": "Birisi kayıt kuyruğuna eklendiğinde", + "notificationType_post-queue": "Yeni bir ileti sıraya alındığında", + "notificationType_new-post-flag": "Bir ileti bayraklandığında", + "notificationType_new-user-flag": "Bir kullanıcı bayraklandığında" } \ No newline at end of file diff --git a/public/language/tr/pages.json b/public/language/tr/pages.json index ad5a4dafb4..19fcfd2fa7 100644 --- a/public/language/tr/pages.json +++ b/public/language/tr/pages.json @@ -20,7 +20,7 @@ "users/search": "Kullanıcı Ara", "notifications": "Bildirimler", "tags": "Etiketler", - "tag": "Topics tagged under "%1"", + "tag": ""%1" altında etiketlenen başlıklar", "register": "Bir hesap aç", "registration-complete": "Kayıt tamamlandı", "login": "Hesabına giriş yap", diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json index e3c0e4aff8..c97b9b6033 100644 --- a/public/language/tr/topic.json +++ b/public/language/tr/topic.json @@ -52,7 +52,7 @@ "not-watching.description": "Yeni bir ileti geldiğinde bildirme.
Kategori susturulmamışsa okunmamış olarak göster.", "ignoring.description": "Yeni bir ileti geldiğinde bildirme.
Okunmamış olarak gösterme.", "thread_tools.title": "Konu Ayarları", - "thread_tools.markAsUnreadForAll": "Mark Unread For All", + "thread_tools.markAsUnreadForAll": "Okunmamış olarak İşaretle", "thread_tools.pin": "Başlığı Sabitle", "thread_tools.unpin": "Başlığı Sabitleme", "thread_tools.lock": "Başlığı Kitle", @@ -68,7 +68,7 @@ "thread_tools.restore_confirm": "Bu konuyu gerçekten geri getirmek istiyor musun?", "thread_tools.purge": "Konuyu Temizle", "thread_tools.purge_confirm": "Bu konuyu temizlemek istediğinize eminmisiniz?", - "thread_tools.merge_topics": "Merge Topics", + "thread_tools.merge_topics": "Başlık Birleştir", "thread_tools.merge": "Taşı", "topic_move_success": "Başlık %1 kategorisine başarıyla taşındı.", "post_delete_confirm": "Bu iletiyi gerçekten silmek istediğinize emin misiniz?", @@ -91,7 +91,7 @@ "fork_pid_count": "%1 ileti(ler) seçildi", "fork_success": "Başlık başarıyla ayrıldı!", "delete_posts_instruction": "Silmek/temizlemek istediğiniz iletilere tıklayın.", - "merge_topics_instruction": "Click the topics you want to merge", + "merge_topics_instruction": "Birleştirmek istediğiniz başlıklara tıklayın", "composer.title_placeholder": "Başlık ismini buraya girin...", "composer.handle_placeholder": "İsim", "composer.discard": "Vazgeç", diff --git a/public/language/zh-CN/pages.json b/public/language/zh-CN/pages.json index 754ecf9eff..2b0c8e73e2 100644 --- a/public/language/zh-CN/pages.json +++ b/public/language/zh-CN/pages.json @@ -20,7 +20,7 @@ "users/search": "会员搜索", "notifications": "提醒", "tags": "话题", - "tag": "Topics tagged under "%1"", + "tag": "话题为\"%1\"的主题", "register": "注册帐号", "registration-complete": "注册完成", "login": "登录帐号", From df86c2ff3fabaeeb7c0411c6f391d548edd094ae Mon Sep 17 00:00:00 2001 From: "Misty (Bot)" Date: Mon, 22 Jan 2018 09:25:39 +0000 Subject: [PATCH 19/24] Latest translations and fallbacks --- public/language/sr/error.json | 6 +++--- public/language/sr/pages.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/language/sr/error.json b/public/language/sr/error.json index c376dcb952..d6caec4f13 100644 --- a/public/language/sr/error.json +++ b/public/language/sr/error.json @@ -121,9 +121,9 @@ "downvoting-disabled": "Негативно гласање је онемогућено", "not-enough-reputation-to-downvote": "Немате довољно велики углед да бисте негативно гласали за ову поруку", "not-enough-reputation-to-flag": "Немате довољно велики углед да бисте означили заставицом ову поруку", - "not-enough-reputation-min-rep-website": "You do not have enough reputation to add a website", - "not-enough-reputation-min-rep-aboutme": "You do not have enough reputation to add an about me", - "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature", + "not-enough-reputation-min-rep-website": "Немате довољно велики углед да бисте додали веб сајт", + "not-enough-reputation-min-rep-aboutme": "Немате довољно велики углед да бисте додали информације", + "not-enough-reputation-min-rep-signature": "Немате довољно велики углед да бисте додали потпис", "already-flagged": "Већ сте означили заставицом ову поруку", "self-vote": "Не можете гласати за своју поруку", "reload-failed": "NodeBB је наишао на проблем док се поново учитавао: \"%1\". NodeBB ће наставити да опслужује постојећа клијентска средства , иако би требало да опозовете оно што сте урадили пре поновног учитавања.", diff --git a/public/language/sr/pages.json b/public/language/sr/pages.json index f0f5e3d24a..9b902290aa 100644 --- a/public/language/sr/pages.json +++ b/public/language/sr/pages.json @@ -20,7 +20,7 @@ "users/search": "Претрага корисника", "notifications": "Обавештења", "tags": "Ознаке", - "tag": "Topics tagged under "%1"", + "tag": "Теме са ознаком "%1"", "register": "Региструј налог", "registration-complete": "Регистрација је комплетирана", "login": "Пријавите се на ваш налог", From 8ceb102ed3f08dbd1f72e990fe10a994ad1b4969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 22 Jan 2018 10:06:43 -0500 Subject: [PATCH 20/24] closes #6274 --- src/topics/tools.js | 15 +++--- .../1.7.4/fix_user_topics_per_category.js | 52 +++++++++++++++++++ 2 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 src/upgrades/1.7.4/fix_user_topics_per_category.js diff --git a/src/topics/tools.js b/src/topics/tools.js index 7ff9d23348..bacfe20b4d 100644 --- a/src/topics/tools.js +++ b/src/topics/tools.js @@ -253,16 +253,13 @@ module.exports = function (Topics) { async.waterfall([ function (next) { - Topics.exists(tid, next); - }, - function (exists, next) { - if (!exists) { - return next(new Error('[[error:no-topic]]')); - } - Topics.getTopicFields(tid, ['cid', 'lastposttime', 'pinned', 'deleted', 'postcount', 'upvotes', 'downvotes'], next); + Topics.getTopicData(tid, next); }, function (topicData, next) { topic = topicData; + if (!topic) { + return next(new Error('[[error:no-topic]]')); + } if (parseInt(cid, 10) === parseInt(topic.cid, 10)) { return next(new Error('[[error:cant-move-topic-to-same-category]]')); } @@ -273,11 +270,15 @@ module.exports = function (Topics) { 'cid:' + topicData.cid + ':tids:votes', 'cid:' + topicData.cid + ':tids:lastposttime', 'cid:' + topicData.cid + ':recent_tids', + 'cid:' + topicData.cid + ':uid:' + topicData.uid + ':tids', ], tid, next); }, function (next) { db.sortedSetAdd('cid:' + cid + ':tids:lastposttime', topic.lastposttime, tid, next); }, + function (next) { + db.sortedSetAdd('cid:' + cid + ':uid:' + topic.uid + ':tids', topic.timestamp, tid, next); + }, function (next) { if (parseInt(topic.pinned, 10)) { db.sortedSetAdd('cid:' + cid + ':tids:pinned', Date.now(), tid, next); diff --git a/src/upgrades/1.7.4/fix_user_topics_per_category.js b/src/upgrades/1.7.4/fix_user_topics_per_category.js new file mode 100644 index 0000000000..bd963c6ea1 --- /dev/null +++ b/src/upgrades/1.7.4/fix_user_topics_per_category.js @@ -0,0 +1,52 @@ +'use strict'; + +var async = require('async'); +var batch = require('../../batch'); +var db = require('../../database'); + +module.exports = { + name: 'Fix topics in categories per user if they were moved', + timestamp: Date.UTC(2018, 0, 22), + method: function (callback) { + var progress = this.progress; + + batch.processSortedSet('topics:tid', function (tids, next) { + async.eachLimit(tids, 500, function (tid, _next) { + progress.incr(); + var topicData; + async.waterfall([ + function (next) { + db.getObjectFields('topic:' + tid, ['cid', 'tid', 'uid', 'oldCid', 'timestamp'], next); + }, + function (_topicData, next) { + topicData = _topicData; + if (!topicData.cid || !topicData.oldCid) { + return _next(); + } + + db.isSortedSetMember('cid:' + topicData.oldCid + ':uid:' + topicData.uid, topicData.tid, next); + }, + function (isMember, next) { + if (isMember) { + async.series([ + function (next) { + db.sortedSetRemove('cid:' + topicData.oldCid + ':uid:' + topicData.uid + ':tids', tid, next); + }, + function (next) { + db.sortedSetAdd('cid:' + topicData.cid + ':uid:' + topicData.uid + ':tids', topicData.timestamp, tid, next); + }, + ], function (err) { + next(err); + }); + } else { + next(); + } + }, + ], _next); + }, next); + }, { + progress: progress, + batch: 500, + }, callback); + }, +}; From 6946800d8bfd5deccb8b7350eb0150749cb11376 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 22 Jan 2018 10:23:25 -0500 Subject: [PATCH 21/24] closes #6262 --- install/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index e4d03cf2cd..148b70c443 100644 --- a/install/package.json +++ b/install/package.json @@ -68,8 +68,8 @@ "nodebb-plugin-soundpack-default": "1.0.0", "nodebb-plugin-spam-be-gone": "0.5.1", "nodebb-rewards-essentials": "0.0.11", - "nodebb-theme-lavender": "5.0.0", - "nodebb-theme-persona": "7.2.17", + "nodebb-theme-lavender": "5.0.1", + "nodebb-theme-persona": "7.2.18", "nodebb-theme-slick": "1.1.4", "nodebb-theme-vanilla": "8.1.8", "nodebb-theme-persona": "7.2.16", From 593c5047cfe972f7d4ae1da12e3d2a8a078bb7d2 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 22 Jan 2018 11:31:28 -0500 Subject: [PATCH 22/24] fixes #6269 --- src/controllers/helpers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js index 260069ce4e..8be4927860 100644 --- a/src/controllers/helpers.js +++ b/src/controllers/helpers.js @@ -129,7 +129,7 @@ helpers.buildCategoryBreadcrumbs = function (cid, callback) { return callback(err); } - if (!meta.config.homePageRoute && meta.config.homePageCustom) { + if (meta.config.homePageRoute !== 'categories') { breadcrumbs.unshift({ text: '[[global:header.categories]]', url: nconf.get('relative_path') + '/categories', From 0cefa56a0b21444baa7f4245937f815fc727c5f5 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 22 Jan 2018 11:39:39 -0500 Subject: [PATCH 23/24] Fixes #6269 Also fixed issue where if homePageRoute was not set (as in brand- new install), then categories would also show up, in this revised logic. Oops. --- src/controllers/helpers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js index 8be4927860..319f10e841 100644 --- a/src/controllers/helpers.js +++ b/src/controllers/helpers.js @@ -129,7 +129,7 @@ helpers.buildCategoryBreadcrumbs = function (cid, callback) { return callback(err); } - if (meta.config.homePageRoute !== 'categories') { + if (meta.config.homePageRoute && meta.config.homePageRoute !== 'categories') { breadcrumbs.unshift({ text: '[[global:header.categories]]', url: nconf.get('relative_path') + '/categories', From 08562ad9cc508b2a0942a25df3ad246a6b96c162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 22 Jan 2018 15:01:10 -0500 Subject: [PATCH 24/24] closes #6276 --- src/controllers/accounts/helpers.js | 5 ++++- src/privileges/users.js | 10 +++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/controllers/accounts/helpers.js b/src/controllers/accounts/helpers.js index a854fd0a1b..0a99d83af1 100644 --- a/src/controllers/accounts/helpers.js +++ b/src/controllers/accounts/helpers.js @@ -62,6 +62,9 @@ helpers.getUserDataByUserSlug = function (userslug, callerUID, callback) { sso: function (next) { plugins.fireHook('filter:auth.list', { uid: uid, associations: [] }, next); }, + canEdit: function (next) { + privileges.users.canEdit(callerUID, uid, next); + }, canBanUser: function (next) { privileges.users.canBanUser(callerUID, uid, next); }, @@ -113,7 +116,7 @@ helpers.getUserDataByUserSlug = function (userslug, callerUID, callback) { userData.isAdminOrGlobalModerator = isAdmin || isGlobalModerator; userData.isAdminOrGlobalModeratorOrModerator = isAdmin || isGlobalModerator || isModerator; userData.isSelfOrAdminOrGlobalModerator = isSelf || isAdmin || isGlobalModerator; - userData.canEdit = isAdmin || (isGlobalModerator && !results.isTargetAdmin); + userData.canEdit = results.canEdit; userData.canBan = results.canBanUser; userData.canChangePassword = isAdmin || (isSelf && parseInt(meta.config['password:disableEdit'], 10) !== 1); userData.isSelf = isSelf; diff --git a/src/privileges/users.js b/src/privileges/users.js index 5e48750dc9..c656ab0b8d 100644 --- a/src/privileges/users.js +++ b/src/privileges/users.js @@ -141,9 +141,13 @@ module.exports = function (privileges) { }, next); }, function (results, next) { - var canEdit = results.isAdmin || (results.isGlobalMod && !results.isTargetAdmin); - - next(null, canEdit); + results.canEdit = results.isAdmin || (results.isGlobalMod && !results.isTargetAdmin); + results.callerUid = callerUid; + results.uid = uid; + plugins.fireHook('filter:user.canEdit', results, next); + }, + function (data, next) { + next(null, data.canEdit); }, ], callback); };