Merge branch 'master' of https://github.com/NodeBB/NodeBB

install/package.json

@@ -83,7 +83,7 @@
         "mousetrap": "^1.6.5",
         "@nodebb/bootswatch": "3.4.2",
         "nconf": "^0.11.2",
-        "nodebb-plugin-composer-default": "6.5.14",
+        "nodebb-plugin-composer-default": "6.5.16",
         "nodebb-plugin-dbsearch": "4.2.0",
         "nodebb-plugin-emoji": "^3.5.0",
         "nodebb-plugin-emoji-android": "2.0.5",
@@ -121,7 +121,7 @@
         "socket.io": "4.0.0",
         "socket.io-adapter-cluster": "^1.0.1",
         "socket.io-client": "4.0.0",
-        "socket.io-redis": "6.0.1",
+        "socket.io-redis": "6.1.0",
         "sortablejs": "1.13.0",
         "spdx-license-list": "^6.4.0",
         "spider-detector": "2.0.0",
@@ -150,7 +150,7 @@
         "grunt": "1.3.0",
         "grunt-contrib-watch": "1.1.0",
         "husky": "5.1.3",
-        "jsdom": "16.5.0",
+        "jsdom": "16.5.1",
         "lint-staged": "10.5.4",
         "mocha": "8.3.2",
         "mocha-lcov-reporter": "1.3.0",

public/language/ar/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "المحال إليه",
 	"update": "تحديث",
 	"updated": "تم التحديث",
+	"resolved": "Resolved",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"graph-label": "Daily Flags",

public/language/ar/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "هذه المشاركة محذوفة. فقط من لهم صلاحية الإشراف على ا لمشاركات يمكنهم معاينتها.",
     "following_topic.message": "ستستلم تنبيها عند كل مشاركة جديدة في هذا الموضوع.",

public/language/bg/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Назначен",
 	"update": "Обновяване",
 	"updated": "Обновено",
+	"resolved": "Resolved",
 	"target-purged": "Съдържанието, за което се отнася този доклад, е било изтрито и вече не е налично.",
 
 	"graph-label": "Дневни етикети",

public/language/bg/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Докладване на този потребител",
     "already-flagged": "Вече е докладвано",
     "view-flag-report": "Преглед на доклада",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "Тази тема беше слята в <a href=\"%1\">%2</a>",
     "deleted_message": "Темата е изтрита. Само потребители с права за управление на темите могат да я видят.",
     "following_topic.message": "Вече ще получавате известия когато някой публикува коментар в тази тема.",

public/language/bn/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Assignee",
 	"update": "Update",
 	"updated": "Updated",
+	"resolved": "Resolved",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"graph-label": "Daily Flags",

public/language/bn/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "এই টপিকটি মুছে ফেলা হয়েছে। শুধুমাত্র টপিক ব্যবস্থাপনার ক্ষমতাপ্রাপ্ত সদস্যগণ এটি দেখতে পারবেন।",
     "following_topic.message": "এখন থেকে এই টপিকে অন্যকেউ পোস্ট করলে আপনি নোটিফিকেশন পাবেন।",

public/language/cs/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Nabyvatel",
 	"update": "Aktualizovat",
 	"updated": "Aktualizováno",
+	"resolved": "Resolved",
 	"target-purged": "Obsah, na který se toto označení vztahuje, byl vymazán a již není k dispozici.",
 
 	"graph-label": "Denní označení",

public/language/cs/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Toto téma bylo odstraněno. Jen uživatelé s oprávněním správy témat ho mohou vidět.",
     "following_topic.message": "Nyní budete dostávat upozornění, jakmile někdo přidá příspěvek do tohoto tématu.",

public/language/da/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Assignee",
 	"update": "Update",
 	"updated": "Updated",
+	"resolved": "Resolved",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"graph-label": "Daily Flags",

public/language/da/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Denne tråd er blevet slettet. Kun brugere med emne behandlings privilegier kan se den.",
     "following_topic.message": "Du vil nu modtage notifikationer når nogle skriver et indlæg i dette emne.",

public/language/de/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Zugeordneter Benutzer",
 	"update": "Aktualisieren",
 	"updated": "Aktualisiert",
+	"resolved": "Resolved",
 	"target-purged": "Der Inhalt auf den diese Meldung hingewiesen hat, wurde gelöscht und ist nicht mehr verfügbar.",
 
 	"graph-label": "Tägliche Meldungen",

public/language/de/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Diesen Benutzer melden",
     "already-flagged": "Bereits gemeldet",
     "view-flag-report": "Meldungs-Report anzeigen",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "Diese Thema wurde mit <a href=\"%1\">%2</a> fusioniert",
     "deleted_message": "Dieses Thema wurde gelöscht. Nur Nutzer mit entsprechenden Rechten können es sehen.",
     "following_topic.message": "Du erhältst nun eine Benachrichtigung, wenn jemand einen Beitrag zu diesem Thema verfasst.",

public/language/el/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Assignee",
 	"update": "Update",
 	"updated": "Updated",
+	"resolved": "Resolved",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"graph-label": "Daily Flags",

public/language/el/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Το θέμα αυτό έχει διαγραφεί. Μόνο οι χρήστες με δικαιώματα διαχειριστή θεμάτων μπορούν να το δουν.",
     "following_topic.message": "Θα λαμβάνεις ειδοποιήσεις όποτε κάποιος δημοσιεύει κάτι σε αυτό το θέμα.",

public/language/en-US/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Assignee",
 	"update": "Update",
 	"updated": "Updated",
+	"resolved": "Resolved",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"graph-label": "Daily Flags",

public/language/en-US/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
     "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",

public/language/en-x-pirate/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Assignee",
 	"update": "Update",
 	"updated": "Updated",
+	"resolved": "Resolved",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"graph-label": "Daily Flags",

public/language/en-x-pirate/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
     "following_topic.message": "You will now be receiving notifications when somebody posts to this topic.",

public/language/es/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Asignado",
 	"update": "Actualizar",
 	"updated": "Actualizado",
+	"resolved": "Resolved",
 	"target-purged": "El contenido al que se refiere este indicador ha sido purgado y ya no está disponible.",
 
 	"graph-label": "Daily Flags",

public/language/es/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Este tema ha sido borrado. Solo los usuarios que tengan privilegios de administración de temas pueden verlo.",
     "following_topic.message": "Ahora recibiras notificaciones cuando alguien publique en este tema.",

public/language/et/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Assignee",
 	"update": "Update",
 	"updated": "Updated",
+	"resolved": "Resolved",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"graph-label": "Daily Flags",

public/language/et/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "See teema on kustutatud. Ainult kasutajad kellel on piisavalt õigusi saavad seda näha.",
     "following_topic.message": "Sulle ei edastata enam teateid uutest postitustest kui keegi postitab siia teemasse.",

public/language/fa-IR/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "اختصاص دادن ",
 	"update": "به روزرسانی",
 	"updated": "به روز رسانی شد",
+	"resolved": "Resolved",
 	"target-purged": "محتوای این گزارش حذف شده است و در دسترس نیست.",
 
 	"graph-label": "آمار گزارش های روزانه",

public/language/fa-IR/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "گزارش این کاربر",
     "already-flagged": "قبلا گزارش شده",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "این موضوع پاک شده است. تنها کاربرانِ با حق مدیریت موضوع می‌توانند آن را ببینند.",
     "following_topic.message": "از این پس اگر کسی در این موضوع پست بگذارد، شما آگاه خواهید شد.",

public/language/fi/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Assignee",
 	"update": "Update",
 	"updated": "Updated",
+	"resolved": "Resolved",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"graph-label": "Daily Flags",

public/language/fi/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Tämä aihe on poistettu. Vain käyttäjät, joilla on aiheen hallintaoikeudet, voivat nähdä sen.",
     "following_topic.message": "Saat nyt ilmoituksen, kun joku kirjoittaa tähän aiheeseen.",

public/language/fr/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Assigné",
 	"update": "Mettre à jour",
 	"updated": "Mis à jour",
+	"resolved": "Resolved",
 	"target-purged": "Le rapport pour ce signalement a été supprimé et n'est plus accessible",
 
 	"graph-label": "Signalements du jour",

public/language/fr/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Signaler cet utilisateur",
     "already-flagged": "Déjà signalé",
     "view-flag-report": "Voir le rapport de signalement",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "Ce sujet a été fusionné dans <a href=\"%1\">%2</a>",
     "deleted_message": "Ce sujet a été supprimé. Seuls les utilisateurs avec les droits d'administration peuvent le voir.",
     "following_topic.message": "Vous recevrez désormais des notifications lorsque quelqu'un postera dans ce sujet.",

public/language/gl/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Encargado",
 	"update": "Actualizar",
 	"updated": "Actualizado",
+	"resolved": "Resolved",
 	"target-purged": "O contido marcado foi purgado e xa non está dispoñible",
 
 	"graph-label": "Daily Flags",

public/language/gl/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Este tema foi borrado. Só os usuarios con privilexios administrativos poden velo.",
     "following_topic.message": "Agora recibirás notificacións cando alguén publique neste tema.",

public/language/he/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "מוקצה",
 	"update": "עדכון",
 	"updated": "עודכן",
+	"resolved": "Resolved",
 	"target-purged": "התוכן שסומן נוקה ולא קיים יותר.",
 
 	"graph-label": "דיווחים יומיים",

public/language/he/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "דווח על משתמש זה",
     "already-flagged": "דווח כבר",
     "view-flag-report": "הצג דוח דיווחים",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "נושא זה מוזג בתוך <a href=\"%1\">%2</a>",
     "deleted_message": "נושא זה נמחק. רק משתמשים עם הרשאות מתאימות יוכלו לצפות בו.",
     "following_topic.message": "מעתה, תקבל התראה כאשר מישהו יעלה פוסט לנושא זה.",

public/language/hr/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Dodijeljeni",
 	"update": "Nadogradnja",
 	"updated": "Nadograđeno",
+	"resolved": "Resolved",
 	"target-purged": "Sadržaj koji je označen zastavom je odbačen i više nije dostupan.",
 
 	"graph-label": "Daily Flags",

public/language/hr/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Ova tema je obrisana. Samo korisnici sa privilegijom upravljanja tema je mogu vidjeti.",
     "following_topic.message": "Od sada ćete primati obavijesti kada netko objavi objavu u ovoj temi.",

public/language/hu/admin/manage/digest.json

@@ -14,7 +14,7 @@
 	"resent-day": "Daily digest resent",
 	"resent-week": "Weekly digest resent",
 	"resent-month": "Monthly digest resent",
-	"null": "<em>Never</em>",
+	"null": "<em>Soha</em>",
 	"manual-run": "Manual digest run:",
 
 	"no-delivery-data": "No delivery data found"

public/language/hu/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Assignee",
 	"update": "Frissítés",
 	"updated": "Frissítve",
+	"resolved": "Resolved",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"graph-label": "Daily Flags",

public/language/hu/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "A  témakör törölve lett. Csak a témakör-kezelési joggal rendelkező felhasználók láthatják.",
     "following_topic.message": "Mostantól értesítést kapsz, mikor valaki hozzászól ehhez a témakörhöz.",

public/language/id/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Assignee",
 	"update": "Update",
 	"updated": "Updated",
+	"resolved": "Resolved",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"graph-label": "Daily Flags",

public/language/id/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Topik ini telah dihapus. Hanya pengguna dengan hak manajemen topik yang dapat melihatnya.",
     "following_topic.message": "Saat ini kamu akan menerima pemberitahuan saat seseorang membuat posting di dalam topik ini.",

public/language/it/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Assegnatario",
 	"update": "Aggiorna",
 	"updated": "Aggiornato",
+	"resolved": "Resolved",
 	"target-purged": "Il contenuto di questa segnalazione è stato eliminato e non è più disponibile.",
 
 	"graph-label": "Segnalazioni Giornaliere",

public/language/it/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Segnala questo utente",
     "already-flagged": "Già segnalato",
     "view-flag-report": "Visualizza rapporto segnalazione",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "Questa discussione è stata unita a <a href=\"%1\">%2</a>",
     "deleted_message": "Questa discussione è stata eliminata. Solo gli utenti con diritti di gestione possono vederla.",
     "following_topic.message": "Da ora riceverai notifiche quando qualcuno posterà in questa discussione.",

public/language/ja/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "譲受人",
 	"update": "更新",
 	"updated": "更新されました",
+	"resolved": "Resolved",
 	"target-purged": "このフラグが参照しているコンテンツは切り離されており、利用できません。",
 
 	"graph-label": "Daily Flags",

public/language/ja/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "このスレッドが削除されました。スレッド管理権を持っているユーザーにしか読めません。",
     "following_topic.message": "このスレッドが更新された際に通知を受け取ります。",

public/language/ko/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "담당자",
 	"update": "업데이트",
 	"updated": "업데이트 되었습니다.",
+	"resolved": "Resolved",
 	"target-purged": "해당 신고된 컨텐츠는 완전 삭제 되었으며, 더이상 존재하지 않습니다.",
 
 	"graph-label": "Daily Flags",

public/language/ko/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "이 유저를 신고",
     "already-flagged": "이미 신고 처리됨",
     "view-flag-report": "신고 기록 보기",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "이 게시물은 삭제됐습니다. 게시물 관리 권한이 있는 사용자만 볼 수 있습니다.",
     "following_topic.message": "이제 이 게시물에 새 답글이 달리면 알림을 받습니다.",

public/language/lt/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Assignee",
 	"update": "Atnaujinti",
 	"updated": "Atnaujinta",
+	"resolved": "Resolved",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"graph-label": "Daily Flags",

public/language/lt/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Ši tema buvo ištrinta. Tik Vartotojai su temos redagavimo privilegijomis gali matyti ja",
     "following_topic.message": "Dabar jūs gausite pranešimus kai kas nors atrašys šioje temoje.",

public/language/lv/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Piešķirtais",
 	"update": "Atjaunot",
 	"updated": "Atjaunots",
+	"resolved": "Resolved",
 	"target-purged": "Saturs, uz kā attiecas atzīme, ir iztīrīts un vairs nav pieejams.",
 
 	"graph-label": "Daily Flags",

public/language/lv/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Šis temats ir izdzēsts. To var skatīt tikai lietotāji ar temata pārvaldības privilēģijām.",
     "following_topic.message": "Tagad saņemsi paziņojumus, kad kāds šai tematā rakstīs.",

public/language/ms/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Assignee",
 	"update": "Update",
 	"updated": "Updated",
+	"resolved": "Resolved",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"graph-label": "Daily Flags",

public/language/ms/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Topik ini telah dipadam. Hanya pengguna dengan kuasa pengurusan boleh melihatnya.",
     "following_topic.message": "Anda akan menerima makluman apabila ada kiriman ke dalam topik ini",

public/language/nb/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Assignee",
 	"update": "Update",
 	"updated": "Updated",
+	"resolved": "Resolved",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"graph-label": "Daily Flags",

public/language/nb/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Dette emnet har blitt slettet. Bare brukere med emnehåndterings-privilegier kan se den.",
     "following_topic.message": "Du vil nå motta varsler når noen skriver i denne tråden.",

public/language/nl/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Toegekend aan",
 	"update": "Bijwerken",
 	"updated": "Bijgewerkt",
+	"resolved": "Resolved",
 	"target-purged": "De inhoud waar deze markering naar verwijst is verwijderd en niet meer beschikbaar.",
 
 	"graph-label": "Dagelijkse markeringen",

public/language/nl/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Rapporteer deze gebruiker",
     "already-flagged": "Al gerapporteerd",
     "view-flag-report": "Rapportage inzien",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "Dit onderwerp is samengevoegd met <a href=\"%1\">%2</a>",
     "deleted_message": "Dit onderwerp is verwijderd. Alleen gebruikers met beheerrechten op onderwerpniveau kunnen dit inzien.",
     "following_topic.message": "Vanaf nu worden meldingen ontvangen zodra iemand een reactie op dit onderwerp geeft.",

public/language/pl/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Oflagowany",
 	"update": "Zaktualizuj",
 	"updated": "Zaaktualizowano",
+	"resolved": "Resolved",
 	"target-purged": "Treści, do których odnosi się ta flaga, zostały usunięte i nie są już dostępne.",
 
 	"graph-label": "Codzienne flagi",

public/language/pl/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Zgłoś tego użytkownika",
     "already-flagged": "Już zgłoszono",
     "view-flag-report": "Zobacz zgłoszenie",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "Ten temat został połączony z <a href=\"%1\">%2</a>",
     "deleted_message": "Ten temat został usunięty. Mogą go zobaczyć tylko użytkownicy upoważnieni do zarządzania tematami.",
     "following_topic.message": "Będziesz teraz otrzymywać powiadomienia o nowych odpowiedziach w tym temacie.",

public/language/pt-BR/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Responsável",
 	"update": "Atualizar",
 	"updated": "Atualizado",
+	"resolved": "Resolved",
 	"target-purged": "O conteúdo ao qual essa sinalização se referia foi removido e não está mais disponível.",
 
 	"graph-label": "Sinalizações Diárias",

public/language/pt-BR/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Este tópico foi deletado. Apenas usuários com privilégios de moderação de tópico podem vê-lo.",
     "following_topic.message": "Agora você receberá notificações quando alguém responder este tópico.",

public/language/pt-PT/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Responsável",
 	"update": "Atualizar",
 	"updated": "Atualizado",
+	"resolved": "Resolved",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"graph-label": "Denúncias Diárias",

public/language/pt-PT/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "Este tópico foi fundido com <a href=\"%1\">%2</a>",
     "deleted_message": "Este tópico foi eliminado. Apenas utilizadores com privilégios de moderação do tópico podem vê-lo.",
     "following_topic.message": "A partir de agora receberás uma notificação sempre que alguém publicar neste tópico.",

public/language/ro/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Assignee",
 	"update": "Update",
 	"updated": "Updated",
+	"resolved": "Resolved",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"graph-label": "Daily Flags",

public/language/ro/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Acest subiect a fost șters. Doar utilizatorii cu privilegii pentru moderarea subiectelor îl poate vedea.",
     "following_topic.message": "Vei primi notificări când cineva va posta un nou mesaj in acest subiect.",

public/language/ru/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Исполнитель",
 	"update": "Обновить",
 	"updated": "Обновлено",
+	"resolved": "Resolved",
 	"target-purged": "Сообщение, на которое поступила жалоба, было удалено и больше не доступно.",
 
 	"graph-label": "Жалоб в день",

public/language/ru/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Отметить этого пользователя",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "Эта тема была объединена с <a href=\"%1\">%2</a>",
     "deleted_message": "Эта тема была удалена. Только пользователи с правом управления темами могут её видеть.",
     "following_topic.message": "Теперь вы будете получать уведомления каждый раз, когда кто-нибудь напишет сообщение в эту тему.",

public/language/rw/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Assignee",
 	"update": "Update",
 	"updated": "Updated",
+	"resolved": "Resolved",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"graph-label": "Daily Flags",

public/language/rw/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Iki kiganiro cyamaze gukurwaho. Abantu babifitiye uburenganzira ni bo bonyine bashobora kukibona. ",
     "following_topic.message": "Ntabwo uzongera kubimenyeshwa nihagira umuntu ugira icyo yandika kuri iki kiganiro. ",

public/language/sc/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Assignee",
 	"update": "Update",
 	"updated": "Updated",
+	"resolved": "Resolved",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"graph-label": "Daily Flags",

public/language/sc/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.",
     "following_topic.message": "As a retzire notìficas si calincunu pùblica in custa arresonada.",

public/language/sk/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Nástupca",
 	"update": "Aktualizovať",
 	"updated": "Aktualizované",
+	"resolved": "Resolved",
 	"target-purged": "Obsah, na ktorý sa vzťahuje toto označenie, bol odstránený a už nie je k dispozícii.",
 
 	"graph-label": "Daily Flags",

public/language/sk/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Táto téma bola odstránená. Iba užívatelia s výsadami správcu ju môžu vidieť.",
     "following_topic.message": "Odteraz budete prijímať oznámenia, keď niekto prispeje do tejto témy.",

public/language/sl/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Assignee",
 	"update": "Update",
 	"updated": "Updated",
+	"resolved": "Resolved",
 	"target-purged": "The content this flag referred to has been purged and is no longer available.",
 
 	"graph-label": "Daily Flags",

public/language/sl/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Ta tema je bila izbrisana. Le uporabniki s pravicami upravljanja tem jo lahko vidijo.",
     "following_topic.message": "Če nekdo objavi v to temo, boste od sedaj  dobivali obvestila. ",

public/language/sr/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Заступник",
 	"update": "Ажурирај",
 	"updated": "Ажурирано",
+	"resolved": "Resolved",
 	"target-purged": "Садржај на који се односи ова заставица је очишћен и није више доступан.",
 
 	"graph-label": "Дневне заставице",

public/language/sr/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Ова тема је избрисана. Само корисници са привилегијама управљања темама је могу видети.",
     "following_topic.message": "Од сада ће те примати обавештења када неко одговори у овој теми.",

public/language/sv/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Tilldelad",
 	"update": "Uppdatera",
 	"updated": "Uppdatering",
+	"resolved": "Resolved",
 	"target-purged": "Innehållet denna flagga refererar till har rensats bort och är inte längre tillgängligt.",
 
 	"graph-label": "Dagliga flaggningar",

public/language/sv/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Det här ämnet har raderats. Endast användare med ämneshanterings-privilegier kan se det.",
     "following_topic.message": "Du kommer nu få notiser när någon gör inlägg i detta ämne.",

public/language/th/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "ผู้ได้รับมอบหมาย",
 	"update": "อัพเดท",
 	"updated": "ได้รับการอัพเดท",
+	"resolved": "Resolved",
 	"target-purged": "เนื้อหาที่ธงนี้อ้างถึงถูกลบออกและไม่มีอยู่ในระบบอีกต่อไป",
 
 	"graph-label": "Daily Flags",

public/language/th/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Topic นี้ถูกลบไปแล้ว เฉพาะผู้ใช้งานที่มีสิทธิ์ในการจัดการ Topic เท่านั้นที่จะมีสิทธิ์ในการเข้าชม",
     "following_topic.message": "คุณจะได้รับการแจ้งเตือนเมื่อมีคนโพสต์ในกระทู้นี้",

public/language/tr/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Vekil",
 	"update": "Güncelle",
 	"updated": "Güncellendi",
+	"resolved": "Resolved",
 	"target-purged": "Şikayet edilen içerik temizlendi ve artık mevcut değil.",
 
 	"graph-label": "Günlük Şikayetler",

public/language/tr/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Bu kullanıcıyı şikayet et",
     "already-flagged": "Halihazırda şikayet edilmiş",
     "view-flag-report": "Şikayet raporunu görüntüle",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "Bu başlık <a href=\"/topic/%1\">%2</a> ile birleştirildi",
     "deleted_message": "Bu başlık silindi. Sadece başlık düzenleme yetkisi olan kullanıcılar görebilir.",
     "following_topic.message": "Artık bir kullanıcı bu konuya yeni ileti gönderdiğinde siz de bildirim alacaksınız.",

public/language/uk/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Цю тему було видалено. Лише користувачі з правом керування темами можуть її бачити.",
     "following_topic.message": "Відтепер ви будете отримувати сповіщення коли хтось постить в цю тему.",

public/language/vi/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "Người được ủy nhiệm",
 	"update": "Cập nhật",
 	"updated": "Đã cập nhật",
+	"resolved": "Đã Xử Lý",
 	"target-purged": "Nội dung mà cờ này đề cập đến đã bị xóa và không còn nữa.",
 
 	"graph-label": "Cờ Hàng Ngày",
@@ -80,7 +81,7 @@
 	"modal-submit-confirm-text-help": "Gửi báo cáo nhanh sẽ thay thế bất kỳ lý do tùy chỉnh nào đã đưa ra.",
 
 	"bulk-actions": "‎Hành động hàng loạt‎",
-	"bulk-resolve": "Giải Quyết Cờ",
+	"bulk-resolve": "Xử Lý Cờ",
 	"bulk-success": "%1 cờ đã cập nhật",
 	"flagged-timeago-readable": "Đã Gắn Cờ <span class=\"timeago\" title=\"%1\"></span> (%2)"
 }

public/language/vi/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Gắn cờ người dùng này",
     "already-flagged": "Đã Được Gắn Cờ",
     "view-flag-report": "Xem Báo Cáo Gắn Cờ",
+    "resolve-flag": "Xử Lý Cờ",
     "merged_message": "Chủ đề này đã được gộp chung thành <a href=\"%1\">%2</a>",
     "deleted_message": "Chủ đề này đã bị xóa. Chỉ người dùng có quyền quản lý chủ đề mới được xem.",
     "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.",

public/language/zh-CN/admin/settings/advanced.json

@@ -5,9 +5,9 @@
 	"maintenance-mode.message": "维护消息",
 	"headers": "标题",
 	"headers.allow-from": "设置 ALLOW-FROM 来放置 NodeBB 于 iFrame 中",
-	"headers.csp-frame-ancestors": "Set Content-Security-Policy frame-ancestors header to Place NodeBB in an iFrame",
-	"headers.csp-frame-ancestors-help": "'none', 'self'(default) or list of URIs to allow.",
-	"headers.powered-by": "自定义由 NodeBB 发送的 \"Powered By\" 头部 ",
+	"headers.csp-frame-ancestors": "设置 Content-Security-Policy frame-ancestors 响应头来将 NodeBB 置于 iFrame 中",
+	"headers.csp-frame-ancestors-help": "在此输入 none 或是 self （默认），或一系列允许的 URI。",
+	"headers.powered-by": "自定义由 NodeBB 发送的 \"Powered By\" 响应头 ",
 	"headers.acao": "Access-Control-Allow-Origin",
 	"headers.acao-regex": "Access-Control-Allow-Origin 正则表达式",
 	"headers.acao-help": "要拒绝所有网站，请留空",

public/language/zh-CN/admin/settings/api.json

@@ -1,12 +1,12 @@
 {
 	"tokens": "令牌",
-	"settings": "Settings",
+	"settings": "设置",
 	"lead-text": "从此处，您可以配置对 NodeBB 中 Write API 的访问。",
-	"intro": "默认情况下，Write API根据用户的会话cookie对用户进行身份验证，但 NodeBB 也支持通过此页面生成的令牌进行身份验证。",
+	"intro": "默认情况下，Write API 根据用户的会话cookie对用户进行身份验证，但 NodeBB 也支持通过此页面生成的令牌进行身份验证。",
 	"docs": "单击此处访问完整的 API 规范",
 
-	"require-https": "Require API usage via HTTPS only",
-	"require-https-caveat": "<strong>Note</strong>: Some installations involving load balancers may proxy their requests to NodeBB using HTTP, in which case this option should remain disabled.",
+	"require-https": "要求 API 只能通过 HTTPS 调用",
+	"require-https-caveat": "<strong>注意：</strong>一些负载均衡器可能会使用 HTTP 代理对 NodeBB 的请求，在此情况下此选项应保持关闭状态。",
 
 	"uid": "用户ID",
 	"uid-help-text": "指定要与此令牌关联的用户ID。如果用户ID是 <code>0</code>, 它将被实危 <em>最高</em> 令牌，可以通过 <code>_uid</code> 参数假定其他用户的身份",

public/language/zh-CN/admin/settings/guest.json

@@ -1,7 +1,7 @@
 {
-	"settings": "Settings",
+	"settings": "设置",
 	"handles.enabled": "允许游客用户名",
 	"handles.enabled-help": "这个选项将允许游客使用一个额外的输入框来设置发帖时的用户名，如果被禁用，仅会统一显示为“游客”",
-	"topic-views.enabled": "Allow guests to increase topic view counts",
-	"reply-notifications.enabled": "Allow guests to generate reply notifications"
+	"topic-views.enabled": "将来自游客的浏览记入帖子的浏览数",
+	"reply-notifications.enabled": "允许游客生成回帖通知"
 }

public/language/zh-CN/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "受委托人",
 	"update": "更新",
 	"updated": "已更新",
+	"resolved": "Resolved",
 	"target-purged": "被举报的内容已经被清除，不再可用。",
 
 	"graph-label": "日举报",

public/language/zh-CN/register.json

@@ -18,14 +18,14 @@
     "agree_to_terms_of_use": "我同意使用条款",
     "terms_of_use_error": "您必须同意使用条款",
     "registration-added-to-queue": "您的注册正在等待批准。一旦通过，管理员会发送邮件通知您。",
-    "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.",
-    "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.",
+    "registration-queue-average-time": "我们通常的注册批准时间为 %1 小时 %2 分钟。",
+    "registration-queue-auto-approve-time": "您在此论坛的帐号将会在最迟  %1  小时后被完全激活。",
     "interstitial.intro": "在创建您的账户前我们需要一些额外信息。",
     "interstitial.errors-found": "我们无法完成您的注册：",
     "gdpr_agree_data": "我同意此网站对我个人信息的收集与处理。",
     "gdpr_agree_email": "我同意此网站向我发送摘要和通知邮件。",
     "gdpr_consent_denied": "您需要同意此网站收集与处理您的个人信息，以及向您发送电子邮件。",
-    "invite.error-admin-only": "Direct user registration has been disabled. Please contact an administrator for more details.",
-    "invite.error-invite-only": "Direct user registration has been disabled. You must be invited by an existing user in order to access this forum.",
-    "invite.error-invalid-data": "The registration data received does not correspond to our records. Please contact an administrator for more details"
+    "invite.error-admin-only": "开放的用户注册已被禁用，详情请联系管理员。",
+    "invite.error-invite-only": "开放的用户注册已被禁用，您必须被其他用户邀请才能访问此论坛。",
+    "invite.error-invalid-data": "您的注册资料与我们的记录不符，详情请联系管理员。"
 }

public/language/zh-CN/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "举报此用户",
     "already-flagged": "已举报",
     "view-flag-report": "查看举报报告",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "此主题已并入<a href=\"/topic/%1\">%2</a>",
     "deleted_message": "此主题已被删除。只有拥有主题管理权限的用户可以查看。",
     "following_topic.message": "当有人回复此主题时，您会收到通知。",

public/language/zh-TW/flags.json

@@ -6,6 +6,7 @@
 	"assignee": "受指派人",
 	"update": "更新",
 	"updated": "已更新",
+	"resolved": "Resolved",
 	"target-purged": "被舉報的內容已經被清除，不再可用。",
 
 	"graph-label": "日舉報",

public/language/zh-TW/topic.json

@@ -48,6 +48,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
+    "resolve-flag": "Resolve Flag",
     "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "此主題已被刪除。只有擁有主題管理權限的使用者可以查看。",
     "following_topic.message": "當有人回覆此主題時，您會收到通知。",