fix: tests

* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels

- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks

* docs: fix typo in comment

* test: spec changes

.github/workflows/test.yaml

@@ -5,10 +5,12 @@ on:
     branches:
       - master
       - develop
+      - webpack5
   pull_request:
     branches:
       - master
       - develop
+      - webpack5
 
 defaults:
   run:
@@ -21,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        node: [14, 16, 18]
+        node: [12, 14, 16]
         database: [mongo-dev, mongo, redis, postgres]
         include:
           # only run coverage once
@@ -95,7 +97,6 @@ jobs:
           SETUP: >-
             {
               "url": "http://127.0.0.1:4567",
-              "secret": "abcdef",
               "admin:username": "admin",
               "admin:email": "test@example.org",
               "admin:password": "hAN3Eg8W",
@@ -123,7 +124,6 @@ jobs:
           SETUP: >-
             {
               "url": "http://127.0.0.1:4567",
-              "secret": "abcdef",
               "admin:username": "admin",
               "admin:email": "test@example.org",
               "admin:password": "hAN3Eg8W",
@@ -154,7 +154,6 @@ jobs:
           SETUP: >-
             {
               "url": "http://127.0.0.1:4567/forum",
-              "secret": "abcdef",
               "admin:username": "admin",
               "admin:email": "test@example.org",
               "admin:password": "hAN3Eg8W",

CHANGELOG.md

@@ -1,179 +1,3 @@
-#### v2.0.0 (2022-05-04)
-
-##### Chores
-
-*  incrementing version number - v2.0.0 (f23c3ff5)
-*  update changelog for v1.19.7 (a764df52)
-* **deps:**
-  *  update dependency mocha to v10 (a7986773)
-  *  bump nodebb-plugin-dbsearch from 5.1.3 to 5.1.4 in /install (#10545) (a2e263a1)
-  *  update dependency smtp-server to v3.11.0 (62f1c78a)
-* **i18n:**
-  *  fallback strings for new resources: nodebb.post-queue (d617c665)
-  *  fallback strings for new resources: nodebb.post-queue (3492dd11)
-  *  fallback strings for new resources: nodebb.error, nodebb.flags (72d47a0b)
-
-##### New Features
-
-*  show number of selected posts in reject confirm (012860a4)
-*  post queue bulk actions closes #10520, fix #10555, (23175110)
-*  output canonical URL as last line on NodeBB boot (e4a9c078)
-
-##### Bug Fixes
-
-* **deps:**
-  *  update dependency @socket.io/redis-adapter to v7.2.0 (#10571) (c3c77915)
-  *  update dependency autoprefixer to v10.4.7 (#10563) (68168a7d)
-  *  update dependency nodebb-theme-persona to v12.0.1 (#10561) (1d446e14)
-  *  update dependency nodebb-plugin-mentions to v3.0.10 (#10560) (eb3c398e)
-  *  update dependency nodebb-plugin-dbsearch to v5.1.5 (#10559) (c3ff28ff)
-  *  update dependency nodebb-plugin-mentions to v3.0.9 (#10554) (1acbe4c1)
-  *  update dependency postcss to v8.4.13 (#10553) (6217db00)
-  *  update dependency express to v4.18.1 (#10550) (b0dc5615)
-  *  pin dependency webpack to 5.72.0 (#10549) (672ab25a)
-  *  update dependency cron to v1.8.3 (#10543) (d6843294)
-  *  update dependency bootbox to v5.5.3 (#10531) (8d47f352)
-  *  update dependency nodemailer to v6.7.4 (#10540) (afefee08)
-*  #10569, fix category move event text (ea01ba01)
-
-##### Refactors
-
-*  not used anymore (d2e6f317)
-
-#### v1.19.7 (2022-04-28)
-
-##### Breaking Changes
-
-*  #10443, regression where sorted-list items did not render into the DOM in the predicted order [breaking] (46fbe156)
-
-##### Chores
-
-*  incrementing version number - v1.19.7 (0c4850e2)
-*  update changelog for v1.19.6 (acca7811)
-* **deps:**
-  *  update commitlint monorepo to v16.2.4 (0d9179f7)
-  *  update dependency lint-staged to v12.4.1 (#10527) (804542e4)
-  *  bump socket.io from 4.4.1 to 4.5.0 in /install (#10523) (0c2d015c)
-  *  update dependency eslint to v8.14.0 (#10514) (40b7ff4b)
-  *  update dependency lint-staged to v12.4.0 (fff818c6)
-  *  update dependency lint-staged to v12.3.8 (7c1d98c7)
-* **i18n:**  fallback strings for new resources: nodebb.admin-settings-reputation, nodebb.error (01e65395)
-
-##### New Features
-
-*  make it simpler to use redis sentinels (82389469)
-*  closes #10501, minimum reputation to chat (b28f9f77)
-
-##### Bug Fixes
-
-*  typo in hook name (21dbd476)
-*  upload test for latest sharp (424db9ff)
-*  #10502, allow unblocking admin/mod (b9f91643)
-* **deps:**
-  *  update dependency express to v4.18.0 (#10526) (5ae690a6)
-  *  update socket.io packages to v4.5.0 (#10522) (d86c447a)
-  *  update dependency autoprefixer to v10.4.5 (#10521) (5ce4c874)
-  *  update dependency nodebb-plugin-2factor to v3.0.7 (#10510) (b81a0cfe)
-  *  update dependency nodebb-widget-essentials to v5.0.11 (#10517) (a767d623)
-  *  update dependency sharp to v0.30.4 (#10504) (a36911fc)
-  *  update dependency prompt to v1.3.0 (#10487) (07678fb5)
-  *  update dependency nconf to v0.12.0 (#10496) (fe492b11)
-  *  update dependency archiver to v5.3.1 (#10500) (6c727859)
-
-##### Refactors
-
-*  closes #10509 (7f241dbb)
-*  show invalid uri (ac125538)
-*  skip content length check if submitting from post-queue (a8e642ad)
-
-##### Tests
-
-*  remove node18 until nodemailer is fixed (50658a82)
-*  remove node 12, add 18 (976914e7)
-
-#### v1.19.6 (2022-04-13)
-
-##### Chores
-
-*  incrementing version number - v1.19.6 (283a0072)
-*  update changelog for v1.19.5 (05032ca2)
-* **deps:**
-  *  bump semver from 7.3.6 to 7.3.7 in /install (#10493) (65cec8d0)
-  *  update dependency grunt to v1.5.2 (9f496659)
-  *  update dependency grunt to v1.5.1 (0a8bf44e)
-  *  update dependency grunt to v1.5.0 (e82d8bb6)
-  *  update dependency eslint to v8.13.0 (bc3aabb4)
-  *  update dependency eslint-plugin-import to v2.26.0 (a2ebf53b)
-  *  bump nodebb-theme-persona from 11.4.3 to 11.4.4 in /install (#10437) (5b1789c1)
-  *  bump nodebb-plugin-composer-default in /install (#10438) (c8c42933)
-  *  update dependency eslint to v8.12.0 (a6590e20)
-  *  update dependency lint-staged to v12.3.7 (#10407) (5f36ad39)
-* **i18n:**  fallback strings for new resources: nodebb.post-queue (a06d1246)
-
-##### New Features
-
-*  #10460, add cutoff to suggested topics (799e94e0)
-*  add response:helpers.notAllowed (e8058ca3)
-*  add filter:image.stripEXIF (b8765df5)
-*  add confirm to reject, closes #10427 (538ad9e1)
-*  allow client-side hook registration chaining (b88bb3cf)
-*  delete flagId field from post/user on flag purge (31251282)
-*  add flags.purge (3b529b84)
-*  new admin events, closes #10405 (421ba6e1)
-*  add Albanian localisation :tada: (309968bf)
-
-##### Bug Fixes
-
-*  dont add caller to arrays (5316029f)
-*  #10491, don't leak deleted message in cleanedContent (c52401da)
-*  #10473, trim trailing slashes on config url (9f91db16)
-*  closes #10436, fix DST issue on acp dashboard (39877763)
-*  delete history as well (002a241c)
-*  handle purge posts as well (93b60532)
-*  byCid removal, targetCid not stored in flagObj (03fdb5be)
-*  upgrade script (55be4202)
-*  column counts for other privileges (2b9b2b4a)
-* **deps:**
-  *  update dependency nodebb-plugin-mentions to v3.0.8 (#10490) (7c733e9c)
-  *  update dependency winston to v3.7.2 (#10454) (dc03a2f9)
-  *  update dependency nconf to v0.11.4 (#10481) (f253bbdd)
-  *  update dependency yargs to v17.4.1 (#10480) (bbf2b73e)
-  *  update dependency ioredis to v5.0.4 (#10479) (88200ec1)
-  *  update dependency html-to-text to v8.2.0 (#10471) (91026e5f)
-  *  update dependency semver to v7.3.6 (#10466) (c50de911)
-  *  update dependency html-to-text to v8.1.1 (#10470) (b3ec8059)
-  *  update dependency nodebb-widget-essentials to v5.0.10 (#10461) (b6517cfd)
-  *  update dependency body-parser to v1.20.0 (#10450) (26511185)
-  *  update dependency spdx-license-list to v6.5.0 (#10452) (5e37f34e)
-  *  update dependency graceful-fs to v4.2.10 (#10457) (947fa193)
-  *  update dependency mongodb to v4.5.0 (#10458) (30f728ca)
-  *  update dependency ioredis to v5.0.3 (#10446) (0d744d30)
-  *  update dependency ioredis to v5 (#10434) (060ad1b0)
-  *  update dependency nodebb-plugin-2factor to v3.0.6 (#10435) (0ac426e0)
-  *  update dependency nodebb-plugin-composer-default to v7.0.21 (#10429) (898e0e89)
-  *  update dependency nodebb-plugin-spam-be-gone to v0.8.1 (#10425) (47399bfe)
-  *  update dependency sortablejs to v1.15.0 (#10418) (12cd1df2)
-  *  update dependency nodemailer to v6.7.3 (#10421) (7e542495)
-  *  update dependency yargs to v17.4.0 (#10416) (eaa05517)
-  *  update dependency nodebb-theme-persona to v11.4.3 (#10414) (720a9dba)
-  *  update dependency connect-redis to v6.1.3 (#10390) (06594131)
-* **security:**
-  *  explicitly declare cache-control header instead of using middleware (38ca73c4)
-  *  cache-control on all pages using setupPageRoute or setupApiRoute, and 404 controllers. (1f6f389f)
-  *  explicitly set cache-control 'private' on any page where a header is built (e39cdd49)
-
-##### Performance Improvements
-
-*  WIP #10449, allow array of pids for posts.purge (#10465) (76797371)
-*  #10410, faster upgrade script (dab22d5f)
-
-##### Refactors
-
-*  replace deprecated String.prototype.substr() (#10432) (200f0b2e)
-*  remove some verbose logging (9abe22a0)
-*  :trollface: (29b86b32)
-*  shorter generateTopicClass (f76c0e89)
-
 #### v1.19.5 (2022-03-16)
 
 ##### Chores

app.js

@@ -38,7 +38,7 @@ global.env = process.env.NODE_ENV || 'production';
 // Alternate configuration file support
 const configFile = path.resolve(__dirname, nconf.any(['config', 'CONFIG']) || 'config.json');
 
-const configExists = file.existsSync(configFile) || (nconf.get('url') && nconf.get('secret') && nconf.get('database'));
+const configExists = file.existsSync(configFile) || (nconf.get('url') && nconf.get('database'));
 
 const prestart = require('./src/prestart');
 

install/data/defaults.json

@@ -81,7 +81,6 @@
     "upvotesPerUserPerDay": 6,
     "downvotesPerDay": 10,
     "downvotesPerUserPerDay": 3,
-    "min:rep:chat": 0,
     "min:rep:downvote": 0,
     "min:rep:upvote": 0,
     "min:rep:flag": 0,

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "2.0.1",
+    "version": "2.0.0-beta.1",
     "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -29,19 +29,19 @@
     },
     "dependencies": {
         "@adactive/bootstrap-tagsinput": "0.8.2",
-        "ace-builds": "1.5.1",
+        "ace-builds": "1.4.14",
-        "archiver": "5.3.1",
+        "archiver": "5.3.0",
         "async": "3.2.3",
-        "autoprefixer": "10.4.7",
+        "autoprefixer": "10.4.4",
         "bcryptjs": "2.4.3",
         "benchpressjs": "2.4.3",
-        "body-parser": "1.20.0",
+        "body-parser": "1.19.2",
-        "bootbox": "5.5.3",
+        "bootbox": "5.5.2",
         "bootstrap": "3.4.1",
         "chalk": "4.1.2",
         "chart.js": "2.9.4",
         "cli-graph": "3.2.2",
-        "clipboard": "2.0.11",
+        "clipboard": "2.0.10",
         "colors": "1.4.0",
         "commander": "7.2.0",
         "compare-versions": "4.1.3",
@@ -52,19 +52,18 @@
         "connect-pg-simple": "7.0.0",
         "connect-redis": "6.1.3",
         "cookie-parser": "1.4.6",
-        "cron": "1.8.3",
+        "cron": "1.8.2",
         "cropperjs": "1.5.12",
         "csurf": "1.11.0",
         "daemon": "1.1.0",
         "diff": "5.0.0",
-        "express": "4.18.1",
+        "express": "4.17.3",
-        "express-session": "1.17.3",
+        "express-session": "1.17.2",
         "express-useragent": "1.0.15",
         "file-loader": "6.2.0",
-        "fs-extra": "10.1.0",
+        "graceful-fs": "4.2.9",
-        "graceful-fs": "4.2.10",
         "helmet": "5.0.2",
-        "html-to-text": "8.2.0",
+        "html-to-text": "8.1.0",
         "ipaddr.js": "2.0.1",
         "jquery": "3.6.0",
         "jquery-deserialize": "2.0.0",
@@ -81,53 +80,53 @@
         "material-design-lite": "1.3.0",
         "mime": "3.0.0",
         "mkdirp": "1.0.4",
-        "mongodb": "4.6.0",
+        "mongodb": "4.4.1",
         "morgan": "1.10.0",
         "mousetrap": "1.6.5",
         "multiparty": "4.2.3",
         "@nodebb/bootswatch": "3.4.2",
-        "nconf": "0.12.0",
+        "nconf": "0.11.3",
-        "nodebb-plugin-2factor": "4.0.0",
+        "nodebb-plugin-2factor": "https://github.com/NodeBB/nodebb-plugin-2factor#webpack5",
-        "nodebb-plugin-composer-default": "8.0.0",
+        "nodebb-plugin-composer-default": "https://github.com/nodebb/nodebb-plugin-composer-default.git#webpack5",
-        "nodebb-plugin-dbsearch": "5.1.5",
+        "nodebb-plugin-dbsearch": "5.1.3",
-        "nodebb-plugin-emoji": "4.0.4",
+        "nodebb-plugin-emoji": "https://github.com/NodeBB/nodebb-plugin-emoji.git#webpack5",
-        "nodebb-plugin-emoji-android": "3.0.0",
+        "nodebb-plugin-emoji-android": "2.0.5",
-        "nodebb-plugin-markdown": "10.0.0",
+        "nodebb-plugin-markdown": "https://github.com/julianlam/nodebb-plugin-markdown.git#webpack5",
-        "nodebb-plugin-mentions": "3.0.10",
+        "nodebb-plugin-mentions": "3.0.7",
-        "nodebb-plugin-spam-be-gone": "1.0.0",
+        "nodebb-plugin-spam-be-gone": "https://github.com/akhoury/nodebb-plugin-spam-be-gone.git#webpack5",
         "nodebb-rewards-essentials": "0.2.1",
-        "nodebb-theme-lavender": "6.0.0",
+        "nodebb-theme-lavender": "https://github.com/nodebb/nodebb-theme-lavender.git#webpack5",
-        "nodebb-theme-persona": "12.0.2",
+        "nodebb-theme-persona": "https://github.com/nodebb/nodebb-theme-persona.git#webpack5",
-        "nodebb-theme-slick": "2.0.1",
+        "nodebb-theme-slick": "https://github.com/pichalite/nodebb-theme-slick.git#webpack5",
         "nodebb-theme-vanilla": "12.1.17",
-        "nodebb-widget-essentials": "6.0.0",
+        "nodebb-widget-essentials": "https://github.com/nodebb/nodebb-widget-essentials.git#webpack5",
-        "nodemailer": "6.7.5",
+        "nodemailer": "6.7.3",
         "nprogress": "0.2.0",
         "passport": "0.5.2",
         "passport-http-bearer": "1.0.1",
         "passport-local": "1.0.0",
         "pg": "8.7.3",
         "pg-cursor": "2.7.3",
-        "postcss": "8.4.13",
+        "postcss": "8.4.12",
         "postcss-clean": "1.2.0",
-        "prompt": "1.3.0",
+        "prompt": "1.2.2",
-        "ioredis": "5.0.5",
+        "ioredis": "4.28.5",
         "request": "2.88.2",
         "request-promise-native": "1.0.9",
         "rimraf": "3.0.2",
         "rss": "1.2.2",
         "sanitize-html": "2.7.0",
-        "semver": "7.3.7",
+        "semver": "7.3.5",
         "serve-favicon": "2.5.0",
-        "sharp": "0.30.4",
+        "sharp": "0.30.3",
         "sitemap": "7.1.1",
         "slideout": "1.0.1",
-        "socket.io": "4.5.1",
+        "socket.io": "4.4.1",
         "socket.io-adapter-cluster": "1.0.1",
-        "socket.io-client": "4.5.0",
+        "socket.io-client": "4.4.1",
-        "@socket.io/redis-adapter": "7.2.0",
+        "@socket.io/redis-adapter": "7.1.0",
         "sortablejs": "1.15.0",
-        "spdx-license-list": "6.5.0",
+        "spdx-license-list": "6.4.0",
         "spider-detector": "2.0.0",
         "textcomplete": "0.18.2",
         "textcomplete.contenteditable": "0.1.1",
@@ -137,32 +136,32 @@
         "uglify-es": "3.3.9",
         "validator": "13.7.0",
         "visibilityjs": "2.0.2",
-        "webpack": "5.72.1",
+        "webpack": "^5.68.0",
         "webpack-merge": "5.8.0",
-        "winston": "3.7.2",
+        "winston": "3.6.0",
         "xml": "1.0.1",
         "xregexp": "5.1.0",
-        "yargs": "17.5.1",
+        "yargs": "17.4.0",
         "zxcvbn": "4.4.2"
     },
     "devDependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@commitlint/cli": "16.3.0",
+        "@commitlint/cli": "16.2.3",
-        "@commitlint/config-angular": "16.3.0",
+        "@commitlint/config-angular": "16.2.3",
         "coveralls": "3.1.1",
-        "eslint": "8.15.0",
+        "eslint": "8.11.0",
         "eslint-config-nodebb": "0.1.1",
-        "eslint-plugin-import": "2.26.0",
+        "eslint-plugin-import": "2.25.4",
-        "grunt": "1.5.3",
+        "grunt": "1.4.1",
         "grunt-contrib-watch": "1.1.0",
-        "husky": "8.0.1",
+        "husky": "7.0.4",
         "jsdom": "19.0.0",
-        "lint-staged": "12.4.1",
+        "lint-staged": "12.3.7",
-        "mocha": "10.0.0",
+        "mocha": "9.2.2",
         "mocha-lcov-reporter": "1.3.0",
         "mockdate": "3.0.5",
         "nyc": "15.1.0",
-        "smtp-server": "3.11.0"
+        "smtp-server": "3.10.0"
     },
     "bugs": {
         "url": "https://github.com/NodeBB/NodeBB/issues"

install/web.js

@@ -58,7 +58,7 @@ web.install = async function (port) {
 	winston.info(`Launching web installer on port ${port}`);
 
 	app.use(express.static('public', {}));
-	app.use('/assets', express.static(path.join(__dirname, '../build/public'), {}));
+	app.use('/assets', express.static(path.join(__dirname, '../build/webpack'), {}));
 
 	app.engine('tpl', (filepath, options, callback) => {
 		filepath = filepath.replace(/\.tpl$/, '.js');
@@ -206,20 +206,15 @@ async function launch(req, res) {
 		}
 
 		const filesToDelete = [
-			path.join(__dirname, '../public', 'installer.css'),
+			'installer.css',
-			path.join(__dirname, '../public', 'bootstrap.min.css'),
+			'installer.min.js',
-			path.join(__dirname, '../build/public', 'installer.min.js'),
+			'bootstrap.min.css',
 		];
-		try {
+		await Promise.all(
-			await Promise.all(
+			filesToDelete.map(
-				filesToDelete.map(
+				filename => fs.promises.unlink(path.join(__dirname, '../public', filename))
-					filename => fs.promises.unlink(filename)
+			)
-				)
+		);
-			);
-		} catch (err) {
-			console.log(err.stack);
-		}
-
 		child.unref();
 		process.exit(0);
 	} catch (err) {

public/language/ar/admin/manage/admins-mods.json

@@ -1,10 +1,8 @@
 {
     "administrators": "Administrators",
     "global-moderators": "Global Moderators",
-    "moderators": "Moderators",
     "no-global-moderators": "No Global Moderators",
-    "no-sub-categories": "No subcategories",
+    "moderators-of-category": "%1 Moderators",
-    "subcategories": "%1 subcategories",
     "no-moderators": "No Moderators",
     "add-administrator": "Add Administrator",
     "add-global-moderator": "Add Global Moderator",

public/language/ar/admin/settings/reputation.json

@@ -10,7 +10,6 @@
 	"min-rep-downvote": "Minimum reputation to downvote posts",
 	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
 	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
-	"min-rep-chat": "Minimum reputation to send chat messages",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",

public/language/ar/error.json

@@ -61,7 +61,6 @@
     "no-group": "مجموعة غير موجودة",
     "no-user": "اسم مستخدم غير موجود",
     "no-teaser": "مقتطف غير موجود",
-    "no-flag": "Flag does not exist",
     "no-privileges": "لاتملك الصلاحيات اللازمة للقيام بهذه العملية",
     "category-disabled": "قائمة معطلة",
     "topic-locked": "الموضوع مقفول",
@@ -158,7 +157,6 @@
     "already-voting-for-this-post": "لقد شاركت بالتصويت ، ألا تذكر؟",
     "reputation-system-disabled": "نظام السمعة معطل",
     "downvoting-disabled": "التصويتات السلبية معطلة",
-    "not-enough-reputation-to-chat": "You need %1 reputation to chat",
     "not-enough-reputation-to-upvote": "You need %1 reputation to upvote",
     "not-enough-reputation-to-downvote": "You need %1 reputation to downvote",
     "not-enough-reputation-to-flag": "You need %1 reputation to flag this post",

public/language/ar/flags.json

@@ -38,7 +38,6 @@
 	"delete-post": "حذف المشاركة",
 	"purge-post": "Purge Post",
 	"restore-post": "استرجاع المشاركة",
-	"delete": "Delete Flag",
 
 	"user-view": "مشاهدة الملف الشخصي",
 	"user-edit": "تعديل الملف الشخصي",
@@ -47,10 +46,8 @@
 	"add-note": "اضافة ملاحظة",
 	"no-notes": "No shared notes.",
 	"delete-note-confirm": "Are you sure you want to delete this flag note?",
-	"delete-flag-confirm": "Are you sure you want to delete this flag?",
 	"note-added": "Note Added",
 	"note-deleted": "Note Deleted",
-	"flag-deleted": "Flag Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "No flag history.",

public/language/ar/post-queue.json

@@ -17,15 +17,5 @@
 	"reject": "Reject",
 	"remove": "Remove",
 	"notify": "Notify",
-	"notify-user": "Notify User",
+	"notify-user": "Notify User"
-	"confirm-reject": "Do you want to reject this post?",
-	"bulk-actions": "Bulk Actions",
-	"accept-all": "Accept All",
-	"accept-selected": "Accept Selected",
-	"reject-all": "Reject All",
-	"reject-all-confirm": "Do you want to reject all posts?",
-	"reject-selected": "Reject Selected",
-	"reject-selected-confirm": "Do you want to reject %1 selected posts?",
-	"bulk-accept-success": "%1 posts accepted",
-	"bulk-reject-success": "%1 posts rejected"
 }

public/language/ar/user.json

@@ -1,6 +1,5 @@
 {
     "banned": "محظور",
-    "muted": "Muted",
     "offline": "غير متصل",
     "deleted": "محذوف",
     "username": "إسم المستخدم",
@@ -157,10 +156,6 @@
     "info.banned-permanently": "محظور بشكل دائم",
     "info.banned-reason-label": "سبب",
     "info.banned-no-reason": "لم يتم إعطاء سبب.",
-    "info.mute-history": "Recent Mute History",
-    "info.no-mute-history": "This user has never been muted",
-    "info.muted-until": "Muted until %1",
-    "info.muted-expiry": "Expiry",
     "info.muted-no-reason": "No reason given.",
     "info.username-history": "سجل اسم المستخدم",
     "info.email-history": "سجل البريد الإلكتروني",

public/language/bg/admin/manage/admins-mods.json

@@ -1,10 +1,8 @@
 {
     "administrators": "Администратори",
     "global-moderators": "Глобални модератори",
-    "moderators": "Модератори",
     "no-global-moderators": "Няма глобални модератори",
-    "no-sub-categories": "Няма подкатегории",
+    "moderators-of-category": "%1 модератори",
-    "subcategories": "%1 подкатегории",
     "no-moderators": "Няма модератори",
     "add-administrator": "Добавяне на администратор",
     "add-global-moderator": "Добавяне на глобален модератор",

public/language/bg/admin/settings/reputation.json

@@ -10,7 +10,6 @@
 	"min-rep-downvote": "Минимална репутация, необходима за отрицателно гласуване за публикации",
 	"downvotes-per-day": "Отрицателни гласувания за ден (задайте 0 за неограничен брой)",
 	"downvotes-per-user-per-day": "Отрицателни гласувания за потребител за ден (задайте 0 за неограничен брой)",
-	"min-rep-chat": "Минимална репутация, необходима за изпращане на съобщения в разговори",
 	"min-rep-flag": "Минимална репутация, необходима за докладване на публикации",
 	"min-rep-website": "Минимална репутация, необходима за добавяне на полето „Уебсайт“ към профила на потребителя",
 	"min-rep-aboutme": "Минимална репутация, необходима за добавяне на полето „За мен“ към профила на потребителя",

public/language/bg/error.json

@@ -61,7 +61,6 @@
     "no-group": "Групата не съществува",
     "no-user": "Потребителят не съществува",
     "no-teaser": "Резюмето не съществува",
-    "no-flag": "Докладът не съществува",
     "no-privileges": "Нямате достатъчно права за това действие.",
     "category-disabled": "Категорията е изключена",
     "topic-locked": "Темата е заключена",
@@ -158,7 +157,6 @@
     "already-voting-for-this-post": "Вече сте дали глас за тази публикация.",
     "reputation-system-disabled": "Системата за репутация е изключена.",
     "downvoting-disabled": "Отрицателното гласуване е изключено",
-    "not-enough-reputation-to-chat": "Репутацията Ви трябва да бъде поне %1, за да участвате в разговори",
     "not-enough-reputation-to-upvote": "Репутацията Ви трябва да бъде поне %1, за да гласувате положително",
     "not-enough-reputation-to-downvote": "Репутацията Ви трябва да бъде поне %1, за да гласувате отрицателно",
     "not-enough-reputation-to-flag": "Репутацията Ви трябва да бъде поне %1, за да докладвате тази публикация",

public/language/bg/flags.json

@@ -38,7 +38,6 @@
 	"delete-post": "Изтриване на публикацията",
 	"purge-post": "Изчистване на публикацията",
 	"restore-post": "Възстановяване на публикацията",
-	"delete": "Изтриване на доклада",
 
 	"user-view": "Преглед на профила",
 	"user-edit": "Редактиране на профила",
@@ -47,10 +46,8 @@
 	"add-note": "Добавяне на бележка",
 	"no-notes": "Няма споделени бележки.",
 	"delete-note-confirm": "Наистина ли искате да изтриете тази бележка към доклада?",
-	"delete-flag-confirm": "Наистина ли искате да изтриете този доклад?",
 	"note-added": "Бележката е добавена",
 	"note-deleted": "Бележката е изтрита",
-	"flag-deleted": "Докладът е изтрит",
 
 	"history": "Акаунт и история на докладванията",
 	"no-history": "Няма история на доклада.",

public/language/bg/post-queue.json

@@ -17,15 +17,5 @@
 	"reject": "Отказване",
 	"remove": "Премахване",
 	"notify": "Известяване",
-	"notify-user": "Известяване на потребителя",
+	"notify-user": "Известяване на потребителя"
-	"confirm-reject": "Искате ли да отхвърлите тази публикация?",
-	"bulk-actions": "Групови действия",
-	"accept-all": "Приемане на всички",
-	"accept-selected": "Приемане на избраните",
-	"reject-all": "Отхвърляне на всички",
-	"reject-all-confirm": "Наистина ли искате да отхвърлите всички публикации?",
-	"reject-selected": "Отхвърляне на избраните",
-	"reject-selected-confirm": "Наистина ли искате да отхвърлите %1 избрани публикации?",
-	"bulk-accept-success": "Одобрени публикации: %1",
-	"bulk-reject-success": "Отхвърлени публикации: %1"
 }

public/language/bg/user.json

@@ -1,6 +1,5 @@
 {
     "banned": "Блокиран",
-    "muted": "Заглушен",
     "offline": "Извън линия",
     "deleted": "Изтрит",
     "username": "Потребителско име",
@@ -157,10 +156,6 @@
     "info.banned-permanently": "Блокиран за постоянно",
     "info.banned-reason-label": "Причина",
     "info.banned-no-reason": "Няма посочена причина.",
-    "info.mute-history": "Скорошна история на заглушаванията",
-    "info.no-mute-history": "Този потребител никога не е бил заглушаван",
-    "info.muted-until": "Заглушен до %1",
-    "info.muted-expiry": "Давност",
     "info.muted-no-reason": "Няма посочена причина.",
     "info.username-history": "История на потребителските имена",
     "info.email-history": "Историята на е-пощите",

public/language/bn/admin/manage/admins-mods.json

@@ -1,10 +1,8 @@
 {
     "administrators": "Administrators",
     "global-moderators": "Global Moderators",
-    "moderators": "Moderators",
     "no-global-moderators": "No Global Moderators",
-    "no-sub-categories": "No subcategories",
+    "moderators-of-category": "%1 Moderators",
-    "subcategories": "%1 subcategories",
     "no-moderators": "No Moderators",
     "add-administrator": "Add Administrator",
     "add-global-moderator": "Add Global Moderator",

public/language/bn/admin/settings/reputation.json

@@ -10,7 +10,6 @@
 	"min-rep-downvote": "Minimum reputation to downvote posts",
 	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
 	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
-	"min-rep-chat": "Minimum reputation to send chat messages",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",

public/language/bn/error.json

@@ -61,7 +61,6 @@
     "no-group": "এই গ্রুপ অস্তিত্বহীন",
     "no-user": "এই নামে কোন সদস্য নেই",
     "no-teaser": "টিজারটি খুজে পাওয়া যায় নি",
-    "no-flag": "Flag does not exist",
     "no-privileges": "এই কাজটির জন্য আপনার পর্যাপ্ত অধিকার নেই",
     "category-disabled": "বিভাগটি নিষ্ক্রিয়",
     "topic-locked": "টপিক বন্ধ",
@@ -158,7 +157,6 @@
     "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "সম্মাননা ব্যাবস্থা নিস্ক্রীয় রাখা হয়েছে",
     "downvoting-disabled": "ঋণাত্মক ভোট নিস্ক্রীয় রাখা হয়েছে।",
-    "not-enough-reputation-to-chat": "You need %1 reputation to chat",
     "not-enough-reputation-to-upvote": "You need %1 reputation to upvote",
     "not-enough-reputation-to-downvote": "You need %1 reputation to downvote",
     "not-enough-reputation-to-flag": "You need %1 reputation to flag this post",

public/language/bn/flags.json

@@ -38,7 +38,6 @@
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",
-	"delete": "Delete Flag",
 
 	"user-view": "View Profile",
 	"user-edit": "Edit Profile",
@@ -47,10 +46,8 @@
 	"add-note": "Add Note",
 	"no-notes": "No shared notes.",
 	"delete-note-confirm": "Are you sure you want to delete this flag note?",
-	"delete-flag-confirm": "Are you sure you want to delete this flag?",
 	"note-added": "Note Added",
 	"note-deleted": "Note Deleted",
-	"flag-deleted": "Flag Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "No flag history.",

public/language/bn/post-queue.json

@@ -17,15 +17,5 @@
 	"reject": "Reject",
 	"remove": "Remove",
 	"notify": "Notify",
-	"notify-user": "Notify User",
+	"notify-user": "Notify User"
-	"confirm-reject": "Do you want to reject this post?",
-	"bulk-actions": "Bulk Actions",
-	"accept-all": "Accept All",
-	"accept-selected": "Accept Selected",
-	"reject-all": "Reject All",
-	"reject-all-confirm": "Do you want to reject all posts?",
-	"reject-selected": "Reject Selected",
-	"reject-selected-confirm": "Do you want to reject %1 selected posts?",
-	"bulk-accept-success": "%1 posts accepted",
-	"bulk-reject-success": "%1 posts rejected"
 }

public/language/bn/user.json

@@ -1,6 +1,5 @@
 {
     "banned": "নিষিদ্ধ",
-    "muted": "Muted",
     "offline": "অফলাইন",
     "deleted": "Deleted",
     "username": "সদস্যের নাম",
@@ -157,10 +156,6 @@
     "info.banned-permanently": "Banned permanently",
     "info.banned-reason-label": "Reason",
     "info.banned-no-reason": "No reason given.",
-    "info.mute-history": "Recent Mute History",
-    "info.no-mute-history": "This user has never been muted",
-    "info.muted-until": "Muted until %1",
-    "info.muted-expiry": "Expiry",
     "info.muted-no-reason": "No reason given.",
     "info.username-history": "Username History",
     "info.email-history": "Email History",

public/language/cs/admin/manage/admins-mods.json

@@ -1,10 +1,8 @@
 {
     "administrators": "Správci",
     "global-moderators": "Hlavní moderátoři",
-    "moderators": "Moderators",
     "no-global-moderators": "Žádní hlavní moderátoři",
-    "no-sub-categories": "No subcategories",
+    "moderators-of-category": "%1 moderátorů",
-    "subcategories": "%1 subcategories",
     "no-moderators": "Žádní moderátoři",
     "add-administrator": "Přidat správce",
     "add-global-moderator": "Přidat hlavního moderátora",

public/language/cs/admin/settings/reputation.json

@@ -10,7 +10,6 @@
 	"min-rep-downvote": "Minimální reputace pro vyjádření nesouhlasu s příspěvkem",
 	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
 	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
-	"min-rep-chat": "Minimum reputation to send chat messages",
 	"min-rep-flag": "Minimální reputace pro označení příspěvků",
 	"min-rep-website": "Minimální reputace pro přidání „Webové stránky” do uživatelského profilu",
 	"min-rep-aboutme": "Minimální reputace pro přidání „O mně” do uživatelského profilu",

public/language/cs/error.json

@@ -61,7 +61,6 @@
     "no-group": "Skupina neexistuje",
     "no-user": "Uživatel neexistuje",
     "no-teaser": "Chyták neexistuje",
-    "no-flag": "Flag does not exist",
     "no-privileges": "Na tuto akci nemáte dostatečné oprávnění.",
     "category-disabled": "Kategorie zakázána",
     "topic-locked": "Téma uzamknuto",
@@ -158,7 +157,6 @@
     "already-voting-for-this-post": "Již jste v tomto příspěvku hlasoval.",
     "reputation-system-disabled": "Systém reputací je zakázán.",
     "downvoting-disabled": "Systém nesouhlasu je zakázán",
-    "not-enough-reputation-to-chat": "You need %1 reputation to chat",
     "not-enough-reputation-to-upvote": "You need %1 reputation to upvote",
     "not-enough-reputation-to-downvote": "You need %1 reputation to downvote",
     "not-enough-reputation-to-flag": "You need %1 reputation to flag this post",

public/language/cs/flags.json

@@ -38,7 +38,6 @@
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",
-	"delete": "Delete Flag",
 
 	"user-view": "Zobrazit profil",
 	"user-edit": "Upravit profil",
@@ -47,10 +46,8 @@
 	"add-note": "Přidat poznámku",
 	"no-notes": "Žádné sdílené poznámky.",
 	"delete-note-confirm": "Are you sure you want to delete this flag note?",
-	"delete-flag-confirm": "Are you sure you want to delete this flag?",
 	"note-added": "Poznámka přidána",
 	"note-deleted": "Note Deleted",
-	"flag-deleted": "Flag Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "Žádná historie označení.",

public/language/cs/post-queue.json

@@ -17,15 +17,5 @@
 	"reject": "Reject",
 	"remove": "Remove",
 	"notify": "Notify",
-	"notify-user": "Notify User",
+	"notify-user": "Notify User"
-	"confirm-reject": "Do you want to reject this post?",
-	"bulk-actions": "Bulk Actions",
-	"accept-all": "Accept All",
-	"accept-selected": "Accept Selected",
-	"reject-all": "Reject All",
-	"reject-all-confirm": "Do you want to reject all posts?",
-	"reject-selected": "Reject Selected",
-	"reject-selected-confirm": "Do you want to reject %1 selected posts?",
-	"bulk-accept-success": "%1 posts accepted",
-	"bulk-reject-success": "%1 posts rejected"
 }

public/language/cs/user.json

@@ -1,6 +1,5 @@
 {
     "banned": "Zablokován",
-    "muted": "Muted",
     "offline": "Nepřipojen",
     "deleted": "Odstraněno",
     "username": "Uživatelské jméno",
@@ -157,10 +156,6 @@
     "info.banned-permanently": "Trvale zablokován",
     "info.banned-reason-label": "Důvod",
     "info.banned-no-reason": "Bez důvodu",
-    "info.mute-history": "Recent Mute History",
-    "info.no-mute-history": "This user has never been muted",
-    "info.muted-until": "Muted until %1",
-    "info.muted-expiry": "Expiry",
     "info.muted-no-reason": "No reason given.",
     "info.username-history": "Historie uživatelského jména",
     "info.email-history": "E-mailová historie",

public/language/da/admin/manage/admins-mods.json

@@ -1,10 +1,8 @@
 {
     "administrators": "Administrators",
     "global-moderators": "Global Moderators",
-    "moderators": "Moderators",
     "no-global-moderators": "No Global Moderators",
-    "no-sub-categories": "No subcategories",
+    "moderators-of-category": "%1 Moderators",
-    "subcategories": "%1 subcategories",
     "no-moderators": "No Moderators",
     "add-administrator": "Add Administrator",
     "add-global-moderator": "Add Global Moderator",

public/language/da/admin/settings/reputation.json

@@ -10,7 +10,6 @@
 	"min-rep-downvote": "Minimum reputation to downvote posts",
 	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
 	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
-	"min-rep-chat": "Minimum reputation to send chat messages",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",

public/language/da/error.json

@@ -61,7 +61,6 @@
     "no-group": "Gruppen eksisterer ikke",
     "no-user": "Brugeren eksisterer ikke",
     "no-teaser": "Teaser eksisterer ikke",
-    "no-flag": "Flag does not exist",
     "no-privileges": "Du har ikke nok rettigheder til at udføre denne handling",
     "category-disabled": "Kategorien er deaktiveret",
     "topic-locked": "Tråden er låst",
@@ -158,7 +157,6 @@
     "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Vurderingssystem er slået fra.",
     "downvoting-disabled": "Nedvurdering er slået fra",
-    "not-enough-reputation-to-chat": "You need %1 reputation to chat",
     "not-enough-reputation-to-upvote": "You need %1 reputation to upvote",
     "not-enough-reputation-to-downvote": "You need %1 reputation to downvote",
     "not-enough-reputation-to-flag": "You need %1 reputation to flag this post",

public/language/da/flags.json

@@ -38,7 +38,6 @@
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",
-	"delete": "Delete Flag",
 
 	"user-view": "View Profile",
 	"user-edit": "Edit Profile",
@@ -47,10 +46,8 @@
 	"add-note": "Add Note",
 	"no-notes": "No shared notes.",
 	"delete-note-confirm": "Are you sure you want to delete this flag note?",
-	"delete-flag-confirm": "Are you sure you want to delete this flag?",
 	"note-added": "Note Added",
 	"note-deleted": "Note Deleted",
-	"flag-deleted": "Flag Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "No flag history.",

public/language/da/post-queue.json

@@ -17,15 +17,5 @@
 	"reject": "Reject",
 	"remove": "Remove",
 	"notify": "Notify",
-	"notify-user": "Notify User",
+	"notify-user": "Notify User"
-	"confirm-reject": "Do you want to reject this post?",
-	"bulk-actions": "Bulk Actions",
-	"accept-all": "Accept All",
-	"accept-selected": "Accept Selected",
-	"reject-all": "Reject All",
-	"reject-all-confirm": "Do you want to reject all posts?",
-	"reject-selected": "Reject Selected",
-	"reject-selected-confirm": "Do you want to reject %1 selected posts?",
-	"bulk-accept-success": "%1 posts accepted",
-	"bulk-reject-success": "%1 posts rejected"
 }

public/language/da/user.json

@@ -1,6 +1,5 @@
 {
     "banned": "Banlyst",
-    "muted": "Muted",
     "offline": "Offline",
     "deleted": "Deleted",
     "username": "Brugernavn",
@@ -157,10 +156,6 @@
     "info.banned-permanently": "Banned permanently",
     "info.banned-reason-label": "Reason",
     "info.banned-no-reason": "No reason given.",
-    "info.mute-history": "Recent Mute History",
-    "info.no-mute-history": "This user has never been muted",
-    "info.muted-until": "Muted until %1",
-    "info.muted-expiry": "Expiry",
     "info.muted-no-reason": "No reason given.",
     "info.username-history": "Username History",
     "info.email-history": "Email History",

public/language/de/admin/manage/admins-mods.json

@@ -1,10 +1,8 @@
 {
     "administrators": "Administratoren",
     "global-moderators": "Globale Moderatoren",
-    "moderators": "Moderators",
     "no-global-moderators": "Keine globalen Moderatoren",
-    "no-sub-categories": "No subcategories",
+    "moderators-of-category": "%1 Moderatoren",
-    "subcategories": "%1 subcategories",
     "no-moderators": "Keine Moderatoren",
     "add-administrator": "Administrator hinzufügen",
     "add-global-moderator": "Globalen Moderator hinzufügen",

public/language/de/admin/settings/reputation.json

@@ -10,7 +10,6 @@
 	"min-rep-downvote": "Minimales Ansehen um Beiträge negativ zu bewerten",
 	"downvotes-per-day": "Runtervoten pro Tag (auf 0 gesetzt für unbegrenzte Runtervotes)",
 	"downvotes-per-user-per-day": "Runtervoten pro Benutzer pro Tag (auf 0 gesetzt für unbegrenzte Runtervotes)",
-	"min-rep-chat": "Minimum reputation to send chat messages",
 	"min-rep-flag": "Minimales Ansehen und Beiträge zu melden",
 	"min-rep-website": "Erforderliche Reputation um eine \"Website\" zum Benutzerprofil hinzuzufügen",
 	"min-rep-aboutme": "Erforderliche Reputation um eine \"Über mich\"-Sektion zum Benutzerprofil hinzuzufügen",

public/language/de/error.json

@@ -61,7 +61,6 @@
     "no-group": "Die Gruppe existiert nicht",
     "no-user": "Der Benutzer existiert nicht",
     "no-teaser": "Zusammenfassung existiert nicht",
-    "no-flag": "Flag does not exist",
     "no-privileges": "Du verfügst nicht über ausreichende Berechtigungen, um die Aktion durchzuführen.",
     "category-disabled": "Kategorie ist deaktiviert",
     "topic-locked": "Thema ist gesperrt",
@@ -158,7 +157,6 @@
     "already-voting-for-this-post": "Du hast diesen Beitrag bereits bewertet.",
     "reputation-system-disabled": "Das Reputationssystem ist deaktiviert.",
     "downvoting-disabled": "Downvotes sind deaktiviert.",
-    "not-enough-reputation-to-chat": "You need %1 reputation to chat",
     "not-enough-reputation-to-upvote": "You need %1 reputation to upvote",
     "not-enough-reputation-to-downvote": "You need %1 reputation to downvote",
     "not-enough-reputation-to-flag": "You need %1 reputation to flag this post",

public/language/de/flags.json

@@ -38,7 +38,6 @@
 	"delete-post": "Post löschen",
 	"purge-post": "Post bereiningen",
 	"restore-post": "Post wiederherstellen",
-	"delete": "Delete Flag",
 
 	"user-view": "Profil ansehen",
 	"user-edit": "Profil bearbeiten",
@@ -47,10 +46,8 @@
 	"add-note": "Notiz hinzufügen",
 	"no-notes": "Keine geteilten Notizen",
 	"delete-note-confirm": "Bist du sicher, dass du diese Notiz löschen möchtest?",
-	"delete-flag-confirm": "Are you sure you want to delete this flag?",
 	"note-added": "Notiz hinzugefügt",
 	"note-deleted": "Notiz gelöscht",
-	"flag-deleted": "Flag Deleted",
 
 	"history": "Konto & Markierungsverlauf",
 	"no-history": "Kein Meldungsverlauf",

public/language/de/post-queue.json

@@ -17,15 +17,5 @@
 	"reject": "Ablehnen",
 	"remove": "Entfernen",
 	"notify": "Benachrichtigen",
-	"notify-user": "Benutzer benachrichtigen",
+	"notify-user": "Benutzer benachrichtigen"
-	"confirm-reject": "Do you want to reject this post?",
-	"bulk-actions": "Bulk Actions",
-	"accept-all": "Accept All",
-	"accept-selected": "Accept Selected",
-	"reject-all": "Reject All",
-	"reject-all-confirm": "Do you want to reject all posts?",
-	"reject-selected": "Reject Selected",
-	"reject-selected-confirm": "Do you want to reject %1 selected posts?",
-	"bulk-accept-success": "%1 posts accepted",
-	"bulk-reject-success": "%1 posts rejected"
 }

public/language/de/user.json

@@ -1,6 +1,5 @@
 {
     "banned": "Gesperrt",
-    "muted": "Muted",
     "offline": "offline",
     "deleted": "Gelöscht",
     "username": "Benutzername",
@@ -157,10 +156,6 @@
     "info.banned-permanently": "Permanent gesperrt",
     "info.banned-reason-label": "Grund",
     "info.banned-no-reason": "Kein Grund angegeben.",
-    "info.mute-history": "Recent Mute History",
-    "info.no-mute-history": "This user has never been muted",
-    "info.muted-until": "Muted until %1",
-    "info.muted-expiry": "Expiry",
     "info.muted-no-reason": "No reason given.",
     "info.username-history": "Benutzernamen Verlauf",
     "info.email-history": "E-Mail Verlauf",

public/language/el/admin/manage/admins-mods.json

@@ -1,10 +1,8 @@
 {
     "administrators": "Administrators",
     "global-moderators": "Global Moderators",
-    "moderators": "Moderators",
     "no-global-moderators": "No Global Moderators",
-    "no-sub-categories": "No subcategories",
+    "moderators-of-category": "%1 Moderators",
-    "subcategories": "%1 subcategories",
     "no-moderators": "No Moderators",
     "add-administrator": "Add Administrator",
     "add-global-moderator": "Add Global Moderator",

public/language/el/admin/settings/reputation.json

@@ -10,7 +10,6 @@
 	"min-rep-downvote": "Minimum reputation to downvote posts",
 	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
 	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
-	"min-rep-chat": "Minimum reputation to send chat messages",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",

public/language/el/error.json

@@ -61,7 +61,6 @@
     "no-group": "Group does not exist",
     "no-user": "User does not exist",
     "no-teaser": "Teaser does not exist",
-    "no-flag": "Flag does not exist",
     "no-privileges": "You do not have enough privileges for this action.",
     "category-disabled": "Η κατηγορία έχει απενεργοποιηθεί",
     "topic-locked": "Το θέμα έχει κλειδωθεί",
@@ -158,7 +157,6 @@
     "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Το σύστημα φήμης έχει απενεργοποιηθεί.",
     "downvoting-disabled": "Η καταψήφιση έχει απενεργοποιηθεί",
-    "not-enough-reputation-to-chat": "You need %1 reputation to chat",
     "not-enough-reputation-to-upvote": "You need %1 reputation to upvote",
     "not-enough-reputation-to-downvote": "You need %1 reputation to downvote",
     "not-enough-reputation-to-flag": "You need %1 reputation to flag this post",

public/language/el/flags.json

@@ -38,7 +38,6 @@
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",
-	"delete": "Delete Flag",
 
 	"user-view": "View Profile",
 	"user-edit": "Edit Profile",
@@ -47,10 +46,8 @@
 	"add-note": "Add Note",
 	"no-notes": "No shared notes.",
 	"delete-note-confirm": "Are you sure you want to delete this flag note?",
-	"delete-flag-confirm": "Are you sure you want to delete this flag?",
 	"note-added": "Note Added",
 	"note-deleted": "Note Deleted",
-	"flag-deleted": "Flag Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "No flag history.",

public/language/el/post-queue.json

@@ -17,15 +17,5 @@
 	"reject": "Reject",
 	"remove": "Remove",
 	"notify": "Notify",
-	"notify-user": "Notify User",
+	"notify-user": "Notify User"
-	"confirm-reject": "Do you want to reject this post?",
-	"bulk-actions": "Bulk Actions",
-	"accept-all": "Accept All",
-	"accept-selected": "Accept Selected",
-	"reject-all": "Reject All",
-	"reject-all-confirm": "Do you want to reject all posts?",
-	"reject-selected": "Reject Selected",
-	"reject-selected-confirm": "Do you want to reject %1 selected posts?",
-	"bulk-accept-success": "%1 posts accepted",
-	"bulk-reject-success": "%1 posts rejected"
 }

public/language/el/user.json

@@ -1,6 +1,5 @@
 {
     "banned": "Αποκλεισμένος/η",
-    "muted": "Muted",
     "offline": "Εκτός Σύνδεσης",
     "deleted": "Deleted",
     "username": "Όνομα Χρήστη",
@@ -157,10 +156,6 @@
     "info.banned-permanently": "Banned permanently",
     "info.banned-reason-label": "Reason",
     "info.banned-no-reason": "No reason given.",
-    "info.mute-history": "Recent Mute History",
-    "info.no-mute-history": "This user has never been muted",
-    "info.muted-until": "Muted until %1",
-    "info.muted-expiry": "Expiry",
     "info.muted-no-reason": "No reason given.",
     "info.username-history": "Username History",
     "info.email-history": "Email History",

public/language/en-GB/admin/manage/admins-mods.json

@@ -1,10 +1,8 @@
 {
     "administrators": "Administrators",
     "global-moderators": "Global Moderators",
-    "moderators": "Moderators",
     "no-global-moderators": "No Global Moderators",
-    "no-sub-categories": "No subcategories",
+    "moderators-of-category": "%1 Moderators",
-    "subcategories": "%1 subcategories",
     "no-moderators": "No Moderators",
     "add-administrator": "Add Administrator",
     "add-global-moderator": "Add Global Moderator",

public/language/en-GB/admin/settings/reputation.json

@@ -10,7 +10,6 @@
 	"min-rep-downvote": "Minimum reputation to downvote posts",
 	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
 	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
-	"min-rep-chat": "Minimum reputation to send chat messages",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",

public/language/en-GB/error.json

@@ -69,7 +69,6 @@
 	"no-group": "Group does not exist",
 	"no-user": "User does not exist",
 	"no-teaser": "Teaser does not exist",
-	"no-flag": "Flag does not exist",
 	"no-privileges": "You do not have enough privileges for this action.",
 
 	"category-disabled": "Category disabled",
@@ -185,7 +184,6 @@
 	"already-voting-for-this-post": "You have already voted for this post.",
 	"reputation-system-disabled": "Reputation system is disabled.",
 	"downvoting-disabled": "Downvoting is disabled",
-	"not-enough-reputation-to-chat": "You need %1 reputation to chat",
 	"not-enough-reputation-to-upvote": "You need %1 reputation to upvote",
 	"not-enough-reputation-to-downvote": "You need %1 reputation to downvote",
 	"not-enough-reputation-to-flag": "You need %1 reputation to flag this post",

public/language/en-GB/flags.json

@@ -38,7 +38,6 @@
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",
-	"delete": "Delete Flag",
 
 	"user-view": "View Profile",
 	"user-edit": "Edit Profile",
@@ -47,10 +46,8 @@
 	"add-note": "Add Note",
 	"no-notes": "No shared notes.",
 	"delete-note-confirm": "Are you sure you want to delete this flag note?",
-	"delete-flag-confirm": "Are you sure you want to delete this flag?",
 	"note-added": "Note Added",
 	"note-deleted": "Note Deleted",
-	"flag-deleted": "Flag Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "No flag history.",

public/language/en-GB/post-queue.json

@@ -17,15 +17,5 @@
 	"reject": "Reject",
 	"remove": "Remove",
 	"notify": "Notify",
-	"notify-user": "Notify User",
+	"notify-user": "Notify User"
-	"confirm-reject": "Do you want to reject this post?",
-	"bulk-actions": "Bulk Actions",
-	"accept-all": "Accept All",
-	"accept-selected": "Accept Selected",
-	"reject-all": "Reject All",
-	"reject-all-confirm": "Do you want to reject all posts?",
-	"reject-selected": "Reject Selected",
-	"reject-selected-confirm": "Do you want to reject %1 selected posts?",
-	"bulk-accept-success": "%1 posts accepted",
-	"bulk-reject-success": "%1 posts rejected"
 }

public/language/en-GB/user.json

@@ -1,6 +1,5 @@
 {
 	"banned": "Banned",
-	"muted": "Muted",
 	"offline": "Offline",
 	"deleted": "Deleted",
 	"username": "User Name",
@@ -174,10 +173,6 @@
 	"info.banned-permanently": "Banned permanently",
 	"info.banned-reason-label": "Reason",
 	"info.banned-no-reason": "No reason given.",
-	"info.mute-history": "Recent Mute History",
-	"info.no-mute-history": "This user has never been muted",
-	"info.muted-until": "Muted until %1",
-	"info.muted-expiry": "Expiry",
 	"info.muted-no-reason": "No reason given.",
 	"info.username-history": "Username History",
 	"info.email-history": "Email History",

public/language/en-US/admin/manage/admins-mods.json

@@ -1,10 +1,8 @@
 {
     "administrators": "Administrators",
     "global-moderators": "Global Moderators",
-    "moderators": "Moderators",
     "no-global-moderators": "No Global Moderators",
-    "no-sub-categories": "No subcategories",
+    "moderators-of-category": "%1 Moderators",
-    "subcategories": "%1 subcategories",
     "no-moderators": "No Moderators",
     "add-administrator": "Add Administrator",
     "add-global-moderator": "Add Global Moderator",

public/language/en-US/admin/settings/reputation.json

@@ -10,7 +10,6 @@
 	"min-rep-downvote": "Minimum reputation to downvote posts",
 	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
 	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
-	"min-rep-chat": "Minimum reputation to send chat messages",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",

public/language/en-US/error.json

@@ -61,7 +61,6 @@
     "no-group": "Group does not exist",
     "no-user": "User does not exist",
     "no-teaser": "Teaser does not exist",
-    "no-flag": "Flag does not exist",
     "no-privileges": "You do not have enough privileges for this action.",
     "category-disabled": "Category disabled",
     "topic-locked": "Topic Locked",
@@ -158,7 +157,6 @@
     "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
-    "not-enough-reputation-to-chat": "You need %1 reputation to chat",
     "not-enough-reputation-to-upvote": "You need %1 reputation to upvote",
     "not-enough-reputation-to-downvote": "You need %1 reputation to downvote",
     "not-enough-reputation-to-flag": "You need %1 reputation to flag this post",

public/language/en-US/flags.json

@@ -38,7 +38,6 @@
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",
-	"delete": "Delete Flag",
 
 	"user-view": "View Profile",
 	"user-edit": "Edit Profile",
@@ -47,10 +46,8 @@
 	"add-note": "Add Note",
 	"no-notes": "No shared notes.",
 	"delete-note-confirm": "Are you sure you want to delete this flag note?",
-	"delete-flag-confirm": "Are you sure you want to delete this flag?",
 	"note-added": "Note Added",
 	"note-deleted": "Note Deleted",
-	"flag-deleted": "Flag Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "No flag history.",

public/language/en-US/post-queue.json

@@ -17,15 +17,5 @@
 	"reject": "Reject",
 	"remove": "Remove",
 	"notify": "Notify",
-	"notify-user": "Notify User",
+	"notify-user": "Notify User"
-	"confirm-reject": "Do you want to reject this post?",
-	"bulk-actions": "Bulk Actions",
-	"accept-all": "Accept All",
-	"accept-selected": "Accept Selected",
-	"reject-all": "Reject All",
-	"reject-all-confirm": "Do you want to reject all posts?",
-	"reject-selected": "Reject Selected",
-	"reject-selected-confirm": "Do you want to reject %1 selected posts?",
-	"bulk-accept-success": "%1 posts accepted",
-	"bulk-reject-success": "%1 posts rejected"
 }

public/language/en-US/user.json

@@ -1,6 +1,5 @@
 {
     "banned": "Banned",
-    "muted": "Muted",
     "offline": "Offline",
     "deleted": "Deleted",
     "username": "User Name",
@@ -157,10 +156,6 @@
     "info.banned-permanently": "Banned permanently",
     "info.banned-reason-label": "Reason",
     "info.banned-no-reason": "No reason given.",
-    "info.mute-history": "Recent Mute History",
-    "info.no-mute-history": "This user has never been muted",
-    "info.muted-until": "Muted until %1",
-    "info.muted-expiry": "Expiry",
     "info.muted-no-reason": "No reason given.",
     "info.username-history": "Username History",
     "info.email-history": "Email History",

public/language/en-x-pirate/admin/manage/admins-mods.json

@@ -1,10 +1,8 @@
 {
     "administrators": "Administrators",
     "global-moderators": "Global Moderators",
-    "moderators": "Moderators",
     "no-global-moderators": "No Global Moderators",
-    "no-sub-categories": "No subcategories",
+    "moderators-of-category": "%1 Moderators",
-    "subcategories": "%1 subcategories",
     "no-moderators": "No Moderators",
     "add-administrator": "Add Administrator",
     "add-global-moderator": "Add Global Moderator",

public/language/en-x-pirate/admin/settings/reputation.json

@@ -10,7 +10,6 @@
 	"min-rep-downvote": "Minimum reputation to downvote posts",
 	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
 	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
-	"min-rep-chat": "Minimum reputation to send chat messages",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",

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

@@ -61,7 +61,6 @@
     "no-group": "Group does not exist",
     "no-user": "User does not exist",
     "no-teaser": "Teaser does not exist",
-    "no-flag": "Flag does not exist",
     "no-privileges": "You do not have enough privileges for this action.",
     "category-disabled": "Category disabled",
     "topic-locked": "Topic Locked",
@@ -158,7 +157,6 @@
     "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
-    "not-enough-reputation-to-chat": "You need %1 reputation to chat",
     "not-enough-reputation-to-upvote": "You need %1 reputation to upvote",
     "not-enough-reputation-to-downvote": "You need %1 reputation to downvote",
     "not-enough-reputation-to-flag": "You need %1 reputation to flag this post",

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

@@ -38,7 +38,6 @@
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",
-	"delete": "Delete Flag",
 
 	"user-view": "View Profile",
 	"user-edit": "Edit Profile",
@@ -47,10 +46,8 @@
 	"add-note": "Add Note",
 	"no-notes": "No shared notes.",
 	"delete-note-confirm": "Are you sure you want to delete this flag note?",
-	"delete-flag-confirm": "Are you sure you want to delete this flag?",
 	"note-added": "Note Added",
 	"note-deleted": "Note Deleted",
-	"flag-deleted": "Flag Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "No flag history.",

public/language/en-x-pirate/post-queue.json

@@ -17,15 +17,5 @@
 	"reject": "Reject",
 	"remove": "Remove",
 	"notify": "Notify",
-	"notify-user": "Notify User",
+	"notify-user": "Notify User"
-	"confirm-reject": "Do you want to reject this post?",
-	"bulk-actions": "Bulk Actions",
-	"accept-all": "Accept All",
-	"accept-selected": "Accept Selected",
-	"reject-all": "Reject All",
-	"reject-all-confirm": "Do you want to reject all posts?",
-	"reject-selected": "Reject Selected",
-	"reject-selected-confirm": "Do you want to reject %1 selected posts?",
-	"bulk-accept-success": "%1 posts accepted",
-	"bulk-reject-success": "%1 posts rejected"
 }

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

@@ -1,6 +1,5 @@
 {
     "banned": "Blackmarked",
-    "muted": "Muted",
     "offline": "Asleep at the wheel",
     "deleted": "Deleted",
     "username": "User Name",
@@ -157,10 +156,6 @@
     "info.banned-permanently": "Banned permanently",
     "info.banned-reason-label": "Reason",
     "info.banned-no-reason": "No reason given.",
-    "info.mute-history": "Recent Mute History",
-    "info.no-mute-history": "This user has never been muted",
-    "info.muted-until": "Muted until %1",
-    "info.muted-expiry": "Expiry",
     "info.muted-no-reason": "No reason given.",
     "info.username-history": "Username History",
     "info.email-history": "Email History",

public/language/es/admin/manage/admins-mods.json

@@ -1,10 +1,8 @@
 {
     "administrators": "Administradores",
     "global-moderators": "Moderadores Globales",
-    "moderators": "Moderators",
     "no-global-moderators": "Sin Moderadores Globales",
-    "no-sub-categories": "No subcategories",
+    "moderators-of-category": "%1 Moderadores",
-    "subcategories": "%1 subcategories",
     "no-moderators": "Sin Moderadores",
     "add-administrator": "Añadir Administrador",
     "add-global-moderator": "Añadir Moderador Global",

public/language/es/admin/settings/reputation.json

@@ -10,7 +10,6 @@
 	"min-rep-downvote": "Reputación mínima para votar negativamente",
 	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
 	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
-	"min-rep-chat": "Minimum reputation to send chat messages",
 	"min-rep-flag": "Reputación negativa para denunciar",
 	"min-rep-website": "Reputación mínima para añadir \"Sitio web\" al perfil del usuario.",
 	"min-rep-aboutme": "Reputación mínima para añadir \"Sobre mi\" al perfil de usuario.",

public/language/es/error.json

@@ -61,7 +61,6 @@
     "no-group": "El grupo no existe",
     "no-user": "El usuario no existe",
     "no-teaser": "El resumen no existe",
-    "no-flag": "Flag does not exist",
     "no-privileges": "No tienes suficientes privilegios para realizar esta acción.",
     "category-disabled": "Categoría deshabilitada",
     "topic-locked": "Tema bloqueado",
@@ -158,7 +157,6 @@
     "already-voting-for-this-post": "Ya has votado a este mensaje.",
     "reputation-system-disabled": "El sistema de reputación está deshabilitado.",
     "downvoting-disabled": "La votación negativa está deshabilitada.",
-    "not-enough-reputation-to-chat": "You need %1 reputation to chat",
     "not-enough-reputation-to-upvote": "You need %1 reputation to upvote",
     "not-enough-reputation-to-downvote": "You need %1 reputation to downvote",
     "not-enough-reputation-to-flag": "You need %1 reputation to flag this post",

public/language/es/flags.json

@@ -38,7 +38,6 @@
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",
-	"delete": "Delete Flag",
 
 	"user-view": "Ver perfil",
 	"user-edit": "Editar perfil",
@@ -47,10 +46,8 @@
 	"add-note": "Añadir nota",
 	"no-notes": "No hay notas compartidas",
 	"delete-note-confirm": "Are you sure you want to delete this flag note?",
-	"delete-flag-confirm": "Are you sure you want to delete this flag?",
 	"note-added": "Nota añadida",
 	"note-deleted": "Note Deleted",
-	"flag-deleted": "Flag Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "No hay registro de marcadores",

public/language/es/post-queue.json

@@ -17,15 +17,5 @@
 	"reject": "Rechazar",
 	"remove": "Remove",
 	"notify": "Notify",
-	"notify-user": "Notify User",
+	"notify-user": "Notify User"
-	"confirm-reject": "Do you want to reject this post?",
-	"bulk-actions": "Bulk Actions",
-	"accept-all": "Accept All",
-	"accept-selected": "Accept Selected",
-	"reject-all": "Reject All",
-	"reject-all-confirm": "Do you want to reject all posts?",
-	"reject-selected": "Reject Selected",
-	"reject-selected-confirm": "Do you want to reject %1 selected posts?",
-	"bulk-accept-success": "%1 posts accepted",
-	"bulk-reject-success": "%1 posts rejected"
 }

public/language/es/user.json

@@ -1,6 +1,5 @@
 {
     "banned": "Baneado",
-    "muted": "Muted",
     "offline": "Desconectado",
     "deleted": "Borrado",
     "username": "Nombre de usuario",
@@ -157,10 +156,6 @@
     "info.banned-permanently": "Baneado permanentemente",
     "info.banned-reason-label": "Motivo",
     "info.banned-no-reason": "Motivo no especificado",
-    "info.mute-history": "Recent Mute History",
-    "info.no-mute-history": "This user has never been muted",
-    "info.muted-until": "Muted until %1",
-    "info.muted-expiry": "Expiry",
     "info.muted-no-reason": "No reason given.",
     "info.username-history": "Histórico de nombre de usuario",
     "info.email-history": "HIstórico de Email",

public/language/et/admin/manage/admins-mods.json

@@ -1,10 +1,8 @@
 {
     "administrators": "Administrators",
     "global-moderators": "Global Moderators",
-    "moderators": "Moderators",
     "no-global-moderators": "No Global Moderators",
-    "no-sub-categories": "No subcategories",
+    "moderators-of-category": "%1 Moderators",
-    "subcategories": "%1 subcategories",
     "no-moderators": "No Moderators",
     "add-administrator": "Add Administrator",
     "add-global-moderator": "Add Global Moderator",

public/language/et/admin/settings/reputation.json

@@ -10,7 +10,6 @@
 	"min-rep-downvote": "Minimum reputation to downvote posts",
 	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
 	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
-	"min-rep-chat": "Minimum reputation to send chat messages",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",

public/language/et/error.json

@@ -61,7 +61,6 @@
     "no-group": "Gruppi ei eksisteeri",
     "no-user": "Kasutajat ei eksisteeri",
     "no-teaser": "Eelvaadet ei eksisteeri",
-    "no-flag": "Flag does not exist",
     "no-privileges": "Sul pole piisavalt õigusi.",
     "category-disabled": "Kategooria keelatud",
     "topic-locked": "Teema lukustatud",
@@ -158,7 +157,6 @@
     "already-voting-for-this-post": "Sa oled juba hääletanud sellel postitusel.",
     "reputation-system-disabled": "Reputatsiooni süsteem ei ole aktiveeritud",
     "downvoting-disabled": "Negatiivsete häälte andmine ei ole võimaldatud",
-    "not-enough-reputation-to-chat": "You need %1 reputation to chat",
     "not-enough-reputation-to-upvote": "You need %1 reputation to upvote",
     "not-enough-reputation-to-downvote": "You need %1 reputation to downvote",
     "not-enough-reputation-to-flag": "You need %1 reputation to flag this post",

public/language/et/flags.json

@@ -38,7 +38,6 @@
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",
-	"delete": "Delete Flag",
 
 	"user-view": "View Profile",
 	"user-edit": "Edit Profile",
@@ -47,10 +46,8 @@
 	"add-note": "Add Note",
 	"no-notes": "No shared notes.",
 	"delete-note-confirm": "Are you sure you want to delete this flag note?",
-	"delete-flag-confirm": "Are you sure you want to delete this flag?",
 	"note-added": "Note Added",
 	"note-deleted": "Note Deleted",
-	"flag-deleted": "Flag Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "No flag history.",

public/language/et/post-queue.json

@@ -17,15 +17,5 @@
 	"reject": "Reject",
 	"remove": "Remove",
 	"notify": "Notify",
-	"notify-user": "Notify User",
+	"notify-user": "Notify User"
-	"confirm-reject": "Do you want to reject this post?",
-	"bulk-actions": "Bulk Actions",
-	"accept-all": "Accept All",
-	"accept-selected": "Accept Selected",
-	"reject-all": "Reject All",
-	"reject-all-confirm": "Do you want to reject all posts?",
-	"reject-selected": "Reject Selected",
-	"reject-selected-confirm": "Do you want to reject %1 selected posts?",
-	"bulk-accept-success": "%1 posts accepted",
-	"bulk-reject-success": "%1 posts rejected"
 }

public/language/et/user.json

@@ -1,6 +1,5 @@
 {
     "banned": "Banned",
-    "muted": "Muted",
     "offline": "Väljas",
     "deleted": "Deleted",
     "username": "Kasutajanimi",
@@ -157,10 +156,6 @@
     "info.banned-permanently": "Igavesti keelustatud",
     "info.banned-reason-label": "Reason",
     "info.banned-no-reason": "No reason given.",
-    "info.mute-history": "Recent Mute History",
-    "info.no-mute-history": "This user has never been muted",
-    "info.muted-until": "Muted until %1",
-    "info.muted-expiry": "Expiry",
     "info.muted-no-reason": "No reason given.",
     "info.username-history": "Username History",
     "info.email-history": "Email History",

public/language/fa-IR/admin/manage/admins-mods.json

@@ -1,10 +1,8 @@
 {
     "administrators": "Administrators",
     "global-moderators": "Global Moderators",
-    "moderators": "Moderators",
     "no-global-moderators": "No Global Moderators",
-    "no-sub-categories": "No subcategories",
+    "moderators-of-category": "%1 Moderators",
-    "subcategories": "%1 subcategories",
     "no-moderators": "No Moderators",
     "add-administrator": "Add Administrator",
     "add-global-moderator": "Add Global Moderator",

public/language/fa-IR/admin/settings/reputation.json

@@ -10,7 +10,6 @@
 	"min-rep-downvote": "Minimum reputation to downvote posts",
 	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
 	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
-	"min-rep-chat": "Minimum reputation to send chat messages",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",

public/language/fa-IR/error.json

@@ -61,7 +61,6 @@
     "no-group": "گروه وجود ندارد",
     "no-user": "کاربر وجود ندارد",
     "no-teaser": "تیزر وجود ندارد",
-    "no-flag": "Flag does not exist",
     "no-privileges": "شما دسترسی کافی برای این کار را ندارید",
     "category-disabled": "دسته غیر‌فعال شد.",
     "topic-locked": "موضوع بسته شد.",
@@ -158,7 +157,6 @@
     "already-voting-for-this-post": "شما قبلا به این پست رای داده اید.",
     "reputation-system-disabled": "سیستم اعتبار غیر فعال شده است",
     "downvoting-disabled": "رأی منفی غیر فعال شده است",
-    "not-enough-reputation-to-chat": "You need %1 reputation to chat",
     "not-enough-reputation-to-upvote": "You need %1 reputation to upvote",
     "not-enough-reputation-to-downvote": "You need %1 reputation to downvote",
     "not-enough-reputation-to-flag": "You need %1 reputation to flag this post",

public/language/fa-IR/flags.json

@@ -38,7 +38,6 @@
 	"delete-post": "حذف پست",
 	"purge-post": "پاک کردن پست",
 	"restore-post": "برگرداندن پست",
-	"delete": "Delete Flag",
 
 	"user-view": "نمایش پروفایل",
 	"user-edit": "ویرایش پروفایل",
@@ -47,10 +46,8 @@
 	"add-note": "افزودن یادداشت",
 	"no-notes": "بدون یادداشت",
 	"delete-note-confirm": "آیا مطمئن هستید میخواهید این یادداشت را حذف کنید؟",
-	"delete-flag-confirm": "Are you sure you want to delete this flag?",
 	"note-added": "یادداشت افزوده شد",
 	"note-deleted": "یادداشت حذف شد",
-	"flag-deleted": "Flag Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "بدون تاریخچه گزارش",

public/language/fa-IR/post-queue.json

@@ -17,15 +17,5 @@
 	"reject": "Reject",
 	"remove": "Remove",
 	"notify": "Notify",
-	"notify-user": "Notify User",
+	"notify-user": "Notify User"
-	"confirm-reject": "Do you want to reject this post?",
-	"bulk-actions": "Bulk Actions",
-	"accept-all": "Accept All",
-	"accept-selected": "Accept Selected",
-	"reject-all": "Reject All",
-	"reject-all-confirm": "Do you want to reject all posts?",
-	"reject-selected": "Reject Selected",
-	"reject-selected-confirm": "Do you want to reject %1 selected posts?",
-	"bulk-accept-success": "%1 posts accepted",
-	"bulk-reject-success": "%1 posts rejected"
 }

public/language/fa-IR/user.json

@@ -1,6 +1,5 @@
 {
     "banned": "اخراج شده",
-    "muted": "Muted",
     "offline": "آفلاین",
     "deleted": "حذف شده",
     "username": "نام کاربری",
@@ -157,10 +156,6 @@
     "info.banned-permanently": "مسدود شده به طور دائم",
     "info.banned-reason-label": "دلیل",
     "info.banned-no-reason": "هیچ دلیلی ارایه نشد.",
-    "info.mute-history": "Recent Mute History",
-    "info.no-mute-history": "This user has never been muted",
-    "info.muted-until": "Muted until %1",
-    "info.muted-expiry": "Expiry",
     "info.muted-no-reason": "No reason given.",
     "info.username-history": "تاریخچه تعویض نام کاربری",
     "info.email-history": "تاریخچه تعویض ایمیل",

public/language/fi/admin/manage/admins-mods.json

@@ -1,10 +1,8 @@
 {
     "administrators": "Administrators",
     "global-moderators": "Global Moderators",
-    "moderators": "Moderators",
     "no-global-moderators": "No Global Moderators",
-    "no-sub-categories": "No subcategories",
+    "moderators-of-category": "%1 Moderators",
-    "subcategories": "%1 subcategories",
     "no-moderators": "No Moderators",
     "add-administrator": "Add Administrator",
     "add-global-moderator": "Add Global Moderator",

public/language/fi/admin/settings/reputation.json

@@ -10,7 +10,6 @@
 	"min-rep-downvote": "Minimum reputation to downvote posts",
 	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
 	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
-	"min-rep-chat": "Minimum reputation to send chat messages",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",

public/language/fi/error.json

@@ -61,7 +61,6 @@
     "no-group": "Ryhmää ei ole olemassa",
     "no-user": "Käyttäjää ei ole olemassa",
     "no-teaser": "Teaser does not exist",
-    "no-flag": "Flag does not exist",
     "no-privileges": "Oikeutesi eivät riitä toiminnon suorittamiseen.",
     "category-disabled": "Kategoria ei ole käytössä",
     "topic-locked": "Aihe lukittu",
@@ -158,7 +157,6 @@
     "already-voting-for-this-post": "You have already voted for this post.",
     "reputation-system-disabled": "Reputation system is disabled.",
     "downvoting-disabled": "Downvoting is disabled",
-    "not-enough-reputation-to-chat": "You need %1 reputation to chat",
     "not-enough-reputation-to-upvote": "You need %1 reputation to upvote",
     "not-enough-reputation-to-downvote": "You need %1 reputation to downvote",
     "not-enough-reputation-to-flag": "You need %1 reputation to flag this post",

public/language/fi/flags.json

@@ -38,7 +38,6 @@
 	"delete-post": "Delete Post",
 	"purge-post": "Purge Post",
 	"restore-post": "Restore Post",
-	"delete": "Delete Flag",
 
 	"user-view": "View Profile",
 	"user-edit": "Edit Profile",
@@ -47,10 +46,8 @@
 	"add-note": "Add Note",
 	"no-notes": "No shared notes.",
 	"delete-note-confirm": "Are you sure you want to delete this flag note?",
-	"delete-flag-confirm": "Are you sure you want to delete this flag?",
 	"note-added": "Note Added",
 	"note-deleted": "Note Deleted",
-	"flag-deleted": "Flag Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "No flag history.",

public/language/fi/post-queue.json

@@ -17,15 +17,5 @@
 	"reject": "Reject",
 	"remove": "Remove",
 	"notify": "Notify",
-	"notify-user": "Notify User",
+	"notify-user": "Notify User"
-	"confirm-reject": "Do you want to reject this post?",
-	"bulk-actions": "Bulk Actions",
-	"accept-all": "Accept All",
-	"accept-selected": "Accept Selected",
-	"reject-all": "Reject All",
-	"reject-all-confirm": "Do you want to reject all posts?",
-	"reject-selected": "Reject Selected",
-	"reject-selected-confirm": "Do you want to reject %1 selected posts?",
-	"bulk-accept-success": "%1 posts accepted",
-	"bulk-reject-success": "%1 posts rejected"
 }

public/language/fi/user.json

@@ -1,6 +1,5 @@
 {
     "banned": "Bannattu",
-    "muted": "Muted",
     "offline": "Offline",
     "deleted": "Poistettu",
     "username": "Käyttäjän nimi",
@@ -157,10 +156,6 @@
     "info.banned-permanently": "Banned permanently",
     "info.banned-reason-label": "Syy ",
     "info.banned-no-reason": "Syytä ei ole annettu",
-    "info.mute-history": "Recent Mute History",
-    "info.no-mute-history": "This user has never been muted",
-    "info.muted-until": "Muted until %1",
-    "info.muted-expiry": "Expiry",
     "info.muted-no-reason": "No reason given.",
     "info.username-history": "Username History",
     "info.email-history": "Email History",

public/language/fr/admin/manage/admins-mods.json

@@ -1,10 +1,8 @@
 {
     "administrators": "Administrateurs",
     "global-moderators": "Modérateurs Globaux",
-    "moderators": "Modérateurs",
     "no-global-moderators": "Aucun Modérateur Global ",
-    "no-sub-categories": "Aucunes sous-catégories",
+    "moderators-of-category": "%1 Modérateur(s)",
-    "subcategories": "%1 Sous-catégories",
     "no-moderators": "Aucun Modérateur",
     "add-administrator": "Ajouter un Administrateur",
     "add-global-moderator": "Ajouter un Modérateur Global",

public/language/fr/admin/settings/reputation.json

@@ -10,7 +10,6 @@
 	"min-rep-downvote": "Réputation minimum pour les votes négatifs",
 	"downvotes-per-day": "Votes négatif par jour (0 = illimités)",
 	"downvotes-per-user-per-day": "Votes négatif pour un utilisateur par jour (0 = illimités)",
-	"min-rep-chat": "Réputation minimum pour écrire un message",
 	"min-rep-flag": "Réputation minimum pour signaler un message",
 	"min-rep-website": "Réputation minimum pour ajouter \"Site internet\" au profil utilisateur",
 	"min-rep-aboutme": "Réputation minimum pour ajouter \"À propos\" au profil utilisateur",

public/language/fr/error.json

@@ -61,7 +61,6 @@
     "no-group": "Ce groupe n'existe pas",
     "no-user": "Cet utilisateur n'existe pas",
     "no-teaser": "L’aperçu n'existe pas",
-    "no-flag": "Le signalement n'existe pas",
     "no-privileges": "Vous n'avez pas les privilèges nécessaires pour effectuer cette action.",
     "category-disabled": "Catégorie désactivée",
     "topic-locked": "Sujet verrouillé",
@@ -158,7 +157,6 @@
     "already-voting-for-this-post": "Vous avez déjà voté pour ce message.",
     "reputation-system-disabled": "Le système de réputation est désactivé",
     "downvoting-disabled": "Les votes négatifs ne sont pas autorisés",
-    "not-enough-reputation-to-chat": "Vous avez besoin de %1 réputation pour signaler",
     "not-enough-reputation-to-upvote": "Vous avez besoin de %1 réputation pour voter",
     "not-enough-reputation-to-downvote": "Vous avez besoin de %1 réputation pour voter",
     "not-enough-reputation-to-flag": "Vous avez besoin de %1 réputation pour faire un signalement",

public/language/fr/flags.json

@@ -38,7 +38,6 @@
 	"delete-post": "Supprimer les messages",
 	"purge-post": "Supprimer définitivement",
 	"restore-post": "Restaurer les messages",
-	"delete": "Supprimer le signalement",
 
 	"user-view": "Voir le profil",
 	"user-edit": "Éditer le profil",
@@ -47,10 +46,8 @@
 	"add-note": "Ajouter une note",
 	"no-notes": "aucune note partagée",
 	"delete-note-confirm": "Êtes-vous sûr de bien vouloir supprimer cette note de signalement ?",
-	"delete-flag-confirm": "Êtes-vous sûr de bien vouloir supprimer ce signalement ?",
 	"note-added": "Note ajoutée",
 	"note-deleted": "Note supprimée",
-	"flag-deleted": "Signalement supprimé",
 
 	"history": "Compte & Historique des signalements",
 	"no-history": "Aucun historique de signalements",

public/language/fr/post-queue.json

@@ -17,15 +17,5 @@
 	"reject": "Refuser",
 	"remove": "Enlever",
 	"notify": "Notifier",
-	"notify-user": "Notifier l'utilisateur",
+	"notify-user": "Notifier l'utilisateur"
-	"confirm-reject": "Voulez vous réellement rejeter ce message ?",
-	"bulk-actions": "Actions",
-	"accept-all": "Tout accepter",
-	"accept-selected": "Acceptation sélectionné",
-	"reject-all": "Tout rejeter",
-	"reject-all-confirm": "Voulez vous réellement rejeter tous ces messages ?",
-	"reject-selected": "Rejets sélectionnés",
-	"reject-selected-confirm": "Voulez vous réellement rejeter ces %1 messages ?",
-	"bulk-accept-success": "%1 messages acceptés",
-	"bulk-reject-success": "%1 messages rejetés"
 }

public/language/fr/topic.json

@@ -49,7 +49,7 @@
     "queued-by": "Message en attente d'approbation →",
     "backlink": "Référencé par",
     "forked-by": "Dupliqué par",
-    "bookmark_instructions": "Cliquez ici pour aller au dernier message lu de ce fil.",
+    "bookmark_instructions": "Cliquez ici pour retourner au dernier message lu de ce fil.",
     "flag-post": "Signaler ce message",
     "flag-user": "Signaler cet utilisateur",
     "already-flagged": "Déjà signalé",

public/language/fr/user.json

@@ -1,6 +1,5 @@
 {
     "banned": "Banni",
-    "muted": "Muted",
     "offline": "Hors-ligne",
     "deleted": "Effacé",
     "username": "Nom d'utilisateur",
@@ -157,10 +156,6 @@
     "info.banned-permanently": "Banni de façon permanente",
     "info.banned-reason-label": "Raison",
     "info.banned-no-reason": "Aucune raison donnée",
-    "info.mute-history": "Recent Mute History",
-    "info.no-mute-history": "This user has never been muted",
-    "info.muted-until": "Muted until %1",
-    "info.muted-expiry": "Expiry",
     "info.muted-no-reason": "Aucune raison donnée.",
     "info.username-history": "Historique des noms d'utilisateur",
     "info.email-history": "Historique des adresses email",

public/language/gl/admin/manage/admins-mods.json

@@ -1,10 +1,8 @@
 {
     "administrators": "Administrators",
     "global-moderators": "Global Moderators",
-    "moderators": "Moderators",
     "no-global-moderators": "No Global Moderators",
-    "no-sub-categories": "No subcategories",
+    "moderators-of-category": "%1 Moderators",
-    "subcategories": "%1 subcategories",
     "no-moderators": "No Moderators",
     "add-administrator": "Add Administrator",
     "add-global-moderator": "Add Global Moderator",

public/language/gl/admin/settings/reputation.json

@@ -10,7 +10,6 @@
 	"min-rep-downvote": "Minimum reputation to downvote posts",
 	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
 	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
-	"min-rep-chat": "Minimum reputation to send chat messages",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",

public/language/gl/error.json

@@ -61,7 +61,6 @@
     "no-group": "O grupo non existe",
     "no-user": "O usuario non existe",
     "no-teaser": "A vista previa do tema non existe",
-    "no-flag": "Flag does not exist",
     "no-privileges": "Non tes privilexios dabondo para ver este tema.",
     "category-disabled": "Categoría deshabilitada",
     "topic-locked": "Tema Pechado",
@@ -158,7 +157,6 @@
     "already-voting-for-this-post": "Xa votache esta mensaxe.",
     "reputation-system-disabled": "O sistema de reputación está deshabilitado",
     "downvoting-disabled": "Os votos negativos están deshabilitados",
-    "not-enough-reputation-to-chat": "You need %1 reputation to chat",
     "not-enough-reputation-to-upvote": "You need %1 reputation to upvote",
     "not-enough-reputation-to-downvote": "You need %1 reputation to downvote",
     "not-enough-reputation-to-flag": "You need %1 reputation to flag this post",