From cca365432b3deef2921338c2d1f6c344560ec569 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 14 Sep 2014 19:35:10 -0400 Subject: [PATCH 1/6] closes #2084 --- src/middleware/index.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/middleware/index.js b/src/middleware/index.js index 5ea711b46c..6897e34052 100644 --- a/src/middleware/index.js +++ b/src/middleware/index.js @@ -64,7 +64,15 @@ function routeCurrentTheme(app, themeId, themesData) { } // Theme's templates path - nconf.set('theme_templates_path', themeObj.templates ? path.join(themesPath, themeObj.id, themeObj.templates) : nconf.get('base_templates_path')); + var themePath = nconf.get('base_templates_path'), + fallback = path.join(themesPath, themeObj.id, 'templates'); + if (themeObj.templates) { + themePath = path.join(themesPath, themeObj.id, themeObj.templates); + } else if (fs.existsSync(fallback)) { + themePath = fallback; + } + + nconf.set('theme_templates_path', themePath); } module.exports = function(app, data) { From 51cefb00d2b1d6b6ef410da92beb80b65226e7a4 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 5 Sep 2014 14:14:41 -0400 Subject: [PATCH 2/6] add support to set parentCid to 0 --- public/src/forum/admin/categories.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/public/src/forum/admin/categories.js b/public/src/forum/admin/categories.js index c7851c1e7e..37a551ffef 100644 --- a/public/src/forum/admin/categories.js +++ b/public/src/forum/admin/categories.js @@ -239,6 +239,21 @@ define('forum/admin/categories', ['uploader', 'forum/admin/iconSelect'], functio modal.find('select').val($(this).attr('data-parentCid')); modal.attr('data-cid', cid).modal(); }); + + $('button[data-action="removeParent"]').on('click', function() { + var cid = $(this).parents('[data-cid]').attr('data-cid'); + var payload= {}; + payload[cid] = { + parentCid: 0 + }; + socket.emit('admin.categories.update', payload, function(err) { + if (err) { + return app.alertError(err.message); + } + ajaxify.go('admin/categories/active'); + }); + }); + $('#setParent [data-cid]').on('click', function() { var modalEl = $('#setParent'), parentCid = $(this).attr('data-cid'), From d22fe4ad1e47814baac2eb000ab1ebcaa6421297 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Sun, 14 Sep 2014 21:25:01 -0400 Subject: [PATCH 3/6] removing disabled categories from being listed as children, #2080 --- src/categories.js | 3 ++- src/categories/update.js | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/categories.js b/src/categories.js index 8043401830..e33d8a7aa3 100644 --- a/src/categories.js +++ b/src/categories.js @@ -402,9 +402,10 @@ var db = require('./database'), Categories.getCategoriesData(cids, next); }, function (categories, next) { + // Filter categories to isolate children, and remove disabled categories async.map(cids, function(cid, next) { next(null, categories.filter(function(category) { - return parseInt(category.parentCid, 10) === parseInt(cid, 10); + return parseInt(category.parentCid, 10) === parseInt(cid, 10) && !category.disabled; })); }, next); } diff --git a/src/categories/update.js b/src/categories/update.js index fa04d99deb..002628d723 100644 --- a/src/categories/update.js +++ b/src/categories/update.js @@ -13,7 +13,6 @@ module.exports = function(Categories) { function updateCategory(cid, next) { var category = modified[cid]; var fields = Object.keys(category); - console.log('updating', cid, 'fields:', fields); async.each(fields, function(key, next) { updateCategoryField(cid, key, category[key], next); From 9cba8d7ecb94d44a79e4d85bf306a70cb879c8d4 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 15 Sep 2014 08:35:10 -0400 Subject: [PATCH 4/6] latest translations and fallbacks, closes #2085" --- public/language/ar/category.json | 3 +- public/language/ar/error.json | 8 ++++- public/language/ar/notifications.json | 9 +++-- public/language/ar/recent.json | 1 + public/language/ar/search.json | 3 +- public/language/ar/user.json | 6 +++- public/language/cs/category.json | 3 +- public/language/cs/error.json | 8 ++++- public/language/cs/notifications.json | 9 +++-- public/language/cs/recent.json | 1 + public/language/cs/search.json | 3 +- public/language/cs/user.json | 6 +++- public/language/de/category.json | 3 +- public/language/de/error.json | 8 ++++- public/language/de/notifications.json | 9 +++-- public/language/de/pages.json | 2 +- public/language/de/recent.json | 1 + public/language/de/search.json | 3 +- public/language/de/topic.json | 2 +- public/language/de/user.json | 6 +++- public/language/en@pirate/category.json | 3 +- public/language/en@pirate/error.json | 8 ++++- public/language/en@pirate/notifications.json | 9 +++-- public/language/en@pirate/recent.json | 1 + public/language/en@pirate/search.json | 3 +- public/language/en@pirate/user.json | 6 +++- public/language/en_US/category.json | 3 +- public/language/en_US/error.json | 8 ++++- public/language/en_US/notifications.json | 9 +++-- public/language/en_US/recent.json | 1 + public/language/en_US/search.json | 3 +- public/language/en_US/user.json | 6 +++- public/language/es/category.json | 3 +- public/language/es/email.json | 36 ++++++++++---------- public/language/es/error.json | 10 ++++-- public/language/es/groups.json | 10 +++--- public/language/es/notifications.json | 15 ++++---- public/language/es/pages.json | 2 +- public/language/es/recent.json | 1 + public/language/es/search.json | 3 +- public/language/es/topic.json | 2 +- public/language/es/user.json | 6 +++- public/language/et/category.json | 3 +- public/language/et/error.json | 8 ++++- public/language/et/notifications.json | 9 +++-- public/language/et/recent.json | 1 + public/language/et/search.json | 3 +- public/language/et/user.json | 6 +++- public/language/fa_IR/category.json | 3 +- public/language/fa_IR/error.json | 8 ++++- public/language/fa_IR/notifications.json | 9 +++-- public/language/fa_IR/recent.json | 1 + public/language/fa_IR/search.json | 3 +- public/language/fa_IR/user.json | 6 +++- public/language/fi/category.json | 3 +- public/language/fi/error.json | 8 ++++- public/language/fi/notifications.json | 9 +++-- public/language/fi/recent.json | 1 + public/language/fi/search.json | 3 +- public/language/fi/user.json | 6 +++- public/language/fr/category.json | 3 +- public/language/fr/error.json | 8 ++++- public/language/fr/notifications.json | 9 +++-- public/language/fr/recent.json | 1 + public/language/fr/search.json | 3 +- public/language/fr/user.json | 6 +++- public/language/he/category.json | 3 +- public/language/he/error.json | 8 ++++- public/language/he/notifications.json | 9 +++-- public/language/he/recent.json | 1 + public/language/he/search.json | 3 +- public/language/he/user.json | 6 +++- public/language/hu/category.json | 3 +- public/language/hu/error.json | 8 ++++- public/language/hu/notifications.json | 9 +++-- public/language/hu/recent.json | 1 + public/language/hu/search.json | 3 +- public/language/hu/user.json | 6 +++- public/language/it/category.json | 3 +- public/language/it/error.json | 8 ++++- public/language/it/notifications.json | 9 +++-- public/language/it/recent.json | 1 + public/language/it/search.json | 3 +- public/language/it/user.json | 6 +++- public/language/ja/category.json | 3 +- public/language/ja/error.json | 8 ++++- public/language/ja/notifications.json | 9 +++-- public/language/ja/recent.json | 1 + public/language/ja/search.json | 3 +- public/language/ja/user.json | 6 +++- public/language/ko/category.json | 3 +- public/language/ko/error.json | 8 ++++- public/language/ko/notifications.json | 9 +++-- public/language/ko/recent.json | 1 + public/language/ko/search.json | 3 +- public/language/ko/user.json | 6 +++- public/language/lt/category.json | 3 +- public/language/lt/error.json | 8 ++++- public/language/lt/notifications.json | 9 +++-- public/language/lt/recent.json | 1 + public/language/lt/search.json | 3 +- public/language/lt/user.json | 6 +++- public/language/ms/category.json | 3 +- public/language/ms/error.json | 8 ++++- public/language/ms/notifications.json | 9 +++-- public/language/ms/recent.json | 1 + public/language/ms/search.json | 3 +- public/language/ms/user.json | 6 +++- public/language/nb/category.json | 3 +- public/language/nb/error.json | 8 ++++- public/language/nb/notifications.json | 9 +++-- public/language/nb/recent.json | 1 + public/language/nb/search.json | 3 +- public/language/nb/user.json | 6 +++- public/language/nl/category.json | 3 +- public/language/nl/email.json | 2 +- public/language/nl/error.json | 10 ++++-- public/language/nl/global.json | 8 ++--- public/language/nl/login.json | 2 +- public/language/nl/notifications.json | 9 +++-- public/language/nl/recent.json | 1 + public/language/nl/search.json | 3 +- public/language/nl/topic.json | 20 +++++------ public/language/nl/user.json | 6 +++- public/language/pl/category.json | 3 +- public/language/pl/email.json | 36 ++++++++++---------- public/language/pl/error.json | 10 ++++-- public/language/pl/global.json | 2 +- public/language/pl/groups.json | 10 +++--- public/language/pl/modules.json | 2 +- public/language/pl/notifications.json | 15 ++++---- public/language/pl/pages.json | 2 +- public/language/pl/recent.json | 3 +- public/language/pl/search.json | 3 +- public/language/pl/tags.json | 8 ++--- public/language/pl/topic.json | 20 +++++------ public/language/pl/user.json | 10 ++++-- public/language/pl/users.json | 4 +-- public/language/pt_BR/category.json | 3 +- public/language/pt_BR/error.json | 8 ++++- public/language/pt_BR/notifications.json | 9 +++-- public/language/pt_BR/pages.json | 2 +- public/language/pt_BR/recent.json | 1 + public/language/pt_BR/search.json | 3 +- public/language/pt_BR/topic.json | 2 +- public/language/pt_BR/user.json | 6 +++- public/language/ro/category.json | 3 +- public/language/ro/error.json | 8 ++++- public/language/ro/notifications.json | 9 +++-- public/language/ro/recent.json | 1 + public/language/ro/search.json | 3 +- public/language/ro/topic.json | 4 +-- public/language/ro/user.json | 6 +++- public/language/ru/category.json | 3 +- public/language/ru/error.json | 8 ++++- public/language/ru/notifications.json | 9 +++-- public/language/ru/recent.json | 1 + public/language/ru/search.json | 3 +- public/language/ru/user.json | 6 +++- public/language/sc/category.json | 3 +- public/language/sc/error.json | 8 ++++- public/language/sc/notifications.json | 9 +++-- public/language/sc/recent.json | 1 + public/language/sc/search.json | 3 +- public/language/sc/user.json | 6 +++- public/language/sk/category.json | 3 +- public/language/sk/error.json | 8 ++++- public/language/sk/notifications.json | 9 +++-- public/language/sk/recent.json | 1 + public/language/sk/search.json | 3 +- public/language/sk/user.json | 6 +++- public/language/sv/category.json | 3 +- public/language/sv/error.json | 8 ++++- public/language/sv/notifications.json | 9 +++-- public/language/sv/recent.json | 1 + public/language/sv/search.json | 3 +- public/language/sv/user.json | 6 +++- public/language/th/category.json | 3 +- public/language/th/error.json | 8 ++++- public/language/th/notifications.json | 9 +++-- public/language/th/recent.json | 1 + public/language/th/search.json | 3 +- public/language/th/user.json | 6 +++- public/language/tr/category.json | 3 +- public/language/tr/error.json | 8 ++++- public/language/tr/notifications.json | 9 +++-- public/language/tr/recent.json | 1 + public/language/tr/search.json | 3 +- public/language/tr/user.json | 6 +++- public/language/vi/category.json | 3 +- public/language/vi/error.json | 8 ++++- public/language/vi/notifications.json | 9 +++-- public/language/vi/recent.json | 1 + public/language/vi/search.json | 3 +- public/language/vi/user.json | 6 +++- public/language/zh_CN/category.json | 3 +- public/language/zh_CN/error.json | 8 ++++- public/language/zh_CN/notifications.json | 9 +++-- public/language/zh_CN/pages.json | 2 +- public/language/zh_CN/recent.json | 1 + public/language/zh_CN/search.json | 3 +- public/language/zh_CN/topic.json | 2 +- public/language/zh_CN/user.json | 6 +++- public/language/zh_TW/category.json | 3 +- public/language/zh_TW/error.json | 8 ++++- public/language/zh_TW/notifications.json | 9 +++-- public/language/zh_TW/recent.json | 1 + public/language/zh_TW/search.json | 3 +- public/language/zh_TW/user.json | 6 +++- 209 files changed, 816 insertions(+), 320 deletions(-) diff --git a/public/language/ar/category.json b/public/language/ar/category.json index 27f20b6d25..7d62f59e6f 100644 --- a/public/language/ar/category.json +++ b/public/language/ar/category.json @@ -3,5 +3,6 @@ "no_topics": "لا توجد مواضيع في هذه الفئةلماذا لا تحاول نشر موضوع؟
", "browsing": "تصفح", "no_replies": "لم يرد أحد", - "share_this_category": "انشر هذه الفئة" + "share_this_category": "انشر هذه الفئة", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/ar/error.json b/public/language/ar/error.json index df25651826..feb589fd8f 100644 --- a/public/language/ar/error.json +++ b/public/language/ar/error.json @@ -12,11 +12,13 @@ "invalid-title": "Invalid title!", "invalid-user-data": "Invalid User Data", "invalid-password": "كلمة السر غير مقبولة", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Invalid pagination value", "username-taken": "اسم المستخدم ماخوذ", "email-taken": "البريد الالكتروني ماخوذ", "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.", "username-too-short": "Username too short", + "username-too-long": "Username too long", "user-banned": "المستخدم محظور", "no-category": "Category doesn't exist", "no-topic": "Topic doesn't exist", @@ -52,5 +54,9 @@ "upload-error": "مشكلة في الرفع: 1%", "signature-too-long": "Signature can't be longer than %1 characters!", "cant-chat-with-yourself": "You can't chat with yourself!", - "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post" + "reputation-system-disabled": "Reputation system is disabled.", + "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": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/ar/notifications.json b/public/language/ar/notifications.json index 32d6b62dcf..eec61f2062 100644 --- a/public/language/ar/notifications.json +++ b/public/language/ar/notifications.json @@ -10,11 +10,14 @@ "new_notification": "New Notification", "you_have_unread_notifications": "You have unread notifications.", "new_message_from": "New message from %1", - "upvoted_your_post": "%1 has upvoted your post.", - "favourited_your_post": "%1 has favourited your post.", - "user_flagged_post": "%1 flagged a post.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 has posted a reply to: %2", "user_mentioned_you_in": "%1 mentioned you in %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error": "An error occurred...", diff --git a/public/language/ar/recent.json b/public/language/ar/recent.json index fa2a081df6..866d0e28fc 100644 --- a/public/language/ar/recent.json +++ b/public/language/ar/recent.json @@ -4,5 +4,6 @@ "week": "أسبوع", "month": "شهر", "year": "Year", + "alltime": "All Time", "no_recent_topics": "There are no recent topics." } \ No newline at end of file diff --git a/public/language/ar/search.json b/public/language/ar/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/ar/search.json +++ b/public/language/ar/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/ar/user.json b/public/language/ar/user.json index 3ec0b2df33..a1aa9dc80f 100644 --- a/public/language/ar/user.json +++ b/public/language/ar/user.json @@ -4,6 +4,8 @@ "username": "إسم المستخدم", "email": "البريد الإلكتروني", "confirm_email": "Confirm Email", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "الاسم الكامل", "website": "الموقع الإلكتروني", "location": "موقع", @@ -61,5 +63,7 @@ "posts_per_page": "Posts per Page", "notification_sounds": "Play a sound when you receive a notification.", "browsing": "Browsing Settings", - "open_links_in_new_tab": "Open outgoing links in new tab?" + "open_links_in_new_tab": "Open outgoing links in new tab?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/cs/category.json b/public/language/cs/category.json index fcaf82c582..0c5e3af859 100644 --- a/public/language/cs/category.json +++ b/public/language/cs/category.json @@ -3,5 +3,6 @@ "no_topics": "V této kategorii zatím nejsou žádné příspěvky.
Můžeš být první!", "browsing": "prohlíží", "no_replies": "Nikdo ještě neodpověděl", - "share_this_category": "Share this category" + "share_this_category": "Share this category", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/cs/error.json b/public/language/cs/error.json index 77c582b23f..26e3c9d80c 100644 --- a/public/language/cs/error.json +++ b/public/language/cs/error.json @@ -12,11 +12,13 @@ "invalid-title": "Invalid title!", "invalid-user-data": "Invalid User Data", "invalid-password": "Invalid Password", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Invalid pagination value", "username-taken": "Username taken", "email-taken": "Email taken", "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.", "username-too-short": "Username too short", + "username-too-long": "Username too long", "user-banned": "User banned", "no-category": "Category doesn't exist", "no-topic": "Topic doesn't exist", @@ -52,5 +54,9 @@ "upload-error": "Upload Error : %1", "signature-too-long": "Signature can't be longer than %1 characters!", "cant-chat-with-yourself": "You can't chat with yourself!", - "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post" + "reputation-system-disabled": "Reputation system is disabled.", + "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": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/cs/notifications.json b/public/language/cs/notifications.json index e315bfd6c0..8a77183b5e 100644 --- a/public/language/cs/notifications.json +++ b/public/language/cs/notifications.json @@ -10,11 +10,14 @@ "new_notification": "New Notification", "you_have_unread_notifications": "You have unread notifications.", "new_message_from": "New message from %1", - "upvoted_your_post": "%1 has upvoted your post.", - "favourited_your_post": "%1 has favourited your post.", - "user_flagged_post": "%1 flagged a post.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 has posted a reply to: %2", "user_mentioned_you_in": "%1 mentioned you in %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error": "An error occurred...", diff --git a/public/language/cs/recent.json b/public/language/cs/recent.json index 34933d6d13..d769997c6f 100644 --- a/public/language/cs/recent.json +++ b/public/language/cs/recent.json @@ -4,5 +4,6 @@ "week": "Týden", "month": "Měsíc", "year": "Year", + "alltime": "All Time", "no_recent_topics": "There are no recent topics." } \ No newline at end of file diff --git a/public/language/cs/search.json b/public/language/cs/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/cs/search.json +++ b/public/language/cs/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/cs/user.json b/public/language/cs/user.json index 6d2bba05e5..13be6ba018 100644 --- a/public/language/cs/user.json +++ b/public/language/cs/user.json @@ -4,6 +4,8 @@ "username": "Uživatelské jméno", "email": "Email", "confirm_email": "Confirm Email", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Jméno a příjmení", "website": "Webové stránky", "location": "Poloha", @@ -61,5 +63,7 @@ "posts_per_page": "Posts per Page", "notification_sounds": "Play a sound when you receive a notification.", "browsing": "Browsing Settings", - "open_links_in_new_tab": "Open outgoing links in new tab?" + "open_links_in_new_tab": "Open outgoing links in new tab?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/de/category.json b/public/language/de/category.json index df8b9796ef..185540948a 100644 --- a/public/language/de/category.json +++ b/public/language/de/category.json @@ -3,5 +3,6 @@ "no_topics": "Es gibt noch keine Themen in dieser Kategorie.
Warum beginnst du nicht das erste?", "browsing": "Aktiv", "no_replies": "Niemand hat geantwortet", - "share_this_category": "Teile diese Kategorie" + "share_this_category": "Teile diese Kategorie", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/de/error.json b/public/language/de/error.json index 73e0f64c0e..4217b44a31 100644 --- a/public/language/de/error.json +++ b/public/language/de/error.json @@ -12,11 +12,13 @@ "invalid-title": "Ungültiger Titel", "invalid-user-data": "Ungültige Benutzerdaten", "invalid-password": "Ungültiges Passwort", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Die Nummerierung ist ungültig", "username-taken": "Der Benutzername ist bereits vergeben", "email-taken": "Die E-Mail-Adresse ist bereits vergeben", "email-not-confirmed": "Deine E-Mail wurde noch nicht bestätigt. Bitte klicke hier, um deine E-Mail zu bestätigen.", "username-too-short": "Benutzername ist zu kurz", + "username-too-long": "Username too long", "user-banned": "Der Benutzer ist gesperrt", "no-category": "Die Kategorie existiert nicht", "no-topic": "Das Thema existiert nicht", @@ -52,5 +54,9 @@ "upload-error": "Upload-Fehler: %1", "signature-too-long": "Die Signatur darf maximal %1 Zeichen enthalten!", "cant-chat-with-yourself": "Du kannst nicht mit dir selber chatten!", - "not-enough-reputation-to-downvote": "Deine Reputation ist zu niedrig, um diesen Beitrag negativ zu bewerten." + "reputation-system-disabled": "Reputation system is disabled.", + "downvoting-disabled": "Downvoting is disabled", + "not-enough-reputation-to-downvote": "Deine Reputation ist zu niedrig, um diesen Beitrag negativ zu bewerten.", + "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/de/notifications.json b/public/language/de/notifications.json index 295796f5d6..a12ad1694c 100644 --- a/public/language/de/notifications.json +++ b/public/language/de/notifications.json @@ -10,11 +10,14 @@ "new_notification": "Neue Benachrichtigung", "you_have_unread_notifications": "Du hast ungelesene Benachrichtigungen.", "new_message_from": "Neue Nachricht von %1", - "upvoted_your_post": "%1 hat deinen Beitrag positiv bewertet.", - "favourited_your_post": "%1 favorisiert deinen Beitrag.", - "user_flagged_post": "%1 hat einen Beitrag markiert.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 hat auf %2 geantwortet.", "user_mentioned_you_in": "%1 erwähnte dich in %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "E-Mail bestätigt", "email-confirmed-message": "Vielen Dank für Ihre E-Mail-Validierung. Ihr Konto ist nun vollständig aktiviert.", "email-confirm-error": "Es ist ein Fehler aufgetreten ...", diff --git a/public/language/de/pages.json b/public/language/de/pages.json index c49854a2a4..2df893a878 100644 --- a/public/language/de/pages.json +++ b/public/language/de/pages.json @@ -5,7 +5,7 @@ "recent": "Neueste Themen", "users": "Registrierte User", "notifications": "Benachrichtigungen", - "tags": "Topics tagged under \"%1\"", + "tags": "Themen markiert unter \"%1\"", "user.edit": "Bearbeite \"%1\"", "user.following": "Nutzer, die %1 folgt", "user.followers": "Nutzer, die %1 folgen", diff --git a/public/language/de/recent.json b/public/language/de/recent.json index b428875786..7e5cc47101 100644 --- a/public/language/de/recent.json +++ b/public/language/de/recent.json @@ -4,5 +4,6 @@ "week": "Woche", "month": "Monat", "year": "Jahr", + "alltime": "All Time", "no_recent_topics": "Es gibt keine aktuellen Themen." } \ No newline at end of file diff --git a/public/language/de/search.json b/public/language/de/search.json index 47ca0be16b..7176039ead 100644 --- a/public/language/de/search.json +++ b/public/language/de/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 Ergebniss(e) stimmen mit \"%2\" überein, (%3 Sekunden)" + "results_matching": "%1 Ergebniss(e) stimmen mit \"%2\" überein, (%3 Sekunden)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/de/topic.json b/public/language/de/topic.json index 85edcd53c7..c3642ea0bd 100644 --- a/public/language/de/topic.json +++ b/public/language/de/topic.json @@ -87,7 +87,7 @@ "more_users_and_guests": "%1 weitere(r) Nutzer und %2 Gäste", "more_users": "%1 weitere(r) Nutzer", "more_guests": "%1 weitere Gäste", - "users_and_others": "%1 and %2 others", + "users_and_others": "%1 und %2 andere", "sort_by": "Sortieren nach", "oldest_to_newest": "Älteste zuerst", "newest_to_oldest": "Neuster zuerst", diff --git a/public/language/de/user.json b/public/language/de/user.json index 524a2ae08b..c264b87190 100644 --- a/public/language/de/user.json +++ b/public/language/de/user.json @@ -4,6 +4,8 @@ "username": "Nutzername", "email": "E-Mail", "confirm_email": "E-Mail bestätigen", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Kompletter Name", "website": "Homepage", "location": "Wohnort", @@ -61,5 +63,7 @@ "posts_per_page": "Beiträge pro Seite", "notification_sounds": "Ton abspielen, wenn ich eine Benachrichtigung erhalte.", "browsing": "Browser Einstellungen", - "open_links_in_new_tab": "Externe Links in neuem Tab öffnen?" + "open_links_in_new_tab": "Externe Links in neuem Tab öffnen?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/en@pirate/category.json b/public/language/en@pirate/category.json index 44e19baa01..74b946d216 100644 --- a/public/language/en@pirate/category.json +++ b/public/language/en@pirate/category.json @@ -3,5 +3,6 @@ "no_topics": "Thar be no topics in 'tis category.
Why don't ye give a go' postin' one?", "browsing": "browsin'", "no_replies": "No one has replied to ye message", - "share_this_category": "Share this category" + "share_this_category": "Share this category", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/en@pirate/error.json b/public/language/en@pirate/error.json index 77c582b23f..26e3c9d80c 100644 --- a/public/language/en@pirate/error.json +++ b/public/language/en@pirate/error.json @@ -12,11 +12,13 @@ "invalid-title": "Invalid title!", "invalid-user-data": "Invalid User Data", "invalid-password": "Invalid Password", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Invalid pagination value", "username-taken": "Username taken", "email-taken": "Email taken", "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.", "username-too-short": "Username too short", + "username-too-long": "Username too long", "user-banned": "User banned", "no-category": "Category doesn't exist", "no-topic": "Topic doesn't exist", @@ -52,5 +54,9 @@ "upload-error": "Upload Error : %1", "signature-too-long": "Signature can't be longer than %1 characters!", "cant-chat-with-yourself": "You can't chat with yourself!", - "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post" + "reputation-system-disabled": "Reputation system is disabled.", + "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": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/en@pirate/notifications.json b/public/language/en@pirate/notifications.json index cc1705eff6..49a3a10e05 100644 --- a/public/language/en@pirate/notifications.json +++ b/public/language/en@pirate/notifications.json @@ -10,11 +10,14 @@ "new_notification": "New Notification", "you_have_unread_notifications": "You have unread notifications.", "new_message_from": "New message from %1", - "upvoted_your_post": "%1 has upvoted your post.", - "favourited_your_post": "%1 has favourited your post.", - "user_flagged_post": "%1 flagged a post.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 has posted a reply to: %2", "user_mentioned_you_in": "%1 mentioned you in %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error": "An error occurred...", diff --git a/public/language/en@pirate/recent.json b/public/language/en@pirate/recent.json index 6e6df209fa..bb4318cb39 100644 --- a/public/language/en@pirate/recent.json +++ b/public/language/en@pirate/recent.json @@ -4,5 +4,6 @@ "week": "Week", "month": "Month", "year": "Year", + "alltime": "All Time", "no_recent_topics": "There be no recent topics." } \ No newline at end of file diff --git a/public/language/en@pirate/search.json b/public/language/en@pirate/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/en@pirate/search.json +++ b/public/language/en@pirate/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/en@pirate/user.json b/public/language/en@pirate/user.json index 286d72030a..a8efc3d857 100644 --- a/public/language/en@pirate/user.json +++ b/public/language/en@pirate/user.json @@ -4,6 +4,8 @@ "username": "User Name", "email": "Email", "confirm_email": "Confirm Email", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Full Name", "website": "Website", "location": "Location", @@ -61,5 +63,7 @@ "posts_per_page": "Posts per Page", "notification_sounds": "Play a sound when you receive a notification.", "browsing": "Browsing Settings", - "open_links_in_new_tab": "Open outgoing links in new tab?" + "open_links_in_new_tab": "Open outgoing links in new tab?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/en_US/category.json b/public/language/en_US/category.json index 99ba34a172..93272e1a06 100644 --- a/public/language/en_US/category.json +++ b/public/language/en_US/category.json @@ -3,5 +3,6 @@ "no_topics": "There are no topics in this category.
Why don't you try posting one?", "browsing": "browsing", "no_replies": "No one has replied", - "share_this_category": "Share this category" + "share_this_category": "Share this category", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/en_US/error.json b/public/language/en_US/error.json index bfec6e00d7..200ce83066 100644 --- a/public/language/en_US/error.json +++ b/public/language/en_US/error.json @@ -12,11 +12,13 @@ "invalid-title": "Invalid title!", "invalid-user-data": "Invalid User Data", "invalid-password": "Invalid Password", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Invalid pagination value", "username-taken": "Username taken", "email-taken": "Email taken", "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.", "username-too-short": "Username too short", + "username-too-long": "Username too long", "user-banned": "User banned", "no-category": "Category doesn't exist", "no-topic": "Topic doesn't exist", @@ -52,5 +54,9 @@ "upload-error": "Upload Error : %1", "signature-too-long": "Signature can't be longer than %1 characters!", "cant-chat-with-yourself": "You can't chat with yourself!", - "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post" + "reputation-system-disabled": "Reputation system is disabled.", + "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": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/en_US/notifications.json b/public/language/en_US/notifications.json index 7f97d92275..4d2461226d 100644 --- a/public/language/en_US/notifications.json +++ b/public/language/en_US/notifications.json @@ -10,11 +10,14 @@ "new_notification": "New Notification", "you_have_unread_notifications": "You have unread notifications.", "new_message_from": "New message from %1", - "upvoted_your_post": "%1 has upvoted your post.", - "favourited_your_post": "%1 has favorited your post.", - "user_flagged_post": "%1 flagged a post.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 has posted a reply to: %2", "user_mentioned_you_in": "%1 mentioned you in %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error": "An error occurred...", diff --git a/public/language/en_US/recent.json b/public/language/en_US/recent.json index 1bf0cf9f01..d683cce436 100644 --- a/public/language/en_US/recent.json +++ b/public/language/en_US/recent.json @@ -4,5 +4,6 @@ "week": "Week", "month": "Month", "year": "Year", + "alltime": "All Time", "no_recent_topics": "There are no recent topics." } \ No newline at end of file diff --git a/public/language/en_US/search.json b/public/language/en_US/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/en_US/search.json +++ b/public/language/en_US/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/en_US/user.json b/public/language/en_US/user.json index 0c68cc21b0..50848c7f83 100644 --- a/public/language/en_US/user.json +++ b/public/language/en_US/user.json @@ -4,6 +4,8 @@ "username": "User Name", "email": "Email", "confirm_email": "Confirm Email", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Full Name", "website": "Website", "location": "Location", @@ -61,5 +63,7 @@ "posts_per_page": "Posts per Page", "notification_sounds": "Play a sound when you receive a notification.", "browsing": "Browsing Settings", - "open_links_in_new_tab": "Open outgoing links in new tab?" + "open_links_in_new_tab": "Open outgoing links in new tab?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/es/category.json b/public/language/es/category.json index cd64161deb..ff01be1a31 100644 --- a/public/language/es/category.json +++ b/public/language/es/category.json @@ -3,5 +3,6 @@ "no_topics": "No hay temas en esta categoría.
¿Por que no te animas y publicas uno?", "browsing": "viendo ahora", "no_replies": "Nadie ha respondido aún", - "share_this_category": "Compartir esta categoría" + "share_this_category": "Compartir esta categoría", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/es/email.json b/public/language/es/email.json index 98e591ab02..b791157e63 100644 --- a/public/language/es/email.json +++ b/public/language/es/email.json @@ -1,20 +1,20 @@ { - "password-reset-requested": "Password Reset Requested - %1!", - "welcome-to": "Welcome to %1", - "greeting_no_name": "Hello", - "greeting_with_name": "Hello %1", - "welcome.text1": "Thank you for registering with %1!", - "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.", - "welcome.cta": "Click here to confirm your email address", - "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.", - "reset.text2": "To continue with the password reset, please click on the following link:", - "reset.cta": "Click here to reset your password", - "digest.notifications": "You have some unread notifications from %1:", - "digest.latest_topics": "Latest topics from %1", - "digest.cta": "Click here to visit %1", - "digest.unsub.info": "This digest was sent to you due to your subscription settings.", - "digest.unsub.cta": "Click here to alter those settings", - "digest.daily.no_topics": "There have been no active topics in the past day", - "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.", - "closing": "Thanks!" + "password-reset-requested": "Reinicio de contraseña solicitado - %1!", + "welcome-to": "Bienvenido a %1", + "greeting_no_name": "Hola", + "greeting_with_name": "Hola %1", + "welcome.text1": "Gracias por registrarte con %1!", + "welcome.text2": "Para activar completamente tu cuenta, necesitamos verificar que la dirección email con la que te registraste te pertenece.", + "welcome.cta": "Cliquea aquí para confirmar tu dirección email.", + "reset.text1": "Recibimos una solicitud para reiniciar tu contraseña, posiblemente porque la olvidaste. Si no es así, por favor ignora este email.", + "reset.text2": "Para continuar con el reinicio de contraseña, por favor cliquea en el siguiente vínculo:", + "reset.cta": "Cliquea aquí para reiniciar tu contraseña", + "digest.notifications": "Tienes algunas notificaciónes de %1 sin leer:", + "digest.latest_topics": "Últimos temas de %1", + "digest.cta": "Cliquea aquí para visitar %1", + "digest.unsub.info": "Este compendio te fue enviado debido a tus ajustes de subscripción.", + "digest.unsub.cta": "Cliquea aquí para alterar estos ajustes", + "digest.daily.no_topics": "No han habido temas activos en el día pasado", + "test.text1": "Este es un email de prueba para verificar que el envío de email está ajustado correctamente para tu NodeBB", + "closing": "¡Gracias!" } \ No newline at end of file diff --git a/public/language/es/error.json b/public/language/es/error.json index 38ff5515ae..d3fa14fe91 100644 --- a/public/language/es/error.json +++ b/public/language/es/error.json @@ -12,11 +12,13 @@ "invalid-title": "Título no válido!", "invalid-user-data": "Datos de Usuario no válidos", "invalid-password": "Contraseña no válida", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Valor de paginación no válido.", "username-taken": "Nombre de usuario ya escogido", "email-taken": "El correo electrónico ya está escogido.", "email-not-confirmed": "Tu correo electrónico está sin confirmar, por favor haz click aquí para confirmar tu email.", "username-too-short": "El nombre de usuario es demasiado corto", + "username-too-long": "Username too long", "user-banned": "Usuario expulsado", "no-category": "La categoría no existe", "no-topic": "El tema no existe.", @@ -25,7 +27,7 @@ "no-user": "El usuario no existe", "no-teaser": "El extracto del tema no existe.", "no-privileges": "No tienes los privilegios necesarios para esa acción.", - "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", + "no-emailers-configured": "Ningún plugin para email fue cargado, así que no se pudo enviar email de prueba.", "category-disabled": "Categoría deshabilitada.", "topic-locked": "Tema bloqueado.", "still-uploading": "Por favor, espera a que terminen las subidas.", @@ -52,5 +54,9 @@ "upload-error": "Error de subida: %1", "signature-too-long": "Las firmas no pueden ser más largas de %1 caracteres!", "cant-chat-with-yourself": "No puedes conversar contigo mismo!", - "not-enough-reputation-to-downvote": "No tienes suficiente reputación para votar negativo este post" + "reputation-system-disabled": "Reputation system is disabled.", + "downvoting-disabled": "Downvoting is disabled", + "not-enough-reputation-to-downvote": "No tienes suficiente reputación para votar negativo este post", + "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/es/groups.json b/public/language/es/groups.json index c00c111e11..bb4b46d1f8 100644 --- a/public/language/es/groups.json +++ b/public/language/es/groups.json @@ -1,7 +1,7 @@ { - "view_group": "View Group", - "details.title": "Group Details", - "details.members": "Member List", - "details.has_no_posts": "This group's members have not made any posts.", - "details.latest_posts": "Latest Posts" + "view_group": "Ver Grupo", + "details.title": "Detalles de Grupo", + "details.members": "Lista de Miembros", + "details.has_no_posts": "Los miembros de este grupo no han hecho ninguna publicación.", + "details.latest_posts": "Últimas Publicaciones" } \ No newline at end of file diff --git a/public/language/es/notifications.json b/public/language/es/notifications.json index 3a7168a44d..3be3cccdc8 100644 --- a/public/language/es/notifications.json +++ b/public/language/es/notifications.json @@ -4,17 +4,20 @@ "see_all": "Ver todas las notificaciones", "back_to_home": "Volver a %1", "outgoing_link": "Enlace Externo", - "outgoing_link_message": "You are now leaving %1.", - "continue_to": "Continue to %1", - "return_to": "Return to %1", + "outgoing_link_message": "Ahora estás saliendo %1.", + "continue_to": "Continuar a %1", + "return_to": "Regresar a %1", "new_notification": "Nueva Notificación", "you_have_unread_notifications": "Tienes notificaciones sin leer.", "new_message_from": "Nuevo mensaje de %1", - "upvoted_your_post": "%1 ha marcado como favorita tu respuesta.", - "favourited_your_post": "%1 ha marcado como favorita tu respuesta.", - "user_flagged_post": "%1 ha marcado como indebida una respuesta.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 ha publicado una respuesta a: %2", "user_mentioned_you_in": "%1 te mencionó en %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Correo electrónico confirmado", "email-confirmed-message": "Gracias por validar tu correo electrónico. Tu cuenta ya está completamente activa.", "email-confirm-error": "Un error ocurrió...", diff --git a/public/language/es/pages.json b/public/language/es/pages.json index 4b79bc293f..ab6e4eaedd 100644 --- a/public/language/es/pages.json +++ b/public/language/es/pages.json @@ -5,7 +5,7 @@ "recent": "Temas Recientes", "users": "Usuarios Registrado", "notifications": "Notificaciones", - "tags": "Topics tagged under \"%1\"", + "tags": "Temas etiquetados bajo \"%1\"", "user.edit": "Editando \"%1\"", "user.following": "Gente que sigue %1 ", "user.followers": "Seguidores de %1", diff --git a/public/language/es/recent.json b/public/language/es/recent.json index 8b25e63d46..a187f9d661 100644 --- a/public/language/es/recent.json +++ b/public/language/es/recent.json @@ -4,5 +4,6 @@ "week": "Semana", "month": "Mes", "year": "Año", + "alltime": "All Time", "no_recent_topics": "No hay publicaciones recientes" } \ No newline at end of file diff --git a/public/language/es/search.json b/public/language/es/search.json index d0ffc64f36..8ac377c932 100644 --- a/public/language/es/search.json +++ b/public/language/es/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 resuldado(s) coinciden con \"%2\". (%3 segundos)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/es/topic.json b/public/language/es/topic.json index ae3fa08fc1..1522291a09 100644 --- a/public/language/es/topic.json +++ b/public/language/es/topic.json @@ -87,7 +87,7 @@ "more_users_and_guests": "%1 usuario(s) y %2 invitado(s) más", "more_users": "%1 usuario(s) más", "more_guests": "%1 invitado(s) más", - "users_and_others": "%1 and %2 others", + "users_and_others": "%1 y otros %2", "sort_by": "Ordenar por", "oldest_to_newest": "Más antiguo a más nuevo", "newest_to_oldest": "Más nuevo a más antiguo", diff --git a/public/language/es/user.json b/public/language/es/user.json index c020d86931..3d711138d2 100644 --- a/public/language/es/user.json +++ b/public/language/es/user.json @@ -4,6 +4,8 @@ "username": "Nombre de usuario", "email": "Correo Electrónico", "confirm_email": "Repetir correo electrónico", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Nombre completo", "website": "Sitio Web", "location": "Ubicación", @@ -61,5 +63,7 @@ "posts_per_page": "Post por página", "notification_sounds": "Reproducir un sonido al recibir una notificación", "browsing": "Preferencias de navegación.", - "open_links_in_new_tab": "Abrir los enlaces externos en una nueva pestaña?" + "open_links_in_new_tab": "Abrir los enlaces externos en una nueva pestaña?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/et/category.json b/public/language/et/category.json index 1d35948aac..865d8dbae9 100644 --- a/public/language/et/category.json +++ b/public/language/et/category.json @@ -3,5 +3,6 @@ "no_topics": "Kahjuks ei leidu siin kategoorias ühtegi teemat.
Soovid postitada?", "browsing": "vaatab", "no_replies": "Keegi pole vastanud", - "share_this_category": "Jaga seda kategooriat" + "share_this_category": "Jaga seda kategooriat", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/et/error.json b/public/language/et/error.json index 596a04b4df..459b749ca0 100644 --- a/public/language/et/error.json +++ b/public/language/et/error.json @@ -12,11 +12,13 @@ "invalid-title": "Vigane pealkiri!", "invalid-user-data": "Vigased kasutaja andmed", "invalid-password": "Vigane parool", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Vigane lehe väärtus", "username-taken": "Kasutajanimi on juba võetud", "email-taken": "Email on võetud", "email-not-confirmed": "Su emaili aadress ei ole kinnitatud, vajuta siia et kinnitada.", "username-too-short": "Kasutajanimi on liiga lühike", + "username-too-long": "Username too long", "user-banned": "Kasutaja bannitud", "no-category": "Kategooriat ei eksisteeri", "no-topic": "Teemat ei eksisteeri", @@ -52,5 +54,9 @@ "upload-error": "Üleslaadimise viga: %1", "signature-too-long": "Allkiri ei saa olla pikem kui %1 tähemärki!", "cant-chat-with-yourself": "Sa ei saa endaga vestelda!", - "not-enough-reputation-to-downvote": "Sul ei ole piisavalt reputatsiooni, et anda negatiivset hinnangut sellele postitusele." + "reputation-system-disabled": "Reputation system is disabled.", + "downvoting-disabled": "Downvoting is disabled", + "not-enough-reputation-to-downvote": "Sul ei ole piisavalt reputatsiooni, et anda negatiivset hinnangut sellele postitusele.", + "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/et/notifications.json b/public/language/et/notifications.json index 4de13a6e0f..8ee69d3072 100644 --- a/public/language/et/notifications.json +++ b/public/language/et/notifications.json @@ -10,11 +10,14 @@ "new_notification": "Uus teade", "you_have_unread_notifications": "Sul ei ole lugemata teateid.", "new_message_from": "Uus sõnum kasutajalt %1", - "upvoted_your_post": "%1 hääletas sinu postituse poolt.", - "favourited_your_post": "%1 märkis sinu postituse lemmikuks.", - "user_flagged_post": "%1 märgistas postituse.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "Kasutaja %1 postitas vastuse teemasse %2", "user_mentioned_you_in": "%1 mainis sind postituses %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Emaili aadress kinnitatud", "email-confirmed-message": "Täname, et kinnitasite oma emaili aadressi. Teie kasutaja omn nüüd täielikult aktiveeritud.", "email-confirm-error": "Süsteemis tekkis viga...", diff --git a/public/language/et/recent.json b/public/language/et/recent.json index 7afd6c41cd..53c112df2d 100644 --- a/public/language/et/recent.json +++ b/public/language/et/recent.json @@ -4,5 +4,6 @@ "week": "Nädal", "month": "Kuu", "year": "Aasta", + "alltime": "All Time", "no_recent_topics": "Hetkel ei ole hiljutisi teemasid." } \ No newline at end of file diff --git a/public/language/et/search.json b/public/language/et/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/et/search.json +++ b/public/language/et/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/et/user.json b/public/language/et/user.json index 7e9a6cc46d..4ecb16dac4 100644 --- a/public/language/et/user.json +++ b/public/language/et/user.json @@ -4,6 +4,8 @@ "username": "Kasutajanimi", "email": "Email", "confirm_email": "Kinnita email", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Täisnimi", "website": "Koduleht", "location": "Asukoht", @@ -61,5 +63,7 @@ "posts_per_page": "Postitusi ühe lehekülje kohta", "notification_sounds": "Tee häält, kui saabub teade.", "browsing": "Sirvimis sätted", - "open_links_in_new_tab": "Ava väljaminevad lingid uues vaheaknas?" + "open_links_in_new_tab": "Ava väljaminevad lingid uues vaheaknas?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/fa_IR/category.json b/public/language/fa_IR/category.json index 1f5299e534..c1c61a1a9f 100644 --- a/public/language/fa_IR/category.json +++ b/public/language/fa_IR/category.json @@ -3,5 +3,6 @@ "no_topics": "هیچ جستاری در این دسته نیست.
چرا شما یکی نفرستید؟", "browsing": "بیننده‌ها", "no_replies": "هیچ کسی پاسخ نداده است.", - "share_this_category": "به اشتراک‌گذاری این دسته" + "share_this_category": "به اشتراک‌گذاری این دسته", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/fa_IR/error.json b/public/language/fa_IR/error.json index cf82fa6622..29caeaa0c1 100644 --- a/public/language/fa_IR/error.json +++ b/public/language/fa_IR/error.json @@ -12,11 +12,13 @@ "invalid-title": "عنوان نامعتبر است!", "invalid-user-data": "داده‌های کاربری نامعتبر است.", "invalid-password": "گذرواژه نامعتبر است.", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "عدد صفحه‌بندی نامعتبر است.", "username-taken": "این نام کاربری گرفته شده است.", "email-taken": "این رایانامه گرفته شده است.", "email-not-confirmed": "رایانامه شما تأیید نشده است، لطفاً برای تأیید رایانامه‌تان اینجا را بفشارید.", "username-too-short": "نام کاربری خیلی کوتاه است.", + "username-too-long": "Username too long", "user-banned": "کاربر محروم شد.", "no-category": "چنین دسته‌ای وجود ندارد.", "no-topic": "چنین جستاری وجود ندارد.", @@ -52,5 +54,9 @@ "upload-error": "خطای بارگذاری: %1", "signature-too-long": "امضا نمی‌تواند بیش‌تر از %1 نویسه داشته باشد.", "cant-chat-with-yourself": "شما نمی‌توانید با خودتان گفتگو کنید!", - "not-enough-reputation-to-downvote": "شما اعتبار کافی برای دادن رای منفی به این دیدگاه را ندارید." + "reputation-system-disabled": "Reputation system is disabled.", + "downvoting-disabled": "Downvoting is disabled", + "not-enough-reputation-to-downvote": "شما اعتبار کافی برای دادن رای منفی به این دیدگاه را ندارید.", + "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/fa_IR/notifications.json b/public/language/fa_IR/notifications.json index a643005e04..62b48b71af 100644 --- a/public/language/fa_IR/notifications.json +++ b/public/language/fa_IR/notifications.json @@ -10,11 +10,14 @@ "new_notification": "آکاه‌سازی تازه", "you_have_unread_notifications": "شما آگاه‌سازی‌های نخوانده دارید.", "new_message_from": "پیام تازه از %1", - "upvoted_your_post": "%1 به دیدگاه شما رای داده است.", - "favourited_your_post": "%1 دیدگاه شما را پسندیده است.", - "user_flagged_post": "پرچم خوردن یک دیدگاه از سوی %1", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "پاسخ دادن به %2 از سوی %1", "user_mentioned_you_in": "%1 در %2 به شما اشاره کرد", + "user_started_following_you": "%1 started following you.", "email-confirmed": "رایانامه تایید شد", "email-confirmed-message": "بابت تایید ایمیلتان سپاس‌گزاریم. حساب کاربری شما اکنون به صورت کامل فعال شده است.", "email-confirm-error": "خطایی پیش آمده است...", diff --git a/public/language/fa_IR/recent.json b/public/language/fa_IR/recent.json index 74a8876ebf..4f6f3256a5 100644 --- a/public/language/fa_IR/recent.json +++ b/public/language/fa_IR/recent.json @@ -4,5 +4,6 @@ "week": "هفته", "month": "ماه", "year": "سال", + "alltime": "All Time", "no_recent_topics": "هیچ جستار تازه‌ای نیست." } \ No newline at end of file diff --git a/public/language/fa_IR/search.json b/public/language/fa_IR/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/fa_IR/search.json +++ b/public/language/fa_IR/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/fa_IR/user.json b/public/language/fa_IR/user.json index cfe346d5fd..f0212723e2 100644 --- a/public/language/fa_IR/user.json +++ b/public/language/fa_IR/user.json @@ -4,6 +4,8 @@ "username": "نام کاربری", "email": "رایانامه", "confirm_email": "تأیید رایانامه", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "نام کامل", "website": "تارنما", "location": "محل سکونت", @@ -61,5 +63,7 @@ "posts_per_page": "شمار دیدگاه‌ها در هر برگه", "notification_sounds": "پخش صدا هنگامی که شما یک آگاه‌سازی دریافت می‌کنید.", "browsing": "تنظیمات مرور", - "open_links_in_new_tab": "بازکردن لینک‌های خارجی در تب جدید؟" + "open_links_in_new_tab": "بازکردن لینک‌های خارجی در تب جدید؟", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/fi/category.json b/public/language/fi/category.json index 67c3c2125a..f3ae42f69f 100644 --- a/public/language/fi/category.json +++ b/public/language/fi/category.json @@ -3,5 +3,6 @@ "no_topics": "Tällä aihealueella ei ole yhtään aihetta.
Miksi et aloittaisi uutta?", "browsing": "selaamassa", "no_replies": "Kukaan ei ole vastannut", - "share_this_category": "Jaa tämä kategoria" + "share_this_category": "Jaa tämä kategoria", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/fi/error.json b/public/language/fi/error.json index a9c4718431..738eb62699 100644 --- a/public/language/fi/error.json +++ b/public/language/fi/error.json @@ -12,11 +12,13 @@ "invalid-title": "Virheellinen otsikko!", "invalid-user-data": "Virheellinen käyttäjätieto", "invalid-password": "Virheellinen salasana", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Virheellinen taittoarvo", "username-taken": "Käyttäjänimi varattu", "email-taken": "Sähköpostiosoite varattu", "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.", "username-too-short": "Käyttäjänimi on liian lyhyt", + "username-too-long": "Username too long", "user-banned": "Käyttäjä on estetty", "no-category": "Kategoriaa ei ole olemassa", "no-topic": "Aihetta ei ole olemassa", @@ -52,5 +54,9 @@ "upload-error": "Lähetysvirhe: %1", "signature-too-long": "Allekirjoitus ei voi olla pidempi kuin %1 merkkiä!", "cant-chat-with-yourself": "Et voi keskustella itsesi kanssa!", - "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post" + "reputation-system-disabled": "Reputation system is disabled.", + "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": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/fi/notifications.json b/public/language/fi/notifications.json index e9507997a0..2eb5163d4a 100644 --- a/public/language/fi/notifications.json +++ b/public/language/fi/notifications.json @@ -10,11 +10,14 @@ "new_notification": "Uusi ilmoitus", "you_have_unread_notifications": "Sinulla on lukemattomia ilmoituksia.", "new_message_from": "Uusi viesti käyttäjältä %1", - "upvoted_your_post": "%1 has upvoted your post.", - "favourited_your_post": "%1 lisäsi viestisi suosikkeihinsa.", - "user_flagged_post": "%1 flagged a post.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 has posted a reply to: %2", "user_mentioned_you_in": "%1 mentioned you in %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Sähköpostiosoite vahvistettu", "email-confirmed-message": "Kiitos sähköpostiosoitteesi vahvistamisesta. Käyttäjätilisi on nyt täysin aktivoitu.", "email-confirm-error": "Tapahtui virhe...", diff --git a/public/language/fi/recent.json b/public/language/fi/recent.json index fb3bd49dbf..b2bff39da7 100644 --- a/public/language/fi/recent.json +++ b/public/language/fi/recent.json @@ -4,5 +4,6 @@ "week": "Viikko", "month": "Kuukausi", "year": "Year", + "alltime": "All Time", "no_recent_topics": "Ei viimeisimpiä aiheita." } \ No newline at end of file diff --git a/public/language/fi/search.json b/public/language/fi/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/fi/search.json +++ b/public/language/fi/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/fi/user.json b/public/language/fi/user.json index 47b8df6b9c..d008e94b62 100644 --- a/public/language/fi/user.json +++ b/public/language/fi/user.json @@ -4,6 +4,8 @@ "username": "Käyttäjän nimi", "email": "Sähköposti", "confirm_email": "Confirm Email", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Koko nimi", "website": "Kotisivu", "location": "Sijainti", @@ -61,5 +63,7 @@ "posts_per_page": "Viestiä per sivu", "notification_sounds": "Soita merkkiääni ilmoituksen saapuessa.", "browsing": "Browsing Settings", - "open_links_in_new_tab": "Open outgoing links in new tab?" + "open_links_in_new_tab": "Open outgoing links in new tab?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/fr/category.json b/public/language/fr/category.json index d53466e617..c680ae7db9 100644 --- a/public/language/fr/category.json +++ b/public/language/fr/category.json @@ -3,5 +3,6 @@ "no_topics": "Il n'y a aucun sujet dans cette catégorie.
Pourquoi ne pas en créer un ?", "browsing": "parcouru par", "no_replies": "Personne n'a répondu", - "share_this_category": "Partager cette catégorie" + "share_this_category": "Partager cette catégorie", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/fr/error.json b/public/language/fr/error.json index 63d9a1765f..821061cee1 100644 --- a/public/language/fr/error.json +++ b/public/language/fr/error.json @@ -12,11 +12,13 @@ "invalid-title": "Titre invalide !", "invalid-user-data": "Données utilisateur invalides", "invalid-password": "Mot de passe invalide", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Valeur de pagination invalide", "username-taken": "Nom d’utilisateur déjà utilisé", "email-taken": "Email déjà utilisé", "email-not-confirmed": "Votre adresse email n'est pas confirmée, cliquez ici pour la valider.", "username-too-short": "Nom d'utilisateur trop court", + "username-too-long": "Username too long", "user-banned": "Utilisateur banni", "no-category": "Cette catégorie n'existe pas", "no-topic": "Ce sujet n'existe pas", @@ -52,5 +54,9 @@ "upload-error": "Erreur d'envoi : %1", "signature-too-long": "La signature ne peut dépasser %1 caractères !", "cant-chat-with-yourself": "Vous ne pouvez chatter avec vous même !", - "not-enough-reputation-to-downvote": "Vous n'avez pas une réputation assez élevée pour noter négativement ce message" + "reputation-system-disabled": "Reputation system is disabled.", + "downvoting-disabled": "Downvoting is disabled", + "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": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/fr/notifications.json b/public/language/fr/notifications.json index 560fb83751..5e1178f78c 100644 --- a/public/language/fr/notifications.json +++ b/public/language/fr/notifications.json @@ -10,11 +10,14 @@ "new_notification": "Nouvelle notification", "you_have_unread_notifications": "Vous avez des notifications non-lues", "new_message_from": "Nouveau message de %1", - "upvoted_your_post": "%1 a voté pour votre message.", - "favourited_your_post": "%1 a mis votre message en favoris.", - "user_flagged_post": "%1 a signalé un message.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 a répondu à : %2", "user_mentioned_you_in": "%1 vous a mentionné dans %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Email vérifié", "email-confirmed-message": "Merci pour la validation de votre adresse email. Votre compte est désormais activé.", "email-confirm-error": "Un erreur est survenue ...", diff --git a/public/language/fr/recent.json b/public/language/fr/recent.json index 2e69d07a4e..6af7b3e81a 100644 --- a/public/language/fr/recent.json +++ b/public/language/fr/recent.json @@ -4,5 +4,6 @@ "week": "Semaine", "month": "Mois", "year": "An", + "alltime": "All Time", "no_recent_topics": "Il n'y a aucun sujet récent." } \ No newline at end of file diff --git a/public/language/fr/search.json b/public/language/fr/search.json index ab88db2e52..8974b7f593 100644 --- a/public/language/fr/search.json +++ b/public/language/fr/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 résultat(s) correspondant(s) à \"%2\", (%3 secondes)" + "results_matching": "%1 résultat(s) correspondant(s) à \"%2\", (%3 secondes)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/fr/user.json b/public/language/fr/user.json index 6ee1f52ce5..68a99a577e 100644 --- a/public/language/fr/user.json +++ b/public/language/fr/user.json @@ -4,6 +4,8 @@ "username": "Nom d'utilisateur", "email": "Email", "confirm_email": "Confirmer l'adresse email", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Nom", "website": "Site web", "location": "Emplacement", @@ -61,5 +63,7 @@ "posts_per_page": "Messages par page", "notification_sounds": "Émettre un son lors de la réception de notifications.", "browsing": "Paramètres de navigation", - "open_links_in_new_tab": "Ouvrir les liens externes dans un nouvel onglet ?" + "open_links_in_new_tab": "Ouvrir les liens externes dans un nouvel onglet ?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/he/category.json b/public/language/he/category.json index 4d32d01bea..bc5e530729 100644 --- a/public/language/he/category.json +++ b/public/language/he/category.json @@ -3,5 +3,6 @@ "no_topics": "קטגוריה זו ריקה מנושאים.
למה שלא תנסה להוסיף נושא חדש?", "browsing": "צופים בנושא זה כעת", "no_replies": "אין תגובות", - "share_this_category": "שתף קטגוריה זו" + "share_this_category": "שתף קטגוריה זו", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/he/error.json b/public/language/he/error.json index c5cd72a2a0..2df9c1b918 100644 --- a/public/language/he/error.json +++ b/public/language/he/error.json @@ -12,11 +12,13 @@ "invalid-title": "כותרת שגויה", "invalid-user-data": "מידע משתמש שגוי", "invalid-password": "סיסמא שגויה", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "ערך דפדוף שגוי", "username-taken": "שם משתמש תפוס", "email-taken": "כתובת אימייל תפוסה", "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.", "username-too-short": "שם משתמש קצר מדי", + "username-too-long": "Username too long", "user-banned": "המשתמש חסום", "no-category": "קטגוריה אינה קיימת", "no-topic": "נושא אינו קיים", @@ -52,5 +54,9 @@ "upload-error": "שגיאה בהעלאה : %1", "signature-too-long": "חתימה אינה יכולה להיות ארוכה מ %1 תווים!", "cant-chat-with-yourself": "לא ניתן לעשות צ'אט עם עצמך!", - "not-enough-reputation-to-downvote": "אין לך מספיק מוניטין כדי להוריד את הדירוג של פוסט זה" + "reputation-system-disabled": "Reputation system is disabled.", + "downvoting-disabled": "Downvoting is disabled", + "not-enough-reputation-to-downvote": "אין לך מספיק מוניטין כדי להוריד את הדירוג של פוסט זה", + "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/he/notifications.json b/public/language/he/notifications.json index bcbb5eac8b..f3f8efa00f 100644 --- a/public/language/he/notifications.json +++ b/public/language/he/notifications.json @@ -10,11 +10,14 @@ "new_notification": "New Notification", "you_have_unread_notifications": "You have unread notifications.", "new_message_from": "New message from %1", - "upvoted_your_post": "%1 has upvoted your post.", - "favourited_your_post": "%1 has favourited your post.", - "user_flagged_post": "%1 flagged a post.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 has posted a reply to: %2", "user_mentioned_you_in": "%1 mentioned you in %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error": "An error occurred...", diff --git a/public/language/he/recent.json b/public/language/he/recent.json index 5629c9f23f..0a20c6301a 100644 --- a/public/language/he/recent.json +++ b/public/language/he/recent.json @@ -4,5 +4,6 @@ "week": "שבוע", "month": "חודש", "year": "Year", + "alltime": "All Time", "no_recent_topics": "אין נושאים חדשים" } \ No newline at end of file diff --git a/public/language/he/search.json b/public/language/he/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/he/search.json +++ b/public/language/he/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/he/user.json b/public/language/he/user.json index 1897b49f7d..292d31f90b 100644 --- a/public/language/he/user.json +++ b/public/language/he/user.json @@ -4,6 +4,8 @@ "username": "שם משתמש", "email": "כתובת אימייל", "confirm_email": "Confirm Email", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "שם מלא", "website": "אתר", "location": "מיקום", @@ -61,5 +63,7 @@ "posts_per_page": "כמות פוסטים בעמוד", "notification_sounds": "השמע צליל כאשר מתקבלת הודעה עבורך.", "browsing": "הגדרות צפייה", - "open_links_in_new_tab": "Open outgoing links in new tab?" + "open_links_in_new_tab": "Open outgoing links in new tab?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/hu/category.json b/public/language/hu/category.json index f6f1002ad9..f0eb8a400b 100644 --- a/public/language/hu/category.json +++ b/public/language/hu/category.json @@ -3,5 +3,6 @@ "no_topics": "Még nincs nyitva egy téma sem ebben a kategóriában.Miért nem hozol létre egyet?", "browsing": "jelenlévők", "no_replies": "Senki sem válaszolt még", - "share_this_category": "Hozzászólás megosztása" + "share_this_category": "Hozzászólás megosztása", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/hu/error.json b/public/language/hu/error.json index 77c582b23f..26e3c9d80c 100644 --- a/public/language/hu/error.json +++ b/public/language/hu/error.json @@ -12,11 +12,13 @@ "invalid-title": "Invalid title!", "invalid-user-data": "Invalid User Data", "invalid-password": "Invalid Password", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Invalid pagination value", "username-taken": "Username taken", "email-taken": "Email taken", "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.", "username-too-short": "Username too short", + "username-too-long": "Username too long", "user-banned": "User banned", "no-category": "Category doesn't exist", "no-topic": "Topic doesn't exist", @@ -52,5 +54,9 @@ "upload-error": "Upload Error : %1", "signature-too-long": "Signature can't be longer than %1 characters!", "cant-chat-with-yourself": "You can't chat with yourself!", - "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post" + "reputation-system-disabled": "Reputation system is disabled.", + "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": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/hu/notifications.json b/public/language/hu/notifications.json index c189a4e5bb..86ce42f88a 100644 --- a/public/language/hu/notifications.json +++ b/public/language/hu/notifications.json @@ -10,11 +10,14 @@ "new_notification": "New Notification", "you_have_unread_notifications": "You have unread notifications.", "new_message_from": "New message from %1", - "upvoted_your_post": "%1 has upvoted your post.", - "favourited_your_post": "%1 has favourited your post.", - "user_flagged_post": "%1 flagged a post.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 has posted a reply to: %2", "user_mentioned_you_in": "%1 mentioned you in %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error": "An error occurred...", diff --git a/public/language/hu/recent.json b/public/language/hu/recent.json index 332aaf1de2..b595ffd958 100644 --- a/public/language/hu/recent.json +++ b/public/language/hu/recent.json @@ -4,5 +4,6 @@ "week": "Hét", "month": "Hónap", "year": "Year", + "alltime": "All Time", "no_recent_topics": "Nincs friss topik." } \ No newline at end of file diff --git a/public/language/hu/search.json b/public/language/hu/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/hu/search.json +++ b/public/language/hu/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/hu/user.json b/public/language/hu/user.json index 9e371cc20b..909e4ad553 100644 --- a/public/language/hu/user.json +++ b/public/language/hu/user.json @@ -4,6 +4,8 @@ "username": "Felhasználónév", "email": "E-mail", "confirm_email": "Confirm Email", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Teljes Név", "website": "Weboldal", "location": "Lakhely", @@ -61,5 +63,7 @@ "posts_per_page": "Hozzászólás oldalanként", "notification_sounds": "Hang lejátszása ha értesítés érkezett.", "browsing": "Browsing Settings", - "open_links_in_new_tab": "Open outgoing links in new tab?" + "open_links_in_new_tab": "Open outgoing links in new tab?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/it/category.json b/public/language/it/category.json index 4d813335c3..c1f4ace222 100644 --- a/public/language/it/category.json +++ b/public/language/it/category.json @@ -3,5 +3,6 @@ "no_topics": "Non ci sono discussioni in questa categoria.
Perché non ne inizi una?", "browsing": "visualizzando", "no_replies": "Nessuno ha risposto", - "share_this_category": "Share this category" + "share_this_category": "Share this category", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/it/error.json b/public/language/it/error.json index 77c582b23f..26e3c9d80c 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -12,11 +12,13 @@ "invalid-title": "Invalid title!", "invalid-user-data": "Invalid User Data", "invalid-password": "Invalid Password", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Invalid pagination value", "username-taken": "Username taken", "email-taken": "Email taken", "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.", "username-too-short": "Username too short", + "username-too-long": "Username too long", "user-banned": "User banned", "no-category": "Category doesn't exist", "no-topic": "Topic doesn't exist", @@ -52,5 +54,9 @@ "upload-error": "Upload Error : %1", "signature-too-long": "Signature can't be longer than %1 characters!", "cant-chat-with-yourself": "You can't chat with yourself!", - "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post" + "reputation-system-disabled": "Reputation system is disabled.", + "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": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/it/notifications.json b/public/language/it/notifications.json index 1d2e122b74..957afe9eec 100644 --- a/public/language/it/notifications.json +++ b/public/language/it/notifications.json @@ -10,11 +10,14 @@ "new_notification": "Nuove Notifiche", "you_have_unread_notifications": "Hai notifiche non lette.", "new_message_from": "Nuovo messaggio da %1", - "upvoted_your_post": "%1 has upvoted your post.", - "favourited_your_post": "%1 has favourited your post.", - "user_flagged_post": "%1 flagged a post.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 has posted a reply to: %2", "user_mentioned_you_in": "%1 mentioned you in %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error": "An error occurred...", diff --git a/public/language/it/recent.json b/public/language/it/recent.json index 56a1191bc0..2047204baf 100644 --- a/public/language/it/recent.json +++ b/public/language/it/recent.json @@ -4,5 +4,6 @@ "week": "Settimana", "month": "Mese", "year": "Year", + "alltime": "All Time", "no_recent_topics": "Non ci sono discussioni recenti." } \ No newline at end of file diff --git a/public/language/it/search.json b/public/language/it/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/it/search.json +++ b/public/language/it/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/it/user.json b/public/language/it/user.json index 7f437d56c5..d490e3e1ef 100644 --- a/public/language/it/user.json +++ b/public/language/it/user.json @@ -4,6 +4,8 @@ "username": "Nome Utente", "email": "Email", "confirm_email": "Confirm Email", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Nome e Cognome", "website": "Sito Internet", "location": "Località", @@ -61,5 +63,7 @@ "posts_per_page": "Post per Pagina", "notification_sounds": "Play a sound when you receive a notification.", "browsing": "Browsing Settings", - "open_links_in_new_tab": "Open outgoing links in new tab?" + "open_links_in_new_tab": "Open outgoing links in new tab?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/ja/category.json b/public/language/ja/category.json index 43bc8f22d5..c5ffc01c13 100644 --- a/public/language/ja/category.json +++ b/public/language/ja/category.json @@ -3,5 +3,6 @@ "no_topics": "まだスレッドはありません.
一番目のスレッドを書いてみないか？", "browsing": "閲覧中", "no_replies": "返事はまだありません", - "share_this_category": "この板を共有" + "share_this_category": "この板を共有", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/ja/error.json b/public/language/ja/error.json index cbaf323360..3d88578169 100644 --- a/public/language/ja/error.json +++ b/public/language/ja/error.json @@ -12,11 +12,13 @@ "invalid-title": "Invalid title!", "invalid-user-data": "無効なユーザーデータ", "invalid-password": "無効なパスワード", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "無効な改ページ設定値", "username-taken": "ユーザー名が取られた", "email-taken": "メールアドレスが使用された", "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.", "username-too-short": "Username too short", + "username-too-long": "Username too long", "user-banned": "ユーザーが停止された", "no-category": "板が存在しない", "no-topic": "スレッドが存在しない", @@ -52,5 +54,9 @@ "upload-error": "Upload Error : %1", "signature-too-long": "署名は最大%1文字までです！", "cant-chat-with-yourself": "自分にチャットすることはできません！", - "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post" + "reputation-system-disabled": "Reputation system is disabled.", + "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": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/ja/notifications.json b/public/language/ja/notifications.json index efe8333fac..9823deff19 100644 --- a/public/language/ja/notifications.json +++ b/public/language/ja/notifications.json @@ -10,11 +10,14 @@ "new_notification": "新しい通知", "you_have_unread_notifications": "未読の通知があります。", "new_message_from": "%1からの新しいメッセージ", - "upvoted_your_post": "%1はあなたのポストを評価しました。", - "favourited_your_post": "%1はあなたのポストをお気に入りにしました。", - "user_flagged_post": "%1 ポストを報告しました。", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 は %2 への返事を作成しました。", "user_mentioned_you_in": "%1 mentioned you in %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error": "An error occurred...", diff --git a/public/language/ja/recent.json b/public/language/ja/recent.json index 4ca75a039d..35cdd2b23f 100644 --- a/public/language/ja/recent.json +++ b/public/language/ja/recent.json @@ -4,5 +4,6 @@ "week": "最近 1 週", "month": "最近 1 ヶ月", "year": "Year", + "alltime": "All Time", "no_recent_topics": "最近のスレッドはありません。" } \ No newline at end of file diff --git a/public/language/ja/search.json b/public/language/ja/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/ja/search.json +++ b/public/language/ja/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/ja/user.json b/public/language/ja/user.json index f37a215849..ddb43c4dd5 100644 --- a/public/language/ja/user.json +++ b/public/language/ja/user.json @@ -4,6 +4,8 @@ "username": "ユーザー名", "email": "メール", "confirm_email": "Confirm Email", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "フルネーム", "website": "ウェブサイト", "location": "ロケーション", @@ -61,5 +63,7 @@ "posts_per_page": "ページ毎のポスト数", "notification_sounds": "通知が来たとき音を流す", "browsing": "Browsing Settings", - "open_links_in_new_tab": "Open outgoing links in new tab?" + "open_links_in_new_tab": "Open outgoing links in new tab?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/ko/category.json b/public/language/ko/category.json index 5437b07304..0ce8558aa9 100644 --- a/public/language/ko/category.json +++ b/public/language/ko/category.json @@ -3,5 +3,6 @@ "no_topics": "이 카테고리에는 생성된 주제가 없습니다.
먼저 주제를 생성해 보세요.", "browsing": "이 주제를 읽고 있는 사용자", "no_replies": "답글이 없습니다.", - "share_this_category": "이 카테고리를 공유" + "share_this_category": "이 카테고리를 공유", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/ko/error.json b/public/language/ko/error.json index fa961bc709..fd74542ee3 100644 --- a/public/language/ko/error.json +++ b/public/language/ko/error.json @@ -12,11 +12,13 @@ "invalid-title": "올바르지 않은 제목입니다.", "invalid-user-data": "올바르지 않은 사용자 정보입니다.", "invalid-password": "올바르지 않은 비밀번호입니다.", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "올바르지 않은 페이지입니다.", "username-taken": "이미 사용 중인 사용자 이름입니다.", "email-taken": "이미 사용 중인 이메일입니다.", "email-not-confirmed": "아직 이메일이 인증되지 않았습니다. 여기를 누르면 인증 메일을 발송할 수 있습니다.", "username-too-short": "사용자 이름이 너무 짧습니다.", + "username-too-long": "Username too long", "user-banned": "차단된 사용자입니다.", "no-category": "존재하지 않는 카테고리입니다.", "no-topic": "존재하지 않는 주제입니다.", @@ -52,5 +54,9 @@ "upload-error": "업로드 오류가 발생했습니다. : %1", "signature-too-long": "서명은 최대 %1자로 제한됩니다.", "cant-chat-with-yourself": "자신과는 채팅할 수 없습니다.", - "not-enough-reputation-to-downvote": "인기도가 낮아 이 게시물에 반대할 수 없습니다." + "reputation-system-disabled": "Reputation system is disabled.", + "downvoting-disabled": "Downvoting is disabled", + "not-enough-reputation-to-downvote": "인기도가 낮아 이 게시물에 반대할 수 없습니다.", + "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/ko/notifications.json b/public/language/ko/notifications.json index 8ececb6c49..90d004d7e0 100644 --- a/public/language/ko/notifications.json +++ b/public/language/ko/notifications.json @@ -10,11 +10,14 @@ "new_notification": "새 알림", "you_have_unread_notifications": "읽지 않은 알림이 있습니다.", "new_message_from": "%1님이 메시지를 보냈습니다.", - "upvoted_your_post": "%1님이 내 게시물을 추천했습니다.", - "favourited_your_post": "%1님이 내 게시물을 관심글로 등록했습니다.", - "user_flagged_post": "%1님이 게시물을 신고했습니다.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1님이 %2님의 게시물에 답글을 작성했습니다.", "user_mentioned_you_in": "%1 mentioned you in %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error": "An error occurred...", diff --git a/public/language/ko/recent.json b/public/language/ko/recent.json index 6190dda700..5e3f728004 100644 --- a/public/language/ko/recent.json +++ b/public/language/ko/recent.json @@ -4,5 +4,6 @@ "week": "주간", "month": "월간", "year": "Year", + "alltime": "All Time", "no_recent_topics": "최근 생성된 주제가 없습니다." } \ No newline at end of file diff --git a/public/language/ko/search.json b/public/language/ko/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/ko/search.json +++ b/public/language/ko/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/ko/user.json b/public/language/ko/user.json index baf5183211..e3b7b29e83 100644 --- a/public/language/ko/user.json +++ b/public/language/ko/user.json @@ -4,6 +4,8 @@ "username": "사용자 이름", "email": "이메일", "confirm_email": "이메일 확인", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "이름", "website": "웹 사이트", "location": "거주지", @@ -61,5 +63,7 @@ "posts_per_page": "페이지 당 게시물 수", "notification_sounds": "알림을 수신하면 알림음을 재생", "browsing": "페이지 열기", - "open_links_in_new_tab": "외부 링크를 새 탭에서 열기" + "open_links_in_new_tab": "외부 링크를 새 탭에서 열기", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/lt/category.json b/public/language/lt/category.json index ba84df3cf4..1c9dd0899b 100644 --- a/public/language/lt/category.json +++ b/public/language/lt/category.json @@ -3,5 +3,6 @@ "no_topics": "Šioje kategorijoje temų nėra.
Kodėl gi jums nesukūrus naujos?", "browsing": "naršo", "no_replies": "Niekas dar neatsakė", - "share_this_category": "Pasidalinti šią kategoriją" + "share_this_category": "Pasidalinti šią kategoriją", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/lt/error.json b/public/language/lt/error.json index ca771bc828..f41fc62c24 100644 --- a/public/language/lt/error.json +++ b/public/language/lt/error.json @@ -12,11 +12,13 @@ "invalid-title": "Neteisingas pavadinimas!", "invalid-user-data": "Klaidingi vartotojo duomenys", "invalid-password": "Klaidingas slaptažodis", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Klaidinga puslapiavimo reikšmė", "username-taken": "Vartotojo vardas jau užimtas", "email-taken": "El. pašto adresas jau užimtas", "email-not-confirmed": "Jūsų el. paštas nepatvirtintas, prašome paspausti čia norint jį patvirtinti.", "username-too-short": "Slapyvardis per trumpas", + "username-too-long": "Username too long", "user-banned": "Vartotojas užblokuotas", "no-category": "Kategorija neegzistuoja", "no-topic": "Tema neegzistuoja", @@ -52,5 +54,9 @@ "upload-error": "Įkėlimo klaida: %1", "signature-too-long": "Parašas negali būti ilgesnis negu %1 simboliai!", "cant-chat-with-yourself": "Jūs negalite susirašinėti su savimi!", - "not-enough-reputation-to-downvote": "Jūs neturite pakankamai reputacijos balsuoti prieš šį pranešimą" + "reputation-system-disabled": "Reputation system is disabled.", + "downvoting-disabled": "Downvoting is disabled", + "not-enough-reputation-to-downvote": "Jūs neturite pakankamai reputacijos balsuoti prieš šį pranešimą", + "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/lt/notifications.json b/public/language/lt/notifications.json index 96ffad091b..864652cb57 100644 --- a/public/language/lt/notifications.json +++ b/public/language/lt/notifications.json @@ -10,11 +10,14 @@ "new_notification": "Naujas pranešimas", "you_have_unread_notifications": "Jūs turite neperskaitytų pranešimų.", "new_message_from": "Nauja žinutė nuo %1", - "upvoted_your_post": "%1 teigiamai įvertino jūsų pranešimą.", - "favourited_your_post": "%1 pamėgo jūsų pranešimą.", - "user_flagged_post": "%1 pažymėjo pranešimą moderavimui.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 parašė atsaką %2", "user_mentioned_you_in": "%1 paminėjo Jus %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "El. paštas patvirtintas", "email-confirmed-message": "Dėkojame už el. pašto patvirtinimą. Jūsų paskyra pilnai aktyvuota.", "email-confirm-error": "Įvyko klaida...", diff --git a/public/language/lt/recent.json b/public/language/lt/recent.json index 5be1ef3ff5..0ccdef0f8c 100644 --- a/public/language/lt/recent.json +++ b/public/language/lt/recent.json @@ -4,5 +4,6 @@ "week": "Savaitė", "month": "Mėnesis", "year": "Metai", + "alltime": "All Time", "no_recent_topics": "Paskutinių temų nėra" } \ No newline at end of file diff --git a/public/language/lt/search.json b/public/language/lt/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/lt/search.json +++ b/public/language/lt/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/lt/user.json b/public/language/lt/user.json index 7c811b34a4..1902cdd399 100644 --- a/public/language/lt/user.json +++ b/public/language/lt/user.json @@ -4,6 +4,8 @@ "username": "Vartotojo vardas", "email": "El. paštas", "confirm_email": "Patvirtinti el. paštą", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Vardas ir pavardė", "website": "Tinklalapis", "location": "Vieta", @@ -61,5 +63,7 @@ "posts_per_page": "Pranešimų puslapyje", "notification_sounds": "Groti garsą kai gaunate pranešimą.", "browsing": "Naršymo nustatymai", - "open_links_in_new_tab": "Atidaryti nuorodas naujame skirtuke?" + "open_links_in_new_tab": "Atidaryti nuorodas naujame skirtuke?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/ms/category.json b/public/language/ms/category.json index 755fb94858..db2dc8d039 100644 --- a/public/language/ms/category.json +++ b/public/language/ms/category.json @@ -3,5 +3,6 @@ "no_topics": "Tiada topik dalam kategori ini.
Cuba menghantar topik yang baru?", "browsing": "melihat", "no_replies": "Tiada jawapan", - "share_this_category": "Kongsi kategori ini" + "share_this_category": "Kongsi kategori ini", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/ms/error.json b/public/language/ms/error.json index c76dc586f1..6c9f213d94 100644 --- a/public/language/ms/error.json +++ b/public/language/ms/error.json @@ -12,11 +12,13 @@ "invalid-title": "Invalid title!", "invalid-user-data": "Invalid User Data", "invalid-password": "Password salah!", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Invalid pagination value", "username-taken": "Username taken", "email-taken": "Email taken", "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.", "username-too-short": "Nama pengunna terlalu pendek", + "username-too-long": "Username too long", "user-banned": "User banned", "no-category": "Category doesn't exist", "no-topic": "Topic doesn't exist", @@ -52,5 +54,9 @@ "upload-error": "Upload Error : %1", "signature-too-long": "Signature can't be longer than %1 characters!", "cant-chat-with-yourself": "You can't chat with yourself!", - "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post" + "reputation-system-disabled": "Reputation system is disabled.", + "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": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/ms/notifications.json b/public/language/ms/notifications.json index 530c9d1f93..02cc302284 100644 --- a/public/language/ms/notifications.json +++ b/public/language/ms/notifications.json @@ -10,11 +10,14 @@ "new_notification": "Pemberitahuan baru", "you_have_unread_notifications": "Anda ada pemberitahuan yang belum dibaca", "new_message_from": "Pesanan baru daripada %1", - "upvoted_your_post": "%1 telah undi-naik posting anda", - "favourited_your_post": "strong>%1 telah menggemari posting anda", - "user_flagged_post": "%1 menandakan posting", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 telah membalas posting kepada: %2", "user_mentioned_you_in": "%1 mentioned you in %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error": "An error occurred...", diff --git a/public/language/ms/recent.json b/public/language/ms/recent.json index 8342257702..bface6de72 100644 --- a/public/language/ms/recent.json +++ b/public/language/ms/recent.json @@ -4,5 +4,6 @@ "week": "Minggu", "month": "Bulan", "year": "Year", + "alltime": "All Time", "no_recent_topics": "Tiada topik terkini" } \ No newline at end of file diff --git a/public/language/ms/search.json b/public/language/ms/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/ms/search.json +++ b/public/language/ms/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/ms/user.json b/public/language/ms/user.json index f560bec8d5..74fffdbd04 100644 --- a/public/language/ms/user.json +++ b/public/language/ms/user.json @@ -4,6 +4,8 @@ "username": "Nama pengguna", "email": "Emel", "confirm_email": "Confirm Email", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Nama penuh", "website": "Laman Web", "location": "Lokasi", @@ -61,5 +63,7 @@ "posts_per_page": "Kiriman setiap muka", "notification_sounds": "Mainkan muzik apabila anda menerima maklumbalas", "browsing": "Browsing Settings", - "open_links_in_new_tab": "Open outgoing links in new tab?" + "open_links_in_new_tab": "Open outgoing links in new tab?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/nb/category.json b/public/language/nb/category.json index 14ab70de34..af2119d658 100644 --- a/public/language/nb/category.json +++ b/public/language/nb/category.json @@ -3,5 +3,6 @@ "no_topics": "Det er ingen emner i denne kategorien
Hvorfor ikke lage ett?", "browsing": "leser", "no_replies": "Ingen har svart", - "share_this_category": "Del denne kategorien" + "share_this_category": "Del denne kategorien", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/nb/error.json b/public/language/nb/error.json index 77c582b23f..26e3c9d80c 100644 --- a/public/language/nb/error.json +++ b/public/language/nb/error.json @@ -12,11 +12,13 @@ "invalid-title": "Invalid title!", "invalid-user-data": "Invalid User Data", "invalid-password": "Invalid Password", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Invalid pagination value", "username-taken": "Username taken", "email-taken": "Email taken", "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.", "username-too-short": "Username too short", + "username-too-long": "Username too long", "user-banned": "User banned", "no-category": "Category doesn't exist", "no-topic": "Topic doesn't exist", @@ -52,5 +54,9 @@ "upload-error": "Upload Error : %1", "signature-too-long": "Signature can't be longer than %1 characters!", "cant-chat-with-yourself": "You can't chat with yourself!", - "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post" + "reputation-system-disabled": "Reputation system is disabled.", + "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": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/nb/notifications.json b/public/language/nb/notifications.json index 96afebd800..2ffabea7c1 100644 --- a/public/language/nb/notifications.json +++ b/public/language/nb/notifications.json @@ -10,11 +10,14 @@ "new_notification": "Nytt varsel", "you_have_unread_notifications": "Du har uleste varsler.", "new_message_from": "Ny melding fra %1", - "upvoted_your_post": "%1 har stemt opp ditt innlegg.", - "favourited_your_post": "%1 har favorittmerket ditt innlegg.", - "user_flagged_post": "%1 flagget ett innlegg.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 har skrevet et svar til: %2", "user_mentioned_you_in": "%1 mentioned you in %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error": "An error occurred...", diff --git a/public/language/nb/recent.json b/public/language/nb/recent.json index 608c10c8b6..d3b44fc0f4 100644 --- a/public/language/nb/recent.json +++ b/public/language/nb/recent.json @@ -4,5 +4,6 @@ "week": "Uke", "month": "Måned", "year": "Year", + "alltime": "All Time", "no_recent_topics": "Det er ingen nye tråder." } \ No newline at end of file diff --git a/public/language/nb/search.json b/public/language/nb/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/nb/search.json +++ b/public/language/nb/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/nb/user.json b/public/language/nb/user.json index c19894c3f3..5f3f3db9ab 100644 --- a/public/language/nb/user.json +++ b/public/language/nb/user.json @@ -4,6 +4,8 @@ "username": "Brukernavn", "email": "E-post", "confirm_email": "Bekfreft e-post", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Fullt navn", "website": "Nettsted", "location": "Plassering", @@ -61,5 +63,7 @@ "posts_per_page": "Innlegg per side", "notification_sounds": "Spill av en lyd når du mottar ett varsel.", "browsing": "Surfeinnstillinger", - "open_links_in_new_tab": "Åpne utgående linker i en ny fane?" + "open_links_in_new_tab": "Åpne utgående linker i en ny fane?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/nl/category.json b/public/language/nl/category.json index 59ca9e6530..7c6651aa9a 100644 --- a/public/language/nl/category.json +++ b/public/language/nl/category.json @@ -3,5 +3,6 @@ "no_topics": "Er zijn geen onderwerpen in deze categorie.
Waarom maak je er niet een aan?", "browsing": "verkennen", "no_replies": "Niemand heeft gereageerd", - "share_this_category": "Deel deze categorie" + "share_this_category": "Deel deze categorie", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/nl/email.json b/public/language/nl/email.json index a4bd403e2a..e662dce397 100644 --- a/public/language/nl/email.json +++ b/public/language/nl/email.json @@ -14,7 +14,7 @@ "digest.cta": "Klik hier om deze website te bezoeken %1 ", "digest.unsub.info": "Deze overzicht was verzonden naar jou vanwege je abbonement instellingen", "digest.unsub.cta": "Klik hier om u instellingen te wijzigen", - "digest.daily.no_topics": "Er zijn geen actieve topics vandaag", + "digest.daily.no_topics": "Er zijn geen actieve onderwerpen vandaag", "test.text1": "Dit is een test email om te verifiëren dat de email service correct is opgezet voor jou NodeBB", "closing": "Bedankt!" } \ No newline at end of file diff --git a/public/language/nl/error.json b/public/language/nl/error.json index b6a85567d1..173db65af9 100644 --- a/public/language/nl/error.json +++ b/public/language/nl/error.json @@ -9,14 +9,16 @@ "invalid-uid": "Ongeldig Gebruikers ID", "invalid-username": "Ongeldig Gebruikersnaam", "invalid-email": "Ongeldig Email Adres", - "invalid-title": "Ongeldig Titel!", + "invalid-title": "Ongeldige Titel!", "invalid-user-data": "Ongeldig Gebruikersdata", "invalid-password": "Ongeldig wachtwoord", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Ongeldig pagineringswaarde", "username-taken": "Gebruikersnaam is al bezet", "email-taken": "Email adres is al gebruikt", "email-not-confirmed": "U email adres is niet bevestigd, Klik hier om uw email adres te bevestigen", "username-too-short": "Gebruikersnaam is te kort", + "username-too-long": "Username too long", "user-banned": "Gebruiker verbannen", "no-category": "Categorie bestaat niet", "no-topic": "Onderwerp bestaat niet", @@ -52,5 +54,9 @@ "upload-error": "Upload Fout : %1", "signature-too-long": "Deze handtekening kan niet groter zijn dan %1 karakters!", "cant-chat-with-yourself": "Je kan niet met jezelf chatten!", - "not-enough-reputation-to-downvote": "U heeft niet de benodigde reputatie om dit bericht te downvoten" + "reputation-system-disabled": "Reputation system is disabled.", + "downvoting-disabled": "Downvoting is disabled", + "not-enough-reputation-to-downvote": "U heeft niet de benodigde reputatie om dit bericht te downvoten", + "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/nl/global.json b/public/language/nl/global.json index 94f5da88ba..446c5d35bd 100644 --- a/public/language/nl/global.json +++ b/public/language/nl/global.json @@ -50,16 +50,16 @@ "read_more": "Lees meer", "posted_ago_by_guest": "geplaatst %1 door gast", "posted_ago_by": "geplaatst %1 door %2", - "posted_ago": "geplaatst %1", - "posted_in_ago_by_guest": "geplaatst in % 1 %2 door gast", + "posted_ago": "geplaatst door %1", + "posted_in_ago_by_guest": "geplaatst in %1 %2 door gast", "posted_in_ago_by": "geplaatst in %1 %2 door %3", "posted_in_ago": "geplaatst in %1 %2", "replied_ago": "gereageerd %1", - "user_posted_ago": "%1 geplaatst %2", + "user_posted_ago": "%1 plaatste %2", "guest_posted_ago": "Gast plaatste %1", "last_edited_by_ago": "voor het laatst aangepast door %1 %2", "norecentposts": "Geen Recente Berichten", - "norecenttopics": "Geen Recente Topics", + "norecenttopics": "Geen Recente Onderwerpen", "recentposts": "Recente Berichten", "recentips": "Recente Ingelogde IPs", "away": "Afwezig", diff --git a/public/language/nl/login.json b/public/language/nl/login.json index ea7a6e3bcd..fa8f5d55d7 100644 --- a/public/language/nl/login.json +++ b/public/language/nl/login.json @@ -2,7 +2,7 @@ "username": "Gebruikersnaam / Emailadres", "remember_me": "Mij Onthouden?", "forgot_password": "Wachtwoord Vergeten?", - "alternative_logins": "Alternatieve Logins", + "alternative_logins": "Alternatieve Loginmethodes", "failed_login_attempt": "Mislukte inlog poging, probeer het later opnieuw.", "login_successful": "Je bent succesvol ingelogd!", "dont_have_account": "Heeft u nog geen account?" diff --git a/public/language/nl/notifications.json b/public/language/nl/notifications.json index 6758b7959f..6559d5df3e 100644 --- a/public/language/nl/notifications.json +++ b/public/language/nl/notifications.json @@ -10,11 +10,14 @@ "new_notification": "een nieuwe notificatie", "you_have_unread_notifications": "U heeft ongelezen notificaties", "new_message_from": "Nieuw bericht van %1", - "upvoted_your_post": "%1 heeft uw bericht geupvote", - "favourited_your_post": "%1 heeft uw bericht aan zijn favorieten toegevoegd", - "user_flagged_post": "%1 rapporteert uw bericht", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 heeft een reactie op het bericht gegeven aan %2", "user_mentioned_you_in": "%1 heeft u genoemd in %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Email adres bevestigd", "email-confirmed-message": "Bedankt voor het bevestigen van uw email adres. Uw account is nu volledig actief.", "email-confirm-error": "Een fout vond plaats", diff --git a/public/language/nl/recent.json b/public/language/nl/recent.json index 2bfc4af744..f111931b98 100644 --- a/public/language/nl/recent.json +++ b/public/language/nl/recent.json @@ -4,5 +4,6 @@ "week": "Week", "month": "Maand", "year": "Jaar", + "alltime": "All Time", "no_recent_topics": "Er zijn geen recente reacties." } \ No newline at end of file diff --git a/public/language/nl/search.json b/public/language/nl/search.json index b7035add16..7b1aab07ca 100644 --- a/public/language/nl/search.json +++ b/public/language/nl/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 resulta(a)ten was een match \"%2\", (%3 seconds)" + "results_matching": "%1 resulta(a)ten was een match \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json index 800d6348ca..9a9d1a2f81 100644 --- a/public/language/nl/topic.json +++ b/public/language/nl/topic.json @@ -17,7 +17,7 @@ "purge": "weggooien", "restore": "Herstellen", "move": "Verplaatsen", - "fork": "Fork", + "fork": "Afsplitsen", "banned": "verbannen", "link": "Link", "share": "Delen", @@ -36,7 +36,7 @@ "watch": "Volgen", "watch.title": "Krijg notificaties van nieuwe reacties op dit onderwerp", "share_this_post": "Deel dit Bericht", - "thread_tools.title": "Thread Gereedschap", + "thread_tools.title": "Acties", "thread_tools.markAsUnreadForAll": "Ongelezen Markeren", "thread_tools.pin": "Onderwerp Vastmaken", "thread_tools.unpin": "Onderwerp Losmaken", @@ -44,13 +44,13 @@ "thread_tools.unlock": "Onderwerp Openen", "thread_tools.move": "Onderwerp Verplaatsen", "thread_tools.move_all": "Verplaats alles", - "thread_tools.fork": "Onderwerp Forken", + "thread_tools.fork": "Onderwerp Afsplitsen", "thread_tools.delete": "Onderwerp Verwijderen", "thread_tools.delete_confirm": "Weet u het zeker dat u dit onderwerp wilt verwijderen?", "thread_tools.restore": "Onderwerp Herstellen", "thread_tools.restore_confirm": "Weet u het zeker dat u het onderwerp wilt herstellen?", - "thread_tools.purge": "Gooi onderwerp weg", - "thread_tools.purge_confirm": "Weet u het zeker dat u dit onderwerp wilt weggooien?", + "thread_tools.purge": "Wis Onderwerp ", + "thread_tools.purge_confirm": "Weet u het zeker dat u dit onderwerp wilt wissen?", "topic_move_success": "Deze onderwerp is succesvol verplaatst naar %1", "post_delete_confirm": "Weet u het zeker dat u dit bericht wilt verwijderen?", "post_restore_confirm": "Weet u het zeker dat u dit bericht wilt herstellen?", @@ -58,7 +58,7 @@ "load_categories": "Categorieën Laden", "disabled_categories_note": "Uitgeschakelde Categorieën zijn grijs", "confirm_move": "Verplaatsen", - "confirm_fork": "Fork", + "confirm_fork": "Splits", "favourite": "Favoriet", "favourites": "Favorieten", "favourites.has_no_favourites": "Je hebt geen favorieten, sla een aantal berichten op als favoriet om ze hier te zien!", @@ -67,11 +67,11 @@ "move_topics": "Verplaats onderwerpen", "move_post": "Bericht Verplaatsen", "post_moved": "Bericht verplaatst!", - "fork_topic": "Onderwerp Forken", + "fork_topic": "Afgesplitste Onderwerp ", "topic_will_be_moved_to": "Dit onderwerp zal verplaatst worden naar de categorie", "fork_topic_instruction": "Klik op de berichten die je wilt forken", "fork_no_pids": "Geen berichten geselecteerd!", - "fork_success": "Onderwerp is met succes geforkt!", + "fork_success": "Onderwerp is met succes gesplitst!", "composer.title_placeholder": "Vul de titel voor het onderwerp hier in...", "composer.discard": "Annuleren", "composer.submit": "Opslaan", @@ -84,9 +84,9 @@ "composer.thumb_file_label": "Of upload een bestand", "composer.thumb_remove": "Velden leegmaken", "composer.drag_and_drop_images": "Sleep en Zet Afbeeldingen Hier", - "more_users_and_guests": "%1 meer gebruiker(s) en %2 gast(en)", + "more_users_and_guests": "%1 of meerdere gebruiker(s) en %2 gast(en)", "more_users": "%1 meer gebruiker(s)", - "more_guests": "%1 meer gast(en)", + "more_guests": "%1 of meerdere gast(en)", "users_and_others": "%1 en %2 anderen", "sort_by": "gesorteerd op", "oldest_to_newest": "Oud naar Nieuw", diff --git a/public/language/nl/user.json b/public/language/nl/user.json index 37103e7644..df0f112c6f 100644 --- a/public/language/nl/user.json +++ b/public/language/nl/user.json @@ -4,6 +4,8 @@ "username": "Gebruikersnaam", "email": "Email", "confirm_email": "Bevestig uw email adres", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Volledige Naam", "website": "Website", "location": "Locatie", @@ -61,5 +63,7 @@ "posts_per_page": "Berichten per Pagina", "notification_sounds": "Speel een geluid af wanneer ik een notificatie ontvang.", "browsing": "Zoek Instellingen", - "open_links_in_new_tab": "Open de uitgaande links in een nieuw tabblad?" + "open_links_in_new_tab": "Open de uitgaande links in een nieuw tabblad?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/pl/category.json b/public/language/pl/category.json index 8e6707e13d..997aae19ae 100644 --- a/public/language/pl/category.json +++ b/public/language/pl/category.json @@ -3,5 +3,6 @@ "no_topics": "W tej kategorii nie ma jeszcze żadnych wątków.
Dlaczego ty nie utworzysz jakiegoś?", "browsing": "przegląda", "no_replies": "Nikt jeszcze nie odpowiedział", - "share_this_category": "Udostępnij tę kategorię" + "share_this_category": "Udostępnij tę kategorię", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/pl/email.json b/public/language/pl/email.json index 98e591ab02..2e5df85e6a 100644 --- a/public/language/pl/email.json +++ b/public/language/pl/email.json @@ -1,20 +1,20 @@ { - "password-reset-requested": "Password Reset Requested - %1!", - "welcome-to": "Welcome to %1", - "greeting_no_name": "Hello", - "greeting_with_name": "Hello %1", - "welcome.text1": "Thank you for registering with %1!", - "welcome.text2": "To fully activate your account, we need to verify that you own the email address you registered with.", - "welcome.cta": "Click here to confirm your email address", - "reset.text1": "We received a request to reset your password, possibly because you have forgotten it. If this is not the case, please ignore this email.", - "reset.text2": "To continue with the password reset, please click on the following link:", - "reset.cta": "Click here to reset your password", - "digest.notifications": "You have some unread notifications from %1:", - "digest.latest_topics": "Latest topics from %1", - "digest.cta": "Click here to visit %1", - "digest.unsub.info": "This digest was sent to you due to your subscription settings.", - "digest.unsub.cta": "Click here to alter those settings", - "digest.daily.no_topics": "There have been no active topics in the past day", - "test.text1": "This is a test email to verify that the emailer is set up correctly for your NodeBB.", - "closing": "Thanks!" + "password-reset-requested": "Wybrano przywrócenie hasła - %1", + "welcome-to": "Witaj w %1", + "greeting_no_name": "Witaj", + "greeting_with_name": "Witaj %1", + "welcome.text1": "Dziękujemy za rejestrację w %1", + "welcome.text2": "Aby aktywować swoje konto, musisz potwierdzić, że skorzystałeś z własnego adresu e-mail.", + "welcome.cta": "Kliknij tutaj, by potwierdzić swój adres", + "reset.text1": "Otrzymaliśmy żądanie przywrócenia Twojego hasła. Jeśli nie żądałeś przywrócenia hasła, zignoruj ten e-mail.", + "reset.text2": "Aby przywrócić swoje hasło, skorzystaj z poniższego linku:", + "reset.cta": "Kliknij tu, by przywrócić swoje hasło", + "digest.notifications": "Masz nieprzeczytane powiadomienia z %1:", + "digest.latest_topics": "Ostatnie tematy z %1", + "digest.cta": "Kliknij, by odwiedzić %1", + "digest.unsub.info": "To podsumowanie zostało wysłane zgodnie z Twoimi ustawieniami.", + "digest.unsub.cta": "Kliknij tutaj, aby je zmienić", + "digest.daily.no_topics": "Wczoraj nie było żadnych aktywnych tematów", + "test.text1": "To jest e-mail testowy, aby sprawdzić, czy poprawnie skonfigurowałeś e-mailer w swoim NodeBB.", + "closing": "Dziękujemy!" } \ No newline at end of file diff --git a/public/language/pl/error.json b/public/language/pl/error.json index e0df9469bb..75fd7e8daa 100644 --- a/public/language/pl/error.json +++ b/public/language/pl/error.json @@ -12,11 +12,13 @@ "invalid-title": "Błędny tytuł.", "invalid-user-data": "Błędne dane użytkownika.", "invalid-password": "Błędne hasło", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Błędna wartość paginacji", "username-taken": "Login zajęty.", "email-taken": "E-mail zajęty.", "email-not-confirmed": "Twój email nie jest potwierdzony, kliknij tutaj aby go potwierdzić.", "username-too-short": "Nazwa użytkownika za krótka.", + "username-too-long": "Username too long", "user-banned": "Użytkownik zbanowany", "no-category": "Kategoria nie istnieje.", "no-topic": "Temat nie istnieje", @@ -25,7 +27,7 @@ "no-user": "Użytkownik nie istnieje", "no-teaser": "Podgląd nie istnieje", "no-privileges": "Nie masz wystarczających praw by to wykonać.", - "no-emailers-configured": "No email plugins were loaded, so a test email could not be sent", + "no-emailers-configured": "Nie zainstalowano żadnego dodatku obsługującego e-mail, więc nie można wysłać testowej wiadomości.", "category-disabled": "Kategoria wyłączona.", "topic-locked": "Temat zamknięty", "still-uploading": "Poczekaj na pełne załadowanie", @@ -52,5 +54,9 @@ "upload-error": "Błąd uploadu: %1", "signature-too-long": "Sygnatura nie może mieć więcej niż %1 znaków.", "cant-chat-with-yourself": "Nie możesz czatować ze sobą", - "not-enough-reputation-to-downvote": "Masz za mało reputacji by ocenić ten post." + "reputation-system-disabled": "Reputation system is disabled.", + "downvoting-disabled": "Downvoting is disabled", + "not-enough-reputation-to-downvote": "Masz za mało reputacji by ocenić ten post.", + "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/pl/global.json b/public/language/pl/global.json index 84ac6226d5..6a4b6c40b2 100644 --- a/public/language/pl/global.json +++ b/public/language/pl/global.json @@ -18,7 +18,7 @@ "save_changes": "Zapisz zmiany", "close": "Zamknij", "pagination": "Numerowanie stron", - "pagination.out_of": "%1 poza %2", + "pagination.out_of": "%1 z %2", "pagination.enter_index": "Wpisz indeks.", "header.admin": "Administracja", "header.recent": "Ostatnie", diff --git a/public/language/pl/groups.json b/public/language/pl/groups.json index c00c111e11..ecce894b28 100644 --- a/public/language/pl/groups.json +++ b/public/language/pl/groups.json @@ -1,7 +1,7 @@ { - "view_group": "View Group", - "details.title": "Group Details", - "details.members": "Member List", - "details.has_no_posts": "This group's members have not made any posts.", - "details.latest_posts": "Latest Posts" + "view_group": "Obejrzyj grupę", + "details.title": "Szczegóły grupy", + "details.members": "Lista członków", + "details.has_no_posts": "Członkowie tej grupy nie napisali żadnych postów.", + "details.latest_posts": "Ostatnie posty" } \ No newline at end of file diff --git a/public/language/pl/modules.json b/public/language/pl/modules.json index e63c958dc9..154ae27501 100644 --- a/public/language/pl/modules.json +++ b/public/language/pl/modules.json @@ -14,5 +14,5 @@ "chat.maximize": "Maksymalizuj", "composer.user_said_in": "%1 powiedział w %2:", "composer.user_said": "%1 powiedział:", - "composer.discard": "Na pewno chcesz ignorować ten post?" + "composer.discard": "Na pewno chcesz porzucić ten post?" } \ No newline at end of file diff --git a/public/language/pl/notifications.json b/public/language/pl/notifications.json index 493b232147..c715ae9567 100644 --- a/public/language/pl/notifications.json +++ b/public/language/pl/notifications.json @@ -2,19 +2,22 @@ "title": "Powiadomienia", "no_notifs": "Nie masz nowych powiadomień", "see_all": "Zobacz wszystkie powiadomienia", - "back_to_home": "Back to %1", + "back_to_home": "Wróć do %1", "outgoing_link": "Łącze wychodzące", - "outgoing_link_message": "You are now leaving %1.", + "outgoing_link_message": "Opuszczasz %1.", "continue_to": "Continue to %1", "return_to": "Return to %1", "new_notification": "Nowe powiadomienie", "you_have_unread_notifications": "Masz nieprzeczytane powiadomienia.", "new_message_from": "Nowa wiadomość od %1", - "upvoted_your_post": "%1 zagłosował na Twój post", - "favourited_your_post": "%1 polubił/a Twój post.", - "user_flagged_post": "%1 oznaczył/a Twój post", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 dodał odpowiedź do %2", - "user_mentioned_you_in": "%1 mentioned you in %2", + "user_mentioned_you_in": "%1 wspomniał cię w %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "E-mail potwierdzony", "email-confirmed-message": "Dziękujemy za potwierdzenie maila. Twoje konto zostało aktywowane.", "email-confirm-error": "Wystąpił błąd.", diff --git a/public/language/pl/pages.json b/public/language/pl/pages.json index fb43e50c1a..02e459b55a 100644 --- a/public/language/pl/pages.json +++ b/public/language/pl/pages.json @@ -5,7 +5,7 @@ "recent": "Ostatnie wątki", "users": "Zarejestrowani użytkownicy", "notifications": "Powiadomienia", - "tags": "Topics tagged under \"%1\"", + "tags": "Tematy oznaczone \"%1\"", "user.edit": "Edytowanie \"%1\"", "user.following": "Obserwowani przez %1", "user.followers": "Obserwujący %1", diff --git a/public/language/pl/recent.json b/public/language/pl/recent.json index 74050bc028..8f92e35c6a 100644 --- a/public/language/pl/recent.json +++ b/public/language/pl/recent.json @@ -3,6 +3,7 @@ "day": "Dzień", "week": "Tydzień", "month": "Miesiąc", - "year": "Year", + "year": "Rok", + "alltime": "All Time", "no_recent_topics": "Brak ostatnich wątków." } \ No newline at end of file diff --git a/public/language/pl/search.json b/public/language/pl/search.json index d0ffc64f36..2a9252fdab 100644 --- a/public/language/pl/search.json +++ b/public/language/pl/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 wyników pasujących do \"%2\", (%3 sekund)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/pl/tags.json b/public/language/pl/tags.json index f065d4bbfa..d4b35e3b39 100644 --- a/public/language/pl/tags.json +++ b/public/language/pl/tags.json @@ -1,6 +1,6 @@ { - "no_tag_topics": "There are no topics with this tag.", - "tags": "Tags", - "enter_tags_here": "Enter tags here. Press enter after each tag.", - "no_tags": "There are no tags yet." + "no_tag_topics": "Nie ma tematów z tym tagiem", + "tags": "Tagi", + "enter_tags_here": "Tutaj wpisz tagi. Naciśnij enter po każdym.", + "no_tags": "Jeszcze nie ma tagów." } \ No newline at end of file diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json index bcb2ad0721..6ef02c02a4 100644 --- a/public/language/pl/topic.json +++ b/public/language/pl/topic.json @@ -14,7 +14,7 @@ "reply": "Odpowiedz", "edit": "Edytuj", "delete": "Usuń", - "purge": "Purge", + "purge": "Wyczyść", "restore": "Przywróć", "move": "Przenieś", "fork": "Skopiuj", @@ -23,7 +23,7 @@ "share": "Udostępnij", "tools": "Narzędzia", "flag": "Zgłoś", - "locked": "Locked", + "locked": "Zablokowany", "bookmark_instructions": "Kliknij tutaj, aby wrócić do ostatniej pozycji lub zamknij, aby odrzucić.", "flag_title": "Zgłoś post do moderacji", "flag_confirm": "Na pewno chcesz oznaczyć ten post?", @@ -49,12 +49,12 @@ "thread_tools.delete_confirm": "Na pewno chcesz usunąć ten wątek?", "thread_tools.restore": "Przywróć wątek", "thread_tools.restore_confirm": "Na pewno chcesz przywrócić ten wątek?", - "thread_tools.purge": "Purge Topic", - "thread_tools.purge_confirm": "Are you sure you want to purge this thread?", + "thread_tools.purge": "Wyczyść wątek", + "thread_tools.purge_confirm": "Jesteś pewien, że chcesz wyczyścić ten wątek?", "topic_move_success": "Temat przeniesiono do %1", "post_delete_confirm": "Na pewno chcesz usunąć ten post?", "post_restore_confirm": "Na pewno chcesz przywrócić ten post?", - "post_purge_confirm": "Are you sure you want to purge this post?", + "post_purge_confirm": "Jesteś pewien, że chcesz wyczyścić ten post?", "load_categories": "Ładowanie kategorii", "disabled_categories_note": "Zablokowane kategorie zostały wyszarzone.", "confirm_move": "Przenieś", @@ -87,9 +87,9 @@ "more_users_and_guests": "%1 więcej użytkownik(ów) i %2 gośc(i)", "more_users": "%1 więcej użytkownik(ów)", "more_guests": "%1 więcej gośc(i)", - "users_and_others": "%1 and %2 others", - "sort_by": "Sort by", - "oldest_to_newest": "Oldest to Newest", - "newest_to_oldest": "Newest to Oldest", - "most_votes": "Most votes" + "users_and_others": "%1 i %2 innych", + "sort_by": "Sortuj po", + "oldest_to_newest": "Najpierw najstarsze", + "newest_to_oldest": "Najpierw najnowsze", + "most_votes": "Najwięcej głosów" } \ No newline at end of file diff --git a/public/language/pl/user.json b/public/language/pl/user.json index ceb114e4af..65a0258933 100644 --- a/public/language/pl/user.json +++ b/public/language/pl/user.json @@ -3,7 +3,9 @@ "offline": "Offline", "username": "Nazwa użytkownika", "email": "Adres e-mail", - "confirm_email": "Confirm Email", + "confirm_email": "Potwierdź e-mail", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Pełna nazwa", "website": "Strona WWW", "location": "Położenie", @@ -37,7 +39,7 @@ "change_password_success": "Twoje hasło jest zaktualizowane!", "confirm_password": "Potwierdź hasło", "password": "Hasło", - "username_taken_workaround": "Login jakiego chciałeś/aś użyć jest już zajęty, ale my to załatwimy. Jesteś znany/a jako %1", + "username_taken_workaround": "Wybrany login jest już zajęty, więc zmieniliśmy go trochę. Proponujemy %1", "upload_picture": "Prześlij zdjęcie", "upload_a_picture": "Prześlij zdjęcie", "image_spec": "Możesz przesłać tylko pliki PNG, JPG lub GIF.", @@ -61,5 +63,7 @@ "posts_per_page": "Postów na stronę", "notification_sounds": "Odtwórz dźwięk po otrzymaniu powiadomienia.", "browsing": "Ustawienia szukania", - "open_links_in_new_tab": "Otwierać linki zewnętrzne w nowych kartach?" + "open_links_in_new_tab": "Otwierać linki zewnętrzne w nowych kartach?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/pl/users.json b/public/language/pl/users.json index 6a12eb61d4..1c87248f14 100644 --- a/public/language/pl/users.json +++ b/public/language/pl/users.json @@ -5,6 +5,6 @@ "search": "Szukaj", "enter_username": "Wpisz nazwę użytkownika", "load_more": "Więcej", - "user-not-found": "User not found!", - "users-found-search-took": "%1 user(s) found! Search took %2 ms." + "user-not-found": "Nie znaleziono użytkownika!", + "users-found-search-took": "Znaleziono %1 użytkowników. Szukanie zajęło %2 ms." } \ No newline at end of file diff --git a/public/language/pt_BR/category.json b/public/language/pt_BR/category.json index 7b63409f19..13a29a5a02 100644 --- a/public/language/pt_BR/category.json +++ b/public/language/pt_BR/category.json @@ -3,5 +3,6 @@ "no_topics": "Não tem nenhum tópico nesta categoria.
Por que não tenta postar o primeiro?", "browsing": "navegando", "no_replies": "Ninguém respondeu", - "share_this_category": "Compartilhar" + "share_this_category": "Compartilhar", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/pt_BR/error.json b/public/language/pt_BR/error.json index 9dca9b0ae2..dd6fe32c3c 100644 --- a/public/language/pt_BR/error.json +++ b/public/language/pt_BR/error.json @@ -12,11 +12,13 @@ "invalid-title": "Título inválido.", "invalid-user-data": "Informação de usuário inválida", "invalid-password": "Senha inválida", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Informação inválida de paginação", "username-taken": "Usuário já existe", "email-taken": "Email já foi utilizado em um cadastro", "email-not-confirmed": "Seu email não está confirmado, por favor, clique aqui para confirmá-lo", "username-too-short": "Nome de usuário muito curto", + "username-too-long": "Username too long", "user-banned": "Usuário banido", "no-category": "Categoria não existe", "no-topic": "Tópico não existe", @@ -52,5 +54,9 @@ "upload-error": "Erro de Upload : %1", "signature-too-long": "Assinatura não pode conter mais que %1 caracteres!", "cant-chat-with-yourself": "Impossível bater papo consigo mesmo!", - "not-enough-reputation-to-downvote": "Você não possui reputação suficiente para negativar este post" + "reputation-system-disabled": "Reputation system is disabled.", + "downvoting-disabled": "Downvoting is disabled", + "not-enough-reputation-to-downvote": "Você não possui reputação suficiente para negativar este post", + "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/pt_BR/notifications.json b/public/language/pt_BR/notifications.json index 08a4240c19..fc82e93866 100644 --- a/public/language/pt_BR/notifications.json +++ b/public/language/pt_BR/notifications.json @@ -10,11 +10,14 @@ "new_notification": "Nova notificação", "you_have_unread_notifications": "Você possui notificações não lidas.", "new_message_from": "Nova mensagem de %1", - "upvoted_your_post": "%1 votou no seu post.", - "favourited_your_post": "%1 favoritou seu post.", - "user_flagged_post": "%1 sinalizou seu post.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 respondeu para: %2", "user_mentioned_you_in": "%1 mensionou você em %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmado", "email-confirmed-message": "Obrigado por validar seu email. Sua conta foi ativada.", "email-confirm-error": "Ocorreu um erro...", diff --git a/public/language/pt_BR/pages.json b/public/language/pt_BR/pages.json index b700cccb53..48c03f52d9 100644 --- a/public/language/pt_BR/pages.json +++ b/public/language/pt_BR/pages.json @@ -5,7 +5,7 @@ "recent": "Tópicos Recentes", "users": "Usuários Registrados", "notifications": "Notificações", - "tags": "Topics tagged under \"%1\"", + "tags": "Tópicos com a tag sob \"%1\"", "user.edit": "Editando \"%1\"", "user.following": "Seguidos por %1", "user.followers": "Seguidores de %1", diff --git a/public/language/pt_BR/recent.json b/public/language/pt_BR/recent.json index 27a5e4e108..3185b1419b 100644 --- a/public/language/pt_BR/recent.json +++ b/public/language/pt_BR/recent.json @@ -4,5 +4,6 @@ "week": "Semana", "month": "Mês", "year": "Ano", + "alltime": "All Time", "no_recent_topics": "Nenhum tópico recente." } \ No newline at end of file diff --git a/public/language/pt_BR/search.json b/public/language/pt_BR/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/pt_BR/search.json +++ b/public/language/pt_BR/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/pt_BR/topic.json b/public/language/pt_BR/topic.json index eaa541ed33..8a4912a100 100644 --- a/public/language/pt_BR/topic.json +++ b/public/language/pt_BR/topic.json @@ -87,7 +87,7 @@ "more_users_and_guests": "%1 mais usuário(s) e %2 visitante(s)", "more_users": "%1 mais usuário(s)", "more_guests": "%1 mais visitante(s)", - "users_and_others": "%1 and %2 others", + "users_and_others": "%1 e %2 outros", "sort_by": "Ordenar por", "oldest_to_newest": "Mais Antigo para Recente", "newest_to_oldest": "Recente para mais Antigo", diff --git a/public/language/pt_BR/user.json b/public/language/pt_BR/user.json index 8ecaf1e00b..366c291a5d 100644 --- a/public/language/pt_BR/user.json +++ b/public/language/pt_BR/user.json @@ -4,6 +4,8 @@ "username": "Usuário", "email": "Email", "confirm_email": "Confirmar Email", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Nome Completo", "website": "Website", "location": "Localização", @@ -61,5 +63,7 @@ "posts_per_page": "Posts por Página", "notification_sounds": "Tocar um som quando receber notificação.", "browsing": "Configurações de Navegação", - "open_links_in_new_tab": "Abrir links externos em nova aba?" + "open_links_in_new_tab": "Abrir links externos em nova aba?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/ro/category.json b/public/language/ro/category.json index fbd7cd2393..8c5034e4fd 100644 --- a/public/language/ro/category.json +++ b/public/language/ro/category.json @@ -3,5 +3,6 @@ "no_topics": "Nu există nici un subiect de discuție în această categorie.
De ce nu încerci să postezi tu unul?", "browsing": "navighează", "no_replies": "Nu a răspuns nimeni", - "share_this_category": "Distribuie această categorie" + "share_this_category": "Distribuie această categorie", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/ro/error.json b/public/language/ro/error.json index 5b54c36e72..f8346aa636 100644 --- a/public/language/ro/error.json +++ b/public/language/ro/error.json @@ -12,11 +12,13 @@ "invalid-title": "Titlu invalid!", "invalid-user-data": "Date utilizator invalide", "invalid-password": "Parolă Invalidă", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Date paginație invalide", "username-taken": "Numele de utilizator este deja folosit", "email-taken": "Adresa de email este deja folostă", "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.", "username-too-short": "Numele de utilizator este prea scurt", + "username-too-long": "Username too long", "user-banned": "Utilizator banat", "no-category": "Categoria nu există", "no-topic": "Subiectul nu există", @@ -52,5 +54,9 @@ "upload-error": "Eroare Upload : %1", "signature-too-long": "Semnătura ta nu poate fi mai lungă de %1 caractere!", "cant-chat-with-yourself": "Nu poți conversa cu tine!", - "not-enough-reputation-to-downvote": "Nu ai destulă reputație pentru a vota negativ acest post." + "reputation-system-disabled": "Reputation system is disabled.", + "downvoting-disabled": "Downvoting is disabled", + "not-enough-reputation-to-downvote": "Nu ai destulă reputație pentru a vota negativ acest post.", + "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/ro/notifications.json b/public/language/ro/notifications.json index 682cb05ee2..568af20877 100644 --- a/public/language/ro/notifications.json +++ b/public/language/ro/notifications.json @@ -10,11 +10,14 @@ "new_notification": "Notificare Nouă", "you_have_unread_notifications": "Ai notificări necitite.", "new_message_from": "Un mesaj nou de la %1", - "upvoted_your_post": "%1 a votat pozitiv mesajul tău.", - "favourited_your_post": "%1 a adăugat mesajul tău la favorite.", - "user_flagged_post": "%1 a semnalizat un mesaj.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 a postat un răspuns la: %2", "user_mentioned_you_in": "%1 te-a menționat în %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Email confirmat", "email-confirmed-message": "Îți mulțumim pentru validarea emailului. Contul tău este acuma activat.", "email-confirm-error": "S-a produs o eroare ...", diff --git a/public/language/ro/recent.json b/public/language/ro/recent.json index b17702e5e9..c0600afba9 100644 --- a/public/language/ro/recent.json +++ b/public/language/ro/recent.json @@ -4,5 +4,6 @@ "week": "Săptămână", "month": "Lună", "year": "An", + "alltime": "All Time", "no_recent_topics": "Nu există subiecte recente." } \ No newline at end of file diff --git a/public/language/ro/search.json b/public/language/ro/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/ro/search.json +++ b/public/language/ro/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json index eccb976288..0463625d25 100644 --- a/public/language/ro/topic.json +++ b/public/language/ro/topic.json @@ -54,7 +54,7 @@ "topic_move_success": "Acest mesaj a fost mutat cu succes în %1", "post_delete_confirm": "Ești sigur că vrei să ștergi acest mesaj?", "post_restore_confirm": "Esti sigur că vrei să restaurezi acest mesaj?", - "post_purge_confirm": "Are you sure you want to purge this post?", + "post_purge_confirm": "Ești sigur că vrei să cureți acest mesaj?", "load_categories": "Se Încarcă Categoriile", "disabled_categories_note": "Categoriile dezactivate sunt decolorate cu gri", "confirm_move": "Mută", @@ -87,7 +87,7 @@ "more_users_and_guests": "%1 utlizator(i) și %2 vizitator(i)", "more_users": "%1 utilizator(i)", "more_guests": "%1 vizitator(i)", - "users_and_others": "%1 and %2 others", + "users_and_others": "%1 și alți %2", "sort_by": "Sortează de la", "oldest_to_newest": "Vechi la Noi", "newest_to_oldest": "Noi la Vechi", diff --git a/public/language/ro/user.json b/public/language/ro/user.json index 19de3dccf8..124f9076b6 100644 --- a/public/language/ro/user.json +++ b/public/language/ro/user.json @@ -4,6 +4,8 @@ "username": "Nume utilizator", "email": "Adresă Email", "confirm_email": "Confirmă Email", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Nume Întreg", "website": "Pagină Web", "location": "Locație", @@ -61,5 +63,7 @@ "posts_per_page": "Mesaje pe pagină", "notification_sounds": "Redă un sunet când primești o notificare.", "browsing": "Setări navigare", - "open_links_in_new_tab": "Deschide linkurile externe intr-un tab nou?" + "open_links_in_new_tab": "Deschide linkurile externe intr-un tab nou?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/ru/category.json b/public/language/ru/category.json index 9248f1cfd9..9454af6989 100644 --- a/public/language/ru/category.json +++ b/public/language/ru/category.json @@ -3,5 +3,6 @@ "no_topics": "В этой категории еще нет тем.
Почему бы вам не создать первую?", "browsing": "просматривают", "no_replies": "Нет ответов", - "share_this_category": "Поделиться этой категорией" + "share_this_category": "Поделиться этой категорией", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/ru/error.json b/public/language/ru/error.json index 63a6a93355..875a018f95 100644 --- a/public/language/ru/error.json +++ b/public/language/ru/error.json @@ -12,11 +12,13 @@ "invalid-title": "Неверный заголовок!", "invalid-user-data": "Неверные Пользовательские Данные", "invalid-password": "Неверный Пароль", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Неверное значение пагинации", "username-taken": "Имя пользователя занято", "email-taken": "Email занят", "email-not-confirmed": "Ваш email не подтвержден, нажмите для подтверждения.", "username-too-short": "Слишком короткое имя пользователя", + "username-too-long": "Username too long", "user-banned": "Пользователь заблокирован", "no-category": "Несуществующая категория", "no-topic": "Несуществующая тема", @@ -52,5 +54,9 @@ "upload-error": "Ошибка загрузки : %1", "signature-too-long": "Подпись не может быть длиннее %1 символов", "cant-chat-with-yourself": "Вы не можете общаться с самим собой", - "not-enough-reputation-to-downvote": "У Вас недостаточно репутации для понижения оценки поста" + "reputation-system-disabled": "Reputation system is disabled.", + "downvoting-disabled": "Downvoting is disabled", + "not-enough-reputation-to-downvote": "У Вас недостаточно репутации для понижения оценки поста", + "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/ru/notifications.json b/public/language/ru/notifications.json index 1648ebc8f8..0bd4597dd7 100644 --- a/public/language/ru/notifications.json +++ b/public/language/ru/notifications.json @@ -10,11 +10,14 @@ "new_notification": "Новое Уведомление", "you_have_unread_notifications": "У вас есть непрочитанные уведомления", "new_message_from": "Новое сообщение от %1", - "upvoted_your_post": "%1 проголосовал за Ваш пост", - "favourited_your_post": "%1 добавил Ваш пост в избранное", - "user_flagged_post": "%1 пометил пост", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 ответил на запись: %2", "user_mentioned_you_in": "%1 упомянул вас в %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Подтвержден", "email-confirmed-message": "Спасибо за подтверждение Вашего Email-адреса. Ваш аккаунт активирован.", "email-confirm-error": "Произошла ошибка...", diff --git a/public/language/ru/recent.json b/public/language/ru/recent.json index 7dabef695e..428c2c6b3d 100644 --- a/public/language/ru/recent.json +++ b/public/language/ru/recent.json @@ -4,5 +4,6 @@ "week": "Неделя", "month": "Месяц", "year": "Год", + "alltime": "All Time", "no_recent_topics": "Нет свежих тем." } \ No newline at end of file diff --git a/public/language/ru/search.json b/public/language/ru/search.json index 5f0a069bef..17b82606bd 100644 --- a/public/language/ru/search.json +++ b/public/language/ru/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 результатов по фразе \"%2\", (%3 секунды) " + "results_matching": "%1 результатов по фразе \"%2\", (%3 секунды) ", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/ru/user.json b/public/language/ru/user.json index 6f3e7c92e2..6da3902849 100644 --- a/public/language/ru/user.json +++ b/public/language/ru/user.json @@ -4,6 +4,8 @@ "username": "Имя пользователя", "email": "Email", "confirm_email": "Подтвердить Email", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Полное имя", "website": "Сайт", "location": "Откуда", @@ -61,5 +63,7 @@ "posts_per_page": "Постов на Странице", "notification_sounds": "Звук при получении уведомления", "browsing": "Настройки просмотра", - "open_links_in_new_tab": "Открывать ссылки, ведущие на другие сайты, в новой вкладке?" + "open_links_in_new_tab": "Открывать ссылки, ведущие на другие сайты, в новой вкладке?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/sc/category.json b/public/language/sc/category.json index d249aa6ffd..35e7f7b522 100644 --- a/public/language/sc/category.json +++ b/public/language/sc/category.json @@ -3,5 +3,6 @@ "no_topics": "Non bi sunt arresonadas in custa creze.
Pro ite non nde pones una?", "browsing": "navighende", "no_replies": "Perunu at rispostu", - "share_this_category": "Share this category" + "share_this_category": "Share this category", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/sc/error.json b/public/language/sc/error.json index 77c582b23f..26e3c9d80c 100644 --- a/public/language/sc/error.json +++ b/public/language/sc/error.json @@ -12,11 +12,13 @@ "invalid-title": "Invalid title!", "invalid-user-data": "Invalid User Data", "invalid-password": "Invalid Password", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Invalid pagination value", "username-taken": "Username taken", "email-taken": "Email taken", "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.", "username-too-short": "Username too short", + "username-too-long": "Username too long", "user-banned": "User banned", "no-category": "Category doesn't exist", "no-topic": "Topic doesn't exist", @@ -52,5 +54,9 @@ "upload-error": "Upload Error : %1", "signature-too-long": "Signature can't be longer than %1 characters!", "cant-chat-with-yourself": "You can't chat with yourself!", - "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post" + "reputation-system-disabled": "Reputation system is disabled.", + "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": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/sc/notifications.json b/public/language/sc/notifications.json index c5c59c39e1..0fecd4d1a7 100644 --- a/public/language/sc/notifications.json +++ b/public/language/sc/notifications.json @@ -10,11 +10,14 @@ "new_notification": "New Notification", "you_have_unread_notifications": "You have unread notifications.", "new_message_from": "New message from %1", - "upvoted_your_post": "%1 has upvoted your post.", - "favourited_your_post": "%1 has favourited your post.", - "user_flagged_post": "%1 flagged a post.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 has posted a reply to: %2", "user_mentioned_you_in": "%1 mentioned you in %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error": "An error occurred...", diff --git a/public/language/sc/recent.json b/public/language/sc/recent.json index b6d27107b3..2e2d9401c7 100644 --- a/public/language/sc/recent.json +++ b/public/language/sc/recent.json @@ -4,5 +4,6 @@ "week": "Chida", "month": "Mese", "year": "Year", + "alltime": "All Time", "no_recent_topics": "Non bi sunt ùrtimas arresonadas." } \ No newline at end of file diff --git a/public/language/sc/search.json b/public/language/sc/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/sc/search.json +++ b/public/language/sc/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/sc/user.json b/public/language/sc/user.json index d1dfdd8b2e..7c8781dfb8 100644 --- a/public/language/sc/user.json +++ b/public/language/sc/user.json @@ -4,6 +4,8 @@ "username": "Nùmene de Impitadore", "email": "Email", "confirm_email": "Confirm Email", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Nùmene e Sambenadu", "website": "Giassu web", "location": "Logu", @@ -61,5 +63,7 @@ "posts_per_page": "Arresonos pro Pàgina", "notification_sounds": "Play a sound when you receive a notification.", "browsing": "Browsing Settings", - "open_links_in_new_tab": "Open outgoing links in new tab?" + "open_links_in_new_tab": "Open outgoing links in new tab?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/sk/category.json b/public/language/sk/category.json index e804178494..ead803aae6 100644 --- a/public/language/sk/category.json +++ b/public/language/sk/category.json @@ -3,5 +3,6 @@ "no_topics": "V tejto kategórií zatiaľ nie sú žiadne príspevky.
Môžeš byť prvý!", "browsing": "prehliada", "no_replies": "Nikdo ešte neodpovedal", - "share_this_category": "zdielaj túto kategóriu" + "share_this_category": "zdielaj túto kategóriu", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/sk/error.json b/public/language/sk/error.json index 8481519d05..08c0106813 100644 --- a/public/language/sk/error.json +++ b/public/language/sk/error.json @@ -12,11 +12,13 @@ "invalid-title": "Nesprávny titulok!", "invalid-user-data": "Neplatné užívatelské údaje", "invalid-password": "Nesprávne heslo", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Nesprávna hodnota stránkovania", "username-taken": "Užívateľske meno je obsadené", "email-taken": "Email je obsadený", "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.", "username-too-short": "Username too short", + "username-too-long": "Username too long", "user-banned": "Užívateľ je zakázaný", "no-category": "Kategória neexistuje", "no-topic": "Téme neexistuje", @@ -52,5 +54,9 @@ "upload-error": "Upload chyba: %1", "signature-too-long": "Podpis nesmie byť dlhší ako %1 znakov!", "cant-chat-with-yourself": "Nemôžete chatovat so samým sebou.", - "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post" + "reputation-system-disabled": "Reputation system is disabled.", + "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": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/sk/notifications.json b/public/language/sk/notifications.json index 7a5b20cbb7..cffd1a1fc0 100644 --- a/public/language/sk/notifications.json +++ b/public/language/sk/notifications.json @@ -10,11 +10,14 @@ "new_notification": "Nová notifikácia", "you_have_unread_notifications": "Máte neprečítané notifikácie", "new_message_from": "Nova spáva od %1", - "upvoted_your_post": "%1 zahlasoval za Váš príspevok.", - "favourited_your_post": "%1 pridal do obľubených Váš príspevok.", - "user_flagged_post": "%1 označil Váš príspevok", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 odpovedal: %2", "user_mentioned_you_in": "%1 mentioned you in %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Email bol potvrdený", "email-confirmed-message": "Ďakujeme za potvrdenie tvojho emailu. Účet je plne aktivovaný.", "email-confirm-error": "Vyskytla sa chyba...", diff --git a/public/language/sk/recent.json b/public/language/sk/recent.json index cfb6b18bc5..963740ba54 100644 --- a/public/language/sk/recent.json +++ b/public/language/sk/recent.json @@ -4,5 +4,6 @@ "week": "Týždeň", "month": "Mesiac", "year": "Year", + "alltime": "All Time", "no_recent_topics": "Nie sú žiadne posledné témy" } \ No newline at end of file diff --git a/public/language/sk/search.json b/public/language/sk/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/sk/search.json +++ b/public/language/sk/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/sk/user.json b/public/language/sk/user.json index 3a42def9f0..cefdf45dfe 100644 --- a/public/language/sk/user.json +++ b/public/language/sk/user.json @@ -4,6 +4,8 @@ "username": "Uživateľské meno", "email": "Email", "confirm_email": "Confirm Email", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Meno a priezvisko", "website": "Webová stránka", "location": "Poloha", @@ -61,5 +63,7 @@ "posts_per_page": "Príspevkov na stranu", "notification_sounds": "Prehraj zvuk ked príde notifikácia", "browsing": "Hľadaj v nadstaveniach", - "open_links_in_new_tab": "Otvoriť tieto odkazy v novom tabe ?" + "open_links_in_new_tab": "Otvoriť tieto odkazy v novom tabe ?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/sv/category.json b/public/language/sv/category.json index 25b9f9fa83..c9662de9c0 100644 --- a/public/language/sv/category.json +++ b/public/language/sv/category.json @@ -3,5 +3,6 @@ "no_topics": "Det finns inga ämnen i denna kategori.
Varför inte skapa ett?", "browsing": "läser", "no_replies": "Ingen har svarat", - "share_this_category": "Dela den här kategorin" + "share_this_category": "Dela den här kategorin", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/sv/error.json b/public/language/sv/error.json index 8de10daaae..2c10713a84 100644 --- a/public/language/sv/error.json +++ b/public/language/sv/error.json @@ -12,11 +12,13 @@ "invalid-title": "Ogiltig rubrik.", "invalid-user-data": "Ogiltig användardata", "invalid-password": "Ogiltigt lösenord", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Ogiltigt sidnummer", "username-taken": "Användarnamn upptaget", "email-taken": "Epostadress upptagen", "email-not-confirmed": "Din epostadress är ännu inte bekräftad. Klicka här för att bekräfta din epostadress.", "username-too-short": "Användarnamnet är för kort", + "username-too-long": "Username too long", "user-banned": "Användare bannad", "no-category": "Kategori hittades inte", "no-topic": "Ämne hittades inte", @@ -52,5 +54,9 @@ "upload-error": "Fel vid uppladdning: %1", "signature-too-long": "Signaturer kan inte vara längre än %1 tecken.", "cant-chat-with-yourself": "Du kan inte chatta med dig själv.", - "not-enough-reputation-to-downvote": "Du har inte tillräckligt förtroende för att rösta ner det här meddelandet" + "reputation-system-disabled": "Reputation system is disabled.", + "downvoting-disabled": "Downvoting is disabled", + "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": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/sv/notifications.json b/public/language/sv/notifications.json index 9f262b008a..267c761ba5 100644 --- a/public/language/sv/notifications.json +++ b/public/language/sv/notifications.json @@ -10,11 +10,14 @@ "new_notification": "Ny notis", "you_have_unread_notifications": "Du har olästa notiser.", "new_message_from": "Nytt medelande från %1", - "upvoted_your_post": "%1 har röstat på ditt inlägg.", - "favourited_your_post": "%1 har favoriserat ditt inlägg.", - "user_flagged_post": "%1 flaggade ett inlägg.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 har skrivit ett svar på: %2", "user_mentioned_you_in": "%1 nämnde dig i %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Epost bekräftad", "email-confirmed-message": "Tack för att du bekräftat din epostadress. Ditt konto är nu fullt ut aktiverat.", "email-confirm-error": "Ett fel uppstod...", diff --git a/public/language/sv/recent.json b/public/language/sv/recent.json index 4478c47921..f9e04c9081 100644 --- a/public/language/sv/recent.json +++ b/public/language/sv/recent.json @@ -4,5 +4,6 @@ "week": "Vecka", "month": "Månad", "year": "År", + "alltime": "All Time", "no_recent_topics": "Det finns inga olästa ämnen." } \ No newline at end of file diff --git a/public/language/sv/search.json b/public/language/sv/search.json index 996a7d81fd..49e8bde9a0 100644 --- a/public/language/sv/search.json +++ b/public/language/sv/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 resultat matchar \"%2\", (%3 sekunder)" + "results_matching": "%1 resultat matchar \"%2\", (%3 sekunder)", + "no-matches": "Inga inlägg hittades" } \ No newline at end of file diff --git a/public/language/sv/user.json b/public/language/sv/user.json index a6b3a753fb..e4e4c01dcb 100644 --- a/public/language/sv/user.json +++ b/public/language/sv/user.json @@ -4,6 +4,8 @@ "username": "Användarnamn", "email": "Epost", "confirm_email": "Bekräfta epostadress ", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Hela namnet", "website": "Webbsida", "location": "Plats", @@ -61,5 +63,7 @@ "posts_per_page": "Inlägg per sida", "notification_sounds": "Spela ett ljud när du får en notis.", "browsing": "Inställning för bläddring", - "open_links_in_new_tab": "Öppna utgående länkar på ny flik?" + "open_links_in_new_tab": "Öppna utgående länkar på ny flik?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/th/category.json b/public/language/th/category.json index 790f7752fc..31246e2a05 100644 --- a/public/language/th/category.json +++ b/public/language/th/category.json @@ -3,5 +3,6 @@ "no_topics": "ยังไม่มีกระทู้ในหมวดนี้
โพสต์กระทู้แรก?", "browsing": "เรียกดู", "no_replies": "ยังไม่มีใครตอบ", - "share_this_category": "Share this category" + "share_this_category": "Share this category", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/th/error.json b/public/language/th/error.json index 77c582b23f..26e3c9d80c 100644 --- a/public/language/th/error.json +++ b/public/language/th/error.json @@ -12,11 +12,13 @@ "invalid-title": "Invalid title!", "invalid-user-data": "Invalid User Data", "invalid-password": "Invalid Password", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Invalid pagination value", "username-taken": "Username taken", "email-taken": "Email taken", "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.", "username-too-short": "Username too short", + "username-too-long": "Username too long", "user-banned": "User banned", "no-category": "Category doesn't exist", "no-topic": "Topic doesn't exist", @@ -52,5 +54,9 @@ "upload-error": "Upload Error : %1", "signature-too-long": "Signature can't be longer than %1 characters!", "cant-chat-with-yourself": "You can't chat with yourself!", - "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post" + "reputation-system-disabled": "Reputation system is disabled.", + "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": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/th/notifications.json b/public/language/th/notifications.json index 4c33f78276..d78ad8e8f6 100644 --- a/public/language/th/notifications.json +++ b/public/language/th/notifications.json @@ -10,11 +10,14 @@ "new_notification": "New Notification", "you_have_unread_notifications": "You have unread notifications.", "new_message_from": "New message from %1", - "upvoted_your_post": "%1 has upvoted your post.", - "favourited_your_post": "%1 has favourited your post.", - "user_flagged_post": "%1 flagged a post.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 has posted a reply to: %2", "user_mentioned_you_in": "%1 mentioned you in %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error": "An error occurred...", diff --git a/public/language/th/recent.json b/public/language/th/recent.json index c7a2e6bc19..05eec4d503 100644 --- a/public/language/th/recent.json +++ b/public/language/th/recent.json @@ -4,5 +4,6 @@ "week": "สัปดาห์", "month": "เดือน", "year": "Year", + "alltime": "All Time", "no_recent_topics": "ไม่มีกระทู้ล่าสุด" } \ No newline at end of file diff --git a/public/language/th/search.json b/public/language/th/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/th/search.json +++ b/public/language/th/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/th/user.json b/public/language/th/user.json index 9f1e022fd1..f6d6861e31 100644 --- a/public/language/th/user.json +++ b/public/language/th/user.json @@ -4,6 +4,8 @@ "username": "ชื่อผู้ใช้", "email": "อีเมล์", "confirm_email": "Confirm Email", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "ชื่อเต็ม", "website": "เว็บไซต์", "location": "สถานที่", @@ -61,5 +63,7 @@ "posts_per_page": "จำนวนโพสต์ต่อหน้า", "notification_sounds": "Play a sound when you receive a notification.", "browsing": "Browsing Settings", - "open_links_in_new_tab": "Open outgoing links in new tab?" + "open_links_in_new_tab": "Open outgoing links in new tab?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/tr/category.json b/public/language/tr/category.json index 7ec2a32e14..9fae15699d 100644 --- a/public/language/tr/category.json +++ b/public/language/tr/category.json @@ -3,5 +3,6 @@ "no_topics": " Bu kategoride hiç konu yok.
Yeni bir konu açmak istemez misiniz?", "browsing": "dolaşıyor", "no_replies": "Kimse yanıtlamadı", - "share_this_category": "Bu kategoriyi paylaş" + "share_this_category": "Bu kategoriyi paylaş", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/tr/error.json b/public/language/tr/error.json index cec4db9683..6c6a37053a 100644 --- a/public/language/tr/error.json +++ b/public/language/tr/error.json @@ -12,11 +12,13 @@ "invalid-title": "Geçersiz başlık!", "invalid-user-data": "Geçersiz Kullancı Verisi", "invalid-password": "Geçersiz Şifre", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Geçersiz Sayfa Değeri", "username-taken": "Kullanıcı İsmi Alınmış", "email-taken": "E-posta Alınmış", "email-not-confirmed": "E-postanız onaylanmamış, onaylamak için lütfen buraya tıklayın.", "username-too-short": "Kullanıcı ismi çok kısa", + "username-too-long": "Username too long", "user-banned": "Kullanıcı Yasaklı", "no-category": "Kategori Yok", "no-topic": "Başlık Yok", @@ -52,5 +54,9 @@ "upload-error": "Yükleme Hatası : %1", "signature-too-long": "İmza en fazla %1 karakter olabilir!", "cant-chat-with-yourself": "Kendinizle sohbet edemezsiniz!", - "not-enough-reputation-to-downvote": "Bu iletiyi aşagı oylamak için yeterince saygınlığınız yok." + "reputation-system-disabled": "Reputation system is disabled.", + "downvoting-disabled": "Downvoting is disabled", + "not-enough-reputation-to-downvote": "Bu iletiyi aşagı oylamak için yeterince saygınlığınız yok.", + "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/tr/notifications.json b/public/language/tr/notifications.json index 3ff542c19a..8b5db97764 100644 --- a/public/language/tr/notifications.json +++ b/public/language/tr/notifications.json @@ -10,11 +10,14 @@ "new_notification": "Yeni bildirim", "you_have_unread_notifications": "Okunmamış bildirimleriniz var.", "new_message_from": "%1 size bir mesaj gönderdi", - "upvoted_your_post": "%1 iletinizi beğendi.", - "favourited_your_post": "%1 iletinizi favorilerine ekledi.", - "user_flagged_post": "%1 bir iletiyi sakıncalı buldu.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 %2 başlığına bir ileti gönderdi.", "user_mentioned_you_in": "%1 %2 başlığında sizden bahsetti.", + "user_started_following_you": "%1 started following you.", "email-confirmed": "E-posta onaylandı", "email-confirmed-message": "E-postanızı onaylandığınız için teşekkürler. Hesabınız tamamen aktive edildi.", "email-confirm-error": "Bir hata oluştu...", diff --git a/public/language/tr/recent.json b/public/language/tr/recent.json index 333a85f772..088eacdff1 100644 --- a/public/language/tr/recent.json +++ b/public/language/tr/recent.json @@ -4,5 +4,6 @@ "week": "Hafta", "month": "Ay", "year": "Yıl", + "alltime": "All Time", "no_recent_topics": "Güncel konular yok." } \ No newline at end of file diff --git a/public/language/tr/search.json b/public/language/tr/search.json index b384c82c72..307b7cffb3 100644 --- a/public/language/tr/search.json +++ b/public/language/tr/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 tane “%2“ bulundu (%3 saniye)" + "results_matching": "%1 tane “%2“ bulundu (%3 saniye)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/tr/user.json b/public/language/tr/user.json index f8b6b75e3c..fb1316fd7e 100644 --- a/public/language/tr/user.json +++ b/public/language/tr/user.json @@ -4,6 +4,8 @@ "username": "Kullanıcı Adı", "email": "E-posta", "confirm_email": "E-posta onayla", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Tam Ad", "website": "Websitesi", "location": "Konum", @@ -61,5 +63,7 @@ "posts_per_page": "Sayfa başına İletiler", "notification_sounds": "Bildirim alındığında ses çal", "browsing": "Tarayıcı Ayaları", - "open_links_in_new_tab": "Dışarı giden bağlantıları yeni sekmede aç?" + "open_links_in_new_tab": "Dışarı giden bağlantıları yeni sekmede aç?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/vi/category.json b/public/language/vi/category.json index 972df0d4f3..70ab036818 100644 --- a/public/language/vi/category.json +++ b/public/language/vi/category.json @@ -3,5 +3,6 @@ "no_topics": "Không có bài viết trong danh mục.
Hãy đăng một bài viết mới?", "browsing": "đang duyệt", "no_replies": "Chưa có ai bình luận", - "share_this_category": "Chia sẻ phần mục này" + "share_this_category": "Chia sẻ phần mục này", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/vi/error.json b/public/language/vi/error.json index 6b93d3cd98..189c8de1a5 100644 --- a/public/language/vi/error.json +++ b/public/language/vi/error.json @@ -12,11 +12,13 @@ "invalid-title": "Invalid title!", "invalid-user-data": "Dữ liệu tài khoản không hợp lệ", "invalid-password": "Mật khẩu không hợp lệ", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "Số trang không hợp lệ", "username-taken": "Tên đăng nhập đã tồn tại", "email-taken": "Email đã tồn tại", "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.", "username-too-short": "Username too short", + "username-too-long": "Username too long", "user-banned": "Tài khoản bị ban", "no-category": "Phần mục không tồn tại", "no-topic": "Chủ đề không tồn tại", @@ -52,5 +54,9 @@ "upload-error": "Upload Error : %1", "signature-too-long": "Chứ ký không được dài quá %1 ký tự", "cant-chat-with-yourself": "Bạn không thể chat với chính bạn!", - "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post" + "reputation-system-disabled": "Reputation system is disabled.", + "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": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/vi/notifications.json b/public/language/vi/notifications.json index 431305ad23..029eb60475 100644 --- a/public/language/vi/notifications.json +++ b/public/language/vi/notifications.json @@ -10,11 +10,14 @@ "new_notification": "Thông báo mới", "you_have_unread_notifications": "Bạn có thông báo chưa đọc", "new_message_from": "Tin nhắn mới từ %1", - "upvoted_your_post": "%1 đã hủy vote cho bài viết của bạn", - "favourited_your_post": "%1 thích bài viết của bạn", - "user_flagged_post": "%1 đã flag một bài viết", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 đã trả lời %2", "user_mentioned_you_in": "%1 mentioned you in %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error": "An error occurred...", diff --git a/public/language/vi/recent.json b/public/language/vi/recent.json index 907cf76923..544c3cefb2 100644 --- a/public/language/vi/recent.json +++ b/public/language/vi/recent.json @@ -4,5 +4,6 @@ "week": "Tuần", "month": "Tháng", "year": "Year", + "alltime": "All Time", "no_recent_topics": "Không có chủ đề nào gần đây" } \ No newline at end of file diff --git a/public/language/vi/search.json b/public/language/vi/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/vi/search.json +++ b/public/language/vi/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/vi/user.json b/public/language/vi/user.json index b30a8526d9..1f5cb24b9a 100644 --- a/public/language/vi/user.json +++ b/public/language/vi/user.json @@ -4,6 +4,8 @@ "username": "Tên truy cập", "email": "Email", "confirm_email": "Confirm Email", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "Tên đầy đủ", "website": "Website", "location": "Địa điểm", @@ -61,5 +63,7 @@ "posts_per_page": "Số bài viết trong một trang", "notification_sounds": "Xuất hiện âm thanh khi bạn nhận được một thông báo", "browsing": "Browsing Settings", - "open_links_in_new_tab": "Open outgoing links in new tab?" + "open_links_in_new_tab": "Open outgoing links in new tab?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/zh_CN/category.json b/public/language/zh_CN/category.json index aafcf3e407..2f776788d1 100644 --- a/public/language/zh_CN/category.json +++ b/public/language/zh_CN/category.json @@ -3,5 +3,6 @@ "no_topics": "此版块还没有任何内容。
赶紧来发帖吧！", "browsing": "正在浏览", "no_replies": "尚无回复", - "share_this_category": "分享此版块" + "share_this_category": "分享此版块", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/zh_CN/error.json b/public/language/zh_CN/error.json index b0678b8537..561c57a0da 100644 --- a/public/language/zh_CN/error.json +++ b/public/language/zh_CN/error.json @@ -12,11 +12,13 @@ "invalid-title": "无效标题！", "invalid-user-data": "无效用户数据", "invalid-password": "无效密码", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "无效页码", "username-taken": "用户名已注册", "email-taken": "电子邮箱已注册", "email-not-confirmed": "您的电子邮箱尚未确认，请点击这里确认您的电子邮箱。", "username-too-short": "用户名太短", + "username-too-long": "Username too long", "user-banned": "用户已禁止", "no-category": "版块不存在", "no-topic": "主题不存在", @@ -52,5 +54,9 @@ "upload-error": "上传错误：%1", "signature-too-long": "签名档不能超过 %1 字！", "cant-chat-with-yourself": "您不能和自己聊天！", - "not-enough-reputation-to-downvote": "您还没有足够的威望为此帖扣分" + "reputation-system-disabled": "Reputation system is disabled.", + "downvoting-disabled": "Downvoting is disabled", + "not-enough-reputation-to-downvote": "您还没有足够的威望为此帖扣分", + "not-enough-reputation-to-flag": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/zh_CN/notifications.json b/public/language/zh_CN/notifications.json index e2054a17f7..6e4faf216f 100644 --- a/public/language/zh_CN/notifications.json +++ b/public/language/zh_CN/notifications.json @@ -10,11 +10,14 @@ "new_notification": "新通知", "you_have_unread_notifications": "您有未读的通知。", "new_message_from": "来自 %1 的新消息", - "upvoted_your_post": "%1 赞了您的帖子。", - "favourited_your_post": "%1 收藏了您的帖子。", - "user_flagged_post": "%1 标记了一个帖子。", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 回复了：%2", "user_mentioned_you_in": "%1 在 %2 中提到了您", + "user_started_following_you": "%1 started following you.", "email-confirmed": "电子邮箱已确认", "email-confirmed-message": "感谢您验证您的电子邮箱。您的帐户现已全面激活。", "email-confirm-error": "出错了.……", diff --git a/public/language/zh_CN/pages.json b/public/language/zh_CN/pages.json index 32c3ba5e56..28af9ea173 100644 --- a/public/language/zh_CN/pages.json +++ b/public/language/zh_CN/pages.json @@ -5,7 +5,7 @@ "recent": "最新主题", "users": "已注册用户", "notifications": "提醒", - "tags": "Topics tagged under \"%1\"", + "tags": "话题为 \"%1\" 的主题", "user.edit": "正在编辑 \"%1\"", "user.following": "%1 关注", "user.followers": "关注 %1 的人", diff --git a/public/language/zh_CN/recent.json b/public/language/zh_CN/recent.json index 6d9a34e12d..c363d4921c 100644 --- a/public/language/zh_CN/recent.json +++ b/public/language/zh_CN/recent.json @@ -4,5 +4,6 @@ "week": "本周", "month": "本月", "year": "本年", + "alltime": "All Time", "no_recent_topics": "无最新主题。" } \ No newline at end of file diff --git a/public/language/zh_CN/search.json b/public/language/zh_CN/search.json index acbed61943..484acb3626 100644 --- a/public/language/zh_CN/search.json +++ b/public/language/zh_CN/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 条结果，匹配 \"%2\"，(耗时 %3 秒)" + "results_matching": "共 %1 条结果匹配 \"%2\"，(耗时 %3 秒)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/zh_CN/topic.json b/public/language/zh_CN/topic.json index 84275cb148..183cbfcc23 100644 --- a/public/language/zh_CN/topic.json +++ b/public/language/zh_CN/topic.json @@ -87,7 +87,7 @@ "more_users_and_guests": "%1 名会员和 %2 名游客", "more_users": "%1 名会员", "more_guests": "%1 名游客", - "users_and_others": "%1 and %2 others", + "users_and_others": "%1 和 %2 其他人", "sort_by": "排序", "oldest_to_newest": "从旧到新", "newest_to_oldest": "从新到旧", diff --git a/public/language/zh_CN/user.json b/public/language/zh_CN/user.json index 173234796e..51d0b25817 100644 --- a/public/language/zh_CN/user.json +++ b/public/language/zh_CN/user.json @@ -4,6 +4,8 @@ "username": "用户名", "email": "电子邮件", "confirm_email": "确认电子邮箱", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "姓名", "website": "网站", "location": "位置", @@ -61,5 +63,7 @@ "posts_per_page": "每页帖子数", "notification_sounds": "收到通知时播放提示音。", "browsing": "浏览设置", - "open_links_in_new_tab": "在新标签中打开外部链接？" + "open_links_in_new_tab": "在新标签中打开外部链接？", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file diff --git a/public/language/zh_TW/category.json b/public/language/zh_TW/category.json index f1e867bb47..3fb8b883ee 100644 --- a/public/language/zh_TW/category.json +++ b/public/language/zh_TW/category.json @@ -3,5 +3,6 @@ "no_topics": "這個版面還沒有任何內容。
趕緊來發文章吧！", "browsing": "正在瀏覽", "no_replies": "還沒有回覆", - "share_this_category": "分享這類別" + "share_this_category": "分享這類別", + "ignore": "Ignore" } \ No newline at end of file diff --git a/public/language/zh_TW/error.json b/public/language/zh_TW/error.json index a843fee3b9..d965ca117e 100644 --- a/public/language/zh_TW/error.json +++ b/public/language/zh_TW/error.json @@ -12,11 +12,13 @@ "invalid-title": "Invalid title!", "invalid-user-data": "無效的使用者資料", "invalid-password": "無效的密碼", + "invalid-username-or-password": "Please specify both a username and password", "invalid-pagination-value": "無效的分頁數值", "username-taken": "該使用者名稱已被使用", "email-taken": "該信箱已被使用", "email-not-confirmed": "Your email is not confirmed, please click here to confirm your email.", "username-too-short": "Username too short", + "username-too-long": "Username too long", "user-banned": "該使用者已被停用", "no-category": "類別並不存在", "no-topic": "主題並不存在", @@ -52,5 +54,9 @@ "upload-error": "Upload Error : %1", "signature-too-long": "簽名檔長度不能超過 %1 字元！", "cant-chat-with-yourself": "你不能與自己聊天！", - "not-enough-reputation-to-downvote": "You do not have enough reputation to downvote this post" + "reputation-system-disabled": "Reputation system is disabled.", + "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": "Yo do not have enough reputation to flag this 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." } \ No newline at end of file diff --git a/public/language/zh_TW/notifications.json b/public/language/zh_TW/notifications.json index 56c9534641..e9132a07df 100644 --- a/public/language/zh_TW/notifications.json +++ b/public/language/zh_TW/notifications.json @@ -10,11 +10,14 @@ "new_notification": "新訊息通知", "you_have_unread_notifications": "您有未讀的訊息！", "new_message_from": "來自 %1 的新訊息", - "upvoted_your_post": "%1 has upvoted your post.", - "favourited_your_post": "%1 has favourited your post.", - "user_flagged_post": "%1 flagged a post.", + "upvoted_your_post_in": "%1 has upvoted your post in %2.", + "moved_your_post": "%1 has moved your post.", + "moved_your_topic": "%1 has moved your topic.", + "favourited_your_post_in": "%1 has favourited your post in %2.", + "user_flagged_post_in": "%1 flagged a post in %2", "user_posted_to": "%1 has posted a reply to: %2", "user_mentioned_you_in": "%1 mentioned you in %2", + "user_started_following_you": "%1 started following you.", "email-confirmed": "Email Confirmed", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirm-error": "An error occurred...", diff --git a/public/language/zh_TW/recent.json b/public/language/zh_TW/recent.json index f264357969..1b53b1220c 100644 --- a/public/language/zh_TW/recent.json +++ b/public/language/zh_TW/recent.json @@ -4,5 +4,6 @@ "week": "本周", "month": "本月", "year": "Year", + "alltime": "All Time", "no_recent_topics": "最近沒新主題." } \ No newline at end of file diff --git a/public/language/zh_TW/search.json b/public/language/zh_TW/search.json index d0ffc64f36..e9eef4632a 100644 --- a/public/language/zh_TW/search.json +++ b/public/language/zh_TW/search.json @@ -1,3 +1,4 @@ { - "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)" + "results_matching": "%1 result(s) matching \"%2\", (%3 seconds)", + "no-matches": "No posts found" } \ No newline at end of file diff --git a/public/language/zh_TW/user.json b/public/language/zh_TW/user.json index b516f98795..f73d573c02 100644 --- a/public/language/zh_TW/user.json +++ b/public/language/zh_TW/user.json @@ -4,6 +4,8 @@ "username": "使用者名稱", "email": "Email", "confirm_email": "Confirm Email", + "delete_account": "Delete Account", + "delete_account_confirm": "Are you sure you want to delete your account?", "fullname": "姓名", "website": "網站", "location": "地址", @@ -61,5 +63,7 @@ "posts_per_page": "每頁的文章數", "notification_sounds": "當收到新消息時播放提示音", "browsing": "瀏覽設定", - "open_links_in_new_tab": "在新的分頁開啟外部連結?" + "open_links_in_new_tab": "在新的分頁開啟外部連結?", + "follow_topics_you_reply_to": "Follow topics that you reply to.", + "follow_topics_you_create": "Follow topics you create." } \ No newline at end of file From 6e21b7a8306a1021638c031ebe04c982ef3267ed Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 15 Sep 2014 10:47:25 -0400 Subject: [PATCH 5/6] disabled parents no longer show up as parents of a category, re: #2080 --- src/categories.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/categories.js b/src/categories.js index e33d8a7aa3..473bf50c8a 100644 --- a/src/categories.js +++ b/src/categories.js @@ -366,7 +366,7 @@ var db = require('./database'), if (categories[i]) { categories[i]['unread-class'] = (parseInt(categories[i].topic_count, 10) === 0 || (hasRead[i] && uid !== 0)) ? '' : 'unread'; categories[i].children = results.children[i]; - categories[i].parent = results.parents[i]; + categories[i].parent = results.parents[i] && !results.parents[i].disabled ? results.parents[i] : null; } } From 84d4035597e09d1d5da3ec589eb119661105c742 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 15 Sep 2014 10:50:58 -0400 Subject: [PATCH 6/6] Child categories no longer show up on homepage, re: #2080 --- src/controllers/index.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/controllers/index.js b/src/controllers/index.js index 7d7ea579ac..97afb0d4e4 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -69,6 +69,11 @@ Controllers.home = function(req, res, next) { return next(err); } + // Remove child categories, as they don't belong on the home page + categoryData = categoryData.filter(function(categoryObj) { + return !categoryObj.parent; + }); + categories.getRecentTopicReplies(categoryData, uid, function(err) { next(err, categoryData); });