diff --git a/public/language/ar/admin/manage/categories.json b/public/language/ar/admin/manage/categories.json index 4671588bc4..49f16ef323 100644 --- a/public/language/ar/admin/manage/categories.json +++ b/public/language/ar/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/ar/global.json b/public/language/ar/global.json index 5c27db4fae..3bfd6cd4b8 100644 --- a/public/language/ar/global.json +++ b/public/language/ar/global.json @@ -46,7 +46,9 @@ "alert.success": "نجاح", "alert.error": "خطأ", "alert.banned": "محظور", - "alert.banned.message": "لقد تم حظر حسابك. سيتم تسجيل الخروج.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "أنت لا تتابع %1 بعد الآن!", "alert.follow": "أنت الآن تتابع %1!", "users": "الأعضاء", diff --git a/public/language/ar/topic.json b/public/language/ar/topic.json index a8bb7e17c9..3a5382c51a 100644 --- a/public/language/ar/topic.json +++ b/public/language/ar/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/bg/admin/manage/categories.json b/public/language/bg/admin/manage/categories.json index ba8984e32d..b7cf0d5d48 100644 --- a/public/language/bg/admin/manage/categories.json +++ b/public/language/bg/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "В тази категория няма правомощия за отделни потребители.", "privileges.section-group": "Група", "privileges.group-private": "Тази група е частна", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Добавяне на група", "privileges.copy-to-children": "Копиране в наследниците", "privileges.copy-from-category": "Копиране от категория", diff --git a/public/language/bg/global.json b/public/language/bg/global.json index 2a754cbd64..1476a02482 100644 --- a/public/language/bg/global.json +++ b/public/language/bg/global.json @@ -46,7 +46,9 @@ "alert.success": "Готово", "alert.error": "Грешка", "alert.banned": "Блокиран", - "alert.banned.message": "Вие току-що бяхте блокиран. Сега ще излезете от системата.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Вие вече не следвате %1!", "alert.follow": "Вие следвате %1!", "users": "Потребители", diff --git a/public/language/bg/topic.json b/public/language/bg/topic.json index df7ab0c44d..7884f5a8ac 100644 --- a/public/language/bg/topic.json +++ b/public/language/bg/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "текуща версия", "diffs.original-revision": "оригинална версия", "diffs.restore": "Възстановяване на тази версия", - "diffs.restore-description": "Към историята на редакциите на тази публикация ще бъде добавена нова версия.", + "diffs.restore-description": "След възстановяването към историята на редакциите на тази публикация ще бъде добавена нова версия.", "diffs.post-restored": "Публикацията е възстановена успешно до по-ранна версия", + "diffs.delete": "Изтриване на тази версия ", + "diffs.deleted": "Версията е изтрита", "timeago_later": "%1 по-късно", "timeago_earlier": "%1 по-рано", "first-post": "Първа публикация", diff --git a/public/language/bn/admin/manage/categories.json b/public/language/bn/admin/manage/categories.json index eef2e00529..68a79e78aa 100644 --- a/public/language/bn/admin/manage/categories.json +++ b/public/language/bn/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/bn/global.json b/public/language/bn/global.json index 5e5a7cef0a..02e9e61d66 100644 --- a/public/language/bn/global.json +++ b/public/language/bn/global.json @@ -46,7 +46,9 @@ "alert.success": "সফল", "alert.error": "ত্রুটি", "alert.banned": "নিষিদ্ধ", - "alert.banned.message": "আপনাকে কেবলই নিষিদ্ধ করা হয়েছে, আপনি এখন লগআউট হয়ে যাবেন।", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "আপনি আর %1 কে অনুসরণ করছেন না!", "alert.follow": "আপনি এখন %1 কে অনুসরণ করছেন!", "users": "ব্যবহারকারীগণ", diff --git a/public/language/bn/topic.json b/public/language/bn/topic.json index 7ed4d893f9..d4aaf341e9 100644 --- a/public/language/bn/topic.json +++ b/public/language/bn/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/cs/admin/manage/categories.json b/public/language/cs/admin/manage/categories.json index 6883274ff2..e59cc0bab5 100644 --- a/public/language/cs/admin/manage/categories.json +++ b/public/language/cs/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "V této kategorii není nastaveno žádné oprávnění uživatele.", "privileges.section-group": "Skupina", "privileges.group-private": "Tato skupina je soukromá", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Přidat skupinu", "privileges.copy-to-children": "Kopírovat do podřazené", "privileges.copy-from-category": "Kopírovat z kategorie", diff --git a/public/language/cs/global.json b/public/language/cs/global.json index 09f0225f48..54124d8839 100644 --- a/public/language/cs/global.json +++ b/public/language/cs/global.json @@ -46,7 +46,9 @@ "alert.success": "Úspěšné", "alert.error": "Chyba", "alert.banned": "Zabanován", - "alert.banned.message": "Byl jste zabanován, budete odhlášen.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Již nesledujete %1!", "alert.follow": "Nyní sledujete %1!", "users": "Uživatelé", diff --git a/public/language/cs/topic.json b/public/language/cs/topic.json index f6f108bfe0..e8611cfb22 100644 --- a/public/language/cs/topic.json +++ b/public/language/cs/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "aktuální revize", "diffs.original-revision": "originální revize", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 později", "timeago_earlier": "%1 dříve", "first-post": "First post", diff --git a/public/language/da/admin/manage/categories.json b/public/language/da/admin/manage/categories.json index eef2e00529..68a79e78aa 100644 --- a/public/language/da/admin/manage/categories.json +++ b/public/language/da/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/da/global.json b/public/language/da/global.json index 189298e2d3..c9eb5cd6e7 100644 --- a/public/language/da/global.json +++ b/public/language/da/global.json @@ -46,7 +46,9 @@ "alert.success": "Succes", "alert.error": "Fejl", "alert.banned": "Forment adgang", - "alert.banned.message": "Du er lige blevet udelukket, du vil nu blive logget ud.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Du følger ikke længere %1!", "alert.follow": "Du følger nu %1!", "users": "Bruger", diff --git a/public/language/da/topic.json b/public/language/da/topic.json index 29862be0a4..0a8d069279 100644 --- a/public/language/da/topic.json +++ b/public/language/da/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/de/admin/manage/categories.json b/public/language/de/admin/manage/categories.json index 48a33b10d0..be4088b5a0 100644 --- a/public/language/de/admin/manage/categories.json +++ b/public/language/de/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "Keine benutzerspezifischen Berechtigungen in dieser Kategorie.", "privileges.section-group": "Gruppe", "privileges.group-private": "Diese Gruppe ist privat", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Gruppe hinzufügen", "privileges.copy-to-children": "In Untergeordnete kopieren", "privileges.copy-from-category": "Kopiere von Kategorie", diff --git a/public/language/de/global.json b/public/language/de/global.json index 88479d595b..1ffb38ca0c 100644 --- a/public/language/de/global.json +++ b/public/language/de/global.json @@ -46,7 +46,9 @@ "alert.success": "Erfolg", "alert.error": "Fehler", "alert.banned": "Gesperrt", - "alert.banned.message": "Du bist gesperrt und wirst nun abgemeldet.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Du folgst %1 nicht länger!", "alert.follow": "Du folgst nun %1!", "users": "Benutzer", diff --git a/public/language/de/topic.json b/public/language/de/topic.json index 9967911818..a3e3cccac8 100644 --- a/public/language/de/topic.json +++ b/public/language/de/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "Aktuelle Revision", "diffs.original-revision": "Ursprüngliche Revision", "diffs.restore": "Diese Revision wiederherstellen", - "diffs.restore-description": "Eine neue Revision wird dem Beitragsänderungsverlauf hinzugefügt.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post erfolgreich auf eine frühere Version zurückgesetzt", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 später", "timeago_earlier": "%1 früher", "first-post": "First post", diff --git a/public/language/el/admin/manage/categories.json b/public/language/el/admin/manage/categories.json index eef2e00529..68a79e78aa 100644 --- a/public/language/el/admin/manage/categories.json +++ b/public/language/el/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/el/global.json b/public/language/el/global.json index 712e575b0f..f84820f7ec 100644 --- a/public/language/el/global.json +++ b/public/language/el/global.json @@ -46,7 +46,9 @@ "alert.success": "Επιτυχία", "alert.error": "Σφάλμα", "alert.banned": "Αποκλεισμένος/η", - "alert.banned.message": "Μόλις αποκλείστηκες, και θα αποσυνδεθείς.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Δεν ακολουθείς πλέον τον/την %1!", "alert.follow": "Ακολουθείς τον/την %1!", "users": "Χρήστες", diff --git a/public/language/el/topic.json b/public/language/el/topic.json index 5f4526430e..aed0856f00 100644 --- a/public/language/el/topic.json +++ b/public/language/el/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/en-US/admin/manage/categories.json b/public/language/en-US/admin/manage/categories.json index eef2e00529..68a79e78aa 100644 --- a/public/language/en-US/admin/manage/categories.json +++ b/public/language/en-US/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/en-US/global.json b/public/language/en-US/global.json index 36d0132c6e..29247cb49f 100644 --- a/public/language/en-US/global.json +++ b/public/language/en-US/global.json @@ -46,7 +46,9 @@ "alert.success": "Success", "alert.error": "Error", "alert.banned": "Banned", - "alert.banned.message": "You have just been banned, you will now be logged out.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "You are no longer following %1!", "alert.follow": "You are now following %1!", "users": "Users", diff --git a/public/language/en-US/topic.json b/public/language/en-US/topic.json index 1c1d650db2..dd71e39f6e 100644 --- a/public/language/en-US/topic.json +++ b/public/language/en-US/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/en-x-pirate/admin/manage/categories.json b/public/language/en-x-pirate/admin/manage/categories.json index eef2e00529..68a79e78aa 100644 --- a/public/language/en-x-pirate/admin/manage/categories.json +++ b/public/language/en-x-pirate/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/en-x-pirate/global.json b/public/language/en-x-pirate/global.json index 502475490a..601ba21b4d 100644 --- a/public/language/en-x-pirate/global.json +++ b/public/language/en-x-pirate/global.json @@ -46,7 +46,9 @@ "alert.success": "Success", "alert.error": "Somethin' broke", "alert.banned": "Exiled", - "alert.banned.message": "You have just been banned, you will now be logged out.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Ye be no longer stalkin' %1!", "alert.follow": "Ye be stalkin' %1", "users": "Users", diff --git a/public/language/en-x-pirate/topic.json b/public/language/en-x-pirate/topic.json index 1c1d650db2..dd71e39f6e 100644 --- a/public/language/en-x-pirate/topic.json +++ b/public/language/en-x-pirate/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/es/admin/manage/categories.json b/public/language/es/admin/manage/categories.json index 91de912eab..c83a2cb8c7 100644 --- a/public/language/es/admin/manage/categories.json +++ b/public/language/es/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No hay privilegios específicos de usuario en esta categoría.", "privileges.section-group": "Grupo", "privileges.group-private": "Éste grupo es privado", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Añadir Grupo", "privileges.copy-to-children": "Copiar a categorías inferiores", "privileges.copy-from-category": "Copiar de Categoría", diff --git a/public/language/es/global.json b/public/language/es/global.json index f0acacea60..02b2dce29d 100644 --- a/public/language/es/global.json +++ b/public/language/es/global.json @@ -46,7 +46,9 @@ "alert.success": "¡Éxito!", "alert.error": "Error", "alert.banned": "Baneado", - "alert.banned.message": "Has sido expulsado y se procederá a tu desconexión.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Ya no estás siguiendo a %1!", "alert.follow": "Ahora sigues a %1!", "users": "Usuarios", diff --git a/public/language/es/topic.json b/public/language/es/topic.json index a125412ea8..829bffdf0b 100644 --- a/public/language/es/topic.json +++ b/public/language/es/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "revisión actual", "diffs.original-revision": "revisión original", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 después", "timeago_earlier": "%1 antes", "first-post": "First post", diff --git a/public/language/et/admin/manage/categories.json b/public/language/et/admin/manage/categories.json index eef2e00529..68a79e78aa 100644 --- a/public/language/et/admin/manage/categories.json +++ b/public/language/et/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/et/global.json b/public/language/et/global.json index a264b53428..764a6bafe6 100644 --- a/public/language/et/global.json +++ b/public/language/et/global.json @@ -46,7 +46,9 @@ "alert.success": "Õnnestus", "alert.error": "Viga", "alert.banned": "Bannitud", - "alert.banned.message": "Oled bannitud, sind logitakse automaatselt välja", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Sa ei jälgi enam %1!", "alert.follow": "Sa jälgid nüüd %1!", "users": "Kasutajad", diff --git a/public/language/et/topic.json b/public/language/et/topic.json index c456e11e65..3da9d078ed 100644 --- a/public/language/et/topic.json +++ b/public/language/et/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/fa-IR/admin/manage/categories.json b/public/language/fa-IR/admin/manage/categories.json index b9307b2853..28c258568c 100644 --- a/public/language/fa-IR/admin/manage/categories.json +++ b/public/language/fa-IR/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/fa-IR/global.json b/public/language/fa-IR/global.json index 2f3be8e6bb..43be8f8b8e 100644 --- a/public/language/fa-IR/global.json +++ b/public/language/fa-IR/global.json @@ -46,7 +46,9 @@ "alert.success": "موفقیت", "alert.error": "خطا", "alert.banned": "بن شده ها", - "alert.banned.message": "دسترسی شما مسدود شد. اکنون خارج خواهید شد.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "شما دیگر %1 را دنبال نمی‌کنید!", "alert.follow": "اکنون %1 را دنبال می‌کنید.", "users": "کاربران", diff --git a/public/language/fa-IR/topic.json b/public/language/fa-IR/topic.json index 83af9d1f34..fa586c8ee3 100644 --- a/public/language/fa-IR/topic.json +++ b/public/language/fa-IR/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "نسخه فعلی", "diffs.original-revision": "نسخه اصلی", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/fi/admin/manage/categories.json b/public/language/fi/admin/manage/categories.json index eef2e00529..68a79e78aa 100644 --- a/public/language/fi/admin/manage/categories.json +++ b/public/language/fi/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/fi/global.json b/public/language/fi/global.json index fb0550e52d..78f3440df6 100644 --- a/public/language/fi/global.json +++ b/public/language/fi/global.json @@ -46,7 +46,9 @@ "alert.success": "Onnistui", "alert.error": "Virhe", "alert.banned": "Estetty", - "alert.banned.message": "Sinut estettiin juuri ja kirjaudut nyt ulos.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Et seuraa enää %1!", "alert.follow": "Seuraat nyt %1!", "users": "Käyttäjät", diff --git a/public/language/fi/topic.json b/public/language/fi/topic.json index f9dbf3dab6..e524227e18 100644 --- a/public/language/fi/topic.json +++ b/public/language/fi/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "nykyinen versio", "diffs.original-revision": "alkuperäinen versio", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 myöhempi", "timeago_earlier": "%1 aiempi", "first-post": "First post", diff --git a/public/language/fr/admin/manage/categories.json b/public/language/fr/admin/manage/categories.json index 44237df185..b50b26e8c7 100644 --- a/public/language/fr/admin/manage/categories.json +++ b/public/language/fr/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "Aucun privilège spécifique aux utilisateurs dans cette catégorie.", "privileges.section-group": "Groupe", "privileges.group-private": "Ce groupe est privé", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Ajouter un groupe", "privileges.copy-to-children": "Copier aux enfants", "privileges.copy-from-category": "Copier depuis une catégorie", diff --git a/public/language/fr/global.json b/public/language/fr/global.json index 7a1a9d6ecd..a83b512c97 100644 --- a/public/language/fr/global.json +++ b/public/language/fr/global.json @@ -46,7 +46,9 @@ "alert.success": "Succès", "alert.error": "Erreur", "alert.banned": "Bannis", - "alert.banned.message": "Vous venez d'être banni, vous allez maintenant être déconnecté.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Vous n'êtes plus abonné à %1 !", "alert.follow": "Vous êtes désormais abonné à %1 !", "users": "Utilisateurs", diff --git a/public/language/fr/topic.json b/public/language/fr/topic.json index 2ba3161bac..e8bbbc1e09 100644 --- a/public/language/fr/topic.json +++ b/public/language/fr/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "Révision en cours", "diffs.original-revision": "Révision originale", "diffs.restore": "Restaurer cette révision", - "diffs.restore-description": "Une nouvelle révision sera ajoutée à l'historique des modifications de ce message.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Restauration avec succès dans une révision antérieure", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1", "timeago_earlier": "il y a %1", "first-post": "Premier message", diff --git a/public/language/gl/admin/manage/categories.json b/public/language/gl/admin/manage/categories.json index eef2e00529..68a79e78aa 100644 --- a/public/language/gl/admin/manage/categories.json +++ b/public/language/gl/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/gl/global.json b/public/language/gl/global.json index a8d30fe202..711f722414 100644 --- a/public/language/gl/global.json +++ b/public/language/gl/global.json @@ -46,7 +46,9 @@ "alert.success": "Éxito", "alert.error": "Erro", "alert.banned": "Expulsado", - "alert.banned.message": "Acabas de ser expulsado, vas ser desconectado.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Xa non sigues a %1!", "alert.follow": "Agora sigues a %1!", "users": "Usuarios ", diff --git a/public/language/gl/topic.json b/public/language/gl/topic.json index ed3fcee76e..18f74732d1 100644 --- a/public/language/gl/topic.json +++ b/public/language/gl/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/he/admin/manage/categories.json b/public/language/he/admin/manage/categories.json index 3f45c04ee3..7a1adc50f9 100644 --- a/public/language/he/admin/manage/categories.json +++ b/public/language/he/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "אין הרשאות ספציפיות למשתמש בקטגוריה זו.", "privileges.section-group": "קבוצה", "privileges.group-private": "קבוצה זו פרטית", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "הוסף קבוצה", "privileges.copy-to-children": "העתק לצאצאים", "privileges.copy-from-category": "העתק מקטגוריה", diff --git a/public/language/he/global.json b/public/language/he/global.json index c6fa0bc654..5f928cda0f 100644 --- a/public/language/he/global.json +++ b/public/language/he/global.json @@ -46,7 +46,9 @@ "alert.success": "הצלחה", "alert.error": "שגיאה", "alert.banned": "מורחק", - "alert.banned.message": "חשבונך נחסם, מתבצע יציאה מהמערכת.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "אינך עוקב יותר אחרי %1!", "alert.follow": "אתה עכשיו עוקב אחרי %1", "users": "משתמשים", diff --git a/public/language/he/topic.json b/public/language/he/topic.json index 7a0b535212..7829eb35eb 100644 --- a/public/language/he/topic.json +++ b/public/language/he/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "גרסה נוכחית", "diffs.original-revision": "גרסה מקורית", "diffs.restore": "שחזר גרסה זו", - "diffs.restore-description": "גרסה חדשה תצורף להיסטוריית העריכות של פוסט זה.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "הפוסט שוחזר בהצלחה לגרסה קודמת", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "אחרי %1", "timeago_earlier": "לפני %1 ", "first-post": "פוסט ראשון", diff --git a/public/language/hr/admin/manage/categories.json b/public/language/hr/admin/manage/categories.json index e2b4758acb..4abe6bce49 100644 --- a/public/language/hr/admin/manage/categories.json +++ b/public/language/hr/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "U ovoj kategoriji nema privilegije za korisnika.", "privileges.section-group": "Grupa", "privileges.group-private": "Ova grupa je privatna", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Dodaj grupu", "privileges.copy-to-children": "Kopiraj u dijete", "privileges.copy-from-category": "Kopiraj iz kategorije", diff --git a/public/language/hr/global.json b/public/language/hr/global.json index b6e6f38517..973ec540d7 100644 --- a/public/language/hr/global.json +++ b/public/language/hr/global.json @@ -46,7 +46,9 @@ "alert.success": "Uspjeh!", "alert.error": "Greška", "alert.banned": "Blokiran", - "alert.banned.message": "Upravo ste banirani, sada ćete biti odjavljeni", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Više ne pratite %1", "alert.follow": "Sada pratite %1", "users": "Korisnici", diff --git a/public/language/hr/topic.json b/public/language/hr/topic.json index ed059a5b7a..cc478b2ea9 100644 --- a/public/language/hr/topic.json +++ b/public/language/hr/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/hu/admin/manage/categories.json b/public/language/hu/admin/manage/categories.json index b50f837464..86a8fdf818 100644 --- a/public/language/hu/admin/manage/categories.json +++ b/public/language/hu/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "Nincsenek felhasználó-specifikus előjogok ebbe na kategóriában.", "privileges.section-group": "Csoport", "privileges.group-private": "Ez a csoport privát", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Csoport hozzáadása", "privileges.copy-to-children": "Másolás utódokra", "privileges.copy-from-category": "Másolás kategóriűból", diff --git a/public/language/hu/global.json b/public/language/hu/global.json index fcbe2ec17d..290a78e2ce 100644 --- a/public/language/hu/global.json +++ b/public/language/hu/global.json @@ -46,7 +46,9 @@ "alert.success": "Sikeres", "alert.error": "Hiba", "alert.banned": "Kitiltva", - "alert.banned.message": "Kitiltottak, ezért most ki leszel léptetve.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Nem követed tovább: %1!", "alert.follow": "Mostantól követed: %1!", "users": "Felhasználók", diff --git a/public/language/hu/topic.json b/public/language/hu/topic.json index 052478bbbc..d9cd235beb 100644 --- a/public/language/hu/topic.json +++ b/public/language/hu/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/id/admin/manage/categories.json b/public/language/id/admin/manage/categories.json index eef2e00529..68a79e78aa 100644 --- a/public/language/id/admin/manage/categories.json +++ b/public/language/id/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/id/global.json b/public/language/id/global.json index fc3375e3c4..c422ded78e 100644 --- a/public/language/id/global.json +++ b/public/language/id/global.json @@ -46,7 +46,9 @@ "alert.success": "Sukses", "alert.error": "Error", "alert.banned": "Banned", - "alert.banned.message": "Akunmu telah dibanned, kamu akan logout sekarang", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Kamu tidak mengikuti %1", "alert.follow": "Kamu mengikuti %1", "users": "Pengguna", diff --git a/public/language/id/topic.json b/public/language/id/topic.json index 4561b31ca7..d7153f7ca0 100644 --- a/public/language/id/topic.json +++ b/public/language/id/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/it/admin/manage/categories.json b/public/language/it/admin/manage/categories.json index 7ef9f173c3..3d545e76e7 100644 --- a/public/language/it/admin/manage/categories.json +++ b/public/language/it/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "Nessun privilegio specifico dell'utente in questa categoria.", "privileges.section-group": "Gruppo", "privileges.group-private": "Questo gruppo è privato", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Aggiungi gruppo", "privileges.copy-to-children": "Copia i Figli", "privileges.copy-from-category": "Copia da Categoria", diff --git a/public/language/it/global.json b/public/language/it/global.json index d9995c7454..fd18406f69 100644 --- a/public/language/it/global.json +++ b/public/language/it/global.json @@ -46,7 +46,9 @@ "alert.success": "Riuscito", "alert.error": "Errore", "alert.banned": "Bannato", - "alert.banned.message": "Sei stato appena bannato e ora verrai disconnesso.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Non stai più seguendo %1!", "alert.follow": "Stai seguendo %1!", "users": "Utenti", diff --git a/public/language/it/topic.json b/public/language/it/topic.json index bc59a2f55b..c808eba2d5 100644 --- a/public/language/it/topic.json +++ b/public/language/it/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "revisione corrente", "diffs.original-revision": "revisione originale", "diffs.restore": "Ripristina questa revisione", - "diffs.restore-description": "Una nuova revisione sarà aggiunta alla cronologia delle modifiche di questo post.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post ripristinato con successo alla revisione precedente", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 dopo", "timeago_earlier": "%1 precedente", "first-post": "Primo post", diff --git a/public/language/ja/admin/manage/categories.json b/public/language/ja/admin/manage/categories.json index 9eaec1d405..ac04538db0 100644 --- a/public/language/ja/admin/manage/categories.json +++ b/public/language/ja/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "このカテゴリにはユーザー固有の権限はありません。", "privileges.section-group": "グループ", "privileges.group-private": "このグループはプライベートです", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "グループを追加", "privileges.copy-to-children": "子要素にコピーする", "privileges.copy-from-category": "カテゴリからのコピー", diff --git a/public/language/ja/global.json b/public/language/ja/global.json index da967db70a..42d7aab1d0 100644 --- a/public/language/ja/global.json +++ b/public/language/ja/global.json @@ -46,7 +46,9 @@ "alert.success": "成功", "alert.error": "エラー", "alert.banned": "停止した", - "alert.banned.message": "あなたはBANされました、ログアウトします", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "%1へのフォローを停止しました！", "alert.follow": "%1をフォローしています！", "users": "ユーザー", diff --git a/public/language/ja/topic.json b/public/language/ja/topic.json index 06603a6c58..895d121f32 100644 --- a/public/language/ja/topic.json +++ b/public/language/ja/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "現在のリビジョン", "diffs.original-revision": "元のリビジョン", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/ko/admin/manage/categories.json b/public/language/ko/admin/manage/categories.json index e2df789c1d..1cc64468e8 100644 --- a/public/language/ko/admin/manage/categories.json +++ b/public/language/ko/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "이 게시판에는 사용자 별 권한이 없습니다.", "privileges.section-group": "그룹", "privileges.group-private": "이 그룹은 비공개입니다", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "그룹 추가", "privileges.copy-to-children": "하위로 복사", "privileges.copy-from-category": "게시판에서 복사", diff --git a/public/language/ko/global.json b/public/language/ko/global.json index ca66f12e03..d602b2e0e2 100644 --- a/public/language/ko/global.json +++ b/public/language/ko/global.json @@ -46,7 +46,9 @@ "alert.success": "성공", "alert.error": "오류", "alert.banned": "차단됨", - "alert.banned.message": "이 계정은 차단되었습니다. 지금 로그아웃됩니다.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "더 이상 %1 님을 팔로우 하지않습니다.", "alert.follow": "%1 님을 팔로우 합니다.", "users": "사용자", diff --git a/public/language/ko/topic.json b/public/language/ko/topic.json index c1541b09c7..0f8b1264c2 100644 --- a/public/language/ko/topic.json +++ b/public/language/ko/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "현재 리비젼", "diffs.original-revision": "원래의 리비젼", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/lt/admin/manage/categories.json b/public/language/lt/admin/manage/categories.json index eef2e00529..68a79e78aa 100644 --- a/public/language/lt/admin/manage/categories.json +++ b/public/language/lt/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/lt/global.json b/public/language/lt/global.json index b0451f16b5..c1729711e2 100644 --- a/public/language/lt/global.json +++ b/public/language/lt/global.json @@ -46,7 +46,9 @@ "alert.success": "Pavyko", "alert.error": "Klaida", "alert.banned": "Užblokuotas", - "alert.banned.message": "Jūs buvote užblokuotas ir dabar būsite atjungtas.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Jūs jau nebesekate %1! ", "alert.follow": "Jūs sekate vartotoją %1!", "users": "Vartotojai", diff --git a/public/language/lt/topic.json b/public/language/lt/topic.json index 80b3c3d468..b4a7be1b2b 100644 --- a/public/language/lt/topic.json +++ b/public/language/lt/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/lv/admin/manage/categories.json b/public/language/lv/admin/manage/categories.json index 19837cf330..12e5554d96 100644 --- a/public/language/lv/admin/manage/categories.json +++ b/public/language/lv/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "Nav lietotājiem īpašo privilēģiju šinī kategorijā.", "privileges.section-group": "Grupa", "privileges.group-private": "Grupa ir privāta", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Pievienot grupu", "privileges.copy-to-children": "Kopēt uz apakškategorijām", "privileges.copy-from-category": "Kopēt no kategorijas", diff --git a/public/language/lv/global.json b/public/language/lv/global.json index e2378c0eec..57109acf0a 100644 --- a/public/language/lv/global.json +++ b/public/language/lv/global.json @@ -46,7 +46,9 @@ "alert.success": "Veiksme", "alert.error": "Kļūda", "alert.banned": "Bloķētie", - "alert.banned.message": "Tu tikko esi bijis bloķēts, Tu tagad izlogosies.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Tu vairs neseko %1!", "alert.follow": "Tu tagad seko %1!", "users": "Lietotāji", diff --git a/public/language/lv/topic.json b/public/language/lv/topic.json index 689e582dc5..68f32c37e1 100644 --- a/public/language/lv/topic.json +++ b/public/language/lv/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "pašreizējā versija", "diffs.original-revision": "sākotnējā versija", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/ms/admin/manage/categories.json b/public/language/ms/admin/manage/categories.json index eef2e00529..68a79e78aa 100644 --- a/public/language/ms/admin/manage/categories.json +++ b/public/language/ms/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/ms/global.json b/public/language/ms/global.json index 1be118f152..0c200ae13f 100644 --- a/public/language/ms/global.json +++ b/public/language/ms/global.json @@ -46,7 +46,9 @@ "alert.success": "Berjaya", "alert.error": "Ralat", "alert.banned": "Diharamkan", - "alert.banned.message": "Amda baru sahaja diharamkan, anda sekarang akan di log keluar.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Anda tidak lagi mengikuti %1", "alert.follow": "Anda sekarang mengikuti %1", "users": "Pengguna", diff --git a/public/language/ms/topic.json b/public/language/ms/topic.json index 8e269719c8..3d712d83b2 100644 --- a/public/language/ms/topic.json +++ b/public/language/ms/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/nb/admin/manage/categories.json b/public/language/nb/admin/manage/categories.json index eef2e00529..68a79e78aa 100644 --- a/public/language/nb/admin/manage/categories.json +++ b/public/language/nb/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/nb/global.json b/public/language/nb/global.json index 7af5a59994..1601d7765c 100644 --- a/public/language/nb/global.json +++ b/public/language/nb/global.json @@ -46,7 +46,9 @@ "alert.success": "Suksess", "alert.error": "Feil", "alert.banned": "Utestengt", - "alert.banned.message": "Du har nettopp blitt utestengt, og vil nå bli logget ut.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Du følger ikke lenger %1!", "alert.follow": "Du følger nå %1!", "users": "Brukere", diff --git a/public/language/nb/topic.json b/public/language/nb/topic.json index f6457b962f..d9e97baeaf 100644 --- a/public/language/nb/topic.json +++ b/public/language/nb/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/nl/admin/manage/categories.json b/public/language/nl/admin/manage/categories.json index fa7f02c5fc..56ee267487 100644 --- a/public/language/nl/admin/manage/categories.json +++ b/public/language/nl/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/nl/global.json b/public/language/nl/global.json index 53ca6eacd4..e643c6b7fc 100644 --- a/public/language/nl/global.json +++ b/public/language/nl/global.json @@ -46,7 +46,9 @@ "alert.success": "Succes", "alert.error": "Fout", "alert.banned": "Verbannen", - "alert.banned.message": "Je bent verbannen en wordt automatisch uitgelogd.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "%1 wordt niet langer gevolgd!", "alert.follow": "%1 wordt nu gevolgd!", "users": "Gebruikers", diff --git a/public/language/nl/topic.json b/public/language/nl/topic.json index c92dab8f6f..9e1122fb47 100644 --- a/public/language/nl/topic.json +++ b/public/language/nl/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "Huidige revisie", "diffs.original-revision": "Oorspronkelijke revisie", "diffs.restore": "Herstel deze revisie", - "diffs.restore-description": "Een nieuwe revisie zal worden toegevoegd aan de wijzigingshistorie van dit bericht", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Bericht was succesvol hersteld naar een eerdere revisie", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 eerder", "first-post": "First post", diff --git a/public/language/pl/admin/manage/categories.json b/public/language/pl/admin/manage/categories.json index 2212b9e4ba..b9beaf8da5 100644 --- a/public/language/pl/admin/manage/categories.json +++ b/public/language/pl/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "Brak uprawnień specyficznych dla użytkowników w tej kategorii", "privileges.section-group": "Grupa", "privileges.group-private": "Ta grupa jest prywatna", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Dodaj grupę", "privileges.copy-to-children": "Skopiuj do podrzędnej", "privileges.copy-from-category": "Skopiuj z kategorii", diff --git a/public/language/pl/global.json b/public/language/pl/global.json index 5e39241bfd..62a6fb4161 100644 --- a/public/language/pl/global.json +++ b/public/language/pl/global.json @@ -46,7 +46,9 @@ "alert.success": "Udało się", "alert.error": "Błąd", "alert.banned": "Ban", - "alert.banned.message": "Otrzymujesz ban – teraz nastąpi wylogowanie", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Nie obserwujesz już %1.", "alert.follow": "Obserwujesz %1.", "users": "Użytkownicy", diff --git a/public/language/pl/topic.json b/public/language/pl/topic.json index a6cd537cad..f81e063f5d 100644 --- a/public/language/pl/topic.json +++ b/public/language/pl/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "wersja obecna", "diffs.original-revision": "pierwsza zmiana", "diffs.restore": "Przywróć tę wersję", - "diffs.restore-description": "Nowa wersja zostanie dodana do historii edycji tego postu", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post został przywrócony do poprzedniej wersji", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 później", "timeago_earlier": "%1 wcześniej", "first-post": "First post", diff --git a/public/language/pt-BR/admin/manage/categories.json b/public/language/pt-BR/admin/manage/categories.json index b73dd127cc..fc067b32a2 100644 --- a/public/language/pt-BR/admin/manage/categories.json +++ b/public/language/pt-BR/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "Sem privilégios para usuários específicos nesta categoria.", "privileges.section-group": "Grupo", "privileges.group-private": "Este grupo é privado", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Adicionar Grupo", "privileges.copy-to-children": "Copiar para Filhos", "privileges.copy-from-category": "Copiar da Categoria", diff --git a/public/language/pt-BR/global.json b/public/language/pt-BR/global.json index cc589c84c9..8a7669005f 100644 --- a/public/language/pt-BR/global.json +++ b/public/language/pt-BR/global.json @@ -46,7 +46,9 @@ "alert.success": "Sucesso", "alert.error": "Erro", "alert.banned": "Banido", - "alert.banned.message": "Você acabou de ser banido, você será agora deslogado.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Você deixou de seguir %1!", "alert.follow": "Agora você está seguindo %1!", "users": "Usuários", diff --git a/public/language/pt-BR/topic.json b/public/language/pt-BR/topic.json index 140e954e69..dc2443fae4 100644 --- a/public/language/pt-BR/topic.json +++ b/public/language/pt-BR/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "revisão atual", "diffs.original-revision": "revisão original", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 depois", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/pt-PT/admin/manage/categories.json b/public/language/pt-PT/admin/manage/categories.json index 4dbabd9e23..0c63acf284 100644 --- a/public/language/pt-PT/admin/manage/categories.json +++ b/public/language/pt-PT/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "Não existem privilégios específicos para utilizadores nesta categoria.", "privileges.section-group": "Grupo", "privileges.group-private": "Este grupo é privado", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Adicionar Grupo", "privileges.copy-to-children": "Copiar para Filho", "privileges.copy-from-category": "Copiar da Categoria", diff --git a/public/language/pt-PT/global.json b/public/language/pt-PT/global.json index 39b94a8546..03db27dc66 100644 --- a/public/language/pt-PT/global.json +++ b/public/language/pt-PT/global.json @@ -46,7 +46,9 @@ "alert.success": "Sucesso", "alert.error": "Erro", "alert.banned": "Banido", - "alert.banned.message": "Acabaste de ser banido, serás agora obrigado a terminar sessão.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Deixaste de seguir %1!", "alert.follow": "Estás agora a seguir %1!", "users": "Utilizadores", diff --git a/public/language/pt-PT/topic.json b/public/language/pt-PT/topic.json index ee752fb06c..2983bbb303 100644 --- a/public/language/pt-PT/topic.json +++ b/public/language/pt-PT/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "revisão atual", "diffs.original-revision": "revisão original", "diffs.restore": "Restaurar esta revisão", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 depois", "timeago_earlier": "%1 antes", "first-post": "First post", diff --git a/public/language/ro/admin/manage/categories.json b/public/language/ro/admin/manage/categories.json index eef2e00529..68a79e78aa 100644 --- a/public/language/ro/admin/manage/categories.json +++ b/public/language/ro/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/ro/global.json b/public/language/ro/global.json index 687e25dd08..4f8421ec73 100644 --- a/public/language/ro/global.json +++ b/public/language/ro/global.json @@ -46,7 +46,9 @@ "alert.success": "Succes", "alert.error": "Eroare", "alert.banned": "Banat", - "alert.banned.message": "Contul tău a fost banat, acuma vei fi deconectat.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Nu îl mai urmărești pe %1!", "alert.follow": "Îl urmărești pe %1!", "users": "Utilizatori", diff --git a/public/language/ro/topic.json b/public/language/ro/topic.json index f444dceb93..1b304a1d4b 100644 --- a/public/language/ro/topic.json +++ b/public/language/ro/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/ru/admin/manage/categories.json b/public/language/ru/admin/manage/categories.json index 8ef823a511..557fb81a14 100644 --- a/public/language/ru/admin/manage/categories.json +++ b/public/language/ru/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "В этой категории нет специально заданных прав пользователя.", "privileges.section-group": "Группа", "privileges.group-private": "Это закрытая группа", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Добавить группу", "privileges.copy-to-children": "Скопировать в дочерние", "privileges.copy-from-category": "Скопировать из категории", diff --git a/public/language/ru/global.json b/public/language/ru/global.json index f6218854b7..e62a2d661e 100644 --- a/public/language/ru/global.json +++ b/public/language/ru/global.json @@ -46,7 +46,9 @@ "alert.success": "Успешно", "alert.error": "Ошибка", "alert.banned": "Заблокирован", - "alert.banned.message": "Вас только что заблокировали, ваша сессия будет завершена.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Вы больше не подписаны на %1!", "alert.follow": "Вы подписались на %1!", "users": "Пользователи", diff --git a/public/language/ru/topic.json b/public/language/ru/topic.json index 13de3afd56..af8dfa59d8 100644 --- a/public/language/ru/topic.json +++ b/public/language/ru/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "текущая версия", "diffs.original-revision": "исходная версия", "diffs.restore": "Восстановить эту версию", - "diffs.restore-description": "Новая ревизия будет добавлена ​​к истории редактирования этого сообщения.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Сообщение успешно восстановлено до более ранней версии", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "через %1", "timeago_earlier": "на %1 раньше", "first-post": "First post", diff --git a/public/language/rw/admin/manage/categories.json b/public/language/rw/admin/manage/categories.json index eef2e00529..68a79e78aa 100644 --- a/public/language/rw/admin/manage/categories.json +++ b/public/language/rw/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/rw/global.json b/public/language/rw/global.json index 494d1cf67a..29bbc13cb3 100644 --- a/public/language/rw/global.json +++ b/public/language/rw/global.json @@ -46,7 +46,9 @@ "alert.success": "Byaciyemo", "alert.error": "Byanze", "alert.banned": "Birukanwe", - "alert.banned.message": "Ubu ngubu umaze gukumirwa, ugiye guhita usohorwamo", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Ntabwo ukimukurikira %1!", "alert.follow": "Ubu ngubu ukurikira %1!", "users": "Abantu", diff --git a/public/language/rw/topic.json b/public/language/rw/topic.json index dca5e8e73f..a983f41973 100644 --- a/public/language/rw/topic.json +++ b/public/language/rw/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/sc/admin/manage/categories.json b/public/language/sc/admin/manage/categories.json index eef2e00529..68a79e78aa 100644 --- a/public/language/sc/admin/manage/categories.json +++ b/public/language/sc/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/sc/global.json b/public/language/sc/global.json index 5849311702..cef7847ec8 100644 --- a/public/language/sc/global.json +++ b/public/language/sc/global.json @@ -46,7 +46,9 @@ "alert.success": "Andat Bene", "alert.error": "Faddina", "alert.banned": "Blocadu", - "alert.banned.message": "You have just been banned, you will now be logged out.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Immoe non ses prus sighende %1!", "alert.follow": "Immoe ses sighende %1!", "users": "Users", diff --git a/public/language/sc/topic.json b/public/language/sc/topic.json index 93f963e288..e7dc592c52 100644 --- a/public/language/sc/topic.json +++ b/public/language/sc/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/sk/admin/manage/categories.json b/public/language/sk/admin/manage/categories.json index 3378f5e7cb..7e66e6e017 100644 --- a/public/language/sk/admin/manage/categories.json +++ b/public/language/sk/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "V tejto kategórií nie je nastavené žiadne oprávnenie používateľa.", "privileges.section-group": "Skupina", "privileges.group-private": "Táto skupina je súkromná", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Pridať skupinu", "privileges.copy-to-children": "Kopírovať do podradených", "privileges.copy-from-category": "Kopírovať z kategórie", diff --git a/public/language/sk/global.json b/public/language/sk/global.json index 7f95012f06..dbbeab3fca 100644 --- a/public/language/sk/global.json +++ b/public/language/sk/global.json @@ -46,7 +46,9 @@ "alert.success": "Výsledok", "alert.error": "Chyba", "alert.banned": "Zablokovaný", - "alert.banned.message": "Váš prístup bol zablokovaný, budete odhlásený.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Prestali ste sledovať %1!", "alert.follow": "Začali ste sledovať %1!", "users": "Užívatelia", diff --git a/public/language/sk/topic.json b/public/language/sk/topic.json index d02836d952..b48a738ae1 100644 --- a/public/language/sk/topic.json +++ b/public/language/sk/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "aktuálna revízia", "diffs.original-revision": "originálna revízia", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/sl/admin/manage/categories.json b/public/language/sl/admin/manage/categories.json index eef2e00529..68a79e78aa 100644 --- a/public/language/sl/admin/manage/categories.json +++ b/public/language/sl/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/sl/global.json b/public/language/sl/global.json index 800131e019..0cbe046d0b 100644 --- a/public/language/sl/global.json +++ b/public/language/sl/global.json @@ -46,7 +46,9 @@ "alert.success": "Uspešno", "alert.error": "Napaka", "alert.banned": "Izločen", - "alert.banned.message": "Vaš uporabniški račun je izločen, sedaj boste odjavljeni.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Ne spremljate več %1!", "alert.follow": "Sedaj spremljate %1!", "users": "Uporabniki", diff --git a/public/language/sl/topic.json b/public/language/sl/topic.json index 170b01b52a..d494e5cc75 100644 --- a/public/language/sl/topic.json +++ b/public/language/sl/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/sr/admin/manage/categories.json b/public/language/sr/admin/manage/categories.json index eef2e00529..68a79e78aa 100644 --- a/public/language/sr/admin/manage/categories.json +++ b/public/language/sr/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/sr/global.json b/public/language/sr/global.json index 05609e3ee4..66fcbb77f4 100644 --- a/public/language/sr/global.json +++ b/public/language/sr/global.json @@ -46,7 +46,9 @@ "alert.success": "Успешно", "alert.error": "Грешка", "alert.banned": "Забрањен", - "alert.banned.message": "Управо сте добили забрану, бићете одјављени.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Не пратите више %1!", "alert.follow": "Сада пратите %1!", "users": "Корисници", diff --git a/public/language/sr/topic.json b/public/language/sr/topic.json index 184b99f245..9edcc96205 100644 --- a/public/language/sr/topic.json +++ b/public/language/sr/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "тренутна корекција", "diffs.original-revision": "оригинална корекција", "diffs.restore": "Врати корекцију", - "diffs.restore-description": "Нова корекција биће додата историји уређивања ове поруке.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Порука је успешно враћена на ранију корекцију", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 касније", "timeago_earlier": "%1 раније", "first-post": "First post", diff --git a/public/language/sv/admin/manage/categories.json b/public/language/sv/admin/manage/categories.json index eef2e00529..68a79e78aa 100644 --- a/public/language/sv/admin/manage/categories.json +++ b/public/language/sv/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/sv/global.json b/public/language/sv/global.json index c332995a23..f28d4221b5 100644 --- a/public/language/sv/global.json +++ b/public/language/sv/global.json @@ -46,7 +46,9 @@ "alert.success": "Lyckat", "alert.error": "Fel", "alert.banned": "Bannlyst", - "alert.banned.message": "Du har blivit bannlyst och kommer nu att loggas ut. ", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Du följer inte längre %1!", "alert.follow": "Du följer nu %1!", "users": "Användare", diff --git a/public/language/sv/topic.json b/public/language/sv/topic.json index 03e082684f..6549b4a2bf 100644 --- a/public/language/sv/topic.json +++ b/public/language/sv/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "Nuvarande revision", "diffs.original-revision": "Ursprunglig revision", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 senare", "timeago_earlier": "%1 tidigare", "first-post": "First post", diff --git a/public/language/th/admin/manage/categories.json b/public/language/th/admin/manage/categories.json index eef2e00529..68a79e78aa 100644 --- a/public/language/th/admin/manage/categories.json +++ b/public/language/th/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "No user-specific privileges in this category.", "privileges.section-group": "Group", "privileges.group-private": "This group is private", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Add Group", "privileges.copy-to-children": "Copy to Children", "privileges.copy-from-category": "Copy from Category", diff --git a/public/language/th/global.json b/public/language/th/global.json index 799863a494..a0b43838db 100644 --- a/public/language/th/global.json +++ b/public/language/th/global.json @@ -46,7 +46,9 @@ "alert.success": "สำเร็จ", "alert.error": "ผิดพลาด", "alert.banned": "เเบน", - "alert.banned.message": "คุณเพิ่งจะได้รับการแบน คุณจะถูกตัดออกจากระบบเลยตอนนี้", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "คุณได้ยกเลิกติดตาม %1 !\n", "alert.follow": "คุณกำลังติดตาม %1 !", "users": "ผู้ใช้", diff --git a/public/language/th/topic.json b/public/language/th/topic.json index 760587f903..36d2fdde0b 100644 --- a/public/language/th/topic.json +++ b/public/language/th/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "current revision", "diffs.original-revision": "original revision", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 later", "timeago_earlier": "%1 earlier", "first-post": "First post", diff --git a/public/language/tr/admin/manage/categories.json b/public/language/tr/admin/manage/categories.json index 13be00cf10..7df9df32b7 100644 --- a/public/language/tr/admin/manage/categories.json +++ b/public/language/tr/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "Bu kategoride kullanıcıya-özel ayrıcalıklar yok.", "privileges.section-group": "Grup", "privileges.group-private": "Bu grup gizlidir", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Grup Ekle", "privileges.copy-to-children": "Alttakilere Kopyala", "privileges.copy-from-category": "Kategoriden Kopyala", diff --git a/public/language/tr/global.json b/public/language/tr/global.json index 5ff0086b34..71a3d17403 100644 --- a/public/language/tr/global.json +++ b/public/language/tr/global.json @@ -46,7 +46,9 @@ "alert.success": "Başarılı", "alert.error": "Hata", "alert.banned": "Yasaklı", - "alert.banned.message": "Yasaklandınız, şimdi oturumunuz kapatılacak. ", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Artık %1'i takip etmiyorsunuz!", "alert.follow": "%1'i takip ediyorsunuz!", "users": "Kullanıcı", diff --git a/public/language/tr/topic.json b/public/language/tr/topic.json index d9ef5dab2d..9eb859dd36 100644 --- a/public/language/tr/topic.json +++ b/public/language/tr/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "mevcut revizyon", "diffs.original-revision": "orijinal revizyon", "diffs.restore": "Bu revizyonu geri getir", - "diffs.restore-description": "Yeni bir revizyon bu iletinın geçmişine eklenecek. ", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "İleti önceki revizyona başarıyla geri getirildi", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 sonra", "timeago_earlier": "%1 önce", "first-post": "First post", diff --git a/public/language/uk/admin/manage/categories.json b/public/language/uk/admin/manage/categories.json index bb5bfb8776..910f0d6f9e 100644 --- a/public/language/uk/admin/manage/categories.json +++ b/public/language/uk/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "Для цієї категорії не задано особливих прав.", "privileges.section-group": "Група", "privileges.group-private": "Це приватна група", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Додати групу", "privileges.copy-to-children": "Копіювати під-категоріям", "privileges.copy-from-category": "Копіювати з категорії", diff --git a/public/language/uk/global.json b/public/language/uk/global.json index 27df79c51a..f388e5bb2a 100644 --- a/public/language/uk/global.json +++ b/public/language/uk/global.json @@ -46,7 +46,9 @@ "alert.success": "Успіх", "alert.error": "Помилка", "alert.banned": "Забанений", - "alert.banned.message": "Вас щойно забанили і наразі ви будете розлогінені.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Ви більше не стежите за %1!", "alert.follow": "Ви тепер стежите за %1!", "users": "Користувачі", diff --git a/public/language/uk/topic.json b/public/language/uk/topic.json index fec68ab3ea..b179adf183 100644 --- a/public/language/uk/topic.json +++ b/public/language/uk/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "поточна ревізія", "diffs.original-revision": "початкова ревізія", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 пізніше", "timeago_earlier": "%1 раніше", "first-post": "First post", diff --git a/public/language/vi/admin/manage/categories.json b/public/language/vi/admin/manage/categories.json index 302b6f18ca..f883817dbd 100644 --- a/public/language/vi/admin/manage/categories.json +++ b/public/language/vi/admin/manage/categories.json @@ -37,7 +37,7 @@ "privileges.description": "Bạn có thể cấu hình kiểm soát truy cập các phần của trang web ở phần này. Cấp quyền dựa trên cơ sở mỗi người dùng hoặc mỗi nhóm. Chọn tên miền ảnh hưởng từ menu thả xuống bên dưới.", "privileges.category-selector": "Cấu hình đặc quyền cho", - "privileges.warning": "Ghi chú: Cài đặt đặc quyền có hiệu lực ngay lập tức. Không cần thiết phải lưu danh mục sau khi điều chỉnh các cài đặt này.", + "privileges.warning": "Ghi chú: Cài đặt đặc quyền có hiệu lực lập tức. Không cần phải lưu danh mục sau khi điều chỉnh cài đặt này.", "privileges.section-viewing": "Đặc Quyền Xem", "privileges.section-posting": "Đặc Quyền Bài Đăng", "privileges.section-moderation": "Đặc Quyền Kiểm Duyệt", @@ -47,6 +47,8 @@ "privileges.no-users": "Không có đặc quyền riêng cho người dùng trong chuyên mục này.", "privileges.section-group": "Nhóm", "privileges.group-private": "Nhóm này là riêng tư", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "Thêm Nhóm", "privileges.copy-to-children": "Sao Chép Đến mục Con", "privileges.copy-from-category": "Sao Chép Từ Chuyên Mục", diff --git a/public/language/vi/global.json b/public/language/vi/global.json index 08d491e40b..fe46f912f0 100644 --- a/public/language/vi/global.json +++ b/public/language/vi/global.json @@ -15,7 +15,7 @@ "login": "Đăng nhập", "please_log_in": "Vui Lòng Đăng Nhập", "logout": "Đăng xuất", - "posting_restriction_info": "Hiện tại giới hạn chỉ các hành viên đã đăng ký mới được đăng bài, nhấn vào đây để đăng nhập.", + "posting_restriction_info": "Chỉ thành viên chính thức mới được phép đăng bài, nhấn vào đây để đăng nhập.", "welcome_back": "Chào mừng bạn quay lại", "you_have_successfully_logged_in": "Bạn đã đăng nhập thành công", "save_changes": "Lưu thay đổi", @@ -46,7 +46,9 @@ "alert.success": "Thành công", "alert.error": "Lỗi", "alert.banned": "Bị cấm", - "alert.banned.message": "Bạn vừa bị cấm tham gia, bây giờ bạn sẽ được đăng xuất.", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "Bạn không còn theo dõi %1!", "alert.follow": "Bạn đang theo dõi %1!", "users": "Người dùng", diff --git a/public/language/vi/topic.json b/public/language/vi/topic.json index d793833431..30a1540738 100644 --- a/public/language/vi/topic.json +++ b/public/language/vi/topic.json @@ -51,7 +51,7 @@ "following_topic.message": "Bạn sẽ nhận được thông báo khi có ai đó gửi bài viết trong chủ đề này.", "not_following_topic.message": "Bạn sẽ thấy chủ đề này trong danh sách chủ đề chưa đọc, nhưng bạn sẽ không nhận được thông báo khi ai đó đăng lên chủ đề này.", "ignoring_topic.message": "Bạn sẽ không thấy chủ đề này trong danh sách chủ đề chưa đọc. Bạn sẽ nhận thông báo khi bạn được đề cập hoặc bài viết của bạn được ủng hộ.", - "login_to_subscribe": "Xin hãy đăng ký hoặc đăng nhập để theo dõi topic này", + "login_to_subscribe": "Vui lòng đăng ký hoặc đăng nhập để theo dõi chủ đề này", "markAsUnreadForAll.success": "Chủ đề đã được đánh dấu là chưa đọc toàn bộ", "mark_unread": "Đánh dấu chưa đọc", "mark_unread.success": "Đã đánh dấu chủ đề chưa đọc.", @@ -97,7 +97,7 @@ "post_restore_confirm": "Bạn có chắc là muốn phục hồi bài gửi này không?", "post_purge_confirm": "Bạn có chắc muốn xóa hẳn bài này?", "pin-modal-expiry": "Ngày hết hạn", - "pin-modal-help": "Bạn có thể tùy chọn đặt ngày hết hạn cho (các) chủ đề được ghim tại đây. Ngoài ra, bạn có thể để trống trường này để giữ chủ đề được ghim cho đến khi chủ đề được bỏ ghim theo cách thủ công.", + "pin-modal-help": "Bạn có thể đặt ngày hết hạn chủ đề được ghim tại đây. Ngoài ra, bạn có thể để trống để giữ chủ đề được ghim cho đến khi chủ đề được bỏ ghim theo cách thủ công.", "load_categories": "Đang Tải Chuyên Mục", "confirm_move": "Di chuyển", "confirm_fork": "Tạo bảo sao", @@ -155,11 +155,13 @@ "diffs.title": "Lịch sử chỉnh sửa bài viết", "diffs.description": "Bài viết này có %1 sửa đổi. Nhấp vào một trong các bản sửa đổi bên dưới để xem nội dung bài đăng tại thời điểm đó.", "diffs.no-revisions-description": "Bài viết này có %1 sửa đổi", - "diffs.current-revision": "Bản sao lưu hiện tại", - "diffs.original-revision": "Bản sao lưu gốc", + "diffs.current-revision": "bản sửa đổi hiện tại", + "diffs.original-revision": "bản sửa đổi gốc", "diffs.restore": "Khôi phục bản sửa đổi này", - "diffs.restore-description": "Một bản sửa đổi mới sẽ được thêm vào lịch sử chỉnh sửa của bài đăng này.", + "diffs.restore-description": "Một bản sửa đổi mới sẽ được thêm vào lịch sử chỉnh sửa bài đăng này sau khi khôi phục.", "diffs.post-restored": "Đã khôi phục thành công bài đăng về bản sửa đổi trước đó", + "diffs.delete": "Xóa bản sửa đổi này", + "diffs.deleted": "Bản sửa đổi đã bị xóa", "timeago_later": "%1 sau", "timeago_earlier": "%1 trước đó", "first-post": "Bài viết đầu tiên", diff --git a/public/language/zh-CN/admin/manage/categories.json b/public/language/zh-CN/admin/manage/categories.json index e51a38a29d..55376b9832 100644 --- a/public/language/zh-CN/admin/manage/categories.json +++ b/public/language/zh-CN/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "此版块中没有用户特定的权限。", "privileges.section-group": "群组", "privileges.group-private": "这个群组是私密的", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "添加群组", "privileges.copy-to-children": "复制到子版块", "privileges.copy-from-category": "从版块复制", diff --git a/public/language/zh-CN/global.json b/public/language/zh-CN/global.json index 07e160ef4a..edf7528028 100644 --- a/public/language/zh-CN/global.json +++ b/public/language/zh-CN/global.json @@ -46,7 +46,9 @@ "alert.success": "成功", "alert.error": "错误", "alert.banned": "已封禁", - "alert.banned.message": "您刚刚被封禁了，现在您将登出站点。", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "您已取消关注 %1！", "alert.follow": "您已关注 %1！", "users": "用户", diff --git a/public/language/zh-CN/topic.json b/public/language/zh-CN/topic.json index 3b6c28a5c4..16f08e6aa3 100644 --- a/public/language/zh-CN/topic.json +++ b/public/language/zh-CN/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "当前版本", "diffs.original-revision": "原始版本", "diffs.restore": "恢复到此修订", - "diffs.restore-description": "新的修订版本将被添加到此帖子的编辑历史记录中。", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "帖子成功恢复到更早的修订版本", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 后", "timeago_earlier": "%1 前", "first-post": "First post", diff --git a/public/language/zh-TW/admin/manage/categories.json b/public/language/zh-TW/admin/manage/categories.json index 3b2eda6f4a..7aa6324476 100644 --- a/public/language/zh-TW/admin/manage/categories.json +++ b/public/language/zh-TW/admin/manage/categories.json @@ -47,6 +47,8 @@ "privileges.no-users": "此版面中沒有使用者特定的權限。", "privileges.section-group": "群組", "privileges.group-private": "這個群組是私密的", + "privileges.inheritance-exception": "This group does not inherit privileges from registered-users group", + "privileges.banned-user-inheritance": "Banned users inherit privileges from banned-users group", "privileges.search-group": "新增群組", "privileges.copy-to-children": "複製到子版面", "privileges.copy-from-category": "從版面複製", diff --git a/public/language/zh-TW/global.json b/public/language/zh-TW/global.json index 93ec5ad9ab..eb96f2580f 100644 --- a/public/language/zh-TW/global.json +++ b/public/language/zh-TW/global.json @@ -46,7 +46,9 @@ "alert.success": "成功", "alert.error": "錯誤", "alert.banned": "已停權", - "alert.banned.message": "您剛剛被停權了，現在您將登出網站。", + "alert.banned.message": "You have just been banned, your access is now restricted.", + "alert.unbanned": "Unbanned", + "alert.unbanned.message": "Your ban has been lifted.", "alert.unfollow": "您已取消追隨 %1！", "alert.follow": "您已追隨 %1！", "users": "使用者", diff --git a/public/language/zh-TW/topic.json b/public/language/zh-TW/topic.json index 97ae1ab0b3..cd94f57914 100644 --- a/public/language/zh-TW/topic.json +++ b/public/language/zh-TW/topic.json @@ -158,8 +158,10 @@ "diffs.current-revision": "當前版本", "diffs.original-revision": "原始版本", "diffs.restore": "Restore this revision", - "diffs.restore-description": "A new revision will be appended to this post's edit history.", + "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.", "diffs.post-restored": "Post successfully restored to earlier revision", + "diffs.delete": "Delete this revision", + "diffs.deleted": "Revision deleted", "timeago_later": "%1 後", "timeago_earlier": "%1 前", "first-post": "First post",