diff --git a/install/package.json b/install/package.json index ae8eecc4f0..aece091f0e 100644 --- a/install/package.json +++ b/install/package.json @@ -50,7 +50,7 @@ "connect-mongo": "4.6.0", "connect-multiparty": "2.2.0", "connect-pg-simple": "7.0.0", - "connect-redis": "6.1.1", + "connect-redis": "6.1.2", "cookie-parser": "1.4.6", "cron": "1.8.2", "cropperjs": "1.5.12", @@ -118,7 +118,7 @@ "sanitize-html": "2.7.0", "semver": "7.3.5", "serve-favicon": "2.5.0", - "sharp": "0.30.2", + "sharp": "0.30.3", "sitemap": "7.1.1", "slideout": "1.0.1", "socket.io": "4.4.1", @@ -149,7 +149,7 @@ "@commitlint/cli": "16.2.1", "@commitlint/config-angular": "16.2.1", "coveralls": "3.1.1", - "eslint": "8.10.0", + "eslint": "8.11.0", "eslint-config-nodebb": "0.1.1", "eslint-plugin-import": "2.25.4", "grunt": "1.4.1", @@ -157,7 +157,7 @@ "husky": "7.0.4", "jsdom": "19.0.0", "lint-staged": "12.3.5", - "mocha": "9.2.1", + "mocha": "9.2.2", "mocha-lcov-reporter": "1.3.0", "mockdate": "3.0.5", "nyc": "15.1.0", diff --git a/public/language/ar/admin/manage/privileges.json b/public/language/ar/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/ar/admin/manage/privileges.json +++ b/public/language/ar/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/ar/admin/manage/users.json b/public/language/ar/admin/manage/users.json index 510cd1f529..806e678260 100644 --- a/public/language/ar/admin/manage/users.json +++ b/public/language/ar/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Password", "create.password-confirm": "Confirm Password", - "temp-ban.length": "Ban Length", + "temp-ban.length": "Length", "temp-ban.reason": "Reason (Optional)", "temp-ban.hours": "Hours", "temp-ban.days": "Days", diff --git a/public/language/ar/error.json b/public/language/ar/error.json index 869c06d706..d9a7343235 100644 --- a/public/language/ar/error.json +++ b/public/language/ar/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "You have already bookmarked this post", "already-unbookmarked": "You have already unbookmarked this post", "cant-ban-other-admins": "لايمكن حظر مدبر نظام آخر.", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "رجاءًا ، أضف مدير أخر قبل حذف صلاحيات الإدارة من حسابك.", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/ar/user.json b/public/language/ar/user.json index 3ac5f91f63..b285936d0b 100644 --- a/public/language/ar/user.json +++ b/public/language/ar/user.json @@ -12,6 +12,8 @@ "ban_account": "حظر الحساب", "ban_account_confirm": "هل تريد حقاً حظر هاذا العضو؟", "unban_account": "إزالة حظر الحساب", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "حذف الحساب", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "محظور بشكل دائم", "info.banned-reason-label": "سبب", "info.banned-no-reason": "لم يتم إعطاء سبب.", + "info.muted-no-reason": "No reason given.", "info.username-history": "سجل اسم المستخدم", "info.email-history": "سجل البريد الإلكتروني", "info.moderation-note": "ملاحظة الإشراف", diff --git a/public/language/bg/admin/manage/privileges.json b/public/language/bg/admin/manage/privileges.json index 001fd3048e..9ca0014432 100644 --- a/public/language/bg/admin/manage/privileges.json +++ b/public/language/bg/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Качване на файлове", "signature": "Подпис", "ban": "Блокиране", + "mute": "Заглушаване", "invite": "Пращане на покана", "search-content": "Търсене на съдържание", "search-users": "Търсене на потребители", diff --git a/public/language/bg/admin/manage/users.json b/public/language/bg/admin/manage/users.json index 778f50d203..23d0331a3d 100644 --- a/public/language/bg/admin/manage/users.json +++ b/public/language/bg/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Парола", "create.password-confirm": "Потвърдете паролата", - "temp-ban.length": "Продължителност на блокирането", + "temp-ban.length": "Продължителност", "temp-ban.reason": "Причина (незадължително)", "temp-ban.hours": "Часове", "temp-ban.days": "Дни", diff --git a/public/language/bg/admin/settings/reputation.json b/public/language/bg/admin/settings/reputation.json index 376b0da139..b251f5f87d 100644 --- a/public/language/bg/admin/settings/reputation.json +++ b/public/language/bg/admin/settings/reputation.json @@ -4,9 +4,9 @@ "disable-down-voting": "Забрана на отрицателното гласуване", "votes-are-public": "Всички гласувания са публични", "thresholds": "Ограничения на дейността", - "min-rep-upvote": "Minimum reputation to upvote posts", - "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", - "upvotes-per-user-per-day": "Upvotes per user per day (set to 0 for unlimited upvotes)", + "min-rep-upvote": "Минимална репутация, необходима за положително гласуване за публикации", + "upvotes-per-day": "Положителни гласувания за ден (задайте 0 за неограничен брой)", + "upvotes-per-user-per-day": "Положителни гласувания за потребител за ден (задайте 0 за неограничен брой)", "min-rep-downvote": "Минимална репутация, необходима за отрицателно гласуване за публикации", "downvotes-per-day": "Отрицателни гласувания за ден (задайте 0 за неограничен брой)", "downvotes-per-user-per-day": "Отрицателни гласувания за потребител за ден (задайте 0 за неограничен брой)", diff --git a/public/language/bg/error.json b/public/language/bg/error.json index 301da414b8..0d70ac3390 100644 --- a/public/language/bg/error.json +++ b/public/language/bg/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Вече имате отметка към тази публикация", "already-unbookmarked": "Вече сте премахнали отметката си от тази публикация", "cant-ban-other-admins": "Не можете да блокирате другите администратори!", + "cant-mute-other-admins": "Не можете да заглушавате другите администратори!", + "user-muted-for-hours": "Вие бяхте заглушен(а). Ще можете да пускате публикации отново след %1 час(а)", + "user-muted-for-minutes": "Вие бяхте заглушен(а). Ще можете да пускате публикации отново след %1 минута/и", "cant-make-banned-users-admin": "Не можете да давате администраторски права на блокирани потребители.", "cant-remove-last-admin": "Вие сте единственият администратор. Добавете друг потребител като администратор, преди да премахнете себе си като администратор", "account-deletion-disabled": "Изтриването на акаунт е забранено", @@ -154,22 +157,22 @@ "already-voting-for-this-post": "Вече сте дали глас за тази публикация.", "reputation-system-disabled": "Системата за репутация е изключена.", "downvoting-disabled": "Отрицателното гласуване е изключено", - "not-enough-reputation-to-upvote": "You need %1 reputation to upvote", - "not-enough-reputation-to-downvote": "You need %1 reputation to downvote", - "not-enough-reputation-to-flag": "You need %1 reputation to flag this post", - "not-enough-reputation-min-rep-website": "You need %1 reputation to add a website", - "not-enough-reputation-min-rep-aboutme": "You need %1 reputation to add an about me", - "not-enough-reputation-min-rep-signature": "You need %1 reputation to add a signature", - "not-enough-reputation-min-rep-profile-picture": "You need %1 reputation to add a profile picture", - "not-enough-reputation-min-rep-cover-picture": "You need %1 reputation to add a cover picture", + "not-enough-reputation-to-upvote": "Репутацията Ви трябва да бъде поне %1, за да гласувате положително", + "not-enough-reputation-to-downvote": "Репутацията Ви трябва да бъде поне %1, за да гласувате отрицателно", + "not-enough-reputation-to-flag": "Репутацията Ви трябва да бъде поне %1, за да докладвате тази публикация", + "not-enough-reputation-min-rep-website": "Репутацията Ви трябва да бъде поне %1, за да добавите уеб сайт", + "not-enough-reputation-min-rep-aboutme": "Репутацията Ви трябва да бъде поне %1, за да добавите информация за себе си", + "not-enough-reputation-min-rep-signature": "Репутацията Ви трябва да бъде поне %1, за да добавите подпис", + "not-enough-reputation-min-rep-profile-picture": "Репутацията Ви трябва да бъде поне %1, за да добавите снимка на профила си", + "not-enough-reputation-min-rep-cover-picture": "Репутацията Ви трябва да бъде поне %1, за да добавите снимка на корицата", "post-already-flagged": "Вече сте докладвали тази публикация", "user-already-flagged": "Вече сте докладвали този потребител", "post-flagged-too-many-times": "Тази публикация вече е докладвана от други хора", "user-flagged-too-many-times": "Този потребител вече е докладван от други хора", "cant-flag-privileged": "Не можете да докладвате профилите или съдържанието от потребители с по-високи правомощия (модератори, глобални модератори, администратори)", "self-vote": "Не можете да гласувате за собствената си публикация", - "too-many-upvotes-today": "You can only upvote %1 times a day", - "too-many-upvotes-today-user": "You can only upvote a user %1 times a day", + "too-many-upvotes-today": "Можете да гласувате положително не повече от %1 пъти на ден", + "too-many-upvotes-today-user": "Можете да гласувате положително за потребител не повече от %1 пъти на ден", "too-many-downvotes-today": "Можете да гласувате отрицателно не повече от %1 пъти на ден", "too-many-downvotes-today-user": "Можете да гласувате отрицателно за потребител не повече от %1 пъти на ден", "reload-failed": "NodeBB срещна проблем при презареждането: „%1“. NodeBB ще продължи да поддържа съществуващите клиентски ресурси, но Вие трябва да отмените последните си действия преди презареждането.", diff --git a/public/language/bg/user.json b/public/language/bg/user.json index d8a2d03e07..30c9225f7c 100644 --- a/public/language/bg/user.json +++ b/public/language/bg/user.json @@ -12,6 +12,8 @@ "ban_account": "Блокиране на акаунта", "ban_account_confirm": "Наистина ли искате да блокирате този потребител?", "unban_account": "Деблокиране на акаунта", + "mute_account": "Заглушаване на акаунта", + "unmute_account": "Премахване на заглушаването на акаунта", "delete_account": "Изтриване на акаунта", "delete_account_as_admin": "Изтриване на акаунта", "delete_content": "Изтриване на съдържанието на акаунта", @@ -154,6 +156,7 @@ "info.banned-permanently": "Блокиран за постоянно", "info.banned-reason-label": "Причина", "info.banned-no-reason": "Няма посочена причина.", + "info.muted-no-reason": "Няма посочена причина.", "info.username-history": "История на потребителските имена", "info.email-history": "Историята на е-пощите", "info.moderation-note": "Модераторска бележка", diff --git a/public/language/bn/admin/manage/privileges.json b/public/language/bn/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/bn/admin/manage/privileges.json +++ b/public/language/bn/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/bn/admin/manage/users.json b/public/language/bn/admin/manage/users.json index 2a3c0c4829..d5c9914afc 100644 --- a/public/language/bn/admin/manage/users.json +++ b/public/language/bn/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Password", "create.password-confirm": "Confirm Password", - "temp-ban.length": "Ban Length", + "temp-ban.length": "Length", "temp-ban.reason": "Reason (Optional)", "temp-ban.hours": "Hours", "temp-ban.days": "Days", diff --git a/public/language/bn/error.json b/public/language/bn/error.json index 7ec4427cc2..02ae251bc5 100644 --- a/public/language/bn/error.json +++ b/public/language/bn/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "You have already bookmarked this post", "already-unbookmarked": "You have already unbookmarked this post", "cant-ban-other-admins": "আপনি অন্য এ্যাডমিনদের নিষিদ্ধ করতে পারেন না!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/bn/user.json b/public/language/bn/user.json index 3abc8984cf..34e5690baf 100644 --- a/public/language/bn/user.json +++ b/public/language/bn/user.json @@ -12,6 +12,8 @@ "ban_account": "একাউন্ট নিষিদ্ধ করুন", "ban_account_confirm": "আপনি কি নিশ্চিত যে এই সদস্যকে নিষিদ্ধ করতে চান ?", "unban_account": "নিষেদ্ধাজ্ঞা তুলে নিন", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "একাউন্ট মুছে ফেলুন", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "Banned permanently", "info.banned-reason-label": "Reason", "info.banned-no-reason": "No reason given.", + "info.muted-no-reason": "No reason given.", "info.username-history": "Username History", "info.email-history": "Email History", "info.moderation-note": "Moderation Note", diff --git a/public/language/cs/admin/manage/privileges.json b/public/language/cs/admin/manage/privileges.json index a26d488fb8..b65e9f8f3d 100644 --- a/public/language/cs/admin/manage/privileges.json +++ b/public/language/cs/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Náhrát soubory", "signature": "Podpis", "ban": "Blokovat", + "mute": "Mute", "invite": "Invite", "search-content": "Hledat obsah", "search-users": "Hledat uživatele", diff --git a/public/language/cs/admin/manage/users.json b/public/language/cs/admin/manage/users.json index 1389977e70..f036d091c9 100644 --- a/public/language/cs/admin/manage/users.json +++ b/public/language/cs/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Heslo", "create.password-confirm": "Potvrdit heslo", - "temp-ban.length": "Trvání zákazu", + "temp-ban.length": "Length", "temp-ban.reason": "Důvod (volitelné)", "temp-ban.hours": "Hodiny", "temp-ban.days": "Dny", diff --git a/public/language/cs/error.json b/public/language/cs/error.json index 1af7fdd86a..382efbf720 100644 --- a/public/language/cs/error.json +++ b/public/language/cs/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Již jste tento příspěvek zazáložkoval", "already-unbookmarked": "Již jste u tohoto příspěvku odebral záložku", "cant-ban-other-admins": "Nemůžete zablokovat jiné správce.", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "Jste jediným správcem. Před vlastním odebráním oprávnění správce nejdříve přidejte jiného uživatele jako správce", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/cs/user.json b/public/language/cs/user.json index 0b8d96ae47..c21553cf93 100644 --- a/public/language/cs/user.json +++ b/public/language/cs/user.json @@ -12,6 +12,8 @@ "ban_account": "Zablokovat účet", "ban_account_confirm": "Opravdu chcete zablokovat tohoto uživatele?", "unban_account": "Odblokovat účet", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Odstranit účet", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "Trvale zablokován", "info.banned-reason-label": "Důvod", "info.banned-no-reason": "Bez důvodu", + "info.muted-no-reason": "No reason given.", "info.username-history": "Historie uživatelského jména", "info.email-history": "E-mailová historie", "info.moderation-note": "Poznámka moderace", diff --git a/public/language/da/admin/manage/privileges.json b/public/language/da/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/da/admin/manage/privileges.json +++ b/public/language/da/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/da/admin/manage/users.json b/public/language/da/admin/manage/users.json index 2a3c0c4829..d5c9914afc 100644 --- a/public/language/da/admin/manage/users.json +++ b/public/language/da/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Password", "create.password-confirm": "Confirm Password", - "temp-ban.length": "Ban Length", + "temp-ban.length": "Length", "temp-ban.reason": "Reason (Optional)", "temp-ban.hours": "Hours", "temp-ban.days": "Days", diff --git a/public/language/da/error.json b/public/language/da/error.json index 434bbe71f2..f6d74f130c 100644 --- a/public/language/da/error.json +++ b/public/language/da/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "You have already bookmarked this post", "already-unbookmarked": "You have already unbookmarked this post", "cant-ban-other-admins": "Du kan ikke udlukke andre administatrorer!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "Du er den eneste administrator. Tilføj en anden bruger som administrator før du fjerner dig selv som administrator", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/da/user.json b/public/language/da/user.json index 65e8c94092..6754123e22 100644 --- a/public/language/da/user.json +++ b/public/language/da/user.json @@ -12,6 +12,8 @@ "ban_account": "Ban Konto", "ban_account_confirm": "Ønsker du virkelig at banne denne konto?", "unban_account": "Afban Konto", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Slet konto", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "Banned permanently", "info.banned-reason-label": "Reason", "info.banned-no-reason": "No reason given.", + "info.muted-no-reason": "No reason given.", "info.username-history": "Username History", "info.email-history": "Email History", "info.moderation-note": "Moderation Note", diff --git a/public/language/de/admin/manage/privileges.json b/public/language/de/admin/manage/privileges.json index 777cb8404f..fce5cb2d08 100644 --- a/public/language/de/admin/manage/privileges.json +++ b/public/language/de/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Dateien hochladen", "signature": "Signatur", "ban": "Bannen", + "mute": "Mute", "invite": "Einladen", "search-content": "Inhalt durchsuchen", "search-users": "Benutzersuche", diff --git a/public/language/de/admin/manage/users.json b/public/language/de/admin/manage/users.json index ec5fe6807a..e7e5ff0177 100644 --- a/public/language/de/admin/manage/users.json +++ b/public/language/de/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Passwort", "create.password-confirm": "Passwort bestätigen", - "temp-ban.length": "Banndauer", + "temp-ban.length": "Length", "temp-ban.reason": "Grund (optional)", "temp-ban.hours": "Stunden", "temp-ban.days": "Tage", diff --git a/public/language/de/error.json b/public/language/de/error.json index 13c6d6eaa4..2fdeec55ae 100644 --- a/public/language/de/error.json +++ b/public/language/de/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Du hast diesen Beitrag bereits als Lesezeichen gespeichert", "already-unbookmarked": "Du hast diesen Beitrag bereits aus deinen Lesezeichen entfernt", "cant-ban-other-admins": "Du kannst andere Administratoren nicht sperren!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "Sie können gesperrte Benutzer nicht zum Administrator machen.", "cant-remove-last-admin": "Du bist der einzige Administrator. Füge zuerst einen anderen Administrator hinzu, bevor du dich selbst als Administrator entfernst", "account-deletion-disabled": "Kontolöschung ist deaktiviert", diff --git a/public/language/de/user.json b/public/language/de/user.json index 562a0878e1..2854d13254 100644 --- a/public/language/de/user.json +++ b/public/language/de/user.json @@ -12,6 +12,8 @@ "ban_account": "Konto sperren", "ban_account_confirm": "Bist du sicher, dass du diesen Benutzer sperren möchtest?", "unban_account": "Konto entsperren", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Konto löschen", "delete_account_as_admin": "Konto löschen", "delete_content": "Konto-Inhalt löschen", @@ -154,6 +156,7 @@ "info.banned-permanently": "Permanent gesperrt", "info.banned-reason-label": "Grund", "info.banned-no-reason": "Kein Grund angegeben.", + "info.muted-no-reason": "No reason given.", "info.username-history": "Benutzernamen Verlauf", "info.email-history": "E-Mail Verlauf", "info.moderation-note": "Moderationsnotiz", diff --git a/public/language/el/admin/manage/privileges.json b/public/language/el/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/el/admin/manage/privileges.json +++ b/public/language/el/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/el/admin/manage/users.json b/public/language/el/admin/manage/users.json index 2a3c0c4829..d5c9914afc 100644 --- a/public/language/el/admin/manage/users.json +++ b/public/language/el/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Password", "create.password-confirm": "Confirm Password", - "temp-ban.length": "Ban Length", + "temp-ban.length": "Length", "temp-ban.reason": "Reason (Optional)", "temp-ban.hours": "Hours", "temp-ban.days": "Days", diff --git a/public/language/el/error.json b/public/language/el/error.json index de21d020b8..c47e6b2b1c 100644 --- a/public/language/el/error.json +++ b/public/language/el/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "You have already bookmarked this post", "already-unbookmarked": "You have already unbookmarked this post", "cant-ban-other-admins": "Δεν μπορείς να αποκλείσεις άλλους διαχειριστές!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/el/user.json b/public/language/el/user.json index d68724485e..9e9dc2322b 100644 --- a/public/language/el/user.json +++ b/public/language/el/user.json @@ -12,6 +12,8 @@ "ban_account": "Ban Account", "ban_account_confirm": "Do you really want to ban this user?", "unban_account": "Unban Account", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Διαγραφή Λογαριασμού", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "Banned permanently", "info.banned-reason-label": "Reason", "info.banned-no-reason": "No reason given.", + "info.muted-no-reason": "No reason given.", "info.username-history": "Username History", "info.email-history": "Email History", "info.moderation-note": "Moderation Note", diff --git a/public/language/en-GB/admin/manage/privileges.json b/public/language/en-GB/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/en-GB/admin/manage/privileges.json +++ b/public/language/en-GB/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/en-GB/admin/manage/users.json b/public/language/en-GB/admin/manage/users.json index 2a3c0c4829..d5c9914afc 100644 --- a/public/language/en-GB/admin/manage/users.json +++ b/public/language/en-GB/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Password", "create.password-confirm": "Confirm Password", - "temp-ban.length": "Ban Length", + "temp-ban.length": "Length", "temp-ban.reason": "Reason (Optional)", "temp-ban.hours": "Hours", "temp-ban.days": "Days", diff --git a/public/language/en-GB/error.json b/public/language/en-GB/error.json index 1f965d5ea5..e641d741a0 100644 --- a/public/language/en-GB/error.json +++ b/public/language/en-GB/error.json @@ -124,6 +124,9 @@ "already-unbookmarked": "You have already unbookmarked this post", "cant-ban-other-admins": "You can't ban other admins!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/en-GB/user.json b/public/language/en-GB/user.json index 20f47a6d95..58c3759fe8 100644 --- a/public/language/en-GB/user.json +++ b/public/language/en-GB/user.json @@ -13,6 +13,8 @@ "ban_account": "Ban Account", "ban_account_confirm": "Do you really want to ban this user?", "unban_account": "Unban Account", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Delete Account", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -171,6 +173,7 @@ "info.banned-permanently": "Banned permanently", "info.banned-reason-label": "Reason", "info.banned-no-reason": "No reason given.", + "info.muted-no-reason": "No reason given.", "info.username-history": "Username History", "info.email-history": "Email History", "info.moderation-note": "Moderation Note", diff --git a/public/language/en-US/admin/manage/privileges.json b/public/language/en-US/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/en-US/admin/manage/privileges.json +++ b/public/language/en-US/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/en-US/admin/manage/users.json b/public/language/en-US/admin/manage/users.json index 2a3c0c4829..d5c9914afc 100644 --- a/public/language/en-US/admin/manage/users.json +++ b/public/language/en-US/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Password", "create.password-confirm": "Confirm Password", - "temp-ban.length": "Ban Length", + "temp-ban.length": "Length", "temp-ban.reason": "Reason (Optional)", "temp-ban.hours": "Hours", "temp-ban.days": "Days", diff --git a/public/language/en-US/error.json b/public/language/en-US/error.json index 4848f2cc1c..facc2477ea 100644 --- a/public/language/en-US/error.json +++ b/public/language/en-US/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "You have already bookmarked this post", "already-unbookmarked": "You have already unbookmarked this post", "cant-ban-other-admins": "You can't ban other admins!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/en-US/user.json b/public/language/en-US/user.json index a4d58652e8..217d161fb7 100644 --- a/public/language/en-US/user.json +++ b/public/language/en-US/user.json @@ -12,6 +12,8 @@ "ban_account": "Ban Account", "ban_account_confirm": "Do you really want to ban this user?", "unban_account": "Unban Account", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Delete Account", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "Banned permanently", "info.banned-reason-label": "Reason", "info.banned-no-reason": "No reason given.", + "info.muted-no-reason": "No reason given.", "info.username-history": "Username History", "info.email-history": "Email History", "info.moderation-note": "Moderation Note", diff --git a/public/language/en-x-pirate/admin/manage/privileges.json b/public/language/en-x-pirate/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/en-x-pirate/admin/manage/privileges.json +++ b/public/language/en-x-pirate/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/en-x-pirate/admin/manage/users.json b/public/language/en-x-pirate/admin/manage/users.json index 2a3c0c4829..d5c9914afc 100644 --- a/public/language/en-x-pirate/admin/manage/users.json +++ b/public/language/en-x-pirate/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Password", "create.password-confirm": "Confirm Password", - "temp-ban.length": "Ban Length", + "temp-ban.length": "Length", "temp-ban.reason": "Reason (Optional)", "temp-ban.hours": "Hours", "temp-ban.days": "Days", diff --git a/public/language/en-x-pirate/error.json b/public/language/en-x-pirate/error.json index 4848f2cc1c..facc2477ea 100644 --- a/public/language/en-x-pirate/error.json +++ b/public/language/en-x-pirate/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "You have already bookmarked this post", "already-unbookmarked": "You have already unbookmarked this post", "cant-ban-other-admins": "You can't ban other admins!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/en-x-pirate/user.json b/public/language/en-x-pirate/user.json index f23a919cfc..fdbf39eb51 100644 --- a/public/language/en-x-pirate/user.json +++ b/public/language/en-x-pirate/user.json @@ -12,6 +12,8 @@ "ban_account": "Ban Account", "ban_account_confirm": "Do you really want to ban this user?", "unban_account": "Unban Account", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Delete Account", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "Banned permanently", "info.banned-reason-label": "Reason", "info.banned-no-reason": "No reason given.", + "info.muted-no-reason": "No reason given.", "info.username-history": "Username History", "info.email-history": "Email History", "info.moderation-note": "Moderation Note", diff --git a/public/language/es/admin/manage/privileges.json b/public/language/es/admin/manage/privileges.json index a5bcdf1fe9..c705a7312d 100644 --- a/public/language/es/admin/manage/privileges.json +++ b/public/language/es/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Subir Archivos", "signature": "Firma", "ban": "Banear", + "mute": "Mute", "invite": "Invite", "search-content": "Buscar Contenido", "search-users": "Buscar Usuarios", diff --git a/public/language/es/admin/manage/users.json b/public/language/es/admin/manage/users.json index 219bb7e580..ae5aa9eba2 100644 --- a/public/language/es/admin/manage/users.json +++ b/public/language/es/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Contraseña", "create.password-confirm": "Confirmar Contraseña", - "temp-ban.length": "Duración de la Expulsión", + "temp-ban.length": "Length", "temp-ban.reason": "Razón (Opcional)", "temp-ban.hours": "Horas", "temp-ban.days": "Días", diff --git a/public/language/es/error.json b/public/language/es/error.json index b7abf2ec41..349c04e303 100644 --- a/public/language/es/error.json +++ b/public/language/es/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Ya marcaste este mensaje", "already-unbookmarked": "Ya desmarcarste este mensaje", "cant-ban-other-admins": "¡No puedes expulsar a otros administradores!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "Tu eres el unico administrador. Añade otro usuario como administrador antes de eliminarte a ti mismo.", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/es/user.json b/public/language/es/user.json index ecea849853..67ad75173f 100644 --- a/public/language/es/user.json +++ b/public/language/es/user.json @@ -12,6 +12,8 @@ "ban_account": "Banear cuenta", "ban_account_confirm": "Quieres confirmar el baneo de este usuario?", "unban_account": "Desbanear cuenta", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Eliminar cuenta", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "Baneado permanentemente", "info.banned-reason-label": "Motivo", "info.banned-no-reason": "Motivo no especificado", + "info.muted-no-reason": "No reason given.", "info.username-history": "Histórico de nombre de usuario", "info.email-history": "HIstórico de Email", "info.moderation-note": "Nota de Moderación", diff --git a/public/language/et/admin/manage/privileges.json b/public/language/et/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/et/admin/manage/privileges.json +++ b/public/language/et/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/et/admin/manage/users.json b/public/language/et/admin/manage/users.json index 8cf1753398..0341530da7 100644 --- a/public/language/et/admin/manage/users.json +++ b/public/language/et/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Parool", "create.password-confirm": "Kinnita parool", - "temp-ban.length": "Keelustuse pikkus", + "temp-ban.length": "Length", "temp-ban.reason": "Põhjus (valikuline)", "temp-ban.hours": "Tunnid", "temp-ban.days": "Päevad", diff --git a/public/language/et/error.json b/public/language/et/error.json index 5cb3168dce..dc5a8143dd 100644 --- a/public/language/et/error.json +++ b/public/language/et/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "You have already bookmarked this post", "already-unbookmarked": "You have already unbookmarked this post", "cant-ban-other-admins": "Sa ei saa bannida teisi administraatoreid!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "Te olete ainus administraator. Lisage keegi teine administraatoriks, enne kui eemaldate endalt administraatori.", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/et/user.json b/public/language/et/user.json index bcf307ab66..4086944102 100644 --- a/public/language/et/user.json +++ b/public/language/et/user.json @@ -12,6 +12,8 @@ "ban_account": "Bannige kasutaja", "ban_account_confirm": "Kas te tõesti soovite antud kasutajat bannida?", "unban_account": "Eemaldage kontolt ban", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Kustuta kasutaja", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "Igavesti keelustatud", "info.banned-reason-label": "Reason", "info.banned-no-reason": "No reason given.", + "info.muted-no-reason": "No reason given.", "info.username-history": "Username History", "info.email-history": "Email History", "info.moderation-note": "Moderation Note", diff --git a/public/language/fa-IR/admin/manage/privileges.json b/public/language/fa-IR/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/fa-IR/admin/manage/privileges.json +++ b/public/language/fa-IR/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/fa-IR/admin/manage/users.json b/public/language/fa-IR/admin/manage/users.json index 6ae785dcaa..6181bf0f57 100644 --- a/public/language/fa-IR/admin/manage/users.json +++ b/public/language/fa-IR/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Password", "create.password-confirm": "Confirm Password", - "temp-ban.length": "میزان مدت اخراج", + "temp-ban.length": "Length", "temp-ban.reason": "علت (اختیاری)", "temp-ban.hours": "ساعت", "temp-ban.days": "روز", diff --git a/public/language/fa-IR/error.json b/public/language/fa-IR/error.json index fe4596724a..b84f043075 100644 --- a/public/language/fa-IR/error.json +++ b/public/language/fa-IR/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "شما قبلا این پست را نشانک کرده‌اید", "already-unbookmarked": "شما قبلا این پست را از نشانک در آوردید", "cant-ban-other-admins": "شما نمی‌توانید دیگر مدیران را محروم کنید!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "شما تنها مدیر می باشید . شما باید قبل از عزل خود از مدیریت یک کاربر دیگر را مدیر کنید", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/fa-IR/user.json b/public/language/fa-IR/user.json index e37cf8e4d3..05f6a7e3e3 100644 --- a/public/language/fa-IR/user.json +++ b/public/language/fa-IR/user.json @@ -12,6 +12,8 @@ "ban_account": "اخراج کاربر", "ban_account_confirm": "از مسدود کردن این کاربر اطمینان دارید؟", "unban_account": "آزاد کردن حساب کاربری", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "حذف حساب کاربری", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "مسدود شده به طور دائم", "info.banned-reason-label": "دلیل", "info.banned-no-reason": "هیچ دلیلی ارایه نشد.", + "info.muted-no-reason": "No reason given.", "info.username-history": "تاریخچه تعویض نام کاربری", "info.email-history": "تاریخچه تعویض ایمیل", "info.moderation-note": "یادداشت مدیر", diff --git a/public/language/fi/admin/manage/privileges.json b/public/language/fi/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/fi/admin/manage/privileges.json +++ b/public/language/fi/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/fi/admin/manage/users.json b/public/language/fi/admin/manage/users.json index 2a3c0c4829..d5c9914afc 100644 --- a/public/language/fi/admin/manage/users.json +++ b/public/language/fi/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Password", "create.password-confirm": "Confirm Password", - "temp-ban.length": "Ban Length", + "temp-ban.length": "Length", "temp-ban.reason": "Reason (Optional)", "temp-ban.hours": "Hours", "temp-ban.days": "Days", diff --git a/public/language/fi/error.json b/public/language/fi/error.json index af08dd92f0..16d61629a2 100644 --- a/public/language/fi/error.json +++ b/public/language/fi/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "You have already bookmarked this post", "already-unbookmarked": "You have already unbookmarked this post", "cant-ban-other-admins": "Et voi estää muita ylläpitäjiä!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/fi/user.json b/public/language/fi/user.json index b61fa0594b..15016afc1e 100644 --- a/public/language/fi/user.json +++ b/public/language/fi/user.json @@ -12,6 +12,8 @@ "ban_account": "Bannaa käyttäjätili", "ban_account_confirm": "Haluatko varmasti bannata käyttäjän?", "unban_account": "Peru käyttäjätilin banni", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Poista käyttäjätili", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "Banned permanently", "info.banned-reason-label": "Syy ", "info.banned-no-reason": "Syytä ei ole annettu", + "info.muted-no-reason": "No reason given.", "info.username-history": "Username History", "info.email-history": "Email History", "info.moderation-note": "Ylläpidon muistiinpano", diff --git a/public/language/fr/admin/manage/privileges.json b/public/language/fr/admin/manage/privileges.json index 0d6fac887d..c3a45e51de 100644 --- a/public/language/fr/admin/manage/privileges.json +++ b/public/language/fr/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Fichiers envoyés", "signature": "Signature", "ban": "Bannir", + "mute": "Mute", "invite": "Inviter", "search-content": "Rechercher un contenu", "search-users": "Rechercher des utilisateurs", diff --git a/public/language/fr/admin/manage/users.json b/public/language/fr/admin/manage/users.json index 4b98478d81..a2efb7bf9d 100644 --- a/public/language/fr/admin/manage/users.json +++ b/public/language/fr/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Mot de passe", "create.password-confirm": "Confirmer le mot de passe", - "temp-ban.length": "Durée du bannissement", + "temp-ban.length": "Length", "temp-ban.reason": "Raison (Optionel)", "temp-ban.hours": "Heures", "temp-ban.days": "Jours", diff --git a/public/language/fr/error.json b/public/language/fr/error.json index 555216dd82..1ea8948be1 100644 --- a/public/language/fr/error.json +++ b/public/language/fr/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Vous avez déjà mis un marque-page", "already-unbookmarked": "Vous avez déjà retiré un marque-page", "cant-ban-other-admins": "Vous ne pouvez pas bannir les autres administrateurs !", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "Vous ne pouvez pas mettre des utilisateurs bannis en administrateur.", "cant-remove-last-admin": "Vous êtes le seul administrateur. Ajoutez un autre utilisateur en tant qu'administrateur avant de vous retirer.", "account-deletion-disabled": "La suppression du compte est désactivée", diff --git a/public/language/fr/user.json b/public/language/fr/user.json index d1e9dd37f1..dc22b3f3c9 100644 --- a/public/language/fr/user.json +++ b/public/language/fr/user.json @@ -12,6 +12,8 @@ "ban_account": "Bannir le compte", "ban_account_confirm": "Êtes-vous sûr de bien vouloir bannir cet utilisateur ?", "unban_account": "Rétablir le compte", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Supprimer le compte", "delete_account_as_admin": "Supprimer le compte", "delete_content": "Supprimer le contenu du compte", @@ -154,6 +156,7 @@ "info.banned-permanently": "Banni de façon permanente", "info.banned-reason-label": "Raison", "info.banned-no-reason": "Aucune raison donnée", + "info.muted-no-reason": "No reason given.", "info.username-history": "Historique des noms d'utilisateur", "info.email-history": "Historique des adresses email", "info.moderation-note": "Note de modération", diff --git a/public/language/gl/admin/manage/privileges.json b/public/language/gl/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/gl/admin/manage/privileges.json +++ b/public/language/gl/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/gl/admin/manage/users.json b/public/language/gl/admin/manage/users.json index 2a3c0c4829..d5c9914afc 100644 --- a/public/language/gl/admin/manage/users.json +++ b/public/language/gl/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Password", "create.password-confirm": "Confirm Password", - "temp-ban.length": "Ban Length", + "temp-ban.length": "Length", "temp-ban.reason": "Reason (Optional)", "temp-ban.hours": "Hours", "temp-ban.days": "Days", diff --git a/public/language/gl/error.json b/public/language/gl/error.json index 40a28f5dc2..e604ddd5cc 100644 --- a/public/language/gl/error.json +++ b/public/language/gl/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Xa marcaches esta mensaxe", "already-unbookmarked": "Xa desmarcaches esta mensaxe", "cant-ban-other-admins": "Non podes botar outros administradores!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "Eres o único administrador. Engade outros administradores antes de quitarte a ti mesmo como administrador.", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/gl/user.json b/public/language/gl/user.json index d5fed29394..a7e61b42ab 100644 --- a/public/language/gl/user.json +++ b/public/language/gl/user.json @@ -12,6 +12,8 @@ "ban_account": "Suspender conta", "ban_account_confirm": "Estás seguro de que desexas expulsar a este usuario?", "unban_account": "Readmitir conta", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Borrar conta.", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "Baneado permanentemente", "info.banned-reason-label": "Motivo", "info.banned-no-reason": "Motivo non especificado", + "info.muted-no-reason": "No reason given.", "info.username-history": "Histórico de nome de usuario", "info.email-history": "Histórico de Correo Electrónico", "info.moderation-note": "Nota do Moderador", diff --git a/public/language/he/admin/manage/privileges.json b/public/language/he/admin/manage/privileges.json index 819f7260ed..cc1f3aca16 100644 --- a/public/language/he/admin/manage/privileges.json +++ b/public/language/he/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "העלאת קבצים", "signature": "חתימה", "ban": "הרחקה", + "mute": "Mute", "invite": "הזמנה", "search-content": "חיפוש תוכן", "search-users": "חיפוש משתמשים", diff --git a/public/language/he/admin/manage/users.json b/public/language/he/admin/manage/users.json index 1eb0bb2aca..e9cb0b76a2 100644 --- a/public/language/he/admin/manage/users.json +++ b/public/language/he/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "סיסמה", "create.password-confirm": "אשר סיסמה", - "temp-ban.length": "זמן הרחקה", + "temp-ban.length": "Length", "temp-ban.reason": "סיבה (אופציונאלי)", "temp-ban.hours": "שעות", "temp-ban.days": "ימים", diff --git a/public/language/he/error.json b/public/language/he/error.json index 2a157c361c..45ce9a07d0 100644 --- a/public/language/he/error.json +++ b/public/language/he/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "כבר הוספת פוסט זה לרשימת המסומנים", "already-unbookmarked": "כבר הסרת פוסט זה מרשימת המסומנים", "cant-ban-other-admins": "אינך יכול לחסום מנהלים אחרים!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "לא ניתן להפוך משתמשים מורחקים למנהלים.", "cant-remove-last-admin": "אתה המנהל היחיד. הוסף משתמש אחר לניהול לפני שאתה מוריד את עצמך מניהול", "account-deletion-disabled": "מחיקת החשבון מושבתת", diff --git a/public/language/he/user.json b/public/language/he/user.json index 1c065dd3d8..77521a234a 100644 --- a/public/language/he/user.json +++ b/public/language/he/user.json @@ -12,6 +12,8 @@ "ban_account": "הרחק חשבון", "ban_account_confirm": "האם אתה בטוח שאתה רוצה להרחיק משתמש זה?", "unban_account": "בטל את הרחקת החשבון", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "מחק חשבון", "delete_account_as_admin": "מחק חשבון", "delete_content": "מחק תוכן חשבון", @@ -154,6 +156,7 @@ "info.banned-permanently": "הורחק לצמיתות", "info.banned-reason-label": "סיבה", "info.banned-no-reason": "לא ניתנה סיבה.", + "info.muted-no-reason": "No reason given.", "info.username-history": "היסטוריית שם משתמש", "info.email-history": "היסטוריית אימייל", "info.moderation-note": "הערת מודרטור", diff --git a/public/language/hr/admin/manage/privileges.json b/public/language/hr/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/hr/admin/manage/privileges.json +++ b/public/language/hr/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/hr/admin/manage/users.json b/public/language/hr/admin/manage/users.json index b91a04252b..3846a3090e 100644 --- a/public/language/hr/admin/manage/users.json +++ b/public/language/hr/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Lozinka", "create.password-confirm": "Potvdri lozinku", - "temp-ban.length": "Dužina blokade", + "temp-ban.length": "Length", "temp-ban.reason": "Razlog (Opcionalno)", "temp-ban.hours": "Sati", "temp-ban.days": "Dani", diff --git a/public/language/hr/error.json b/public/language/hr/error.json index 0377f7e609..b1d1e8b5ec 100644 --- a/public/language/hr/error.json +++ b/public/language/hr/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Već ste zabilježili ovu objavu", "already-unbookmarked": "Već ste odbilježili ovu objavu", "cant-ban-other-admins": "Nemožete blokirati ostale administratore!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "Vi ste jedini administrator. Dodajte korisnika kao administratora prije nego sebe odjavite kao administratora.", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/hr/user.json b/public/language/hr/user.json index 4b6527dd86..bb5e9b2c75 100644 --- a/public/language/hr/user.json +++ b/public/language/hr/user.json @@ -12,6 +12,8 @@ "ban_account": "Blokiraj račun", "ban_account_confirm": "Da li zaista želite blokirati ovog korisnika", "unban_account": "Odblokiraj račun", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Obriši račun", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "Trajno blokiran", "info.banned-reason-label": "Razlog", "info.banned-no-reason": "Razlog nije dan.", + "info.muted-no-reason": "No reason given.", "info.username-history": "Povijest korisničkog imena", "info.email-history": "Povijest emaila", "info.moderation-note": "Poruka moderiranja", diff --git a/public/language/hu/admin/manage/privileges.json b/public/language/hu/admin/manage/privileges.json index 3e58912274..23c048a409 100644 --- a/public/language/hu/admin/manage/privileges.json +++ b/public/language/hu/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Fájlok feltöltése", "signature": "Aláírás", "ban": "Kitiltás", + "mute": "Mute", "invite": "Meghívás", "search-content": "Tartalom keresése", "search-users": "Felhasználó keresése", diff --git a/public/language/hu/admin/manage/users.json b/public/language/hu/admin/manage/users.json index 71210911d2..c835476ec1 100644 --- a/public/language/hu/admin/manage/users.json +++ b/public/language/hu/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Jelszó", "create.password-confirm": "Jelszó megerősítése", - "temp-ban.length": "Kitiltás hossza", + "temp-ban.length": "Length", "temp-ban.reason": "Indok (Nem kötelező)", "temp-ban.hours": "Óra", "temp-ban.days": "Nap", diff --git a/public/language/hu/error.json b/public/language/hu/error.json index 2d94ae1224..2d5f567533 100644 --- a/public/language/hu/error.json +++ b/public/language/hu/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Már elmentetted ezt a hozzászólást a könyvjelzők közé", "already-unbookmarked": "Már eltávolítottad ezt a hozzászólást a könyvjelzők közül", "cant-ban-other-admins": "Nem tilthatsz ki másik adminisztrátort!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "Te vagy az egyedüli adminisztrátor. Adj hozzá egy másik felhasználót az adminisztrátori szerepkörhöz, hogy levehesd magadról az adminisztrátori rangot", "account-deletion-disabled": "Fiók törlése ki van kapcsolva", diff --git a/public/language/hu/user.json b/public/language/hu/user.json index 49408785bf..71443a1f90 100644 --- a/public/language/hu/user.json +++ b/public/language/hu/user.json @@ -12,6 +12,8 @@ "ban_account": "Fiók tiltása", "ban_account_confirm": "Biztos ki akarod tiltani a felhasználót?", "unban_account": "Fiók feloldása", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Fiók törlése", "delete_account_as_admin": "Fiók törlése", "delete_content": "Fiók tartalmának törlése", @@ -154,6 +156,7 @@ "info.banned-permanently": "Végleges kitiltás", "info.banned-reason-label": "Oka", "info.banned-no-reason": "Az oka nincs megadva.", + "info.muted-no-reason": "No reason given.", "info.username-history": "Felhasználónév előzmény", "info.email-history": "E-mail előzmény", "info.moderation-note": "Moderálási megjegyzés", diff --git a/public/language/id/admin/manage/privileges.json b/public/language/id/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/id/admin/manage/privileges.json +++ b/public/language/id/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/id/admin/manage/users.json b/public/language/id/admin/manage/users.json index 2a3c0c4829..d5c9914afc 100644 --- a/public/language/id/admin/manage/users.json +++ b/public/language/id/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Password", "create.password-confirm": "Confirm Password", - "temp-ban.length": "Ban Length", + "temp-ban.length": "Length", "temp-ban.reason": "Reason (Optional)", "temp-ban.hours": "Hours", "temp-ban.days": "Days", diff --git a/public/language/id/error.json b/public/language/id/error.json index 1c12843200..448d42e834 100644 --- a/public/language/id/error.json +++ b/public/language/id/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "You have already bookmarked this post", "already-unbookmarked": "You have already unbookmarked this post", "cant-ban-other-admins": "Kamu tidak dapat ban admin lainnya!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/id/user.json b/public/language/id/user.json index c8e76c9527..e67d703e91 100644 --- a/public/language/id/user.json +++ b/public/language/id/user.json @@ -12,6 +12,8 @@ "ban_account": "Ban Account", "ban_account_confirm": "Do you really want to ban this user?", "unban_account": "Unban Account", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Hapus Akun", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "Banned permanently", "info.banned-reason-label": "Reason", "info.banned-no-reason": "No reason given.", + "info.muted-no-reason": "No reason given.", "info.username-history": "Username History", "info.email-history": "Email History", "info.moderation-note": "Moderation Note", diff --git a/public/language/it/admin/manage/privileges.json b/public/language/it/admin/manage/privileges.json index 0da351c033..dd80045227 100644 --- a/public/language/it/admin/manage/privileges.json +++ b/public/language/it/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Carica file", "signature": "Firma", "ban": "Ban", + "mute": "Mute", "invite": "Invita", "search-content": "Cerca contenuto", "search-users": "Cerca utenti", diff --git a/public/language/it/admin/manage/users.json b/public/language/it/admin/manage/users.json index ad076e6a89..63648348cd 100644 --- a/public/language/it/admin/manage/users.json +++ b/public/language/it/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Password", "create.password-confirm": "Conferma Password", - "temp-ban.length": "Lunghezza Ban", + "temp-ban.length": "Length", "temp-ban.reason": "Ragione (Opzionale)", "temp-ban.hours": "Ore", "temp-ban.days": "Giorni", diff --git a/public/language/it/error.json b/public/language/it/error.json index 2ec2bdc75d..a8c3399165 100644 --- a/public/language/it/error.json +++ b/public/language/it/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Hai già aggiunto questa discussione ai preferiti.", "already-unbookmarked": "Hai già rimosso questa discussione dai preferiti", "cant-ban-other-admins": "Non puoi bannare altri amministratori!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "Non puoi rendere amministratori gli utenti bannati.", "cant-remove-last-admin": "Sei l'unico Amministratore. Aggiungi un altro amministratore prima di rimuovere il tuo ruolo", "account-deletion-disabled": "L'eliminazione dell'account è disabilitata", diff --git a/public/language/it/user.json b/public/language/it/user.json index beba3efbf3..5bb78d68bb 100644 --- a/public/language/it/user.json +++ b/public/language/it/user.json @@ -12,6 +12,8 @@ "ban_account": "BAN dell'account", "ban_account_confirm": "Sei sicuro di voler bannare questo utente?", "unban_account": "Togli il BAN", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Elimina Account", "delete_account_as_admin": "Elimina account", "delete_content": "Elimina contenuto account", @@ -154,6 +156,7 @@ "info.banned-permanently": "Bannato permanentemente", "info.banned-reason-label": "Motivo", "info.banned-no-reason": "Non è stata data nessuna motivazione.", + "info.muted-no-reason": "No reason given.", "info.username-history": "Storico del nome utente", "info.email-history": "Storico dell'Email", "info.moderation-note": "Nota di moderazione", diff --git a/public/language/ja/admin/manage/privileges.json b/public/language/ja/admin/manage/privileges.json index 4163e37430..8b9ce40a8e 100644 --- a/public/language/ja/admin/manage/privileges.json +++ b/public/language/ja/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "ファイルをアップロード", "signature": "署名", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "コンテンツを検索", "search-users": "ユーザー検索", diff --git a/public/language/ja/admin/manage/users.json b/public/language/ja/admin/manage/users.json index 9d9c693e1c..5875773e00 100644 --- a/public/language/ja/admin/manage/users.json +++ b/public/language/ja/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "パスワード", "create.password-confirm": "パスワードを確認", - "temp-ban.length": "BANの長さ", + "temp-ban.length": "Length", "temp-ban.reason": "理由(任意)", "temp-ban.hours": "時間", "temp-ban.days": "日", diff --git a/public/language/ja/error.json b/public/language/ja/error.json index cf2f034a70..98d8d3fbb7 100644 --- a/public/language/ja/error.json +++ b/public/language/ja/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "あなたは、この投稿をすでにブックマークしています", "already-unbookmarked": "あなたは、この投稿をすでにブックマークから外しています", "cant-ban-other-admins": "ほかの管理者を停止することはできません！", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "あなたが唯一の管理者です。管理者としてあなた自身を削除する前に、管理者として別のユーザーを追加します。", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/ja/user.json b/public/language/ja/user.json index 4509e672c8..e51a48ffd8 100644 --- a/public/language/ja/user.json +++ b/public/language/ja/user.json @@ -12,6 +12,8 @@ "ban_account": "BANアカウント", "ban_account_confirm": "本当にこのユーザーをBANしますか？", "unban_account": "禁止アカウント解除します", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "アカウント削除します", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "永久に停止", "info.banned-reason-label": "理由", "info.banned-no-reason": "理由なし。", + "info.muted-no-reason": "No reason given.", "info.username-history": "ユーザー名の履歴", "info.email-history": "Eメール履歴", "info.moderation-note": "モデレーションノート", diff --git a/public/language/ko/admin/manage/privileges.json b/public/language/ko/admin/manage/privileges.json index d01ba7c79e..e150a7dee6 100644 --- a/public/language/ko/admin/manage/privileges.json +++ b/public/language/ko/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "파일 업로드", "signature": "서명", "ban": "차단", + "mute": "Mute", "invite": "초대", "search-content": "콘텐츠 검색", "search-users": "사용자 검색", diff --git a/public/language/ko/admin/manage/users.json b/public/language/ko/admin/manage/users.json index 948440a063..c768a2c9ec 100644 --- a/public/language/ko/admin/manage/users.json +++ b/public/language/ko/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "비밀번호", "create.password-confirm": "비밀번호 재입력", - "temp-ban.length": "차단 기간", + "temp-ban.length": "Length", "temp-ban.reason": "사유 (선택 사항)", "temp-ban.hours": "시간", "temp-ban.days": "일", diff --git a/public/language/ko/error.json b/public/language/ko/error.json index e44d8857ba..1db0bf909d 100644 --- a/public/language/ko/error.json +++ b/public/language/ko/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "이미 즐겨찾기에 추가한 포스트 입니다.", "already-unbookmarked": "이미 즐겨찾기를 해제한 포스트 입니다.", "cant-ban-other-admins": "다른 관리자를 차단할 수 없습니다!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "당신은 유일한 관리자입니다. 관리자를 그만두기 전에 다른 사용자를 관리자로 임명하세요.", "account-deletion-disabled": "계정 삭제 기능이 비활성화 상태입니다.", diff --git a/public/language/ko/user.json b/public/language/ko/user.json index 28fc86680d..3147dcb121 100644 --- a/public/language/ko/user.json +++ b/public/language/ko/user.json @@ -12,6 +12,8 @@ "ban_account": "계정 차단", "ban_account_confirm": "이 사용자를 차단하시겠습니까?", "unban_account": "차단 해제", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "계정 삭제", "delete_account_as_admin": "계정 삭제", "delete_content": "계정 컨텐츠 삭제", @@ -154,6 +156,7 @@ "info.banned-permanently": "영구 차단", "info.banned-reason-label": "사유", "info.banned-no-reason": "사유 없음", + "info.muted-no-reason": "No reason given.", "info.username-history": "사용자명 변경 기록", "info.email-history": "이메일 변경 기록", "info.moderation-note": "관리자 메모", diff --git a/public/language/lt/admin/manage/privileges.json b/public/language/lt/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/lt/admin/manage/privileges.json +++ b/public/language/lt/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/lt/admin/manage/users.json b/public/language/lt/admin/manage/users.json index 2a3c0c4829..d5c9914afc 100644 --- a/public/language/lt/admin/manage/users.json +++ b/public/language/lt/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Password", "create.password-confirm": "Confirm Password", - "temp-ban.length": "Ban Length", + "temp-ban.length": "Length", "temp-ban.reason": "Reason (Optional)", "temp-ban.hours": "Hours", "temp-ban.days": "Days", diff --git a/public/language/lt/error.json b/public/language/lt/error.json index 8ea1d70c0d..0ce4d98cce 100644 --- a/public/language/lt/error.json +++ b/public/language/lt/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Jūs jau turite žymekelį šiam įrašui", "already-unbookmarked": "Jūs jau nuėmėte žymeklį šiam įrašui", "cant-ban-other-admins": "Jūs negalite užblokuoti kitų administratorių!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "Jūs esate vienintelis administratorius. Pridėkite kitą vartotoja kaip administratorių prieš pašalindamas save", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/lt/user.json b/public/language/lt/user.json index 481c5bfdf5..85948d0be6 100644 --- a/public/language/lt/user.json +++ b/public/language/lt/user.json @@ -12,6 +12,8 @@ "ban_account": "Užblokuoti Paskyrą", "ban_account_confirm": "Jūs tikrai norite užblokuoti šį vartotoją?", "unban_account": "Atblokuoti Paskyrą", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Ištrinti paskyrą", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "Užblokuotas visam laikui", "info.banned-reason-label": "Priežastis", "info.banned-no-reason": "Be priežasties", + "info.muted-no-reason": "No reason given.", "info.username-history": "Username History", "info.email-history": "El. pašto istorija", "info.moderation-note": "Moderation Note", diff --git a/public/language/lv/admin/manage/privileges.json b/public/language/lv/admin/manage/privileges.json index f0cfbb8c21..60ba5996f2 100644 --- a/public/language/lv/admin/manage/privileges.json +++ b/public/language/lv/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Augšupielādēt failus", "signature": "Parakstīties", "ban": "Bloķēt", + "mute": "Mute", "invite": "Invite", "search-content": "Meklēt saturā", "search-users": "Meklēt lietotājos", diff --git a/public/language/lv/admin/manage/users.json b/public/language/lv/admin/manage/users.json index 44619ba911..487013274c 100644 --- a/public/language/lv/admin/manage/users.json +++ b/public/language/lv/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Parole", "create.password-confirm": "Atkārtot paroli", - "temp-ban.length": "Bloķēšanas termiņš", + "temp-ban.length": "Length", "temp-ban.reason": "Iemesls (neobligāts)", "temp-ban.hours": "Stundas", "temp-ban.days": "Dienas", diff --git a/public/language/lv/error.json b/public/language/lv/error.json index b1d1c76949..361c34e236 100644 --- a/public/language/lv/error.json +++ b/public/language/lv/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Tu jau esi atzīmējis šo rakstu ar grāmatzīmi", "already-unbookmarked": "Tu jau esi noņēmis grāmatzīmi no šī raksta", "cant-ban-other-admins": "Nevar bloķēt citus administratorus!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "Tu esi vienīgais administrators. Pievieno vēl vienu lietotāju kā administratoru, pirms noņemi sevi kā administratoru", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/lv/user.json b/public/language/lv/user.json index 5308e64362..72199b701f 100644 --- a/public/language/lv/user.json +++ b/public/language/lv/user.json @@ -12,6 +12,8 @@ "ban_account": "Bloķēt kontu", "ban_account_confirm": "Vai tiešām vēlies bloķēt šo lietotāju?", "unban_account": "Atbloķēt kontu", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Izdzēst kontu", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "Bloķēts pastāvīgi", "info.banned-reason-label": "Iemesls", "info.banned-no-reason": "Bez iemesla.", + "info.muted-no-reason": "No reason given.", "info.username-history": "Lietotājvārdu vēsture", "info.email-history": "E-pastu vēsture", "info.moderation-note": "Moderatora piezīmes", diff --git a/public/language/ms/admin/manage/privileges.json b/public/language/ms/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/ms/admin/manage/privileges.json +++ b/public/language/ms/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/ms/admin/manage/users.json b/public/language/ms/admin/manage/users.json index 2a3c0c4829..d5c9914afc 100644 --- a/public/language/ms/admin/manage/users.json +++ b/public/language/ms/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Password", "create.password-confirm": "Confirm Password", - "temp-ban.length": "Ban Length", + "temp-ban.length": "Length", "temp-ban.reason": "Reason (Optional)", "temp-ban.hours": "Hours", "temp-ban.days": "Days", diff --git a/public/language/ms/error.json b/public/language/ms/error.json index a82376c0e0..f63324d764 100644 --- a/public/language/ms/error.json +++ b/public/language/ms/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "You have already bookmarked this post", "already-unbookmarked": "You have already unbookmarked this post", "cant-ban-other-admins": "Anda tidak boleh haramkan admin / pentadbir!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "Anda satu-satunya pentadbir. Tambah pentadbir lain sebelum membuang diri anda sebagai pentadbir", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/ms/user.json b/public/language/ms/user.json index 4f7a5b9dec..d0fb72db64 100644 --- a/public/language/ms/user.json +++ b/public/language/ms/user.json @@ -12,6 +12,8 @@ "ban_account": "Haramkan Akaun", "ban_account_confirm": "Adakah anda pasti ingin menyekat pengguna ini?", "unban_account": "Buang Sekatan Akaun", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Padam Akaun", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "Banned permanently", "info.banned-reason-label": "Reason", "info.banned-no-reason": "No reason given.", + "info.muted-no-reason": "No reason given.", "info.username-history": "Username History", "info.email-history": "Email History", "info.moderation-note": "Moderation Note", diff --git a/public/language/nb/admin/admin.json b/public/language/nb/admin/admin.json index bb955d4ca3..83e867a30f 100644 --- a/public/language/nb/admin/admin.json +++ b/public/language/nb/admin/admin.json @@ -4,8 +4,8 @@ "acp-title": "%1 | NodeBB Admin Kontrollpanel", "settings-header-contents": "Innhold", - "changes-saved": "Changes Saved", - "changes-saved-message": "Your changes to the NodeBB configuration have been saved.", - "changes-not-saved": "Changes Not Saved", - "changes-not-saved-message": "NodeBB encountered a problem saving your changes. (%1)" + "changes-saved": "Endringer lagret", + "changes-saved-message": "Dine endringer til NodeBB-konfigurasjonen har blitt lagret.", + "changes-not-saved": "Endringer ikke lagret", + "changes-not-saved-message": "NodeBB støtte på et problem ved lagring av endringer. (%1)" } \ No newline at end of file diff --git a/public/language/nb/admin/manage/privileges.json b/public/language/nb/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/nb/admin/manage/privileges.json +++ b/public/language/nb/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/nb/admin/manage/users.json b/public/language/nb/admin/manage/users.json index 091c07f1e0..12e3ff1d39 100644 --- a/public/language/nb/admin/manage/users.json +++ b/public/language/nb/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Password", "create.password-confirm": "Confirm Password", - "temp-ban.length": "Ban Length", + "temp-ban.length": "Length", "temp-ban.reason": "Reason (Optional)", "temp-ban.hours": "Hours", "temp-ban.days": "Days", diff --git a/public/language/nb/admin/settings/user.json b/public/language/nb/admin/settings/user.json index 6becd6a6e9..42b878793a 100644 --- a/public/language/nb/admin/settings/user.json +++ b/public/language/nb/admin/settings/user.json @@ -65,11 +65,11 @@ "outgoing-new-tab": "Åpne utgående lenker i ny fane", "topic-search": "Aktiver i-tråd-søk", "update-url-with-post-index": "Oppdater url med postindeks mens du surfer på emner", - "digest-freq": "Subscribe to Digest", + "digest-freq": "Abonner på sammendrag", "digest-freq.off": "Av", "digest-freq.daily": "Daglig", "digest-freq.weekly": "Ukentlig", - "digest-freq.biweekly": "Bi-Weekly", + "digest-freq.biweekly": "Annenhver uke", "digest-freq.monthly": "Månedlig ", "email-chat-notifs": "Send en e-post hvis jeg mottar en ny chatt-melding om jeg ikke er online. ", "email-post-notif": "Send en e-post når det kommer svar på tråder jeg abbonnerer på", diff --git a/public/language/nb/error.json b/public/language/nb/error.json index 28a43c2104..691b1ad462 100644 --- a/public/language/nb/error.json +++ b/public/language/nb/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Du har allerede bokmerket dette innlegget", "already-unbookmarked": "Du har allerede fjernet bokmerket fra dette innlegget", "cant-ban-other-admins": "Du kan ikke utestenge andre administratorer!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "Du er den eneste administratoren. Legg til en annen bruker som administrator før du fjerner deg selv.", "account-deletion-disabled": "Kontosletting er deaktivert", diff --git a/public/language/nb/user.json b/public/language/nb/user.json index 1e0f3fcf9f..51378a5e37 100644 --- a/public/language/nb/user.json +++ b/public/language/nb/user.json @@ -12,6 +12,8 @@ "ban_account": "Utesteng kont", "ban_account_confirm": "Vil du virkelig utestenge denne brukeren?", "unban_account": "Opphev utestenging", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Slett konto", "delete_account_as_admin": "Slett Brukerkonto", "delete_content": "Slett brukerkonto Innhold", @@ -94,18 +96,18 @@ "digest_off": "Av", "digest_daily": "Daglig", "digest_weekly": "Ukentlig", - "digest_biweekly": "Bi-Weekly", + "digest_biweekly": "Annenhver uke", "digest_monthly": "Månedlig", "has_no_follower": "Denne brukeren har ingen følgere :(", "follows_no_one": "Denne brukeren følger ingen :(", "has_no_posts": "Denne brukeren har ikke skrevet noe enda.", - "has_no_best_posts": "This user does not have any upvoted posts yet.", + "has_no_best_posts": "Denne brukeren har ingen opp-stemte innlegg ennå.", "has_no_topics": "Denne brukeren har ikke skrevet noen tråder enda.", "has_no_watched_topics": "Denne brukeren har ikke fulgt noen tråder enda.", "has_no_ignored_topics": "Denne brukeren har ikke ignorert noen emner ennå", - "has_no_upvoted_posts": "Denne brukeren har ikke lastet opp noen innlegg ennå", - "has_no_downvoted_posts": "Denne brukeren har ikke nedlastet noen innlegg ennå", - "has_no_controversial_posts": "This user does not have any downvoted posts yet.", + "has_no_upvoted_posts": "Denne brukeren har ikke stemt opp noen innlegg ennå.", + "has_no_downvoted_posts": "Denne brukeren har ikke stemt ned noen innlegg ennå.", + "has_no_controversial_posts": "Denne brukeren har ikke noen nedstemte innlegg ennå.", "has_no_blocks": "Du har ingen blokkerte brukere.", "email_hidden": "E-post skjult", "hidden": "skjult", @@ -115,7 +117,7 @@ "max_items_per_page": "Maksimum %1", "acp_language": "Administrer sidespråk", "notifications": "Notifikasjoner", - "upvote-notif-freq": "Upvote Notification Frequency", + "upvote-notif-freq": "Varslingsfrekvens for opp-stemmer", "upvote-notif-freq.all": "Alle oppstemmer", "upvote-notif-freq.first": "Først per innlegg", "upvote-notif-freq.everyTen": "Hver tiende oppstemning", @@ -154,6 +156,7 @@ "info.banned-permanently": "Utestengt permanent", "info.banned-reason-label": "Årsak", "info.banned-no-reason": "ingen årsak oppgitt", + "info.muted-no-reason": "Ingen grunn oppgitt.", "info.username-history": "Brukernavnhistorikk", "info.email-history": "E-post historikk", "info.moderation-note": "Moderasjonsnotat ", @@ -185,6 +188,6 @@ "consent.export-posts-success": "Eksporterer innlegg, du får en notifikasjon når eksporten er fullført.", "emailUpdate.intro": "Please enter your email address below. This forum uses your email address for scheduled digest and notifications, as well as for account recovery in the event of a lost password.", "emailUpdate.optional": "This field is optional. You are not obligated to provide your email address, but without a validated email you will not be able to recover your account or login with your email.", - "emailUpdate.required": "This field is required.", + "emailUpdate.required": "Dette feltet er obligatorisk", "emailUpdate.change-instructions": "A confirmation email will be sent to the entered email address with a unique link. Accessing that link will confirm your ownership of the email address and it will become active on your account. At any time, you are able to update your email on file from within your account page." } \ No newline at end of file diff --git a/public/language/nl/admin/manage/privileges.json b/public/language/nl/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/nl/admin/manage/privileges.json +++ b/public/language/nl/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/nl/admin/manage/users.json b/public/language/nl/admin/manage/users.json index 4002ccbe34..ce310f1d61 100644 --- a/public/language/nl/admin/manage/users.json +++ b/public/language/nl/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Password", "create.password-confirm": "Confirm Password", - "temp-ban.length": "Ban Length", + "temp-ban.length": "Length", "temp-ban.reason": "Reason (Optional)", "temp-ban.hours": "Hours", "temp-ban.days": "Days", diff --git a/public/language/nl/error.json b/public/language/nl/error.json index c13cf6ad7f..9b05a8572e 100644 --- a/public/language/nl/error.json +++ b/public/language/nl/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Je hebt dit bericht al als favoriet toegevoegd", "already-unbookmarked": "Je hebt dit bericht al verwijderd uit je favorieten", "cant-ban-other-admins": "Het is niet toegestaan andere beheerders te verbannen!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "Je bent de enige beheerder. Stel eerst een andere gebruiker als beheerder in voordat je jezelf geen beheerder meer maakt.", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/nl/user.json b/public/language/nl/user.json index b5f9e10232..fe60100794 100644 --- a/public/language/nl/user.json +++ b/public/language/nl/user.json @@ -12,6 +12,8 @@ "ban_account": "Verban gebruiker", "ban_account_confirm": "Weet u zeker dat u deze gebruiker wilt verbannen?", "unban_account": "Verbanning intrekken", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Account verwijderen", "delete_account_as_admin": "Account verwijderen", "delete_content": "Account Content verwijderen", @@ -154,6 +156,7 @@ "info.banned-permanently": "Voor altijd verbannen", "info.banned-reason-label": "Reden", "info.banned-no-reason": "Geen reden opgegeven", + "info.muted-no-reason": "No reason given.", "info.username-history": "Gebruikersnaam geschiedenis", "info.email-history": "Email geschiedenis", "info.moderation-note": "Moderatie notitie", diff --git a/public/language/pl/admin/manage/privileges.json b/public/language/pl/admin/manage/privileges.json index 2ad16ccb8e..eed78b6293 100644 --- a/public/language/pl/admin/manage/privileges.json +++ b/public/language/pl/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Przesyłanie plików", "signature": "Dodanie sygnatury", "ban": "Banowanie", + "mute": "Mute", "invite": "Invite", "search-content": "Szukanie treści", "search-users": "Szukanie użytkowników", diff --git a/public/language/pl/admin/manage/users.json b/public/language/pl/admin/manage/users.json index 783de0e01c..505b42b1f7 100644 --- a/public/language/pl/admin/manage/users.json +++ b/public/language/pl/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Hasło", "create.password-confirm": "Powtórz hasło", - "temp-ban.length": "Okres bana", + "temp-ban.length": "Length", "temp-ban.reason": "Powód (Opcjonalnie)", "temp-ban.hours": "Godziny", "temp-ban.days": "Dni", diff --git a/public/language/pl/error.json b/public/language/pl/error.json index 1b1b68f1dd..6dfdc506d7 100644 --- a/public/language/pl/error.json +++ b/public/language/pl/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Już dodałeś ten post do zakładek", "already-unbookmarked": "Już usunąłeś ten post z zakładek", "cant-ban-other-admins": "Nie możesz zbanować innych adminów!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "Jesteś jedynym administratorem. Dodaj innego użytkownika jako administratora przed usunięciem siebie z tej grupy", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/pl/user.json b/public/language/pl/user.json index 3d088c2bd2..2876b02a05 100644 --- a/public/language/pl/user.json +++ b/public/language/pl/user.json @@ -12,6 +12,8 @@ "ban_account": "Zbanuj konto", "ban_account_confirm": "Na pewno chcesz zbanować tego użytkownika?", "unban_account": "Odbanuj konto", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Usuń konto", "delete_account_as_admin": "Usuń Konto", "delete_content": "Usuń Treści Konta", @@ -154,6 +156,7 @@ "info.banned-permanently": "Zbanowany permanentnie", "info.banned-reason-label": "Powód", "info.banned-no-reason": "Nie podano powodu.", + "info.muted-no-reason": "No reason given.", "info.username-history": "Historia nazwy użytkownika", "info.email-history": "Historia adresu e-mail", "info.moderation-note": "Notatka moderatora", diff --git a/public/language/pt-BR/admin/manage/privileges.json b/public/language/pt-BR/admin/manage/privileges.json index 128ce942f8..6841ea3f91 100644 --- a/public/language/pt-BR/admin/manage/privileges.json +++ b/public/language/pt-BR/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Enviar Arquivos", "signature": "Assinatura", "ban": "Banir", + "mute": "Mute", "invite": "Convidar", "search-content": "Pesquisar Conteúdo", "search-users": "Pesquisar Usuários", diff --git a/public/language/pt-BR/admin/manage/users.json b/public/language/pt-BR/admin/manage/users.json index 49f4284e34..90ef677787 100644 --- a/public/language/pt-BR/admin/manage/users.json +++ b/public/language/pt-BR/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Senha", "create.password-confirm": "Confirme a Senha", - "temp-ban.length": "Período do Banimento", + "temp-ban.length": "Length", "temp-ban.reason": "Motivo (Opcional)", "temp-ban.hours": "Horas", "temp-ban.days": "Dias", diff --git a/public/language/pt-BR/error.json b/public/language/pt-BR/error.json index 4abb1210bd..fcb3f30088 100644 --- a/public/language/pt-BR/error.json +++ b/public/language/pt-BR/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Você já adicionou este post aos favoritos", "already-unbookmarked": "Você já removeu este post dos favoritos", "cant-ban-other-admins": "Você não pode banir outros administradores!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "Você é o único administrador. Adicione outro usuário como administrador antes de remover a si mesmo como admin", "account-deletion-disabled": "A exclusão de conta está desabilitada", diff --git a/public/language/pt-BR/user.json b/public/language/pt-BR/user.json index 6b3ab8a029..9bbc5ebf33 100644 --- a/public/language/pt-BR/user.json +++ b/public/language/pt-BR/user.json @@ -12,6 +12,8 @@ "ban_account": "Banir Conta", "ban_account_confirm": "Você realmente quer banir esse usuario?", "unban_account": "Desbanir Conta", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Deletar Conta", "delete_account_as_admin": "Deletar Conta", "delete_content": "Excluir Conteúdo da Conta", @@ -154,6 +156,7 @@ "info.banned-permanently": "Banido permanentemente", "info.banned-reason-label": "Motivo", "info.banned-no-reason": "Sem motivo escolhido.", + "info.muted-no-reason": "No reason given.", "info.username-history": "Histórico do Nome de Usuário", "info.email-history": "Histórico do Email", "info.moderation-note": "Nota da Moderação", diff --git a/public/language/pt-PT/admin/manage/privileges.json b/public/language/pt-PT/admin/manage/privileges.json index ba991846f3..79b2e087dd 100644 --- a/public/language/pt-PT/admin/manage/privileges.json +++ b/public/language/pt-PT/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Enviar Ficheiros", "signature": "Assinatura", "ban": "Banir", + "mute": "Mute", "invite": "Invite", "search-content": "Procurar Conteúdo", "search-users": "Procurar Utilizadores", diff --git a/public/language/pt-PT/admin/manage/users.json b/public/language/pt-PT/admin/manage/users.json index 296d0a8dd9..a8fa7fa42b 100644 --- a/public/language/pt-PT/admin/manage/users.json +++ b/public/language/pt-PT/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Palavra-passe", "create.password-confirm": "Confirmar palavra-passe", - "temp-ban.length": "Duração do Banimento", + "temp-ban.length": "Length", "temp-ban.reason": "Razão (Opcional)", "temp-ban.hours": "Horas", "temp-ban.days": "Dias", diff --git a/public/language/pt-PT/error.json b/public/language/pt-PT/error.json index a2b7813dcd..04f244947a 100644 --- a/public/language/pt-PT/error.json +++ b/public/language/pt-PT/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Já marcaste esta publicação", "already-unbookmarked": "Já desmarcaste esta publicação", "cant-ban-other-admins": "Não podes banir outros administradores!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "És o único administrador. Adicionar outro utilizador como administrador antes de te removeres como administrador.", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/pt-PT/user.json b/public/language/pt-PT/user.json index b8721b81d2..a7b7971a1f 100644 --- a/public/language/pt-PT/user.json +++ b/public/language/pt-PT/user.json @@ -12,6 +12,8 @@ "ban_account": "Banir conta", "ban_account_confirm": "Queres realmente banir este utilizador?", "unban_account": "Deixar de banir esta conta", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Eliminar conta", "delete_account_as_admin": "Eliminar Conta", "delete_content": "Eliminar Conteúdos da Conta", @@ -154,6 +156,7 @@ "info.banned-permanently": "Banido permanentemente", "info.banned-reason-label": "Razão", "info.banned-no-reason": "Sem razão atribuida.", + "info.muted-no-reason": "No reason given.", "info.username-history": "Históricos do nome de utilizador", "info.email-history": "Histórico de e-mail", "info.moderation-note": "Nota de moderação", diff --git a/public/language/ro/admin/manage/privileges.json b/public/language/ro/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/ro/admin/manage/privileges.json +++ b/public/language/ro/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/ro/admin/manage/users.json b/public/language/ro/admin/manage/users.json index 2a3c0c4829..d5c9914afc 100644 --- a/public/language/ro/admin/manage/users.json +++ b/public/language/ro/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Password", "create.password-confirm": "Confirm Password", - "temp-ban.length": "Ban Length", + "temp-ban.length": "Length", "temp-ban.reason": "Reason (Optional)", "temp-ban.hours": "Hours", "temp-ban.days": "Days", diff --git a/public/language/ro/error.json b/public/language/ro/error.json index 343fc51a18..3d1248f710 100644 --- a/public/language/ro/error.json +++ b/public/language/ro/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "You have already bookmarked this post", "already-unbookmarked": "You have already unbookmarked this post", "cant-ban-other-admins": "Nu poți bana alți administratori!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/ro/user.json b/public/language/ro/user.json index 4c2d37d421..cbe8f37a9e 100644 --- a/public/language/ro/user.json +++ b/public/language/ro/user.json @@ -12,6 +12,8 @@ "ban_account": "Ban Account", "ban_account_confirm": "Do you really want to ban this user?", "unban_account": "Unban Account", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Șterge Cont", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "Banned permanently", "info.banned-reason-label": "Reason", "info.banned-no-reason": "No reason given.", + "info.muted-no-reason": "No reason given.", "info.username-history": "Username History", "info.email-history": "Email History", "info.moderation-note": "Moderation Note", diff --git a/public/language/ru/admin/manage/privileges.json b/public/language/ru/admin/manage/privileges.json index 78a444399a..87e9ba1af6 100644 --- a/public/language/ru/admin/manage/privileges.json +++ b/public/language/ru/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Загрузка файлов", "signature": "Подпись", "ban": "Блокировка пользователей", + "mute": "Mute", "invite": "Приглашать", "search-content": "Поиск по содержимому", "search-users": "Поиск пользователей", diff --git a/public/language/ru/admin/manage/users.json b/public/language/ru/admin/manage/users.json index 33642a429f..b0268d668e 100644 --- a/public/language/ru/admin/manage/users.json +++ b/public/language/ru/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Пароль", "create.password-confirm": "Подтвердите пароль", - "temp-ban.length": "Период блокировки", + "temp-ban.length": "Length", "temp-ban.reason": "Причина (Необязательно)", "temp-ban.hours": "Часов", "temp-ban.days": "Дней", diff --git a/public/language/ru/error.json b/public/language/ru/error.json index f7c324fa1c..a1c0cf8a83 100644 --- a/public/language/ru/error.json +++ b/public/language/ru/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Вы уже добавили это сообщение в закладки", "already-unbookmarked": "Вы уже удалили это сообщение из закладок", "cant-ban-other-admins": "Вы не можете заблокировать других администраторов!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "Вы единственный администратор. Чтобы отказаться от своих полномочий, пожалуйста, назначьте администратором другого участника.", "account-deletion-disabled": "Удаление аккаунта отключено", diff --git a/public/language/ru/user.json b/public/language/ru/user.json index 09fb1a7d75..74ef55f038 100644 --- a/public/language/ru/user.json +++ b/public/language/ru/user.json @@ -12,6 +12,8 @@ "ban_account": "Заблокировать учётную запись", "ban_account_confirm": "Вы действительно хотите заблокировать этого пользователя?", "unban_account": "Разблокировать учётную запись", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Удалить учётную запись", "delete_account_as_admin": "Удалить учётную запись", "delete_content": "Удалить контент учетной записи", @@ -154,6 +156,7 @@ "info.banned-permanently": "Заблокирован навсегда", "info.banned-reason-label": "Причина", "info.banned-no-reason": "Без объяснения причин.", + "info.muted-no-reason": "No reason given.", "info.username-history": "История изменения имён", "info.email-history": "История изменения электронной почты", "info.moderation-note": "Примечание модератора", diff --git a/public/language/rw/admin/manage/privileges.json b/public/language/rw/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/rw/admin/manage/privileges.json +++ b/public/language/rw/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/rw/admin/manage/users.json b/public/language/rw/admin/manage/users.json index 2a3c0c4829..d5c9914afc 100644 --- a/public/language/rw/admin/manage/users.json +++ b/public/language/rw/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Password", "create.password-confirm": "Confirm Password", - "temp-ban.length": "Ban Length", + "temp-ban.length": "Length", "temp-ban.reason": "Reason (Optional)", "temp-ban.hours": "Hours", "temp-ban.days": "Days", diff --git a/public/language/rw/error.json b/public/language/rw/error.json index 882bb1edc5..7416c8cd51 100644 --- a/public/language/rw/error.json +++ b/public/language/rw/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "You have already bookmarked this post", "already-unbookmarked": "You have already unbookmarked this post", "cant-ban-other-admins": "Ntabwo wakwirukana abandi bayobozi!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "Ni wowe muyobozi wenyine. Ongeramo undi muntu nk'umuyobozi mbere y'uko wikura ku buyobozi", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/rw/user.json b/public/language/rw/user.json index b5a94aab34..92639a5ad1 100644 --- a/public/language/rw/user.json +++ b/public/language/rw/user.json @@ -12,6 +12,8 @@ "ban_account": "Irukana", "ban_account_confirm": "Wiringiye neza ko ushaka kwirukana uyu muntu?", "unban_account": "Garura iyi Konte", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Siba Konte", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "Banned permanently", "info.banned-reason-label": "Reason", "info.banned-no-reason": "No reason given.", + "info.muted-no-reason": "No reason given.", "info.username-history": "Username History", "info.email-history": "Email History", "info.moderation-note": "Moderation Note", diff --git a/public/language/sc/admin/manage/privileges.json b/public/language/sc/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/sc/admin/manage/privileges.json +++ b/public/language/sc/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/sc/admin/manage/users.json b/public/language/sc/admin/manage/users.json index 2a3c0c4829..d5c9914afc 100644 --- a/public/language/sc/admin/manage/users.json +++ b/public/language/sc/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Password", "create.password-confirm": "Confirm Password", - "temp-ban.length": "Ban Length", + "temp-ban.length": "Length", "temp-ban.reason": "Reason (Optional)", "temp-ban.hours": "Hours", "temp-ban.days": "Days", diff --git a/public/language/sc/error.json b/public/language/sc/error.json index 4848f2cc1c..facc2477ea 100644 --- a/public/language/sc/error.json +++ b/public/language/sc/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "You have already bookmarked this post", "already-unbookmarked": "You have already unbookmarked this post", "cant-ban-other-admins": "You can't ban other admins!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/sc/user.json b/public/language/sc/user.json index 7a3db319ff..d7fc1bf813 100644 --- a/public/language/sc/user.json +++ b/public/language/sc/user.json @@ -12,6 +12,8 @@ "ban_account": "Ban Account", "ban_account_confirm": "Do you really want to ban this user?", "unban_account": "Unban Account", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Delete Account", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "Banned permanently", "info.banned-reason-label": "Reason", "info.banned-no-reason": "No reason given.", + "info.muted-no-reason": "No reason given.", "info.username-history": "Username History", "info.email-history": "Email History", "info.moderation-note": "Moderation Note", diff --git a/public/language/sk/admin/manage/privileges.json b/public/language/sk/admin/manage/privileges.json index 598d668366..df6a6ad14e 100644 --- a/public/language/sk/admin/manage/privileges.json +++ b/public/language/sk/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Nahrať súbory", "signature": "Podpis", "ban": "Zablokovať", + "mute": "Mute", "invite": "Invite", "search-content": "Vyhľadať obsah", "search-users": "Vyhľadať používateľov", diff --git a/public/language/sk/admin/manage/users.json b/public/language/sk/admin/manage/users.json index 5494728eae..610c00a58c 100644 --- a/public/language/sk/admin/manage/users.json +++ b/public/language/sk/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Heslo", "create.password-confirm": "Potvrdiť heslo", - "temp-ban.length": "Trvanie zákazu", + "temp-ban.length": "Length", "temp-ban.reason": "Dôvod (voliteľné)", "temp-ban.hours": "Hodiny", "temp-ban.days": "Dni", diff --git a/public/language/sk/error.json b/public/language/sk/error.json index 268e5782fb..bbed06208c 100644 --- a/public/language/sk/error.json +++ b/public/language/sk/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Tento príspevok máte už medzi záložkami", "already-unbookmarked": "Tento príspevok už nemáte medzi záložkami", "cant-ban-other-admins": "Nemôžte zablokovať iných správcov.", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "Momentálne ste jediný správca. Najskôr pridajte ďalšieho užívateľa za správcu predtým, ako zrušíte svoje výsady správcu", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/sk/user.json b/public/language/sk/user.json index e5870ffdf8..34a022da31 100644 --- a/public/language/sk/user.json +++ b/public/language/sk/user.json @@ -12,6 +12,8 @@ "ban_account": "Zablokovať účet", "ban_account_confirm": "Naozaj chcete zablokovať tohto používateľa?", "unban_account": "Odblokovať účet", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Odstrániť účet", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "Zablokovaný natrvalo", "info.banned-reason-label": "Dôvod", "info.banned-no-reason": "Neboli uvedené žiadne dôvody.", + "info.muted-no-reason": "No reason given.", "info.username-history": "História užívateľského mena", "info.email-history": "Hitória e-mailu", "info.moderation-note": "Zmierňujúca poznámka", diff --git a/public/language/sl/admin/manage/privileges.json b/public/language/sl/admin/manage/privileges.json index de7c226776..b404e7b615 100644 --- a/public/language/sl/admin/manage/privileges.json +++ b/public/language/sl/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Naloži datoteke", "signature": "Podpis", "ban": "Ban", + "mute": "Mute", "invite": "Povabi", "search-content": "Išči vsebino", "search-users": "Išči uporabnike", diff --git a/public/language/sl/admin/manage/users.json b/public/language/sl/admin/manage/users.json index 8fbd1bc68f..46c094a8e1 100644 --- a/public/language/sl/admin/manage/users.json +++ b/public/language/sl/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Geslo", "create.password-confirm": "Potrdi geslo", - "temp-ban.length": "Ban Length", + "temp-ban.length": "Length", "temp-ban.reason": "Reason (Optional)", "temp-ban.hours": "Ur", "temp-ban.days": "Dni", diff --git a/public/language/sl/error.json b/public/language/sl/error.json index 88ef89f3d7..71768573bb 100644 --- a/public/language/sl/error.json +++ b/public/language/sl/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "You have already bookmarked this post", "already-unbookmarked": "You have already unbookmarked this post", "cant-ban-other-admins": "Ne morete izločati drugih skrbnikov!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "Ste edini skrbnik. Preden se odstranite, dodajte novega skrbnika.", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/sl/user.json b/public/language/sl/user.json index edfb2f1f3a..4dac5934b4 100644 --- a/public/language/sl/user.json +++ b/public/language/sl/user.json @@ -12,6 +12,8 @@ "ban_account": "Izločen račun", "ban_account_confirm": "Ali želiš izločiti uporabnika?", "unban_account": "Ponovno vključi račun", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Izbriši račun", "delete_account_as_admin": "Izbriši račun", "delete_content": "Izbriši vsebino računa", @@ -154,6 +156,7 @@ "info.banned-permanently": "Banned permanently", "info.banned-reason-label": "Razlog", "info.banned-no-reason": "Razlog ni podan.", + "info.muted-no-reason": "No reason given.", "info.username-history": "Zgodovina uporabniškega imena", "info.email-history": "Zgodovina e-poštnega naslova", "info.moderation-note": "Moderation Note", diff --git a/public/language/sr/admin/manage/privileges.json b/public/language/sr/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/sr/admin/manage/privileges.json +++ b/public/language/sr/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/sr/admin/manage/users.json b/public/language/sr/admin/manage/users.json index 2a3c0c4829..d5c9914afc 100644 --- a/public/language/sr/admin/manage/users.json +++ b/public/language/sr/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Password", "create.password-confirm": "Confirm Password", - "temp-ban.length": "Ban Length", + "temp-ban.length": "Length", "temp-ban.reason": "Reason (Optional)", "temp-ban.hours": "Hours", "temp-ban.days": "Days", diff --git a/public/language/sr/error.json b/public/language/sr/error.json index efcf80edad..224c4793f8 100644 --- a/public/language/sr/error.json +++ b/public/language/sr/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Већ сте додали ову поруку у обележиваче", "already-unbookmarked": "Већ сте одстранили ову поруку из обележивача", "cant-ban-other-admins": "Не можете забранити друге администраторе!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "Не можете забрањене кориснике учинити администраторима.", "cant-remove-last-admin": "Ви сте једини администратор. Додајте другог корисника као администратора пре него што уклоните себе као администратора.", "account-deletion-disabled": "Брисање налога је онемогућено", diff --git a/public/language/sr/flags.json b/public/language/sr/flags.json index ff16824539..10140ab409 100644 --- a/public/language/sr/flags.json +++ b/public/language/sr/flags.json @@ -82,5 +82,5 @@ "bulk-resolve": "Реши заставицу/е", "bulk-success": "Ажурираних заставица: %1", "flagged-timeago-readable": "Означено заставицом (%2)", - "auto-flagged": "[Auto Flagged] Received %1 downvotes." + "auto-flagged": "[Аутоматски означено заставицом] Примљено је %1 негативних гласова." } \ No newline at end of file diff --git a/public/language/sr/user.json b/public/language/sr/user.json index 6b653744af..c36ce310c2 100644 --- a/public/language/sr/user.json +++ b/public/language/sr/user.json @@ -12,6 +12,8 @@ "ban_account": "Забрани налог", "ban_account_confirm": "Да ли заиста желите да забраните овог корисника?", "unban_account": "Скини забрану налогу", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Брисање налога", "delete_account_as_admin": "Избриши налог", "delete_content": "Избриши садржај налога", @@ -154,6 +156,7 @@ "info.banned-permanently": "Забрањен трајно", "info.banned-reason-label": "Разлог", "info.banned-no-reason": "Није дат разлог.", + "info.muted-no-reason": "Није наведен разлог.", "info.username-history": "Историја корисничког имена", "info.email-history": "Историја е-поште", "info.moderation-note": "Белешка модерације", diff --git a/public/language/sv/admin/manage/privileges.json b/public/language/sv/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/sv/admin/manage/privileges.json +++ b/public/language/sv/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/sv/admin/manage/users.json b/public/language/sv/admin/manage/users.json index 2a3c0c4829..d5c9914afc 100644 --- a/public/language/sv/admin/manage/users.json +++ b/public/language/sv/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Password", "create.password-confirm": "Confirm Password", - "temp-ban.length": "Ban Length", + "temp-ban.length": "Length", "temp-ban.reason": "Reason (Optional)", "temp-ban.hours": "Hours", "temp-ban.days": "Days", diff --git a/public/language/sv/error.json b/public/language/sv/error.json index f2dbf5efd3..d75b0c6057 100644 --- a/public/language/sv/error.json +++ b/public/language/sv/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Du har redan bokmärkt det här inlägget", "already-unbookmarked": "Du har redan tagit bort bokmärket för det här inlägget", "cant-ban-other-admins": "Du kan inte bannlysa andra administratörer!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "Du är den enda administratören. Lägg till en annan användare som administratör innan du tar bort dig själv.", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/sv/user.json b/public/language/sv/user.json index aaa13bfcd5..90d0e37bd9 100644 --- a/public/language/sv/user.json +++ b/public/language/sv/user.json @@ -12,6 +12,8 @@ "ban_account": "Bannlys konto", "ban_account_confirm": "Vill du verkligen bannlysa den här användaren?", "unban_account": "Ta bort bannlysning", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Ta bort ämne", "delete_account_as_admin": "Radera Konto", "delete_content": "Radera Kontots Innehåll", @@ -154,6 +156,7 @@ "info.banned-permanently": "Permanent bannad", "info.banned-reason-label": "Anledning", "info.banned-no-reason": "Ingen anledning angiven", + "info.muted-no-reason": "No reason given.", "info.username-history": "Användarnamn historik", "info.email-history": "Epost historik", "info.moderation-note": "Moderations anteckning", diff --git a/public/language/th/admin/manage/privileges.json b/public/language/th/admin/manage/privileges.json index 8b38b368cd..13a38819b0 100644 --- a/public/language/th/admin/manage/privileges.json +++ b/public/language/th/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Upload Files", "signature": "Signature", "ban": "Ban", + "mute": "Mute", "invite": "Invite", "search-content": "Search Content", "search-users": "Search Users", diff --git a/public/language/th/admin/manage/users.json b/public/language/th/admin/manage/users.json index 9a09edd168..b0ec5fa898 100644 --- a/public/language/th/admin/manage/users.json +++ b/public/language/th/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "รหัสผ่าน", "create.password-confirm": "ยืนยันรหัสผ่าน", - "temp-ban.length": "ระยะเวลาการแบน", + "temp-ban.length": "Length", "temp-ban.reason": "เหตุผล (ตัวเลือก)", "temp-ban.hours": "ชั่วโมง", "temp-ban.days": "วัน", diff --git a/public/language/th/error.json b/public/language/th/error.json index a95a86d476..8410b21369 100644 --- a/public/language/th/error.json +++ b/public/language/th/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "คุณได้ติดบุ๊กมาร์คของโพสต์นี้แล้ว", "already-unbookmarked": "คุณได้ลบบุ๊กมาร์คของโพสต์นี้แล้ว", "cant-ban-other-admins": "คุณแบนแอดมินไม่ได้!!!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "คุณเป็นแอดมินเพียงคนเดียว กรุณาเพิ่มผู้ใช้คนอื่นเป็นแอดมิน ก่อนการลบตัวเองออกจากแอดมิน", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/th/user.json b/public/language/th/user.json index 9e14cb770d..921c1b7c4c 100644 --- a/public/language/th/user.json +++ b/public/language/th/user.json @@ -12,6 +12,8 @@ "ban_account": "แบนบัญชี", "ban_account_confirm": "คุณต้องการแบนผู้ใช้นี้หรือไม่?", "unban_account": "ปลดแบน", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "ลบบัญชี", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "แบนอย่างถาวร", "info.banned-reason-label": "เหตุผล", "info.banned-no-reason": "ไม่มีเหตุผล", + "info.muted-no-reason": "No reason given.", "info.username-history": "ประวัติผู้ใช้", "info.email-history": "ประวัติอีเมล์", "info.moderation-note": "โน๊ตของ Moderation", diff --git a/public/language/tr/admin/manage/privileges.json b/public/language/tr/admin/manage/privileges.json index e641167ad8..0155c573b7 100644 --- a/public/language/tr/admin/manage/privileges.json +++ b/public/language/tr/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Dosya Yükle", "signature": "İmza", "ban": "Ban", + "mute": "Sustur", "invite": "Davet et", "search-content": "İçerik Arama", "search-users": "Kullanıcıları Ara", diff --git a/public/language/tr/admin/manage/users.json b/public/language/tr/admin/manage/users.json index aa8b784cb6..fe7735a5b8 100644 --- a/public/language/tr/admin/manage/users.json +++ b/public/language/tr/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Parola", "create.password-confirm": "Parolayı Onayla", - "temp-ban.length": "Yasaklama uzunluğu", + "temp-ban.length": "Uzunluk", "temp-ban.reason": "Sebep(İsteğe Bağlı)", "temp-ban.hours": "Saat", "temp-ban.days": "Gün", diff --git a/public/language/tr/admin/settings/reputation.json b/public/language/tr/admin/settings/reputation.json index 33c9bb55b1..946a672dd7 100644 --- a/public/language/tr/admin/settings/reputation.json +++ b/public/language/tr/admin/settings/reputation.json @@ -4,9 +4,9 @@ "disable-down-voting": "Eksi Oyu Devre Dışı Bırak", "votes-are-public": "Tüm Oylar Herkese Açık", "thresholds": "Etkinlik Eşikleri", - "min-rep-upvote": "Minimum reputation to upvote posts", - "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", - "upvotes-per-user-per-day": "Upvotes per user per day (set to 0 for unlimited upvotes)", + "min-rep-upvote": "Artılanan iletiler için gereken minimum itibar", + "upvotes-per-day": "Artı oy günlük limiti (sınırsız artı oy için 0 giriniz)", + "upvotes-per-user-per-day": "Aynı kişiye verilecek artı oy günlük limiti (sınırsız artı oy için 0 giriniz)", "min-rep-downvote": "Eksilenen iletiler için gereken minimum itibar", "downvotes-per-day": "Eksi oy günlük limiti (sınırsız eksi oy için 0 giriniz)", "downvotes-per-user-per-day": "Aynı kişiye verilecek eksi oy günlük limiti (sınırsız eksi oy için 0 giriniz)", diff --git a/public/language/tr/error.json b/public/language/tr/error.json index 4b66453cd2..129ecfa0dc 100644 --- a/public/language/tr/error.json +++ b/public/language/tr/error.json @@ -35,7 +35,7 @@ "email-taken": "E-posta Alınmış", "email-nochange": "Girdiğiniz e-posta var olan e-posta ile aynı", "email-invited": "E-posta halihazırda davet edilmiş", - "email-not-confirmed": "E-postanız onaylandıktan sonra bazı kategorilerde veya konularda gönderiler etkinleştirilir, lütfen bir onay e-postası göndermek için burayı tıklayın.", + "email-not-confirmed": "Ancak e-postanız onaylandıktan sonra bazı kategorilere veya konulara ileti gönderebilirsiniz; lütfen bir onay e-postası almak için buraya tıklayın.", "email-not-confirmed-chat": "E-postanız onaylanana kadar sohbet edemezsiniz, onaylamak için lütfen buraya tıklayın.", "email-not-confirmed-email-sent": "E-postanız henüz onaylanmadı, lütfen onay e-postası için gelen kutunuzu kontrol edin. E-postanız onaylanana kadar bazı kategorilerde gönderi paylaşamayabilir veya sohbet edemeyebilirsiniz.", "no-email-to-confirm": "Hesabınızda bir e-posta grubu yok. Hesap kurtarma için bir e-posta gereklidir ve bazı kategorilerde sohbet etmek ve gönderi paylaşmak için gerekli olabilir. Bir e-posta girmek için lütfen burayı tıklayın.", @@ -65,28 +65,28 @@ "category-disabled": "Kategori aktif değil", "topic-locked": "Başlık Kilitli", "post-edit-duration-expired": "Gönderilen iletiler %1 saniyeden sonra değiştirilemez", - "post-edit-duration-expired-minutes": "Gönderildikten %1 dakika sonra iletini düzenlemene izin verilir.", - "post-edit-duration-expired-minutes-seconds": "Gönderildikten %1 dakika %2 saniye sonra iletini düzenlemene izin verilir.", - "post-edit-duration-expired-hours": "Gönderildikten %1 saat sonra iletini düzenlemene izin verilir.", - "post-edit-duration-expired-hours-minutes": "Gönderildikten %1 saat %2 dakika sonra iletini düzenlemene izin verilir.", - "post-edit-duration-expired-days": "Gönderildikten %1 gün sonra iletini düzenlemene izin verilir.", - "post-edit-duration-expired-days-hours": "Gönderildikten %1 gün %2 saat sonra iletini düzenlemene izin verilir.", - "post-delete-duration-expired": "Gönderildikten %1 saniye sonra iletini silmene izin verilir.", - "post-delete-duration-expired-minutes": "Gönderildikten %1 dakika sonra iletini silmene izin verilir.", - "post-delete-duration-expired-minutes-seconds": "Gönderildikten %1 dakika %2 saniye sonra iletini silmene izin verilir.", - "post-delete-duration-expired-hours": "Gönderildikten %1 saat sonra iletini silmene izin verilir.", - "post-delete-duration-expired-hours-minutes": "Gönderildikten %1 saat %2 dakika sonra iletini silmene izin verilir.", - "post-delete-duration-expired-days": "Gönderildikten %1 gün sonra iletini silmene izin verilir.", - "post-delete-duration-expired-days-hours": "İleti, gönderildikten %1 gün %2 saat sonra silmenize izin verilir.", + "post-edit-duration-expired-minutes": "Gönderilen iletiler %1 dakikadan sonra değiştirilemez", + "post-edit-duration-expired-minutes-seconds": "Gönderilen iletiler %1 dakika ve %2 saniyeden sonra değiştirilemez", + "post-edit-duration-expired-hours": "Gönderilen iletiler %1 saatten sonra değiştirilemez", + "post-edit-duration-expired-hours-minutes": "Gönderilen iletiler %1 saat ve %2 dakikadan sonra değiştirilemez", + "post-edit-duration-expired-days": "Gönderilen iletiler %1 günden sonra değiştirilemez", + "post-edit-duration-expired-days-hours": "Gönderilen iletiler %1 gün ve %2 saatten sonra değiştirilemez", + "post-delete-duration-expired": "Gönderilen iletiler %1 saniyeden sonra silinemez", + "post-delete-duration-expired-minutes": "Gönderilen iletiler %1 dakikadan sonra silinemez", + "post-delete-duration-expired-minutes-seconds": "Gönderilen iletiler %1 dakika ve %2 saniyeden sonra silinemez", + "post-delete-duration-expired-hours": "Gönderilen iletiler %1 saatten sonra silinemez", + "post-delete-duration-expired-hours-minutes": "Gönderilen iletiler %1 saat ve %2 dakikadan sonra silinemez", + "post-delete-duration-expired-days": "Gönderilen iletiler %1 günden sonra silinemez", + "post-delete-duration-expired-days-hours": "Gönderilen iletiler %1 gün ve %2 saatten sonra silinemez", "cant-delete-topic-has-reply": "Bir başlığı 1 ileti girildikten sonra silemezsiniz!", "cant-delete-topic-has-replies": "Bir başlığı %1 ileti girildikten sonra silemezsiniz!", - "content-too-short": "Lütfen daha uzun bir ileti girin. İletiler en az %1 karakter olmalı.", + "content-too-short": "Lütfen daha uzun bir ileti girin. İletiler en az %1 karakterden oluşmalı.", "content-too-long": "Lütfen daha kısa bir ileti girin. İletiler %1 karakterden uzun olamaz.", "title-too-short": "Lütfen daha uzun bir başlık girin. Başlıklar en az %1 karakter içermelidir.", "title-too-long": "Lütfen daha kısa bir başlık girin. Başlıklar %1 karakterden uzun olamaz.", - "category-not-selected": "Kategori seçilmedi", - "too-many-posts": "%1 saniye içinde yalnızca bir ileti gönderebilirsiniz - tekrar ileti göndermeden önce lütfen bekleyin.", - "too-many-posts-newbie": "Yeni bir kullanıcı olarak, %2 itibar kazanana kadar %1 saniye içinde bir ileti gönderebilirsiniz - tekrar ileti göndermeden önce lütfen bekleyin.", + "category-not-selected": "Kategori bulunamadı. Lütfen bir kategori seçiniz. ", + "too-many-posts": "%1 saniye içinde yalnızca bir ileti gönderebilirsiniz - lütfen tekrar ileti göndermeden önce bekleyiniz.", + "too-many-posts-newbie": "Yeni bir kullanıcı olarak, %2 saygınlık puanı kazanana kadar %1 saniye içinde bir ileti gönderebilirsiniz - lütfen tekrar ileti göndermeden önce bekleyiniz.", "tag-too-short": "Lütfen daha uzun bir etiket girin. Etiketler en az %1 karakter içermelidir.", "tag-too-long": "Lütfen daha kısa bir etiket girin. Etiketler %1 karakterden uzun olamaz.", "not-enough-tags": "Yeterince etiket yok. Başlılar en az %1 etikete sahip olmalıdır", @@ -94,7 +94,7 @@ "cant-use-system-tag": "Bu sistem etiketini kullanamazsınız.", "cant-remove-system-tag": "Bu sistem etiketini kaldıramazsınız.", "still-uploading": "Lütfen yüklemelerin bitmesini bekleyin.", - "file-too-big": "İzin verilen en büyük dosya boyutu %1 kb - lütfen daha küçük bir dosya yükleyin", + "file-too-big": "İzin verilen en büyük dosya boyutu %1 kb - lütfen daha küçük bir dosya yükleyiniz", "guest-upload-disabled": "Ziyaretçilerin yükleme yapması devre dışı bırakıldı", "cors-error": "Yanlış yapılandırılmış CORS nedeniyle resim yüklenemiyor", "upload-ratelimit-reached": "Tek seferde çok sayıda dosya yüklediniz. Lütfen daha sonra tekrar deneyin.", @@ -104,13 +104,16 @@ "cant-merge-scheduled": "Zamanlanmış konular birleştirilemez.", "cant-move-posts-to-scheduled": "İletileri zamanlanmış bir konuya taşıyamazsınız!", "cant-move-from-scheduled-to-existing": "İletileri zamanlanmış bir konudan aktif olan bir konuya taşıyamazsınız!", - "already-bookmarked": "Bu iletiyi yer imine ekledin", - "already-unbookmarked": "Bu iletiyi yer iminden çıkardın", + "already-bookmarked": "Bu iletiyi zaten yer imlerinize eklemişsiniz.", + "already-unbookmarked": "Bu iletiyi zaten yer imlerinizden çıkarmışsınız.", "cant-ban-other-admins": "Başka yöneticileri yasaklayamazsınız!", + "cant-mute-other-admins": "Diğer yöneticileri susturamazsınız!", + "user-muted-for-hours": "Susturuldunuz, %1 saat sonra yeniden ileti gönderebileceksiniz. ", + "user-muted-for-minutes": "Susturuldunuz, %1 dakika sonra yeniden ileti gönderebileceksiniz. ", "cant-make-banned-users-admin": "Yasaklanmış üyeleri yönetici yapamazsınız.", "cant-remove-last-admin": "Tek yönetici sizsiniz. Kendinizi adminlikten çıkarmadan önce başka bir kullanıcıyı admin olarak ekleyiniz", "account-deletion-disabled": "Hesap silme devre dışı bırakılmış", - "cant-delete-admin": "Öncelikle yönetici izinlerini kaldırman gerekiyor.", + "cant-delete-admin": "Bu hesabı kaldırmadan önce yönetici izinlerini kaldırmanız gerekiyor.", "already-deleting": "Halihazırda siliniyor", "invalid-image": "Geçersiz görsel", "invalid-image-type": "Geçersiz görsel uzantısı. Izin verilen uzantılar: %1", @@ -153,23 +156,23 @@ "chat-room-does-not-exist": "Sohbet Odası Mevcut Değil", "already-voting-for-this-post": "Bu gönderi için zaten oy verdin.", "reputation-system-disabled": "İtibar sistemi devre dışı.", - "downvoting-disabled": "Aşagı oylama kapatılmış", - "not-enough-reputation-to-upvote": "You need %1 reputation to upvote", - "not-enough-reputation-to-downvote": "You need %1 reputation to downvote", - "not-enough-reputation-to-flag": "You need %1 reputation to flag this post", - "not-enough-reputation-min-rep-website": "You need %1 reputation to add a website", - "not-enough-reputation-min-rep-aboutme": "You need %1 reputation to add an about me", - "not-enough-reputation-min-rep-signature": "You need %1 reputation to add a signature", - "not-enough-reputation-min-rep-profile-picture": "You need %1 reputation to add a profile picture", - "not-enough-reputation-min-rep-cover-picture": "You need %1 reputation to add a cover picture", + "downvoting-disabled": "Eksi oylama devre dışı bırakılmış. ", + "not-enough-reputation-to-upvote": "Artı oy verebilmek için en az %1 saygınlık puanına sahip olmalısınız.", + "not-enough-reputation-to-downvote": "Eksi oy verebilmek için en az %1 saygınlık puanına sahip olmalısınız.", + "not-enough-reputation-to-flag": "Bu iletiyi şikayet etmek için en az %1 saygınlık puanına sahip olmalısınız.", + "not-enough-reputation-min-rep-website": "Websitesi ekleyebilmek için en az %1 saygınlık puanına sahip olmalısınız.", + "not-enough-reputation-min-rep-aboutme": "Hakkınızda bilgi ekleyebilmek için en az %1 saygınlık puanına sahip olmalısınız.", + "not-enough-reputation-min-rep-signature": "İmza ekleyebilmek için en az %1 saygınlık puanına sahip olmalısınız.", + "not-enough-reputation-min-rep-profile-picture": "Profil fotosu ekleyebilmek için en az %1 saygınlık puanına sahip olmalısınız.", + "not-enough-reputation-min-rep-cover-picture": "Kapak görseli ekleyebilmek için en az %1 saygınlık puanına sahip olmalısınız.", "post-already-flagged": "Bu iletiyi önceden şikayet etmişsiniz.", "user-already-flagged": "Bu kullanıcıyı önceden şikayet etmişsiniz.", "post-flagged-too-many-times": "Bu ileti başkaları tarafından halihazırda şikayet edilmiş.", "user-flagged-too-many-times": "Bu kullanıcı başkaları tarafından halihazırda şikayet edilmiş.", "cant-flag-privileged": "Yöneticilerin profillerini veya içeriklerini bayraklayamazsınız.", "self-vote": "Kendi iletinize oy veremezsiniz", - "too-many-upvotes-today": "You can only upvote %1 times a day", - "too-many-upvotes-today-user": "You can only upvote a user %1 times a day", + "too-many-upvotes-today": "Bir günde sadece %1 artı oy verebilirsiniz", + "too-many-upvotes-today-user": "Bir kullanıcıya bir günde sadece %1 artı oy verebilirsiniz", "too-many-downvotes-today": "Bir günde sadece %1 eksi oy verebilirsiniz", "too-many-downvotes-today-user": "Bir kullanıcıya bir günde sadece %1 eksi oy verebilirsiniz", "reload-failed": "NodeBB tekrar yüklenirken bir sorunla karşılaştı: “%1“. NodeBB varolan dosyaları servis etmeye devam edecek.", diff --git a/public/language/tr/notifications.json b/public/language/tr/notifications.json index 78c5028f9a..876efb036f 100644 --- a/public/language/tr/notifications.json +++ b/public/language/tr/notifications.json @@ -48,7 +48,7 @@ "posts-exported": "%1 iletileri hazırlandı, indirmek için tıklayınız", "uploads-exported": "%1 yüklemeleri hazırlandı, indirmek için tıklayınız", "users-csv-exported": "Kullanıcılar csv hazırlandı, indirmek için tıklayınız", - "post-queue-accepted": "Sıradaki gönderiniz kabul edildi. Gönderinizi görmek için burayı tıklayın.", + "post-queue-accepted": "Sıradaki gönderiniz kabul edildi. Gönderinizi görmek için buraya tıklayın.", "post-queue-rejected": "Sıraya alınmış gönderiniz reddedildi.", "post-queue-notify": "Onay sırasındaki ileti için bir bildirim var:
\"%1\"", "email-confirmed": "E-posta onaylandı", diff --git a/public/language/tr/user.json b/public/language/tr/user.json index 1ff04a6a4d..e1f05a71e6 100644 --- a/public/language/tr/user.json +++ b/public/language/tr/user.json @@ -12,6 +12,8 @@ "ban_account": "Hesabı Yasakla", "ban_account_confirm": "Hesabı yasaklamak istediğinizden emin misiniz?", "unban_account": "Hesabın Yasağını Kaldır", + "mute_account": "Hesabı Sustur", + "unmute_account": "Hesabın Sesini Aç", "delete_account": "Hesabı Sil", "delete_account_as_admin": "Hesabı Sil", "delete_content": "Hesabın İçeriğini Sil", @@ -154,6 +156,7 @@ "info.banned-permanently": "Kalıcı şekilde yasakla", "info.banned-reason-label": "Gerekçe", "info.banned-no-reason": "Gerekçe belirtilmedi.", + "info.muted-no-reason": "Herhangi bir gerekçe belirtilmedi.", "info.username-history": "Kullanıcı Adı Geçmişi", "info.email-history": "E-posta Geçmişi", "info.moderation-note": "Moderasyon Notu", diff --git a/public/language/uk/admin/manage/privileges.json b/public/language/uk/admin/manage/privileges.json index 447eecbf74..caff1bef31 100644 --- a/public/language/uk/admin/manage/privileges.json +++ b/public/language/uk/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Завантаження Файлів", "signature": "Підпис", "ban": "Бан", + "mute": "Mute", "invite": "Invite", "search-content": "Шукати Зміст", "search-users": "Шукати Користувачів", diff --git a/public/language/uk/admin/manage/users.json b/public/language/uk/admin/manage/users.json index afef4cee35..c573692245 100644 --- a/public/language/uk/admin/manage/users.json +++ b/public/language/uk/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Пароль", "create.password-confirm": "Пароль ще раз", - "temp-ban.length": "Тривалість бану", + "temp-ban.length": "Length", "temp-ban.reason": "Причина (необов'язково)", "temp-ban.hours": "Години", "temp-ban.days": "Дні", diff --git a/public/language/uk/error.json b/public/language/uk/error.json index d6fe0b7d5e..54f1dd6159 100644 --- a/public/language/uk/error.json +++ b/public/language/uk/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Ви вже додали цей пост собі в закладки", "already-unbookmarked": "Ви вже видалили цей пост із закладок", "cant-ban-other-admins": "Ви не можете банити інших адмінів!", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "Ви єдиний адміністратор. Додайте іншого користувача в якості адміністратора перш ніж знімати з себе ці обов'язки.", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/uk/user.json b/public/language/uk/user.json index 78d857e7c0..d8676bfa7f 100644 --- a/public/language/uk/user.json +++ b/public/language/uk/user.json @@ -12,6 +12,8 @@ "ban_account": "Заборонити акаунт", "ban_account_confirm": "Ви точно хочете забанити цього користувача?", "unban_account": "Розбанити акаунт", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "Видалити акаунт", "delete_account_as_admin": "Delete Account", "delete_content": "Delete Account Content", @@ -154,6 +156,7 @@ "info.banned-permanently": "Забанений назавжди", "info.banned-reason-label": "Причина", "info.banned-no-reason": "Причина не вказана", + "info.muted-no-reason": "No reason given.", "info.username-history": "Історія імені користувача", "info.email-history": "Історія електронної пошти", "info.moderation-note": "Коментар модератора", diff --git a/public/language/vi/admin/manage/privileges.json b/public/language/vi/admin/manage/privileges.json index a41a2edd82..9aea7f6569 100644 --- a/public/language/vi/admin/manage/privileges.json +++ b/public/language/vi/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "Tải Lên Tệp", "signature": "Chữ ký", "ban": "Cấm", + "mute": "Im lặng", "invite": "Mời", "search-content": "Tìm Kiếm Nội Dung", "search-users": "Tìm Kiếm Người Dùng", diff --git a/public/language/vi/admin/manage/users.json b/public/language/vi/admin/manage/users.json index 2b9507036e..0f4d30a309 100644 --- a/public/language/vi/admin/manage/users.json +++ b/public/language/vi/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "Mật khẩu", "create.password-confirm": "Xác Nhận Mật Khẩu", - "temp-ban.length": "Độ Dài Cấm", + "temp-ban.length": "Length", "temp-ban.reason": "Lý do (Không bắt buộc)", "temp-ban.hours": "Giờ", "temp-ban.days": "Ngày", diff --git a/public/language/vi/admin/settings/reputation.json b/public/language/vi/admin/settings/reputation.json index f9540761e2..2a50abefed 100644 --- a/public/language/vi/admin/settings/reputation.json +++ b/public/language/vi/admin/settings/reputation.json @@ -4,9 +4,9 @@ "disable-down-voting": "Tắt Phản Đối", "votes-are-public": "Tất Cả Bình Chọn Là Công Khai", "thresholds": "Ngưỡng hoạt động", - "min-rep-upvote": "Minimum reputation to upvote posts", - "upvotes-per-day": "Upvotes per day (set to 0 for unlimited upvotes)", - "upvotes-per-user-per-day": "Upvotes per user per day (set to 0 for unlimited upvotes)", + "min-rep-upvote": "Uy tín tối thiểu để ủng hộ bài đăng", + "upvotes-per-day": "Số phiếu ủng hộ mỗi ngày (đặt thành 0 để có số phiếu ủng hộ không giới hạn)", + "upvotes-per-user-per-day": "Số phiếu ủng hộ cho mỗi người dùng mỗi ngày (đặt thành 0 để có số phiếu ủng hộ không giới hạn)", "min-rep-downvote": "Uy tín tối thiểu để phản đối bài đăng", "downvotes-per-day": "Số phản đối mỗi ngày (đặt là 0 không giới hạn phản đối)", "downvotes-per-user-per-day": "Số phản đối mỗi người dùng mỗi ngày (đặt là 0 không giới hạn số phản đối)", diff --git a/public/language/vi/error.json b/public/language/vi/error.json index 7af182d237..86d9f5e54f 100644 --- a/public/language/vi/error.json +++ b/public/language/vi/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "Bạn đã đánh dấu trang chủ đề này rồi", "already-unbookmarked": "Bạn đã hủy đánh dấu trang chủ đề này rồi", "cant-ban-other-admins": "Bạn không thể cấm quản trị viên khác!", + "cant-mute-other-admins": "Bạn không thể buộc quản trị viên khác im lặng!", + "user-muted-for-hours": "Bạn bị buộc giữ im lặng, bạn sẽ có thể đăng sau %1 giờ", + "user-muted-for-minutes": "Bạn bị buộc giữ im lặng, bạn sẽ có thể đăng sau %1 phút", "cant-make-banned-users-admin": "Bạn không thể đặt người dùng bị cấm làm quản trị viên.", "cant-remove-last-admin": "Bạn là quản trị viên duy nhất. Hãy cho thành viên khác làm quản trị viên trước khi huỷ bỏ quyền quản trị của bạn.", "account-deletion-disabled": "Tính năng xóa tài khoản đã bị tắt", @@ -154,22 +157,22 @@ "already-voting-for-this-post": "Bạn đã bỏ phiếu cho bài viết này", "reputation-system-disabled": "Hệ thống đánh giá uy tính đã bị vô hiệu hóa.", "downvoting-disabled": "Phản đối đã bị tắt", - "not-enough-reputation-to-upvote": "You need %1 reputation to upvote", - "not-enough-reputation-to-downvote": "You need %1 reputation to downvote", - "not-enough-reputation-to-flag": "You need %1 reputation to flag this post", - "not-enough-reputation-min-rep-website": "You need %1 reputation to add a website", - "not-enough-reputation-min-rep-aboutme": "You need %1 reputation to add an about me", - "not-enough-reputation-min-rep-signature": "You need %1 reputation to add a signature", - "not-enough-reputation-min-rep-profile-picture": "You need %1 reputation to add a profile picture", - "not-enough-reputation-min-rep-cover-picture": "You need %1 reputation to add a cover picture", + "not-enough-reputation-to-upvote": "Bạn cần %1 uy tín để ủng hộ", + "not-enough-reputation-to-downvote": "Bạn cần %1 uy tín để phản đối", + "not-enough-reputation-to-flag": "Bạn cần %1 uy tín để gắn cờ bài đăng này", + "not-enough-reputation-min-rep-website": "Bạn cần %1 uy tín để thêm một trang web", + "not-enough-reputation-min-rep-aboutme": "Bạn cần %1 uy tín để thêm thông tin bản thân", + "not-enough-reputation-min-rep-signature": "Bạn cần %1 uy tín để thêm chữ ký", + "not-enough-reputation-min-rep-profile-picture": "Bạn cần %1 uy tín để thêm ảnh hồ sơ", + "not-enough-reputation-min-rep-cover-picture": "Bạn cần %1 uy tín để thêm ảnh bìa", "post-already-flagged": "Bạn đã gắn cờ bài đăng này", "user-already-flagged": "Bạn đã gắn cờ người dùng này", "post-flagged-too-many-times": "Bài đăng này đã bị người khác gắn cờ", "user-flagged-too-many-times": "Người dùng này đã bị người khác gắn cờ", "cant-flag-privileged": "Bạn không có quyền gắn cờ hồ sơ / nội dung của người dùng đặc biệt (người kiểm duyệt/ người điều hành toàn quyền/ quản trị viên)", "self-vote": "Bạn không thể tự bầu cho bài đăng của mình", - "too-many-upvotes-today": "You can only upvote %1 times a day", - "too-many-upvotes-today-user": "You can only upvote a user %1 times a day", + "too-many-upvotes-today": "Bạn chỉ có thể ủng hộ %1 lần một ngày", + "too-many-upvotes-today-user": "Bạn chỉ có thể ủng hộ người dùng %1 lần một ngày", "too-many-downvotes-today": "Bạn chỉ có thể phản đối %1 lần một ngày", "too-many-downvotes-today-user": "Bạn chỉ có thể phản đối người dùng %1 lần một ngày", "reload-failed": "NodeBB gặp lỗi trong khi tải lại: \"%1\". NodeBB sẽ tiếp tục hoạt động với dữ liệu trước đó, tuy nhiên bạn nên tháo gỡ những gì bạn vừa thực hiện trước khi tải lại.", diff --git a/public/language/vi/user.json b/public/language/vi/user.json index 7cd520e9af..a632972d0d 100644 --- a/public/language/vi/user.json +++ b/public/language/vi/user.json @@ -12,6 +12,8 @@ "ban_account": "Cấm Tài Khoản", "ban_account_confirm": "Bạn có chắc muốn cấm người dùng này?", "unban_account": "Bỏ Cấm Tài Khoản", + "mute_account": "Im Lặng Tài Khoản", + "unmute_account": "Bỏ Im Lặng Tài Khoản", "delete_account": "Xóa Tài Khoản", "delete_account_as_admin": "Xóa Tài Khoản", "delete_content": "Xóa Nội Dung Tài Khoản", @@ -154,6 +156,7 @@ "info.banned-permanently": "Bị cấm vĩnh viễn", "info.banned-reason-label": "Lý do", "info.banned-no-reason": "Không có lí do.", + "info.muted-no-reason": "Không có lý do nào được đưa ra.", "info.username-history": "Lịch sử tên người d", "info.email-history": "Lịch sử email", "info.moderation-note": "Ghi chú quản lí", diff --git a/public/language/zh-CN/admin/manage/privileges.json b/public/language/zh-CN/admin/manage/privileges.json index 1e9103d4c6..36e4e98783 100644 --- a/public/language/zh-CN/admin/manage/privileges.json +++ b/public/language/zh-CN/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "上传文件", "signature": "签名档", "ban": "封禁", + "mute": "Mute", "invite": "邀请", "search-content": "搜索内容", "search-users": "搜索用户", diff --git a/public/language/zh-CN/admin/manage/users.json b/public/language/zh-CN/admin/manage/users.json index 2aec55959e..d83f0163ae 100644 --- a/public/language/zh-CN/admin/manage/users.json +++ b/public/language/zh-CN/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "密码", "create.password-confirm": "确认密码", - "temp-ban.length": "封禁时长", + "temp-ban.length": "Length", "temp-ban.reason": "理由（可选）", "temp-ban.hours": "小时", "temp-ban.days": "天", diff --git a/public/language/zh-CN/error.json b/public/language/zh-CN/error.json index 48d1c92d9c..909f82eecc 100644 --- a/public/language/zh-CN/error.json +++ b/public/language/zh-CN/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "您已将此贴存为了书签", "already-unbookmarked": "您已取消了此贴的书签", "cant-ban-other-admins": "您不能封禁其他管理员！", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "您是唯一的管理员。在删除您的管理员权限前，请添加另一个管理员。", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/zh-CN/user.json b/public/language/zh-CN/user.json index a890a3c3df..de10043bd1 100644 --- a/public/language/zh-CN/user.json +++ b/public/language/zh-CN/user.json @@ -12,6 +12,8 @@ "ban_account": "封禁账户", "ban_account_confirm": "您确定要封禁这位用户吗？", "unban_account": "解禁账户", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "删除帐号", "delete_account_as_admin": "删除账号", "delete_content": "删除账号内容", @@ -154,6 +156,7 @@ "info.banned-permanently": "永久封禁", "info.banned-reason-label": "原因", "info.banned-no-reason": "没有原因", + "info.muted-no-reason": "No reason given.", "info.username-history": "历史用户名", "info.email-history": "历史邮箱", "info.moderation-note": "版主备注", diff --git a/public/language/zh-TW/admin/manage/privileges.json b/public/language/zh-TW/admin/manage/privileges.json index da54d1c703..b4e1a30bda 100644 --- a/public/language/zh-TW/admin/manage/privileges.json +++ b/public/language/zh-TW/admin/manage/privileges.json @@ -10,6 +10,7 @@ "upload-files": "上傳檔案", "signature": "簽名檔", "ban": "禁用", + "mute": "Mute", "invite": "Invite", "search-content": "搜尋內容", "search-users": "搜尋使用者", diff --git a/public/language/zh-TW/admin/manage/users.json b/public/language/zh-TW/admin/manage/users.json index c755feaf71..3a89f6f1be 100644 --- a/public/language/zh-TW/admin/manage/users.json +++ b/public/language/zh-TW/admin/manage/users.json @@ -62,7 +62,7 @@ "create.password": "密碼", "create.password-confirm": "確認密碼", - "temp-ban.length": "停權期間", + "temp-ban.length": "Length", "temp-ban.reason": "理由（可選）", "temp-ban.hours": "小時", "temp-ban.days": "天", diff --git a/public/language/zh-TW/error.json b/public/language/zh-TW/error.json index c499300eee..88b912e44e 100644 --- a/public/language/zh-TW/error.json +++ b/public/language/zh-TW/error.json @@ -107,6 +107,9 @@ "already-bookmarked": "您已將此貼文存為了書籤", "already-unbookmarked": "您已移除了此貼文的書籤", "cant-ban-other-admins": "您不能封鎖其他管理員！", + "cant-mute-other-admins": "You can't mute other admins!", + "user-muted-for-hours": "You have been muted, you will be able to post in %1 hour(s)", + "user-muted-for-minutes": "You have been muted, you will be able to post in %1 minute(s)", "cant-make-banned-users-admin": "You can't make banned users admin.", "cant-remove-last-admin": "您是唯一的管理員。在刪除您的管理員權限前，請增加另一個管理員。", "account-deletion-disabled": "Account deletion is disabled", diff --git a/public/language/zh-TW/user.json b/public/language/zh-TW/user.json index 52ddc25712..0ff23bd625 100644 --- a/public/language/zh-TW/user.json +++ b/public/language/zh-TW/user.json @@ -12,6 +12,8 @@ "ban_account": "禁用帳戶", "ban_account_confirm": "您確定要禁用此帳戶、嗎？", "unban_account": "解禁帳戶", + "mute_account": "Mute Account", + "unmute_account": "Unmute Account", "delete_account": "刪除帳戶", "delete_account_as_admin": "刪除 帳戶", "delete_content": "刪除帳戶 內容", @@ -154,6 +156,7 @@ "info.banned-permanently": "永久禁用", "info.banned-reason-label": "原因", "info.banned-no-reason": "沒有原因", + "info.muted-no-reason": "No reason given.", "info.username-history": "用過的使用者名", "info.email-history": "用過的電子信箱", "info.moderation-note": "版主備註", diff --git a/public/openapi/write.yaml b/public/openapi/write.yaml index 1e73eb4cf9..eb74cef2d9 100644 --- a/public/openapi/write.yaml +++ b/public/openapi/write.yaml @@ -68,6 +68,8 @@ paths: $ref: 'write/users/uid/follow.yaml' /users/{uid}/ban: $ref: 'write/users/uid/ban.yaml' + /users/{uid}/mute: + $ref: 'write/users/uid/mute.yaml' /users/{uid}/tokens: $ref: 'write/users/uid/tokens.yaml' /users/{uid}/tokens/{token}: diff --git a/public/openapi/write/users/uid/mute.yaml b/public/openapi/write/users/uid/mute.yaml new file mode 100644 index 0000000000..7fa84c9b22 --- /dev/null +++ b/public/openapi/write/users/uid/mute.yaml @@ -0,0 +1,61 @@ +put: + tags: + - users + summary: mute a user + parameters: + - in: path + name: uid + schema: + type: integer + required: true + description: uid of the user to mute + example: 2 + requestBody: + content: + application/json: + schema: + type: object + properties: + until: + type: number + description: UNIX timestamp of the mute expiry + example: 1585775608076 + reason: + type: string + example: the reason for the mute + responses: + '200': + description: successfully muted user + content: + application/json: + schema: + type: object + properties: + status: + $ref: ../../../components/schemas/Status.yaml#/Status + response: + type: object +delete: + tags: + - users + summary: unmute a user + parameters: + - in: path + name: uid + schema: + type: integer + required: true + description: uid of the user to unmute + example: 2 + responses: + '200': + description: successfully unmuted user + content: + application/json: + schema: + type: object + properties: + status: + $ref: ../../../components/schemas/Status.yaml#/Status + response: + type: object \ No newline at end of file diff --git a/public/src/app.js b/public/src/app.js index 843bcddcda..0d428fe578 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -260,6 +260,7 @@ document.addEventListener('DOMContentLoaded', async function () { app.processPage = function () { highlightNavigationLink(); + overrides.overrideTimeagoCutoff(); $('.timeago').timeago(); utils.makeNumbersHumanReadable($('.human-readable-number')); utils.addCommasToNumbers($('.formatted-number')); diff --git a/public/src/client/account/header.js b/public/src/client/account/header.js index c7880123c9..a793403bfc 100644 --- a/public/src/client/account/header.js +++ b/public/src/client/account/header.js @@ -54,7 +54,9 @@ define('forum/account/header', [ components.get('account/ban').on('click', function () { banAccount(ajaxify.data.theirid); }); + components.get('account/mute').on('click', muteAccount); components.get('account/unban').on('click', unbanAccount); + components.get('account/unmute').on('click', unmuteAccount); components.get('account/delete-account').on('click', handleDeleteEvent.bind(null, 'account')); components.get('account/delete-content').on('click', handleDeleteEvent.bind(null, 'content')); components.get('account/delete-all').on('click', handleDeleteEvent.bind(null, 'purge')); @@ -177,6 +179,49 @@ define('forum/account/header', [ }).catch(alerts.error); } + function muteAccount() { + Benchpress.render('admin/partials/temporary-mute', {}).then(function (html) { + bootbox.dialog({ + className: 'mute-modal', + title: '[[user:mute_account]]', + message: html, + show: true, + buttons: { + close: { + label: '[[global:close]]', + className: 'btn-link', + }, + submit: { + label: '[[user:mute_account]]', + callback: function () { + const formData = $('.mute-modal form').serializeArray().reduce(function (data, cur) { + data[cur.name] = cur.value; + return data; + }, {}); + + const until = formData.length > 0 ? ( + Date.now() + (formData.length * 1000 * 60 * 60 * (parseInt(formData.unit, 10) ? 24 : 1)) + ) : 0; + + api.put('/users/' + ajaxify.data.theirid + '/mute', { + until: until, + reason: formData.reason || '', + }).then(() => { + ajaxify.refresh(); + }).catch(alerts.error); + }, + }, + }, + }); + }); + } + + function unmuteAccount() { + api.del('/users/' + ajaxify.data.theirid + '/mute').then(() => { + ajaxify.refresh(); + }).catch(alerts.error); + } + function flagAccount() { require(['flags'], function (flags) { flags.showFlagModal({ diff --git a/public/src/modules/api.js b/public/src/modules/api.js index e3468190af..78c144ed62 100644 --- a/public/src/modules/api.js +++ b/public/src/modules/api.js @@ -65,6 +65,16 @@ define('api', ['hooks'], (hooks) => { }, }, onSuccess); + api.patch = (route, payload, onSuccess) => call({ + url: route, + method: 'patch', + data: JSON.stringify(payload || {}), + contentType: 'application/json; charset=utf-8', + headers: { + 'x-csrf-token': config.csrf_token, + }, + }, onSuccess); + api.put = (route, payload, onSuccess) => call({ url: route, method: 'put', diff --git a/public/src/overrides.js b/public/src/overrides.js index bbd8bd70d9..4e02be3d9d 100644 --- a/public/src/overrides.js +++ b/public/src/overrides.js @@ -108,16 +108,21 @@ if (typeof window !== 'undefined') { }); }()); let timeagoFn; + overrides.overrideTimeagoCutoff = function () { + const cutoff = parseInt(ajaxify.data.timeagoCutoff || config.timeagoCutoff, 10); + if (cutoff === 0) { + $.timeago.settings.cutoff = 1; + } else if (cutoff > 0) { + $.timeago.settings.cutoff = 1000 * 60 * 60 * 24 * cutoff; + } + }; + overrides.overrideTimeago = function () { if (!timeagoFn) { timeagoFn = $.fn.timeago; } - if (parseInt(config.timeagoCutoff, 10) === 0) { - $.timeago.settings.cutoff = 1; - } else if (parseInt(config.timeagoCutoff, 10) > 0) { - $.timeago.settings.cutoff = 1000 * 60 * 60 * 24 * (parseInt(config.timeagoCutoff, 10) || 30); - } + overrides.overrideTimeagoCutoff(); $.timeago.settings.allowFuture = true; const userLang = config.userLang.replace('_', '-'); diff --git a/src/api/users.js b/src/api/users.js index 1803259b39..4cf9622d70 100644 --- a/src/api/users.js +++ b/src/api/users.js @@ -225,6 +225,53 @@ usersAPI.unban = async function (caller, data) { }); }; +usersAPI.mute = async function (caller, data) { + if (!await privileges.users.hasMutePrivilege(caller.uid)) { + throw new Error('[[error:no-privileges]]'); + } else if (await user.isAdministrator(data.uid)) { + throw new Error('[[error:cant-mute-other-admins]]'); + } + await db.setObject(`user:${data.uid}`, { + mutedUntil: data.until, + mutedReason: data.reason || '[[user:info.muted-no-reason]]', + }); + + await events.log({ + type: 'user-mute', + uid: caller.uid, + targetUid: data.uid, + ip: caller.ip, + reason: data.reason || undefined, + }); + plugins.hooks.fire('action:user.muted', { + callerUid: caller.uid, + ip: caller.ip, + uid: data.uid, + until: data.until > 0 ? data.until : undefined, + reason: data.reason || undefined, + }); +}; + +usersAPI.unmute = async function (caller, data) { + if (!await privileges.users.hasMutePrivilege(caller.uid)) { + throw new Error('[[error:no-privileges]]'); + } + + await db.deleteObjectFields(`user:${data.uid}`, ['mutedUntil', 'mutedReason']); + + await events.log({ + type: 'user-unmute', + uid: caller.uid, + targetUid: data.uid, + ip: caller.ip, + }); + plugins.hooks.fire('action:user.unmuted', { + callerUid: caller.uid, + ip: caller.ip, + uid: data.uid, + }); +}; + async function isPrivilegedOrSelfAndPasswordMatch(caller, data) { const { uid } = caller; const isSelf = parseInt(uid, 10) === parseInt(data.uid, 10); diff --git a/src/controllers/accounts/helpers.js b/src/controllers/accounts/helpers.js index d845ebdbb0..e151f7c731 100644 --- a/src/controllers/accounts/helpers.js +++ b/src/controllers/accounts/helpers.js @@ -73,6 +73,7 @@ helpers.getUserDataByUserSlug = async function (userslug, callerUID, query = {}) userData.isSelfOrAdminOrGlobalModerator = isSelf || isAdmin || isGlobalModerator; userData.canEdit = results.canEdit; userData.canBan = results.canBanUser; + userData.canMute = results.canMuteUser; userData.canFlag = (await privileges.users.canFlag(callerUID, userData.uid)).flag; userData.canChangePassword = isAdmin || (isSelf && !meta.config['password:disableEdit']); userData.isSelf = isSelf; @@ -95,6 +96,7 @@ helpers.getUserDataByUserSlug = async function (userslug, callerUID, query = {}) userData.sso = results.sso.associations; userData.banned = Boolean(userData.banned); + userData.muted = parseInt(userData.mutedUntil, 10) > Date.now(); userData.website = escape(userData.website); userData.websiteLink = !userData.website.startsWith('http') ? `http://${userData.website}` : userData.website; userData.websiteName = userData.website.replace(validator.escape('http://'), '').replace(validator.escape('https://'), ''); @@ -144,6 +146,7 @@ async function getAllData(uid, callerUID) { sso: plugins.hooks.fire('filter:auth.list', { uid: uid, associations: [] }), canEdit: privileges.users.canEdit(callerUID, uid), canBanUser: privileges.users.canBanUser(callerUID, uid), + canMuteUser: privileges.users.canMuteUser(callerUID, uid), isBlocked: user.blocks.is(uid, callerUID), canViewInfo: privileges.global.can('view:users:info', callerUID), hasPrivateChat: messaging.hasPrivateChat(callerUID, uid), diff --git a/src/controllers/users.js b/src/controllers/users.js index 2f697c4b9c..f08e428c38 100644 --- a/src/controllers/users.js +++ b/src/controllers/users.js @@ -61,6 +61,7 @@ usersController.getOnlineUsers = async function (req, res) { } userData.anonymousUserCount = guests + hiddenCount; + userData.timeagoCutoff = 1000 * 60 * 60 * 24; await render(req, res, userData); }; diff --git a/src/controllers/write/users.js b/src/controllers/write/users.js index 4cea3af1da..ddf1b5b93c 100644 --- a/src/controllers/write/users.js +++ b/src/controllers/write/users.js @@ -111,6 +111,16 @@ Users.unban = async (req, res) => { helpers.formatApiResponse(200, res); }; +Users.mute = async (req, res) => { + await api.users.mute(req, { ...req.body, uid: req.params.uid }); + helpers.formatApiResponse(200, res); +}; + +Users.unmute = async (req, res) => { + await api.users.unmute(req, { ...req.body, uid: req.params.uid }); + helpers.formatApiResponse(200, res); +}; + Users.generateToken = async (req, res) => { await hasAdminPrivilege(req.uid, 'settings'); if (parseInt(req.params.uid, 10) !== parseInt(req.user.uid, 10)) { diff --git a/src/events.js b/src/events.js index 69da2ef272..b4ce5e3fbd 100644 --- a/src/events.js +++ b/src/events.js @@ -36,6 +36,8 @@ events.types = [ 'user-removeAdmin', 'user-ban', 'user-unban', + 'user-mute', + 'user-unmute', 'user-delete', 'user-deleteAccount', 'user-deleteContent', diff --git a/src/meta/tags.js b/src/meta/tags.js index 4e5aeb6815..121c1c74c2 100644 --- a/src/meta/tags.js +++ b/src/meta/tags.js @@ -115,27 +115,27 @@ Tags.parse = async (req, data, meta, link) => { }, { rel: 'icon', sizes: '36x36', - href: `${relative_path}/assets/images/touch/192.png`, + href: `${relative_path}/assets/images/touch/36.png`, }, { rel: 'icon', sizes: '48x48', - href: `${relative_path}/assets/images/touch/144.png`, - }, { - rel: 'icon', - sizes: '72x72', - href: `${relative_path}/assets/images/touch/96.png`, - }, { - rel: 'icon', - sizes: '96x96', - href: `${relative_path}/assets/images/touch/72.png`, - }, { - rel: 'icon', - sizes: '144x144', href: `${relative_path}/assets/images/touch/48.png`, + }, { + rel: 'icon', + sizes: '72x72', + href: `${relative_path}/assets/images/touch/72.png`, + }, { + rel: 'icon', + sizes: '96x96', + href: `${relative_path}/assets/images/touch/96.png`, + }, { + rel: 'icon', + sizes: '144x144', + href: `${relative_path}/assets/images/touch/144.png`, }, { rel: 'icon', sizes: '192x192', - href: `${relative_path}/assets/images/touch/36.png`, + href: `${relative_path}/assets/images/touch/192.png`, }, { rel: 'icon', sizes: '512x512', diff --git a/src/privileges/global.js b/src/privileges/global.js index 734f242b1d..65d8671c68 100644 --- a/src/privileges/global.js +++ b/src/privileges/global.js @@ -31,6 +31,7 @@ const _privilegeMap = new Map([ ['view:groups', { label: '[[admin/manage/privileges:view-groups]]' }], ['local:login', { label: '[[admin/manage/privileges:allow-local-login]]' }], ['ban', { label: '[[admin/manage/privileges:ban]]' }], + ['mute', { label: '[[admin/manage/privileges:mute]]' }], ['view:users:info', { label: '[[admin/manage/privileges:view-users-info]]' }], ]); diff --git a/src/privileges/users.js b/src/privileges/users.js index 88f28ea5c7..ac3c0ca1c7 100644 --- a/src/privileges/users.js +++ b/src/privileges/users.js @@ -109,6 +109,21 @@ privsUsers.canBanUser = async function (callerUid, uid) { return data.canBan; }; +privsUsers.canMuteUser = async function (callerUid, uid) { + const privsGlobal = require('./global'); + const [canMute, isTargetAdmin] = await Promise.all([ + privsGlobal.can('mute', callerUid), + privsUsers.isAdministrator(uid), + ]); + + const data = await plugins.hooks.fire('filter:user.canMuteUser', { + canMute: canMute && !isTargetAdmin, + callerUid: callerUid, + uid: uid, + }); + return data.canMute; +}; + privsUsers.canFlag = async function (callerUid, uid) { const [userReputation, targetPrivileged, reporterPrivileged] = await Promise.all([ user.getUserField(callerUid, 'reputation'), @@ -126,6 +141,7 @@ privsUsers.canFlag = async function (callerUid, uid) { }; privsUsers.hasBanPrivilege = async uid => await hasGlobalPrivilege('ban', uid); +privsUsers.hasMutePrivilege = async uid => await hasGlobalPrivilege('mute', uid); privsUsers.hasInvitePrivilege = async uid => await hasGlobalPrivilege('invite', uid); async function hasGlobalPrivilege(privilege, uid) { diff --git a/src/routes/write/users.js b/src/routes/write/users.js index d3d3b0017d..6f22fa6166 100644 --- a/src/routes/write/users.js +++ b/src/routes/write/users.js @@ -36,6 +36,9 @@ function authenticatedRoutes() { setupApiRoute(router, 'put', '/:uid/ban', [...middlewares, middleware.assert.user], controllers.write.users.ban); setupApiRoute(router, 'delete', '/:uid/ban', [...middlewares, middleware.assert.user], controllers.write.users.unban); + setupApiRoute(router, 'put', '/:uid/mute', [...middlewares, middleware.assert.user], controllers.write.users.mute); + setupApiRoute(router, 'delete', '/:uid/mute', [...middlewares, middleware.assert.user], controllers.write.users.unmute); + setupApiRoute(router, 'post', '/:uid/tokens', [...middlewares, middleware.assert.user], controllers.write.users.generateToken); setupApiRoute(router, 'delete', '/:uid/tokens/:token', [...middlewares, middleware.assert.user], controllers.write.users.deleteToken); diff --git a/src/user/data.js b/src/user/data.js index d784a7efe7..a58b95669a 100644 --- a/src/user/data.js +++ b/src/user/data.js @@ -15,7 +15,7 @@ const intFields = [ 'uid', 'postcount', 'topiccount', 'reputation', 'profileviews', 'banned', 'banned:expire', 'email:confirmed', 'joindate', 'lastonline', 'lastqueuetime', 'lastposttime', 'followingCount', 'followerCount', - 'blocksCount', 'passwordExpiry', + 'blocksCount', 'passwordExpiry', 'mutedUntil', ]; module.exports = function (User) { @@ -25,7 +25,7 @@ module.exports = function (User) { 'aboutme', 'signature', 'uploadedpicture', 'profileviews', 'reputation', 'postcount', 'topiccount', 'lastposttime', 'banned', 'banned:expire', 'status', 'flags', 'followerCount', 'followingCount', 'cover:url', - 'cover:position', 'groupTitle', + 'cover:position', 'groupTitle', 'mutedUntil', 'mutedReason', ]; User.guestData = { diff --git a/src/user/posts.js b/src/user/posts.js index 65d80849ef..a49ced7fd3 100644 --- a/src/user/posts.js +++ b/src/user/posts.js @@ -18,7 +18,7 @@ module.exports = function (User) { return; } const [userData, isAdminOrMod] = await Promise.all([ - User.getUserFields(uid, ['uid', 'banned', 'joindate', 'email', 'reputation'].concat([field])), + User.getUserFields(uid, ['uid', 'banned', 'mutedUntil', 'joindate', 'email', 'reputation'].concat([field])), privileges.categories.isAdminOrMod(cid, uid), ]); @@ -35,6 +35,16 @@ module.exports = function (User) { } const now = Date.now(); + if (userData.mutedUntil > now) { + let muteLeft = ((userData.mutedUntil - now) / (1000 * 60)); + if (muteLeft > 60) { + muteLeft = (muteLeft / 60).toFixed(0); + throw new Error(`[[error:user-muted-for-hours, ${muteLeft}]]`); + } else { + throw new Error(`[[error:user-muted-for-minutes, ${muteLeft.toFixed(0)}]]`); + } + } + if (now - userData.joindate < meta.config.initialPostDelay * 1000) { throw new Error(`[[error:user-too-new, ${meta.config.initialPostDelay}]]`); } diff --git a/src/views/admin/partials/privileges/global.tpl b/src/views/admin/partials/privileges/global.tpl index a6f3e6f4ad..8dc3aafc69 100644 --- a/src/views/admin/partials/privileges/global.tpl +++ b/src/views/admin/partials/privileges/global.tpl @@ -3,15 +3,13 @@ {{{ if !isAdminPriv }}} - - - [[admin/manage/categories:privileges.section-posting]] - - - [[admin/manage/categories:privileges.section-viewing]] - - - [[admin/manage/categories:privileges.section-moderation]] + + + + + + + {{{ end }}} @@ -65,9 +63,18 @@ + {{{ if !isAdminPriv }}} - + + {{{ end }}} diff --git a/src/views/admin/partials/temporary-mute.tpl b/src/views/admin/partials/temporary-mute.tpl new file mode 100644 index 0000000000..31bcd631f3 --- /dev/null +++ b/src/views/admin/partials/temporary-mute.tpl @@ -0,0 +1,27 @@ + +
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+ + +    + + +
+
+
+ diff --git a/test/categories.js b/test/categories.js index 04633da7c9..98d15c28bc 100644 --- a/test/categories.js +++ b/test/categories.js @@ -729,6 +729,7 @@ describe('Categories', () => { assert.ifError(err); assert.deepEqual(data, { ban: false, + mute: false, invite: false, chat: false, 'search:content': false, @@ -780,6 +781,7 @@ describe('Categories', () => { assert.ifError(err); assert.deepEqual(data, { 'groups:ban': false, + 'groups:mute': false, 'groups:invite': false, 'groups:chat': true, 'groups:search:content': true, diff --git a/test/middleware.js b/test/middleware.js index e6ee7818db..c197b0757a 100644 --- a/test/middleware.js +++ b/test/middleware.js @@ -78,6 +78,7 @@ describe('Middlewares', () => { 'view:groups': true, 'local:login': true, ban: true, + mute: true, 'view:users:info': true, 'admin:dashboard': true, 'admin:categories': true,
+ + + + + + +
[[admin/manage/categories:privileges.section-user]] [[admin/manage/privileges:select-clear-all]]