Merge commit 'd3cfa1b7e3ddb214682e663c961518d4df9071dd' into v3.x

2026-05-07 12:35:50 +02:00 · 2023-12-20 19:02:58 +00:00
parent ed0e8783c3 d3cfa1b7e3
commit 84d53a5e31
659 changed files with 7950 additions and 7197 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,10 @@
+.*
+logs
+test
+node_modules
+commitlint.config.js
+nodebb.bat
+renovate.json
+*.yml
+*.md
+Dockerfile
--- a/.eslintignore
+++ b/.eslintignore
@@ -18,3 +18,4 @@ logs/
 .eslintrc
 test/files
 *.min.js
+install/docker/
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -52,10 +52,10 @@ jobs:
      - name: Build and push Docker images
        uses: docker/build-push-action@v5
        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
          cache-from: type=gha
          cache-to: type=gha,mode=max
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -63,7 +63,7 @@ jobs:
          - 5432:5432

      redis:
-        image: 'redis:7.2.2'
+        image: 'redis:7.2.3'
        # Set health checks to wait until redis has started
        options: >-
          --health-cmd "redis-cli ping"
--- a/.gitignore
+++ b/.gitignore
@@ -69,4 +69,6 @@ package-lock.json
 /package.json
 *.mongodb
 link-plugins.sh
-test.sh
+test.sh
+
+.docker/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,49 @@
+#### v3.5.3 (2023-12-13)
+
+##### Chores
+
+*  up composer (245e5df3)
+*  up composer default (c1f82b78)
+*  incrementing version number - v3.5.2 (52fbb2da)
+*  update changelog for v3.5.2 (e2e85053)
+*  incrementing version number - v3.5.1 (4c543488)
+*  incrementing version number - v3.5.0 (d06fb4f0)
+*  incrementing version number - v3.4.3 (5c984250)
+*  incrementing version number - v3.4.2 (3f0dac38)
+*  incrementing version number - v3.4.1 (01e69574)
+*  incrementing version number - v3.4.0 (fd9247c5)
+*  incrementing version number - v3.3.9 (5805e770)
+*  incrementing version number - v3.3.8 (a5603565)
+*  incrementing version number - v3.3.7 (b26f1744)
+*  incrementing version number - v3.3.6 (7fb38792)
+*  incrementing version number - v3.3.4 (a67f84ea)
+*  incrementing version number - v3.3.3 (f94d239b)
+*  incrementing version number - v3.3.2 (ec9dac97)
+*  incrementing version number - v3.3.1 (151cc68f)
+*  incrementing version number - v3.3.0 (fc1ad70f)
+*  incrementing version number - v3.2.3 (b06d3e63)
+*  incrementing version number - v3.2.2 (758ecfcd)
+*  incrementing version number - v3.2.1 (20145074)
+*  incrementing version number - v3.2.0 (9ecac38e)
+*  incrementing version number - v3.1.7 (0b4e81ab)
+*  incrementing version number - v3.1.6 (b3a3b130)
+*  incrementing version number - v3.1.5 (ec19343a)
+*  incrementing version number - v3.1.4 (2452783c)
+*  incrementing version number - v3.1.3 (3b4e9d3f)
+*  incrementing version number - v3.1.2 (40fa3489)
+*  incrementing version number - v3.1.1 (40250733)
+*  incrementing version number - v3.1.0 (0cb386bd)
+*  incrementing version number - v3.0.1 (26f6ea49)
+*  incrementing version number - v3.0.0 (224e08cd)
+
+##### Bug Fixes
+
+*  change translator escape (c434262e)
+
+##### Other Changes
+
+*  add types for database abstration layer (#10762) (17cd19c7)
+
 #### v3.5.2 (2023-11-29)

 ##### Chores
--- a/46
+++ b/46
@@ -13,29 +13,39 @@ USER node

 RUN npm install --omit=dev

+FROM node:lts as rebuild

-FROM node:lts
+ARG BUILDPLATFORM
+ARG TARGETPLATFORM

-RUN mkdir -p /usr/src/app && \
-    chown -R node:node /usr/src/app
-WORKDIR /usr/src/app
+RUN mkdir -p /usr/src/build && \
+    chown -R node:node /usr/src/build
+
+COPY --from=npm /usr/src/build /usr/src/build
+
+RUN if [ $BUILDPLATFORM != $TARGETPLATFORM ]; then \
+    npm rebuild && \
+    npm cache clean --force; fi
+
+FROM node:lts-slim as run

 ARG NODE_ENV
-ENV NODE_ENV $NODE_ENV
-
-COPY --chown=node:node --from=npm /usr/src/build /usr/src/app
-
-USER node
-
-RUN npm rebuild && \
-    npm cache clean --force
-
-COPY --chown=node:node . /usr/src/app
-
-ENV NODE_ENV=production \
+ENV NODE_ENV=$NODE_ENV \
    daemon=false \
    silent=false

-EXPOSE 4567
+RUN mkdir -p /usr/src/app && \
+    chown -R node:node /usr/src/app

-CMD test -n "${SETUP}" && ./nodebb setup || node ./nodebb build; node ./nodebb start
+COPY --chown=node:node --from=rebuild /usr/src/build /usr/src/app
+
+
+WORKDIR /usr/src/app
+
+USER node
+
+COPY --chown=node:node . /usr/src/app
+
+EXPOSE 4567
+VOLUME ["/usr/src/app/node_modules", "/usr/src/app/build", "/usr/src/app/public/uploads", "/opt/config"]
+ENTRYPOINT ["./install/docker/entrypoint.sh"]
--- a/README.md
+++ b/README.md
@@ -46,7 +46,8 @@ NodeBB requires the following software to be installed:

 ## Installation

-[Please refer to platform-specific installation documentation](https://docs.nodebb.org/installing/os)
+[Please refer to platform-specific installation documentation](https://docs.nodebb.org/installing/os).
+If installing via the cloud (or using Docker), [please see cloud-based installation documentation](https://docs.nodebb.org/installing/cloud/).

 ## Securing NodeBB

@@ -59,6 +60,7 @@ It is important to ensure that your NodeBB and database servers are secured. Bea
 2. Use `iptables` to secure your server from unintended open ports. In Ubuntu, `ufw` provides a friendlier interface to working with `iptables`.
    * e.g. If your NodeBB is proxied, no ports should be open except 80 (and possibly 22, for SSH access)

+
 ## Upgrading NodeBB

 Detailed upgrade instructions are listed in [Upgrading NodeBB](https://docs.nodebb.org/configuring/upgrade/)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,24 +1,55 @@
-version: '3.5'
+version: '3.8'

 services:
-  node:
+  nodebb:
    build: .
    restart: unless-stopped
-    depends_on:
-      - db
-    expose:
-      - 4567 # use a reverse proxy like Traefik
-
-  db:
-    image: mongo:bionic
+    ports:
+      - "4567:4567/tcp" # comment this out if you don't want to expose NodeBB to the host, or change the first number to any port you want
+    # uncomment if you want to use another container as a reverse proxy
+    # expose:
+    #   - 4567
+    volumes:
+      - ./.docker/build:/usr/src/app/build
+      - ./.docker/public/uploads:/usr/src/app/public/uploads
+      - ./.docker:/opt/config
+      - ./install/docker/setup.json:/usr/src/app/setup.json
+  mongo:
+    image: "mongo:7-jammy"
    restart: unless-stopped
    expose:
-      - 27017
+      - "27017"
    environment:
-      MONGO_INITDB_ROOT_USERNAME: root
-      MONGO_INITDB_ROOT_PASSWORD: root
+      MONGO_INITDB_ROOT_USERNAME: nodebb
+      MONGO_INITDB_ROOT_PASSWORD: nodebb
+      MONGO_INITDB_DATABASE: nodebb
    volumes:
-      - mongo:/data/db
-
-volumes:
-  mongo:
+      - ./.docker/database/mongo/config:/etc/mongo
+      - ./.docker/database/mongo/data:/data/db
+      - ./install/docker/mongodb-user-init.js:/docker-entrypoint-initdb.d/user-init.js
+    profiles:
+      - mongo
+  postgres:
+    image: postgres:16.1-alpine
+    restart: unless-stopped
+    expose:
+      - "5432"
+    environment:
+      POSTGRES_USER: nodebb
+      POSTGRES_PASSWORD: nodebb
+      POSTGRES_DB: nodebb
+    volumes:
+      - ./.docker/database/postgresql/data:/var/lib/postgresql/data
+    profiles:
+      - postgres
+  redis:
+    image: redis:7.2.3-alpine
+    restart: unless-stopped
+    command: ["redis-server", "--appendonly", "yes", "--loglevel", "warning"]
+    # command: ["redis-server", "--save", "60", "1", "--loglevel", "warning"] # uncomment if you want to use snapshotting instead of AOF
+    expose:
+      - "6379"
+    volumes:
+      - ./.docker/database/redis:/data
+    profiles:
+      - redis
--- a/install/data/defaults.json
+++ b/install/data/defaults.json
@@ -23,10 +23,11 @@
    "chatMessageDelay": 2000,
    "newbieChatMessageDelay": 120000,
    "notificationSendDelay": 60,
-    "newbiePostDelayThreshold": 3,
+    "newbieReputationThreshold": 3,
    "postQueue": 0,
    "postQueueReputationThreshold": 0,
    "groupsExemptFromPostQueue": ["administrators", "Global Moderators"],
+    "groupsExemptFromNewUserRestrictions": ["administrators", "Global Moderators"],
    "groupsExemptFromMaintenanceMode": ["administrators", "Global Moderators"],
    "minimumPostLength": 8,
    "maximumPostLength": 32767,
@@ -41,7 +42,7 @@
    "registrationApprovalType": "normal",
    "allowAccountDelete": 1,
    "privateUploads": 0,
-    "allowedFileExtensions": "png,jpg,bmp,txt",
+    "allowedFileExtensions": "png,jpg,bmp,txt,webp,webm,mp4,gif",
    "uploadRateLimitThreshold": 10,
    "uploadRateLimitCooldown": 60,
    "allowUserHomePage": 1,
@@ -187,4 +188,4 @@
    "maxReconnectionAttempts": 5,
    "reconnectionDelay": 1500,
    "disableCustomUserSkins": 0
-}
+}
--- a/install/docker/entrypoint.sh
+++ b/install/docker/entrypoint.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+export CONFIG_DIR="${CONFIG_DIR:-/opt/config}"
+export CONFIG=$CONFIG_DIR/config.json
+export FORCE_BUILD_BEFORE_START="${FORCE_BUILD_BEFORE_START:-false}"
+
+# Supported verbs: install (web install), setup (interactive CLI session). Default: web install
+# TODO: constraint it using a hash set (or hash table)
+export NODEBB_INIT_VERB="${NODEBB_INIT_VERB:-install}"
+# Setup variable for backward compatibility, default: <empty>
+export SETUP="${SETUP:-}"
+
+mkdir -p $CONFIG_DIR
+
+# if the folder is mounted as a volume this can fail, the check below is to ensure there is still write access
+chmod -fR 760 $CONFIG_DIR 2> /dev/null
+
+if [[ ! -w $CONFIG_DIR ]]; then
+  echo "panic: no write permission for $CONFIG_DIR"
+  exit 1
+fi
+
+[[ -f $CONFIG_DIR/package.json ]] || cp install/package.json $CONFIG_DIR/package.json
+[[ -f $CONFIG_DIR/package-lock.json ]] || touch $CONFIG_DIR/package-lock.json
+
+ln -fs $CONFIG_DIR/package.json package.json
+ln -fs $CONFIG_DIR/package-lock.json package-lock.json
+
+npm install --omit=dev
+
+if [[ -n $SETUP ]]; then
+  echo "Setup environmental variable detected"
+  echo "Starting setup session"
+  ./nodebb setup --config=$CONFIG
+elif [ -f $CONFIG ]; then
+  echo "Config file exist at $CONFIG, assuming it is a valid config"
+  echo "Starting forum"
+  if [ "$FORCE_BUILD_BEFORE_START" = true ]; then
+    ./nodebb build --config=$CONFIG
+  fi
+  ./nodebb start --config=$CONFIG
+else
+  echo "Config file not found at $CONFIG"
+  echo "Starting installation session"
+  ./nodebb "${NODEBB_INIT_VERB}" --config=$CONFIG
+fi
--- a/install/docker/mongodb-user-init.js
+++ b/install/docker/mongodb-user-init.js
@@ -0,0 +1 @@
+db.createUser( { user: 'nodebb', pwd: 'nodebb', roles: [ { role: 'readWrite', db: 'nodebb' }, { role: 'clusterMonitor', db: 'admin' } ] } )
--- a/install/docker/setup.json
+++ b/install/docker/setup.json
@@ -0,0 +1,21 @@
+{
+    "mongo": {
+        "host": "mongo",
+        "port": 27017,
+        "database": "nodebb",
+        "username": "nodebb",
+        "password": "nodebb"
+    },
+    "redis": {
+        "host": "redis",
+        "port": 6379,
+        "database": 0
+    },
+    "postgres": {
+        "host": "postgres",
+        "port": 5432,
+        "database": "nodebb",
+        "username": "nodebb",
+        "password": "nodebb"
+    }
+}
--- a/install/package.json
+++ b/install/package.json
@@ -29,14 +29,14 @@
    },
    "dependencies": {
        "@adactive/bootstrap-tagsinput": "0.8.2",
-        "@fontsource/inter": "5.0.15",
+        "@fontsource/inter": "5.0.16",
        "@fontsource/poppins": "5.0.8",
-        "@fortawesome/fontawesome-free": "6.4.2",
+        "@fortawesome/fontawesome-free": "6.5.1",
        "@isaacs/ttlcache": "1.4.1",
        "@popperjs/core": "2.11.8",
-        "ace-builds": "1.31.0",
+        "ace-builds": "1.32.2",
        "archiver": "6.0.1",
-        "async": "3.2.4",
+        "async": "3.2.5",
        "autoprefixer": "10.4.16",
        "bcryptjs": "2.4.3",
        "benchpressjs": "2.5.1",
@@ -45,7 +45,7 @@
        "bootstrap": "5.3.2",
        "bootswatch": "5.3.2",
        "chalk": "4.1.2",
-        "chart.js": "4.4.0",
+        "chart.js": "4.4.1",
        "cli-graph": "3.2.2",
        "clipboard": "2.0.11",
        "colors": "1.4.0",
@@ -55,22 +55,23 @@
        "connect-flash": "0.1.1",
        "connect-mongo": "5.1.0",
        "connect-multiparty": "2.2.0",
-        "connect-pg-simple": "9.0.0",
+        "connect-pg-simple": "9.0.1",
        "connect-redis": "7.1.0",
        "cookie-parser": "1.4.6",
-        "cron": "3.1.4",
+        "cron": "3.1.6",
        "cropperjs": "1.6.1",
-        "csrf-sync": "4.0.1",
+        "csrf-sync": "4.0.3",
        "daemon": "1.1.0",
        "diff": "5.1.0",
-        "esbuild": "0.19.5",
+        "esbuild": "0.19.9",
        "express": "4.18.2",
        "express-session": "1.17.3",
        "express-useragent": "1.0.15",
+        "fetch-cookie": "2.1.0",
        "file-loader": "6.2.0",
-        "fs-extra": "11.1.1",
+        "fs-extra": "11.2.0",
        "graceful-fs": "4.2.11",
-        "helmet": "7.0.0",
+        "helmet": "7.1.0",
        "html-to-text": "9.0.5",
        "imagesloaded": "5.0.0",
        "ipaddr.js": "2.1.0",
@@ -84,17 +85,17 @@
        "jsonwebtoken": "9.0.2",
        "lodash": "4.17.21",
        "logrotate-stream": "0.2.9",
-        "lru-cache": "10.0.1",
+        "lru-cache": "10.1.0",
        "mime": "3.0.0",
        "mkdirp": "3.0.1",
-        "mongodb": "6.2.0",
+        "mongodb": "6.3.0",
        "morgan": "1.10.0",
        "mousetrap": "1.6.5",
        "multiparty": "4.2.3",
        "nconf": "0.12.1",
        "nodebb-plugin-2factor": "7.4.0",
        "nodebb-plugin-composer-default": "10.2.29",
-        "nodebb-plugin-dbsearch": "6.2.2",
+        "nodebb-plugin-dbsearch": "6.2.3",
        "nodebb-plugin-emoji": "5.1.13",
        "nodebb-plugin-emoji-android": "4.0.0",
        "nodebb-plugin-markdown": "12.2.5",
@@ -102,39 +103,37 @@
        "nodebb-plugin-ntfy": "1.7.3",
        "nodebb-plugin-spam-be-gone": "2.2.0",
        "nodebb-rewards-essentials": "1.0.0",
-        "nodebb-theme-harmony": "1.1.91",
+        "nodebb-theme-harmony": "1.1.105",
        "nodebb-theme-lavender": "7.1.5",
-        "nodebb-theme-peace": "2.1.23",
-        "nodebb-theme-persona": "13.2.42",
+        "nodebb-theme-peace": "2.1.25",
+        "nodebb-theme-persona": "13.2.49",
        "nodebb-widget-essentials": "7.0.14",
        "nodemailer": "6.9.7",
        "nprogress": "0.2.0",
-        "passport": "0.6.0",
+        "passport": "0.7.0",
        "passport-http-bearer": "1.0.1",
        "passport-local": "1.0.0",
        "pg": "8.11.3",
        "pg-cursor": "2.10.3",
-        "postcss": "8.4.31",
+        "postcss": "8.4.32",
        "postcss-clean": "1.2.0",
        "progress-webpack-plugin": "1.0.16",
        "prompt": "1.3.0",
        "ioredis": "5.3.2",
-        "request": "2.88.2",
-        "request-promise-native": "1.0.9",
        "rimraf": "5.0.5",
        "rss": "1.2.2",
        "rtlcss": "4.1.1",
        "sanitize-html": "2.11.0",
-        "sass": "1.69.4",
+        "sass": "1.69.5",
        "semver": "7.5.4",
        "serve-favicon": "2.5.0",
-        "sharp": "0.32.6",
+        "sharp": "0.33.1",
        "sitemap": "7.1.1",
        "socket.io": "4.7.2",
        "socket.io-client": "4.7.2",
        "@socket.io/redis-adapter": "8.2.1",
-        "sortablejs": "1.15.0",
-        "spdx-license-list": "6.7.0",
+        "sortablejs": "1.15.1",
+        "spdx-license-list": "6.8.0",
        "spider-detector": "2.0.1",
        "terser-webpack-plugin": "5.3.9",
        "textcomplete": "0.18.2",
@@ -142,11 +141,12 @@
        "timeago": "1.6.7",
        "tinycon": "0.6.8",
        "toobusy-js": "0.5.1",
+        "tough-cookie": "4.1.3",
        "validator": "13.11.0",
        "webpack": "5.89.0",
        "webpack-merge": "5.10.0",
        "winston": "3.11.0",
-        "workerpool": "6.5.1",
+        "workerpool": "9.0.1",
        "xml": "1.0.1",
        "xregexp": "5.1.1",
        "yargs": "17.7.2",
@@ -154,17 +154,17 @@
    },
    "devDependencies": {
        "@apidevtools/swagger-parser": "10.1.0",
-        "@commitlint/cli": "17.8.1",
-        "@commitlint/config-angular": "17.8.1",
+        "@commitlint/cli": "18.4.3",
+        "@commitlint/config-angular": "18.4.3",
        "coveralls": "3.1.1",
-        "eslint": "8.52.0",
+        "eslint": "8.56.0",
        "eslint-config-nodebb": "0.2.1",
-        "eslint-plugin-import": "2.29.0",
+        "eslint-plugin-import": "2.29.1",
        "grunt": "1.6.1",
        "grunt-contrib-watch": "1.1.0",
        "husky": "8.0.3",
-        "jsdom": "22.1.0",
-        "lint-staged": "15.0.2",
+        "jsdom": "23.0.1",
+        "lint-staged": "15.2.0",
        "mocha": "10.2.0",
        "mocha-lcov-reporter": "1.3.0",
        "mockdate": "3.0.5",
@@ -172,7 +172,7 @@
        "smtp-server": "3.13.0"
    },
    "optionalDependencies": {
-        "sass-embedded": "1.69.4"
+        "sass-embedded": "1.69.5"
    },
    "resolutions": {
        "*/jquery": "3.7.1"
@@ -181,7 +181,7 @@
        "url": "https://github.com/NodeBB/NodeBB/issues"
    },
    "engines": {
-        "node": ">=16"
+        "node": ">=18"
    },
    "maintainers": [
        {
@@ -195,4 +195,4 @@
            "url": "https://github.com/barisusakli"
        }
    ]
-}
+}
--- a/install/web.js
+++ b/install/web.js
@@ -174,6 +174,8 @@ function install(req, res) {
 	const database = nconf.get('database') || req.body.database || 'mongo';
 	const setupEnvVars = {
 		...process.env,
+		CONFIG: nconf.get('config'),
+		NODEBB_CONFIG: nconf.get('config'),
 		NODEBB_URL: nconf.get('url') || req.body.url || (`${req.protocol}://${req.get('host')}`),
 		NODEBB_PORT: nconf.get('port') || 4567,
 		NODEBB_ADMIN_USERNAME: nconf.get('admin:username') || req.body['admin:username'],
--- a/public/500.html
+++ b/public/500.html
@@ -0,0 +1,41 @@
+<html>
+<head>
+	<title>Internal Server Error</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<link rel="stylesheet" type="text/css" href="/assets/5xx.css" />
+
+	<script type="text/javascript">
+	window.onload = function() {
+		let count = 0;
+		const bounce = document.getElementById('click-me');
+		bounce.onclick = function() {
+			count++;
+			bounce.className = '';
+			setTimeout(function() {
+				bounce.className = 'animated bounce';
+			}, 50);
+
+			if (count > 5) {
+				document.getElementById('hide').className = '';
+			}
+		};
+	}
+	</script>
+</head>
+<body>
+	<div class="wrapper">
+		<div class="center">
+			<h1 id="click-me" class="animated bounce">500</h1>
+			<p>
+				<strong>Internal server error. </strong>
+			</p>
+			<p>
+				{message}
+			</p>
+			<p>
+				&nbsp;<small id="hide" class="hide">Alright. You can stop clicking... it's not going to make the site come back sooner!</small>
+			</p>
+		</div>
+	</div>
+</body>
+</html>
--- a/public/503.html
+++ b/public/503.html
@@ -2,147 +2,12 @@
 <head>
 	<title>Excessive Load Warning</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<style type="text/css">
-	body {
-		background: #00A9EA;
-		color: white;
-		font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-		text-align: center;
-		-webkit-transform-style: preserve-3d;
-		-moz-transform-style: preserve-3d;
-		transform-style: preserve-3d;
-	}
+	<link rel="stylesheet" type="text/css" href="/assets/5xx.css" />

-	h1 {
-		font-size: 250px;
-		color: #fff;
-		opacity: 0.5;
-		margin: 10px;
-		cursor: pointer;
-		-moz-user-select: none;
-		-khtml-user-select: none;
-		-webkit-user-select: none;
-	}
-
-	p {
-		font-size: 20px;
-	}
-
-	p strong {
-		font-size: 28px;
-	}
-
-	@media (max-width: 640px) {
-		h1 {
-			font-size: 125px;
-		}
-
-		p {
-			font-size: 16px;
-		}
-
-		p strong {
-			font-size: 20px;
-		}
-	}
-
-	.center {
-		position: relative;
-		top: 50%;
-		-webkit-transform: translateY(50%);
-		-ms-transform: translateY(50%);
-		transform: translateY(50%);
-	}
-
-	@-webkit-keyframes bounce {
-		0%, 20%, 53%, 80%, 100% {
-			-webkit-transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
-			transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
-			-webkit-transform: translate3d(0,0,0);
-			transform: translate3d(0,0,0);
-		}
-
-		40%, 43% {
-			-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
-			transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
-			-webkit-transform: translate3d(0, -30px, 0);
-			transform: translate3d(0, -30px, 0);
-		}
-
-		70% {
-			-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
-			transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
-			-webkit-transform: translate3d(0, -15px, 0);
-			transform: translate3d(0, -15px, 0);
-		}
-
-		90% {
-			-webkit-transform: translate3d(0,-4px,0);
-			transform: translate3d(0,-4px,0);
-		}
-	}
-
-	@keyframes bounce {
-		0%, 20%, 53%, 80%, 100% {
-			-webkit-transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
-			transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
-			-webkit-transform: translate3d(0,0,0);
-			transform: translate3d(0,0,0);
-		}
-
-		40%, 43% {
-			-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
-			transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
-			-webkit-transform: translate3d(0, -30px, 0);
-			transform: translate3d(0, -30px, 0);
-		}
-
-		70% {
-			-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
-			transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
-			-webkit-transform: translate3d(0, -15px, 0);
-			transform: translate3d(0, -15px, 0);
-		}
-
-		90% {
-			-webkit-transform: translate3d(0,-4px,0);
-			transform: translate3d(0,-4px,0);
-		}
-	}
-
-	.bounce {
-		-webkit-animation-name: bounce;
-		animation-name: bounce;
-		-webkit-transform-origin: center bottom;
-		-ms-transform-origin: center bottom;
-		transform-origin: center bottom;
-	}
-
-	.animated {
-		-webkit-animation-duration: 1s;
-		animation-duration: 1s;
-		-webkit-animation-fill-mode: both;
-		animation-fill-mode: both;
-	}
-
-	.animated.infinite {
-		-webkit-animation-iteration-count: infinite;
-		animation-iteration-count: infinite;
-	}
-
-	.animated.hinge {
-		-webkit-animation-duration: 2s;
-		animation-duration: 2s;
-	}
-
-	.hide {
-		display: none;
-	}
-	</style>
 	<script type="text/javascript">
 	window.onload = function() {
-		var count = 0,
-			bounce = document.getElementById('click-me');
+		let count = 0;
+		const bounce = document.getElementById('click-me');
 		bounce.onclick = function() {
 			count++;
 			bounce.className = '';
--- a/public/5xx.css
+++ b/public/5xx.css
@@ -0,0 +1,135 @@
+body {
+	background: #00A9EA;
+	color: white;
+	font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+	text-align: center;
+	-webkit-transform-style: preserve-3d;
+	-moz-transform-style: preserve-3d;
+	transform-style: preserve-3d;
+}
+
+h1 {
+	font-size: 250px;
+	color: #fff;
+	opacity: 0.5;
+	margin: 10px;
+	cursor: pointer;
+	-moz-user-select: none;
+	-khtml-user-select: none;
+	-webkit-user-select: none;
+}
+
+p {
+	font-size: 20px;
+}
+
+p strong {
+	font-size: 28px;
+}
+
+@media (max-width: 640px) {
+	h1 {
+		font-size: 125px;
+	}
+
+	p {
+		font-size: 16px;
+	}
+
+	p strong {
+		font-size: 20px;
+	}
+}
+
+.center {
+	position: relative;
+	top: 50%;
+	-webkit-transform: translateY(50%);
+	-ms-transform: translateY(50%);
+	transform: translateY(50%);
+}
+
+@-webkit-keyframes bounce {
+	0%, 20%, 53%, 80%, 100% {
+		-webkit-transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+		transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+		-webkit-transform: translate3d(0,0,0);
+		transform: translate3d(0,0,0);
+	}
+
+	40%, 43% {
+		-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+		transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+		-webkit-transform: translate3d(0, -30px, 0);
+		transform: translate3d(0, -30px, 0);
+	}
+
+	70% {
+		-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+		transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+		-webkit-transform: translate3d(0, -15px, 0);
+		transform: translate3d(0, -15px, 0);
+	}
+
+	90% {
+		-webkit-transform: translate3d(0,-4px,0);
+		transform: translate3d(0,-4px,0);
+	}
+}
+
+@keyframes bounce {
+	0%, 20%, 53%, 80%, 100% {
+		-webkit-transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+		transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
+		-webkit-transform: translate3d(0,0,0);
+		transform: translate3d(0,0,0);
+	}
+
+	40%, 43% {
+		-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+		transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+		-webkit-transform: translate3d(0, -30px, 0);
+		transform: translate3d(0, -30px, 0);
+	}
+
+	70% {
+		-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+		transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
+		-webkit-transform: translate3d(0, -15px, 0);
+		transform: translate3d(0, -15px, 0);
+	}
+
+	90% {
+		-webkit-transform: translate3d(0,-4px,0);
+		transform: translate3d(0,-4px,0);
+	}
+}
+
+.bounce {
+	-webkit-animation-name: bounce;
+	animation-name: bounce;
+	-webkit-transform-origin: center bottom;
+	-ms-transform-origin: center bottom;
+	transform-origin: center bottom;
+}
+
+.animated {
+	-webkit-animation-duration: 1s;
+	animation-duration: 1s;
+	-webkit-animation-fill-mode: both;
+	animation-fill-mode: both;
+}
+
+.animated.infinite {
+	-webkit-animation-iteration-count: infinite;
+	animation-iteration-count: infinite;
+}
+
+.animated.hinge {
+	-webkit-animation-duration: 2s;
+	animation-duration: 2s;
+}
+
+.hide {
+	display: none;
+}
--- a/public/language/ar/admin/settings/chat.json
+++ b/public/language/ar/admin/settings/chat.json
@@ -8,7 +8,6 @@
 	"max-chat-room-name-length": "Maximum length of chat room names",
 	"max-room-size": "Maximum number of users in chat rooms",
 	"delay": "Time between chat messages (ms)",
-	"newbieDelay": "... for new users (ms)",
 	"notification-delay": "Notification delay for chat messages",
 	"notification-delay-help": "Additional messages sent between this time are collated, and the user is notified once per delay period. Set this to 0 to disable the delay.",
 	"restrictions.seconds-edit-after": "Number of seconds a chat message will remain editable.",
--- a/public/language/ar/admin/settings/post.json
+++ b/public/language/ar/admin/settings/post.json
@@ -10,7 +10,6 @@
 	"length": "Post Length",
 	"post-queue": "Post Queue",
 	"restrictions": "Posting Restrictions",
-	"restrictions-new": "New User Restrictions",
 	"restrictions.post-queue": "Enable post queue",
 	"restrictions.post-queue-rep-threshold": "Reputation required to bypass post queue",
 	"restrictions.groups-exempt-from-post-queue": "Select groups that should be exempt from the post queue",
@@ -18,9 +17,6 @@
 	"restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval",
 	"restrictions-new.post-queue-help": "Enabling new user restrictions will set restrictions on posts created by new users",
 	"restrictions.seconds-between": "Number of seconds between posts",
-	"restrictions.seconds-between-new": "Seconds between posts for new users",
-	"restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted",
-	"restrictions.seconds-before-new": "Seconds before a new user can make their first post",
 	"restrictions.seconds-edit-after": "Number of seconds a post remains editable (set to 0 to disable)",
 	"restrictions.seconds-delete-after": "Number of seconds a post remains deletable (set to 0 to disable)",
 	"restrictions.replies-no-delete": "Number of replies after users are disallowed to delete their own topics (set to 0 to disable)",
--- a/public/language/ar/admin/settings/user.json
+++ b/public/language/ar/admin/settings/user.json
@@ -79,7 +79,14 @@
 	"follow-replied-topics": "Follow topics that you reply to",
 	"default-notification-settings": "Default notification settings",
 	"categoryWatchState": "Default category watch state",
-	"categoryWatchState.watching": "Watching",
+	"categoryWatchState.tracking": "Tracking",
 	"categoryWatchState.notwatching": "Not Watching",
-	"categoryWatchState.ignoring": "Ignoring"
+	"categoryWatchState.ignoring": "Ignoring",
+	"restrictions-new": "New User Restrictions",
+	"restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted",
+	"restrictions.seconds-between-new": "Seconds between posts for new users",
+	"restrictions.seconds-before-new": "Seconds before a new user can make their first post",
+	"restrictions.seconds-edit-after-new": "Number of seconds a post remains editable for new users (set to 0 to disable)",
+	"restrictions.milliseconds-between-messages": "Time between chat messages for new users (ms)",
+	"restrictions.groups-exempt-from-new-user-restrictions": "Select groups that should be exempt from the new user restrictions"
 }
--- a/public/language/ar/category.json
+++ b/public/language/ar/category.json
@@ -10,12 +10,15 @@
    "watch": "تابع",
    "ignore": "تجاهل",
    "watching": "متابع",
+    "tracking": "Tracking",
    "not-watching": "لست متابع",
    "ignoring": "متجاهل",
-    "watching.description": "أظهر المواضيع في الغير مقروء و الحديث",
+    "watching.description": "Notify me of new topics.<br/>Show topics in unread & recent",
+    "tracking.description": "Shows topics in unread & recent",
    "not-watching.description": "Do not show topics in unread, show in recent",
-    "ignoring.description": "Do not show topics in unread and recent",
+    "ignoring.description": "Do not show topics in unread & recent",
    "watching.message": "You are now watching updates from this category and all subcategories",
+    "tracking.message": "You are now tracking updates from this category and all subcategories",
    "notwatching.message": "You are not watching updates from this category and all subcategories",
    "ignoring.message": "You are now ignoring updates from this category and all subcategories",
    "watched-categories": "الأقسام المُتابعة",
--- a/public/language/ar/error.json
+++ b/public/language/ar/error.json
@@ -32,7 +32,7 @@
    "folder-exists": "Folder exists",
    "invalid-pagination-value": "رقم الصفحة غير صحيح ، يجب أن يكون بين %1 و %2 .",
    "username-taken": "اسم المستخدم مأخوذ",
-    "email-taken": "البريد الالكتروني مأخوذ",
+    "email-taken": "Email address is already taken.",
    "email-nochange": "The email entered is the same as the email already on file.",
    "email-invited": "Email was already invited",
    "email-not-confirmed": "Posting in some categories or topics is enabled once your email is confirmed, please click here to send a confirmation email.",
@@ -91,6 +91,7 @@
    "category-not-selected": "Category not selected.",
    "too-many-posts": "يسمح لك بالنشر مرة كل %1 ثانية - يرجى الإنتظار قبل النشر مجدداً",
    "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
+    "too-many-posts-newbie-minutes": "As a new user, you can only post once every %1 minute(s) until you have earned %2 reputation - please wait before posting again",
    "already-posting": "You are already posting",
    "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",
    "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
--- a/public/language/ar/modules.json
+++ b/public/language/ar/modules.json
@@ -68,6 +68,8 @@
    "chat.in-room": "In this room",
    "chat.kick": "Kick",
    "chat.show-ip": "Show IP",
+    "chat.copy-text": "Copy Text",
+    "chat.copy-link": "Copy Link",
    "chat.owner": "Room Owner",
    "chat.grant-rescind-ownership": "Grant/Rescind Ownership",
    "chat.system.user-join": "%1 has joined the room <span class=\"timeago\" title=\"%2\"></span>",
--- a/public/language/ar/notifications.json
+++ b/public/language/ar/notifications.json
@@ -13,6 +13,7 @@
    "all": "الكل",
    "topics": "مواضيع",
    "tags": "Tags",
+    "categories": "Categories",
    "replies": "ردود",
    "chat": "محادثات",
    "group-chat": "Group Chats",
@@ -55,6 +56,7 @@
    "user-posted-topic-with-tag-dual": "<strong>%1</strong> has posted a new topic with tags <strong>%2</strong> and <strong>%3</strong>",
    "user-posted-topic-with-tag-triple": "<strong>%1</strong> has posted a new topic with tags <strong>%2</strong>, <strong>%3</strong> and <strong>%4</strong>",
    "user-posted-topic-with-tag-multiple": "<strong>%1</strong> has posted a new topic with tags <strong>%2</strong>",
+    "user-posted-topic-in-category": "<strong>%1</strong> has posted a new topic in <strong>%2</strong>",
    "user-started-following-you": "<strong>%1</strong> صار يتابعك.",
    "user-started-following-you-dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
    "user-started-following-you-triple": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> started following you.",
@@ -81,6 +83,7 @@
    "notificationType-upvote": "عندما يوافقك احدهم على منشورك",
    "notificationType-new-topic": "When someone you follow posts a topic",
    "notificationType-new-topic-with-tag": "When a topic is posted with a tag you follow",
+    "notificationType-new-topic-in-category": "When a topic is posted in a category you are watching",
    "notificationType-new-reply": "When a new reply is posted in a topic you are watching",
    "notificationType-post-edit": "When a post is edited in a topic you are watching",
    "notificationType-follow": "When someone starts following you",
--- a/public/language/ar/post-queue.json
+++ b/public/language/ar/post-queue.json
@@ -3,8 +3,10 @@
 	"post-queue": "Post Queue",
 	"no-queued-posts": "There are no posts in the post queue.",
 	"no-single-post": "The topic or post you are looking for is no longer in the queue. It has likely been approved or deleted already.",
-	"enabling-help": "To enable this feature, go to <a href=\"%1\">Settings &rarr; Post &rarr; Post Queue</a> and enable <strong>Post Queue</strong>.",
+	"enabling-help": "The post queue is currently <strong>disabled</strong>. To enable this feature, go to <a href=\"%1\">Settings &rarr; Post &rarr; Post Queue</a> and enable <strong>Post Queue</strong>.",
 	"back-to-list": "Back to Post Queue",
+	"public-intro": "If you have any queued posts, they will be shown here.",
+	"public-description": "This forum is configured to automatically queue posts from new accounts, pending moderator approval.<br />If you have queued posts awaiting approval, you will be able to see them here.",
 	"user": "User",
 	"when": "When",
 	"category": "Category",
--- a/public/language/ar/social.json
+++ b/public/language/ar/social.json
@@ -6,5 +6,7 @@
 	"sign-in-with-google": "تسجيل الدخول باستخدام قوقل",
 	"sign-up-with-google": "التسجيل باستخدام قوقل",
 	"log-in-with-facebook": "تسجيل الدخول باستخدام فيسبوك",
-	"continue-with-facebook": "التسجيل باستخدام فيسبوك"
+	"continue-with-facebook": "التسجيل باستخدام فيسبوك",
+	"sign-in-with-linkedin": "Sign in with LinkedIn",
+	"sign-up-with-linkedin": "Sign up with LinkedIn"
 }
--- a/public/language/bg/admin/settings/chat.json
+++ b/public/language/bg/admin/settings/chat.json
@@ -8,7 +8,6 @@
 	"max-chat-room-name-length": "Максимална дължина на имената на стаи за разговори",
 	"max-room-size": "Максимален брой потребители в стая за разговор",
 	"delay": "Време между съобщенията в разговорите (мсек)",
-	"newbieDelay": "…за нови потребители (мсек)",
 	"notification-delay": "Забавяне преди известяване за съобщения в разговорите",
 	"notification-delay-help": "Допълнителните съобщения, изпратени в рамките на това време, се комбинират, и потребителят получава по едно известие за всеки такъв период на забавяне. Задайте стойност 0, за да изключите забавянето.",
 	"restrictions.seconds-edit-after": "Брой секунди, през които съобщенията в разговор могат да бъдат редактирани.",
--- a/public/language/bg/admin/settings/post.json
+++ b/public/language/bg/admin/settings/post.json
@@ -10,7 +10,6 @@
 	"length": "Дължина на публикациите",
 	"post-queue": "Опашка за публикации",
 	"restrictions": "Ограничения за публикуването",
-	"restrictions-new": "Ограничения за новите потребители",
 	"restrictions.post-queue": "Включване на опашката за публикации",
 	"restrictions.post-queue-rep-threshold": "Нужна репутация за пропускане на опашката за публикации",
 	"restrictions.groups-exempt-from-post-queue": "Избиране на групи, които да пропускат опашката за публикации",
@@ -18,9 +17,6 @@
 	"restrictions.post-queue-help": "Ако опашката за публикации е включена, публикациите на новите потребители ще бъдат добавяни в опашка за одобрение",
 	"restrictions-new.post-queue-help": "Ако ограниченията за новите потребители са включени, това ще зададе някои ограничения за публикациите създадени от новите потребители",
 	"restrictions.seconds-between": "Брой секунди между публикациите",
-	"restrictions.seconds-between-new": "Брой секунди между публикациите за нови потребители",
-	"restrictions.rep-threshold": "Необходима репутация за премахване на това ограничение",
-	"restrictions.seconds-before-new": "Брой секунди преди новите потребители да могат да публикуват за пръв път",
 	"restrictions.seconds-edit-after": "Брой секунди, през които публикациите могат да бъдат редактирани. (0 = изключено)",
 	"restrictions.seconds-delete-after": "Брой секунди, през които публикациите могат да бъдат изтрити. (0 = изключено)",
 	"restrictions.replies-no-delete": "Брой отговори, след които потребителите вече не могат да изтриват собствените си теми. (0 = изключено)",
--- a/public/language/bg/admin/settings/user.json
+++ b/public/language/bg/admin/settings/user.json
@@ -78,8 +78,15 @@
 	"follow-created-topics": "Следване на темите, които създавате",
 	"follow-replied-topics": "Следване на темите, на които отговаряте",
 	"default-notification-settings": "Настройки по подразбиране за известията",
-	"categoryWatchState": "Състояние по подразбиране за следенето на категории",
-	"categoryWatchState.watching": "Да се следят",
-	"categoryWatchState.notwatching": "Да не се следят",
-	"categoryWatchState.ignoring": "Да се пренебрегват"
+	"categoryWatchState": "Състояние по подразбиране за наблюдаването на категории",
+	"categoryWatchState.tracking": "Да се следят",
+	"categoryWatchState.notwatching": "Да не се наблюдават",
+	"categoryWatchState.ignoring": "Да се пренебрегват",
+	"restrictions-new": "Ограничения за новите потребители",
+	"restrictions.rep-threshold": "Необходима репутация за премахване на това ограничение",
+	"restrictions.seconds-between-new": "Брой секунди между публикациите за нови потребители",
+	"restrictions.seconds-before-new": "Брой секунди преди новите потребители да могат да публикуват за пръв път",
+	"restrictions.seconds-edit-after-new": "Брой секунди, през които публикациите могат да бъдат редактирани от нови потребители. (0 = изключено)",
+	"restrictions.milliseconds-between-messages": "Време между съобщенията в разговорите за нови потребители (мсек)",
+	"restrictions.groups-exempt-from-new-user-restrictions": "Избиране на групи, за които да не важат ограниченията за нови потребители"
 }
--- a/public/language/bg/category.json
+++ b/public/language/bg/category.json
@@ -7,17 +7,20 @@
    "browsing": "разглежда",
    "no-replies": "Няма отговори",
    "no-new-posts": "Няма нови публикации.",
-    "watch": "Следене",
+    "watch": "Наблюдаване",
    "ignore": "Пренебрегване",
-    "watching": "Следите",
-    "not-watching": "Не следите",
+    "watching": "Наблюдавате",
+    "tracking": "Следите",
+    "not-watching": "Не наблюдавате",
    "ignoring": "Пренебрегвате",
-    "watching.description": "Темите да се показват в непрочетените и скорошните",
+    "watching.description": "Искам да получавам известия за новите теми.<br/>Искам темите да се показват в списъците с непрочетени и скорошни.",
+    "tracking.description": "Темите да се показват в непрочетените и скорошните",
    "not-watching.description": "Темите да не се показват в непрочетените, а само в скорошните",
    "ignoring.description": "Темите да не се показват нито в непрочетените, нито в скорошните",
-    "watching.message": "Вече следите новите неща в категорията и подкатегориите ѝ",
-    "notwatching.message": "Вече не следите новите неща в категорията и подкатегориите ѝ",
+    "watching.message": "Вече наблюдавате новите неща в категорията и подкатегориите ѝ",
+    "tracking.message": "Вече следите новите неща в категорията и подкатегориите ѝ",
+    "notwatching.message": "Вече не наблюдавате новите неща в категорията и подкатегориите ѝ",
    "ignoring.message": "Вече пренебрегвате новите неща в тази категория и всички нейни подкатегории",
-    "watched-categories": "Следени категории",
+    "watched-categories": "Наблюдавани категории",
    "x-more-categories": "Още %1 категории"
 }
--- a/public/language/bg/error.json
+++ b/public/language/bg/error.json
@@ -32,7 +32,7 @@
    "folder-exists": "Вече има папка с това име",
    "invalid-pagination-value": "Грешен номер на странициране, трябва да бъде между %1 и %2",
    "username-taken": "Потребителското име е заето",
-    "email-taken": "Е-пощата е заета",
+    "email-taken": "Email address is already taken.",
    "email-nochange": "Въведената е-поща е същата като съществуващата.",
    "email-invited": "На тази е-поща вече е била изпратена покана",
    "email-not-confirmed": "Публикуването в някои категории и теми ще бъде възможно едва след като е-пощата Ви бъде потвърдена. Щръкнете тук, за да Ви изпратим е-писмо за потвърждение.",
@@ -91,6 +91,7 @@
    "category-not-selected": "Не е избрана категория.",
    "too-many-posts": "Можете да публикувате веднъж на %1 секунда/и – моля, изчакайте малко, преди да опитате да публикувате отново",
    "too-many-posts-newbie": "Като нов потребител, Вие можете да публикувате веднъж на %1 секунда/и, докато не натрупате %2 репутация – моля, изчакайте малко, преди да опитате да публикувате отново",
+    "too-many-posts-newbie-minutes": "Като нов потребител, Вие можете да публикувате веднъж на %1 минута/и, докато не натрупате %2 репутация – моля, изчакайте малко, преди да опитате да публикувате отново",
    "already-posting": "В момента публикувате",
    "tag-too-short": "Моля, въведете по-дълъг етикет. Етикетите трябва да съдържат поне %1 символ(а)",
    "tag-too-long": "Моля, въведете по-кратък етикет. Етикетите трябва да съдържат не повече от %1 символ(а)",
--- a/public/language/bg/modules.json
+++ b/public/language/bg/modules.json
@@ -68,6 +68,8 @@
    "chat.in-room": "В тази стая",
    "chat.kick": "Изгонване",
    "chat.show-ip": "Показване на IP адреса",
+    "chat.copy-text": "Копиране на текста",
+    "chat.copy-link": "Копиране на връзката",
    "chat.owner": "Собственик на стаята",
    "chat.grant-rescind-ownership": "Даване/отнемане на собственост",
    "chat.system.user-join": "%1 се присъедини към стаята <span class=\"timeago\" title=\"%2\"></span>",
--- a/public/language/bg/notifications.json
+++ b/public/language/bg/notifications.json
@@ -13,6 +13,7 @@
    "all": "Всички",
    "topics": "Теми",
    "tags": "Етикети",
+    "categories": "Категории",
    "replies": "Отговори",
    "chat": "Разговори",
    "group-chat": "Групови разговори",
@@ -55,6 +56,7 @@
    "user-posted-topic-with-tag-dual": "<strong>%1</strong> публикува нова тема с етикети <strong>%2</strong> и <strong>%3</strong>",
    "user-posted-topic-with-tag-triple": "<strong>%1</strong> публикува нова тема с етикети <strong>%2</strong>, <strong>%3</strong> и <strong>%4</strong>",
    "user-posted-topic-with-tag-multiple": "<strong>%1</strong> публикува нова тема с етикети <strong>%2</strong>",
+    "user-posted-topic-in-category": "<strong>%1</strong> публикува нова тема в <strong>%2</strong>",
    "user-started-following-you": "<strong>%1</strong> започна да Ви следва.",
    "user-started-following-you-dual": "<strong>%1</strong> и <strong>%2</strong> започнаха да Ви следват.",
    "user-started-following-you-triple": "<strong>%1</strong>, <strong>%2</strong> и <strong>%3</strong> започнаха да Ви следват.",
@@ -81,8 +83,9 @@
    "notificationType-upvote": "Когато някой гласува положително за Ваша публикация",
    "notificationType-new-topic": "Когато някой, когото следвате, публикува тема",
    "notificationType-new-topic-with-tag": "Когато бъде публикувана нова тема с етикет, който следвате",
-    "notificationType-new-reply": "Когато бъде публикуван нов отговор в тема, която следвате",
-    "notificationType-post-edit": "Когато бъде редактирана публикация в тема, която следите",
+    "notificationType-new-topic-in-category": "Когато бъде публикувана нова тема в категория, която наблюдавате",
+    "notificationType-new-reply": "Когато бъде публикуван нов отговор в тема, която наблюдавате",
+    "notificationType-post-edit": "Когато бъде редактирана публикация в тема, която наблюдавате",
    "notificationType-follow": "Когато някой започне да Ви следва",
    "notificationType-new-chat": "Когато получите съобщение в разговор",
    "notificationType-new-group-chat": "Когато получите съобщение в групов разговор",
--- a/public/language/bg/pages.json
+++ b/public/language/bg/pages.json
@@ -47,12 +47,12 @@
    "account/latest-posts": "Последни публикации от %1",
    "account/topics": "Теми, създадени от %1",
    "account/groups": "Групите на %1",
-    "account/watched-categories": "Следените категории на %1",
-    "account/watched-tags": "Следените етикети на %1",
+    "account/watched-categories": "Наблюдаваните категории на %1",
+    "account/watched-tags": "Наблюдаваните етикети на %1",
    "account/bookmarks": "Отметнатите публикации на %1",
    "account/settings": "Потребителски настройки",
    "account/settings-of": "Променят се настройките на %1",
-    "account/watched": "Теми, следени от %1",
+    "account/watched": "Теми, наблюдавани от %1",
    "account/ignored": "Теми, пренебрегвани от %1",
    "account/upvoted": "Публикации, получили положителен глас от %1",
    "account/downvoted": "Публикации, получили отрицателен глас от %1",
--- a/public/language/bg/post-queue.json
+++ b/public/language/bg/post-queue.json
@@ -3,8 +3,10 @@
 	"post-queue": "Опашка за публикации",
 	"no-queued-posts": "В опашката за публикации няма нищо.",
 	"no-single-post": "Темата или публикацията, която търсите, вече не се намира в опашката. Вероятно или е била одобрена, или изтрита.",
-	"enabling-help": "За да включите тази функционалност, идете в <a href=\"%1\">Настройки &rarr; Публикуване &rarr; Опашка за публикации</a> и включете <strong>Опашката за публикации</strong>.",
+	"enabling-help": "В момента опашката за публикации е <strong>изключена</strong>. За да включите тази функционалност, идете в <a href=\"%1\">Настройки &rarr; Публикации &rarr; Опашка за публикации</a> и включете <strong>Опашката за публикации</strong>.",
 	"back-to-list": "Назад към Опашката за публикации",
+	"public-intro": "Ако имате публикации, които чакат в опашката, те ще бъдат показани тук.",
+	"public-description": "Този форум е настроен автоматично да добавя публикациите от нови потребители, така че да чакат одобрението на модератор.<br />Ако имате публикации, които чакат в опашката за одобрение, ще можете да ги видите тук.",
 	"user": "Потребител",
 	"when": "Кога",
 	"category": "Категория",
--- a/public/language/bg/search.json
+++ b/public/language/bg/search.json
@@ -13,7 +13,7 @@
    "categories": "Категории",
    "all-categories": "Всички категории",
    "categories-x": "Категории: %1",
-    "categories-watched-categories": "Категории: Следени категории",
+    "categories-watched-categories": "Категории: Наблюдавани категории",
    "type-a-category": "Въведете категория",
    "tags": "Етикети",
    "tags-x": "Етикети: %1",
--- a/public/language/bg/social.json
+++ b/public/language/bg/social.json
@@ -6,5 +6,7 @@
 	"sign-in-with-google": "Вписване с Google",
 	"sign-up-with-google": "Регистриране с Google",
 	"log-in-with-facebook": "Вписване с Facebook",
-	"continue-with-facebook": "Продължаване с Facebook"
+	"continue-with-facebook": "Продължаване с Facebook",
+	"sign-in-with-linkedin": "Вписване с LinkedIn",
+	"sign-up-with-linkedin": "Регистриране с LinkedIn"
 }
--- a/public/language/bg/tags.json
+++ b/public/language/bg/tags.json
@@ -8,8 +8,8 @@
    "no-tags": "Все още няма етикети.",
    "select-tags": "Изберете етикети",
    "tag-whitelist": "Списък от разрешени етикети",
-    "watching": "Следите",
-    "not-watching": "Не следите",
+    "watching": "Наблюдавате",
+    "not-watching": "Не наблюдавате",
    "watching.description": "Искам да получавам известия за нови теми.",
    "not-watching.description": "Не искам да получавам известия за нови теми.",
    "following-tag.message": "Вече ще получавате известия, когато някой публикува тема с този етикет.",
--- a/public/language/bg/topic.json
+++ b/public/language/bg/topic.json
@@ -80,13 +80,13 @@
    "markAsUnreadForAll.success": "Темата е отбелязана като непрочетена за всички.",
    "mark-unread": "Отбелязване като непрочетена",
    "mark-unread.success": "Темата е отбелязана като непрочетена.",
-    "watch": "Следене",
-    "unwatch": "Спиране на следенето",
+    "watch": "Наблюдаване",
+    "unwatch": "Спиране на наблюдаването",
    "watch.title": "Получавайте известия за новите отговори в тази тема",
-    "unwatch.title": "Спрете да следите тази тема",
+    "unwatch.title": "Спрете да наблюдавате тази тема",
    "share-this-post": "Споделете тази публикация",
-    "watching": "Следите",
-    "not-watching": "Не следите",
+    "watching": "Наблюдавате",
+    "not-watching": "Не наблюдавате",
    "ignoring": "Пренебрегвате",
    "watching.description": "Искам да получавам известия за новите отговори.<br/>Искам темата да се показва в списъка с непрочетени.",
    "not-watching.description": "Не искам да получавам известия за новите отговори.<br/>Темата да се показва в списъка с непрочетени, само ако категорията не се пренебрегва.",
--- a/public/language/bg/unread.json
+++ b/public/language/bg/unread.json
@@ -9,7 +9,7 @@
    "topics-marked-as-read.success": "Темите бяха отбелязани като прочетени!",
    "all-topics": "Всички теми",
    "new-topics": "Нови теми",
-    "watched-topics": "Следени теми",
+    "watched-topics": "Наблюдавани теми",
    "unreplied-topics": "Теми без отговор",
    "multiple-categories-selected": "Избрани са няколко"
 }
--- a/public/language/bg/user.json
+++ b/public/language/bg/user.json
@@ -35,12 +35,12 @@
    "profile-views": "Преглеждания на профила",
    "reputation": "Репутация",
    "bookmarks": "Отметки",
-    "watched-categories": "Следени категории",
-    "watched-tags": "Следени етикети",
+    "watched-categories": "Наблюдавани категории",
+    "watched-tags": "Наблюдавани етикети",
    "change-all": "Промяна на всички",
-    "watched": "Следени",
+    "watched": "Наблюдавани",
    "ignored": "Пренебрегвани",
-    "default-category-watch-state": "Състояние по подразбиране за следенето на категории",
+    "default-category-watch-state": "Състояние по подразбиране за наблюдаването на категории",
    "followers": "Последователи",
    "following": "Следва",
    "blocks": "Блокира",
@@ -108,7 +108,7 @@
    "has-no-posts": "Този потребител не е публикувал нищо досега.",
    "has-no-best-posts": "Този потребител не е получавал положителни гласове за публикациите си досега.",
    "has-no-topics": "Този потребител не е създавал теми досега.",
-    "has-no-watched-topics": "Този потребител не е следил нито една тема досега.",
+    "has-no-watched-topics": "Този потребител не е наблюдавал нито една тема досега.",
    "has-no-ignored-topics": "Този потребител не е пренебрегнал нито една тема досега.",
    "has-no-upvoted-posts": "Този потребител не е гласувал положително досега.",
    "has-no-downvoted-posts": "Този потребител не е гласувал отрицателно досега.",
@@ -137,8 +137,8 @@
    "topic-search-help": "Ако е включено, търсенето в темата ще замени стандартното поведение на браузъра при търсене в страницата и ще Ви позволи да претърсвате цялата тема, а не само това, което се вижда на екрана",
    "update-url-with-post-index": "Обновяване на адресната лента с номера на публикацията по време на разглеждане на темите",
    "scroll-to-my-post": "След публикуване на отговор, да се показва новата публикация",
-    "follow-topics-you-reply-to": "Следене на темите, в които отговаряте",
-    "follow-topics-you-create": "Следене на темите, които създавате",
+    "follow-topics-you-reply-to": "Наблюдаване на темите, в които отговаряте",
+    "follow-topics-you-create": "Наблюдаване на темите, които създавате",
    "grouptitle": "Заглавие на групата",
    "group-order-help": "Изберете група и използвайте стрелките, за да пренаредите заглавията",
    "no-group-title": "Няма заглавие на група",
--- a/public/language/bn/admin/settings/chat.json
+++ b/public/language/bn/admin/settings/chat.json
@@ -8,7 +8,6 @@
 	"max-chat-room-name-length": "Maximum length of chat room names",
 	"max-room-size": "Maximum number of users in chat rooms",
 	"delay": "Time between chat messages (ms)",
-	"newbieDelay": "... for new users (ms)",
 	"notification-delay": "Notification delay for chat messages",
 	"notification-delay-help": "Additional messages sent between this time are collated, and the user is notified once per delay period. Set this to 0 to disable the delay.",
 	"restrictions.seconds-edit-after": "Number of seconds a chat message will remain editable.",
--- a/public/language/bn/admin/settings/post.json
+++ b/public/language/bn/admin/settings/post.json
@@ -10,7 +10,6 @@
 	"length": "Post Length",
 	"post-queue": "Post Queue",
 	"restrictions": "Posting Restrictions",
-	"restrictions-new": "New User Restrictions",
 	"restrictions.post-queue": "Enable post queue",
 	"restrictions.post-queue-rep-threshold": "Reputation required to bypass post queue",
 	"restrictions.groups-exempt-from-post-queue": "Select groups that should be exempt from the post queue",
@@ -18,9 +17,6 @@
 	"restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval",
 	"restrictions-new.post-queue-help": "Enabling new user restrictions will set restrictions on posts created by new users",
 	"restrictions.seconds-between": "Number of seconds between posts",
-	"restrictions.seconds-between-new": "Seconds between posts for new users",
-	"restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted",
-	"restrictions.seconds-before-new": "Seconds before a new user can make their first post",
 	"restrictions.seconds-edit-after": "Number of seconds a post remains editable (set to 0 to disable)",
 	"restrictions.seconds-delete-after": "Number of seconds a post remains deletable (set to 0 to disable)",
 	"restrictions.replies-no-delete": "Number of replies after users are disallowed to delete their own topics (set to 0 to disable)",
--- a/public/language/bn/admin/settings/user.json
+++ b/public/language/bn/admin/settings/user.json
@@ -79,7 +79,14 @@
 	"follow-replied-topics": "Follow topics that you reply to",
 	"default-notification-settings": "Default notification settings",
 	"categoryWatchState": "Default category watch state",
-	"categoryWatchState.watching": "Watching",
+	"categoryWatchState.tracking": "Tracking",
 	"categoryWatchState.notwatching": "Not Watching",
-	"categoryWatchState.ignoring": "Ignoring"
+	"categoryWatchState.ignoring": "Ignoring",
+	"restrictions-new": "New User Restrictions",
+	"restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted",
+	"restrictions.seconds-between-new": "Seconds between posts for new users",
+	"restrictions.seconds-before-new": "Seconds before a new user can make their first post",
+	"restrictions.seconds-edit-after-new": "Number of seconds a post remains editable for new users (set to 0 to disable)",
+	"restrictions.milliseconds-between-messages": "Time between chat messages for new users (ms)",
+	"restrictions.groups-exempt-from-new-user-restrictions": "Select groups that should be exempt from the new user restrictions"
 }
--- a/public/language/bn/category.json
+++ b/public/language/bn/category.json
@@ -10,12 +10,15 @@
    "watch": "নজর রাখুন",
    "ignore": "উপেক্ষা করুন",
    "watching": "দৃশ্যমান",
+    "tracking": "Tracking",
    "not-watching": "দেখা হচ্ছে না",
    "ignoring": "উপেক্ষারত",
-    "watching.description": "অপঠিত এবং সাম্প্রতিক বিষয়গুলো দেখাও",
+    "watching.description": "Notify me of new topics.<br/>Show topics in unread & recent",
+    "tracking.description": "Shows topics in unread & recent",
    "not-watching.description": "Do not show topics in unread, show in recent",
-    "ignoring.description": "Do not show topics in unread and recent",
+    "ignoring.description": "Do not show topics in unread & recent",
    "watching.message": "You are now watching updates from this category and all subcategories",
+    "tracking.message": "You are now tracking updates from this category and all subcategories",
    "notwatching.message": "You are not watching updates from this category and all subcategories",
    "ignoring.message": "You are now ignoring updates from this category and all subcategories",
    "watched-categories": "প্রেক্ষিত বিভাগসমূহ",
--- a/public/language/bn/error.json
+++ b/public/language/bn/error.json
@@ -32,7 +32,7 @@
    "folder-exists": "Folder exists",
    "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
    "username-taken": "ইউজারনেম আগেই ব্যবহৃত",
-    "email-taken": "ইমেইল আগেই ব্যবহৃত",
+    "email-taken": "Email address is already taken.",
    "email-nochange": "The email entered is the same as the email already on file.",
    "email-invited": "Email was already invited",
    "email-not-confirmed": "Posting in some categories or topics is enabled once your email is confirmed, please click here to send a confirmation email.",
@@ -91,6 +91,7 @@
    "category-not-selected": "Category not selected.",
    "too-many-posts": "You can only post once every %1 second(s) - please wait before posting again",
    "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
+    "too-many-posts-newbie-minutes": "As a new user, you can only post once every %1 minute(s) until you have earned %2 reputation - please wait before posting again",
    "already-posting": "You are already posting",
    "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",
    "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
--- a/public/language/bn/modules.json
+++ b/public/language/bn/modules.json
@@ -68,6 +68,8 @@
    "chat.in-room": "In this room",
    "chat.kick": "Kick",
    "chat.show-ip": "Show IP",
+    "chat.copy-text": "Copy Text",
+    "chat.copy-link": "Copy Link",
    "chat.owner": "Room Owner",
    "chat.grant-rescind-ownership": "Grant/Rescind Ownership",
    "chat.system.user-join": "%1 has joined the room <span class=\"timeago\" title=\"%2\"></span>",
--- a/public/language/bn/notifications.json
+++ b/public/language/bn/notifications.json
@@ -13,6 +13,7 @@
    "all": "All",
    "topics": "Topics",
    "tags": "Tags",
+    "categories": "Categories",
    "replies": "Replies",
    "chat": "Chats",
    "group-chat": "Group Chats",
@@ -55,6 +56,7 @@
    "user-posted-topic-with-tag-dual": "<strong>%1</strong> has posted a new topic with tags <strong>%2</strong> and <strong>%3</strong>",
    "user-posted-topic-with-tag-triple": "<strong>%1</strong> has posted a new topic with tags <strong>%2</strong>, <strong>%3</strong> and <strong>%4</strong>",
    "user-posted-topic-with-tag-multiple": "<strong>%1</strong> has posted a new topic with tags <strong>%2</strong>",
+    "user-posted-topic-in-category": "<strong>%1</strong> has posted a new topic in <strong>%2</strong>",
    "user-started-following-you": "<strong>%1</strong> আপনাকে অনুসরন করা শুরু করেছেন।",
    "user-started-following-you-dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
    "user-started-following-you-triple": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> started following you.",
@@ -81,6 +83,7 @@
    "notificationType-upvote": "When someone upvotes your post",
    "notificationType-new-topic": "When someone you follow posts a topic",
    "notificationType-new-topic-with-tag": "When a topic is posted with a tag you follow",
+    "notificationType-new-topic-in-category": "When a topic is posted in a category you are watching",
    "notificationType-new-reply": "When a new reply is posted in a topic you are watching",
    "notificationType-post-edit": "When a post is edited in a topic you are watching",
    "notificationType-follow": "When someone starts following you",
--- a/public/language/bn/post-queue.json
+++ b/public/language/bn/post-queue.json
@@ -3,8 +3,10 @@
 	"post-queue": "Post Queue",
 	"no-queued-posts": "There are no posts in the post queue.",
 	"no-single-post": "The topic or post you are looking for is no longer in the queue. It has likely been approved or deleted already.",
-	"enabling-help": "To enable this feature, go to <a href=\"%1\">Settings &rarr; Post &rarr; Post Queue</a> and enable <strong>Post Queue</strong>.",
+	"enabling-help": "The post queue is currently <strong>disabled</strong>. To enable this feature, go to <a href=\"%1\">Settings &rarr; Post &rarr; Post Queue</a> and enable <strong>Post Queue</strong>.",
 	"back-to-list": "Back to Post Queue",
+	"public-intro": "If you have any queued posts, they will be shown here.",
+	"public-description": "This forum is configured to automatically queue posts from new accounts, pending moderator approval.<br />If you have queued posts awaiting approval, you will be able to see them here.",
 	"user": "User",
 	"when": "When",
 	"category": "Category",
--- a/public/language/bn/social.json
+++ b/public/language/bn/social.json
@@ -6,5 +6,7 @@
 	"sign-in-with-google": "Sign in with Google",
 	"sign-up-with-google": "Sign up with Google",
 	"log-in-with-facebook": "Log in with Facebook",
-	"continue-with-facebook": "Continue with Facebook"
+	"continue-with-facebook": "Continue with Facebook",
+	"sign-in-with-linkedin": "Sign in with LinkedIn",
+	"sign-up-with-linkedin": "Sign up with LinkedIn"
 }
--- a/public/language/cs/admin/settings/chat.json
+++ b/public/language/cs/admin/settings/chat.json
@@ -8,7 +8,6 @@
 	"max-chat-room-name-length": "Maximum length of chat room names",
 	"max-room-size": "Maximální počet uživatelů v konverzační místnosti",
 	"delay": "Time between chat messages (ms)",
-	"newbieDelay": "... for new users (ms)",
 	"notification-delay": "Notification delay for chat messages",
 	"notification-delay-help": "Additional messages sent between this time are collated, and the user is notified once per delay period. Set this to 0 to disable the delay.",
 	"restrictions.seconds-edit-after": "Number of seconds a chat message will remain editable.",
--- a/public/language/cs/admin/settings/post.json
+++ b/public/language/cs/admin/settings/post.json
@@ -10,7 +10,6 @@
 	"length": "Délka příspěvku",
 	"post-queue": "Příspěvky ve frontě",
 	"restrictions": "Omezení příspěvků",
-	"restrictions-new": "Omezení nového uživatele",
 	"restrictions.post-queue": "Povolit frontu pro příspěvky",
 	"restrictions.post-queue-rep-threshold": "Vyžadovaná reputace pro přeskočení fronty příspěvků",
 	"restrictions.groups-exempt-from-post-queue": "Vyberte skupinu, která by měla být vyloučena z fronty příspěvků",
@@ -18,9 +17,6 @@
 	"restrictions.post-queue-help": "Povolení fronty příspěvků bude mít za následek vložení příspěvků nových uživatelů do fronty pro schválení.",
 	"restrictions-new.post-queue-help": "Povolení omezení nových uživatelů bude mít za následek omezení příspěvků vytvořených novými uživateli",
 	"restrictions.seconds-between": "Počet sekund mezi novými příspěvky",
-	"restrictions.seconds-between-new": "Sekund mezi příspěvky pro nové uživatele",
-	"restrictions.rep-threshold": "Ohraničení reputace než začnou platit tato omezení",
-	"restrictions.seconds-before-new": "Počet sekund, než může nový uživatel vytvořit první příspěvek",
 	"restrictions.seconds-edit-after": "Počet sekund, kdy příspěvek může být ještě upraven (pro zakázání - 0)",
 	"restrictions.seconds-delete-after": "Počet sekund, kdy příspěvek může být ještě odstraněn (pro zakázání - 0)",
 	"restrictions.replies-no-delete": "Počet odpovědí, kdy je již uživateli zakázáno odstranit založená témata (pro zakázání - 0)",
--- a/public/language/cs/admin/settings/user.json
+++ b/public/language/cs/admin/settings/user.json
@@ -79,7 +79,14 @@
 	"follow-replied-topics": "Sledovat témata, na které jste odpověděl",
 	"default-notification-settings": "Nastavení výchozího oznámení",
 	"categoryWatchState": "Stav sledování výchozí kategorie",
-	"categoryWatchState.watching": "Sledování",
+	"categoryWatchState.tracking": "Tracking",
 	"categoryWatchState.notwatching": "Nesleduji",
-	"categoryWatchState.ignoring": "Ignorace"
+	"categoryWatchState.ignoring": "Ignorace",
+	"restrictions-new": "New User Restrictions",
+	"restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted",
+	"restrictions.seconds-between-new": "Seconds between posts for new users",
+	"restrictions.seconds-before-new": "Seconds before a new user can make their first post",
+	"restrictions.seconds-edit-after-new": "Number of seconds a post remains editable for new users (set to 0 to disable)",
+	"restrictions.milliseconds-between-messages": "Time between chat messages for new users (ms)",
+	"restrictions.groups-exempt-from-new-user-restrictions": "Select groups that should be exempt from the new user restrictions"
 }
--- a/public/language/cs/category.json
+++ b/public/language/cs/category.json
@@ -10,12 +10,15 @@
    "watch": "Sledovat",
    "ignore": "Ignorovat",
    "watching": "Sledováno",
+    "tracking": "Tracking",
    "not-watching": "Nesledováno",
    "ignoring": "Ignorováno",
-    "watching.description": "Zobrazit témata v nepřečtených a posledních",
+    "watching.description": "Notify me of new topics.<br/>Show topics in unread & recent",
+    "tracking.description": "Shows topics in unread & recent",
    "not-watching.description": "Nezobrazovat témata v nepřečtených, zobrazit poslední",
-    "ignoring.description": "Nezobrazovat témata v nepřečtených a posledních",
+    "ignoring.description": "Do not show topics in unread & recent",
    "watching.message": "Nyní sledujete aktualizace pro tuto kategorii a všech podkategorii",
+    "tracking.message": "You are now tracking updates from this category and all subcategories",
    "notwatching.message": "Nyní nesledujete aktualizace z této kategorie a všech podkategorií",
    "ignoring.message": "Nyní ignorujete aktualizace této kategorie a všech jejich kategorii",
    "watched-categories": "Sledované kategorie",
--- a/public/language/cs/error.json
+++ b/public/language/cs/error.json
@@ -32,7 +32,7 @@
    "folder-exists": "Folder exists",
    "invalid-pagination-value": "Neplatná hodnota stránkování, musí být alespoň %1 a nejvýše %2",
    "username-taken": "Uživatelské jméno je již použito",
-    "email-taken": "Tento e-mail je již použit",
+    "email-taken": "Email address is already taken.",
    "email-nochange": "The email entered is the same as the email already on file.",
    "email-invited": "Email was already invited",
    "email-not-confirmed": "Posting in some categories or topics is enabled once your email is confirmed, please click here to send a confirmation email.",
@@ -91,6 +91,7 @@
    "category-not-selected": "Nebyla vybrána kategorie.",
    "too-many-posts": "Můžete přispívat jednou za %1 sekund - vyčkejte tedy, než vytvoříte další příspěvek",
    "too-many-posts-newbie": "Jako nový uživatel, můžete přispívat jednou za %1 sekund, dokud nezískáte pověst %2 - vyčkejte tedy, než vytvoříte další příspěvek",
+    "too-many-posts-newbie-minutes": "As a new user, you can only post once every %1 minute(s) until you have earned %2 reputation - please wait before posting again",
    "already-posting": "You are already posting",
    "tag-too-short": "Zadejte delší značku. Značky by měli mít alespoň %1 znaků",
    "tag-too-long": "Zadejte kratší značku. Značky nesmí být delší než %1 znaků",
--- a/public/language/cs/modules.json
+++ b/public/language/cs/modules.json
@@ -68,6 +68,8 @@
    "chat.in-room": "V této místnosti",
    "chat.kick": "Vykopnout",
    "chat.show-ip": "Zobrazit IP",
+    "chat.copy-text": "Copy Text",
+    "chat.copy-link": "Copy Link",
    "chat.owner": "Majitel místnosti",
    "chat.grant-rescind-ownership": "Grant/Rescind Ownership",
    "chat.system.user-join": "%1 has joined the room <span class=\"timeago\" title=\"%2\"></span>",
--- a/public/language/cs/notifications.json
+++ b/public/language/cs/notifications.json
@@ -13,6 +13,7 @@
    "all": "Vše",
    "topics": "Témata",
    "tags": "Tags",
+    "categories": "Categories",
    "replies": "Odpovědi",
    "chat": "Konverzace",
    "group-chat": "Skupinová konverzace",
@@ -55,6 +56,7 @@
    "user-posted-topic-with-tag-dual": "<strong>%1</strong> has posted a new topic with tags <strong>%2</strong> and <strong>%3</strong>",
    "user-posted-topic-with-tag-triple": "<strong>%1</strong> has posted a new topic with tags <strong>%2</strong>, <strong>%3</strong> and <strong>%4</strong>",
    "user-posted-topic-with-tag-multiple": "<strong>%1</strong> has posted a new topic with tags <strong>%2</strong>",
+    "user-posted-topic-in-category": "<strong>%1</strong> has posted a new topic in <strong>%2</strong>",
    "user-started-following-you": "<strong>%1</strong> vás začal sledovat.",
    "user-started-following-you-dual": "<strong>%1</strong> a <strong>%2</strong> vás začali sledovat.",
    "user-started-following-you-triple": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> started following you.",
@@ -81,6 +83,7 @@
    "notificationType-upvote": "Jakmile někdo vyjádří souhlas s vaším příspěvkem",
    "notificationType-new-topic": "Jakmile někdo koho sledujete vytvoří nové téma",
    "notificationType-new-topic-with-tag": "When a topic is posted with a tag you follow",
+    "notificationType-new-topic-in-category": "When a topic is posted in a category you are watching",
    "notificationType-new-reply": "Jakmile je přidán nový příspěvek v tématu, které sledujete",
    "notificationType-post-edit": "Jakmile je upraven příspěvek v tématu, které sledujete",
    "notificationType-follow": "Jakmile vás někdo začne sledovat",
--- a/public/language/cs/post-queue.json
+++ b/public/language/cs/post-queue.json
@@ -3,8 +3,10 @@
 	"post-queue": "Fronta příspěvků",
 	"no-queued-posts": "There are no posts in the post queue.",
 	"no-single-post": "The topic or post you are looking for is no longer in the queue. It has likely been approved or deleted already.",
-	"enabling-help": "To enable this feature, go to <a href=\"%1\">Settings &rarr; Post &rarr; Post Queue</a> and enable <strong>Post Queue</strong>.",
+	"enabling-help": "The post queue is currently <strong>disabled</strong>. To enable this feature, go to <a href=\"%1\">Settings &rarr; Post &rarr; Post Queue</a> and enable <strong>Post Queue</strong>.",
 	"back-to-list": "Back to Post Queue",
+	"public-intro": "If you have any queued posts, they will be shown here.",
+	"public-description": "This forum is configured to automatically queue posts from new accounts, pending moderator approval.<br />If you have queued posts awaiting approval, you will be able to see them here.",
 	"user": "Uživatel",
 	"when": "When",
 	"category": "Kategorie",
--- a/public/language/cs/social.json
+++ b/public/language/cs/social.json
@@ -6,5 +6,7 @@
 	"sign-in-with-google": "Sign in with Google",
 	"sign-up-with-google": "Sign up with Google",
 	"log-in-with-facebook": "Log in with Facebook",
-	"continue-with-facebook": "Continue with Facebook"
+	"continue-with-facebook": "Continue with Facebook",
+	"sign-in-with-linkedin": "Sign in with LinkedIn",
+	"sign-up-with-linkedin": "Sign up with LinkedIn"
 }
--- a/public/language/da/admin/settings/chat.json
+++ b/public/language/da/admin/settings/chat.json
@@ -8,7 +8,6 @@
 	"max-chat-room-name-length": "Maximum length of chat room names",
 	"max-room-size": "Maximum number of users in chat rooms",
 	"delay": "Time between chat messages (ms)",
-	"newbieDelay": "... for new users (ms)",
 	"notification-delay": "Notification delay for chat messages",
 	"notification-delay-help": "Additional messages sent between this time are collated, and the user is notified once per delay period. Set this to 0 to disable the delay.",
 	"restrictions.seconds-edit-after": "Number of seconds a chat message will remain editable.",
--- a/public/language/da/admin/settings/post.json
+++ b/public/language/da/admin/settings/post.json
@@ -10,7 +10,6 @@
 	"length": "Post Length",
 	"post-queue": "Post Queue",
 	"restrictions": "Posting Restrictions",
-	"restrictions-new": "New User Restrictions",
 	"restrictions.post-queue": "Enable post queue",
 	"restrictions.post-queue-rep-threshold": "Reputation required to bypass post queue",
 	"restrictions.groups-exempt-from-post-queue": "Select groups that should be exempt from the post queue",
@@ -18,9 +17,6 @@
 	"restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval",
 	"restrictions-new.post-queue-help": "Enabling new user restrictions will set restrictions on posts created by new users",
 	"restrictions.seconds-between": "Number of seconds between posts",
-	"restrictions.seconds-between-new": "Seconds between posts for new users",
-	"restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted",
-	"restrictions.seconds-before-new": "Seconds before a new user can make their first post",
 	"restrictions.seconds-edit-after": "Number of seconds a post remains editable (set to 0 to disable)",
 	"restrictions.seconds-delete-after": "Number of seconds a post remains deletable (set to 0 to disable)",
 	"restrictions.replies-no-delete": "Number of replies after users are disallowed to delete their own topics (set to 0 to disable)",
--- a/public/language/da/admin/settings/user.json
+++ b/public/language/da/admin/settings/user.json
@@ -79,7 +79,14 @@
 	"follow-replied-topics": "Follow topics that you reply to",
 	"default-notification-settings": "Default notification settings",
 	"categoryWatchState": "Default category watch state",
-	"categoryWatchState.watching": "Watching",
+	"categoryWatchState.tracking": "Tracking",
 	"categoryWatchState.notwatching": "Not Watching",
-	"categoryWatchState.ignoring": "Ignoring"
+	"categoryWatchState.ignoring": "Ignoring",
+	"restrictions-new": "New User Restrictions",
+	"restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted",
+	"restrictions.seconds-between-new": "Seconds between posts for new users",
+	"restrictions.seconds-before-new": "Seconds before a new user can make their first post",
+	"restrictions.seconds-edit-after-new": "Number of seconds a post remains editable for new users (set to 0 to disable)",
+	"restrictions.milliseconds-between-messages": "Time between chat messages for new users (ms)",
+	"restrictions.groups-exempt-from-new-user-restrictions": "Select groups that should be exempt from the new user restrictions"
 }
--- a/public/language/da/category.json
+++ b/public/language/da/category.json
@@ -10,12 +10,15 @@
    "watch": "Overvåg",
    "ignore": "Ignorer",
    "watching": "Watching",
+    "tracking": "Tracking",
    "not-watching": "Not Watching",
    "ignoring": "Ignoring",
-    "watching.description": "Show topics in unread and recent",
+    "watching.description": "Notify me of new topics.<br/>Show topics in unread & recent",
+    "tracking.description": "Shows topics in unread & recent",
    "not-watching.description": "Do not show topics in unread, show in recent",
-    "ignoring.description": "Do not show topics in unread and recent",
+    "ignoring.description": "Do not show topics in unread & recent",
    "watching.message": "You are now watching updates from this category and all subcategories",
+    "tracking.message": "You are now tracking updates from this category and all subcategories",
    "notwatching.message": "You are not watching updates from this category and all subcategories",
    "ignoring.message": "You are now ignoring updates from this category and all subcategories",
    "watched-categories": "Fulgte kategorier",
--- a/public/language/da/error.json
+++ b/public/language/da/error.json
@@ -32,7 +32,7 @@
    "folder-exists": "Folder exists",
    "invalid-pagination-value": "Ugyldig side værdi, skal mindst være %1 og maks. %2",
    "username-taken": "Brugernavn optaget",
-    "email-taken": "Emailadresse allerede i brug",
+    "email-taken": "Email address is already taken.",
    "email-nochange": "The email entered is the same as the email already on file.",
    "email-invited": "Email was already invited",
    "email-not-confirmed": "Posting in some categories or topics is enabled once your email is confirmed, please click here to send a confirmation email.",
@@ -91,6 +91,7 @@
    "category-not-selected": "Category not selected.",
    "too-many-posts": "Du kan højest skrive et indlæg hver %1 sekund(er) - venligst vent et øjeblik før næste indlæg",
    "too-many-posts-newbie": "Som ny bruger kan du kun skrive et indlæg engang hvert %1. sekund() indtil du har optjent %2 omdømme point - venligst vent et øjeblik før næste indlæg.",
+    "too-many-posts-newbie-minutes": "As a new user, you can only post once every %1 minute(s) until you have earned %2 reputation - please wait before posting again",
    "already-posting": "You are already posting",
    "tag-too-short": "Indtast et længere tag. Tags skal indeholde mindst %1 karakter(er).",
    "tag-too-long": "Indtast et længere tag. Tags kan ikke være længere end %1 karakter(er).",
--- a/public/language/da/modules.json
+++ b/public/language/da/modules.json
@@ -68,6 +68,8 @@
    "chat.in-room": "In this room",
    "chat.kick": "Kick",
    "chat.show-ip": "Show IP",
+    "chat.copy-text": "Copy Text",
+    "chat.copy-link": "Copy Link",
    "chat.owner": "Room Owner",
    "chat.grant-rescind-ownership": "Grant/Rescind Ownership",
    "chat.system.user-join": "%1 has joined the room <span class=\"timeago\" title=\"%2\"></span>",
--- a/public/language/da/notifications.json
+++ b/public/language/da/notifications.json
@@ -13,6 +13,7 @@
    "all": "All",
    "topics": "Topics",
    "tags": "Tags",
+    "categories": "Categories",
    "replies": "Replies",
    "chat": "Chats",
    "group-chat": "Group Chats",
@@ -55,6 +56,7 @@
    "user-posted-topic-with-tag-dual": "<strong>%1</strong> has posted a new topic with tags <strong>%2</strong> and <strong>%3</strong>",
    "user-posted-topic-with-tag-triple": "<strong>%1</strong> has posted a new topic with tags <strong>%2</strong>, <strong>%3</strong> and <strong>%4</strong>",
    "user-posted-topic-with-tag-multiple": "<strong>%1</strong> has posted a new topic with tags <strong>%2</strong>",
+    "user-posted-topic-in-category": "<strong>%1</strong> has posted a new topic in <strong>%2</strong>",
    "user-started-following-you": "<strong>%1</strong> har valgt at følge dig.",
    "user-started-following-you-dual": "<strong>%1</strong> og <strong>%2</strong> har valgt at følge dig.",
    "user-started-following-you-triple": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> started following you.",
@@ -81,6 +83,7 @@
    "notificationType-upvote": "When someone upvotes your post",
    "notificationType-new-topic": "When someone you follow posts a topic",
    "notificationType-new-topic-with-tag": "When a topic is posted with a tag you follow",
+    "notificationType-new-topic-in-category": "When a topic is posted in a category you are watching",
    "notificationType-new-reply": "When a new reply is posted in a topic you are watching",
    "notificationType-post-edit": "When a post is edited in a topic you are watching",
    "notificationType-follow": "When someone starts following you",
--- a/public/language/da/post-queue.json
+++ b/public/language/da/post-queue.json
@@ -3,8 +3,10 @@
 	"post-queue": "Post Queue",
 	"no-queued-posts": "There are no posts in the post queue.",
 	"no-single-post": "The topic or post you are looking for is no longer in the queue. It has likely been approved or deleted already.",
-	"enabling-help": "To enable this feature, go to <a href=\"%1\">Settings &rarr; Post &rarr; Post Queue</a> and enable <strong>Post Queue</strong>.",
+	"enabling-help": "The post queue is currently <strong>disabled</strong>. To enable this feature, go to <a href=\"%1\">Settings &rarr; Post &rarr; Post Queue</a> and enable <strong>Post Queue</strong>.",
 	"back-to-list": "Back to Post Queue",
+	"public-intro": "If you have any queued posts, they will be shown here.",
+	"public-description": "This forum is configured to automatically queue posts from new accounts, pending moderator approval.<br />If you have queued posts awaiting approval, you will be able to see them here.",
 	"user": "User",
 	"when": "When",
 	"category": "Category",
--- a/public/language/da/social.json
+++ b/public/language/da/social.json
@@ -6,5 +6,7 @@
 	"sign-in-with-google": "Sign in with Google",
 	"sign-up-with-google": "Sign up with Google",
 	"log-in-with-facebook": "Log in with Facebook",
-	"continue-with-facebook": "Continue with Facebook"
+	"continue-with-facebook": "Continue with Facebook",
+	"sign-in-with-linkedin": "Sign in with LinkedIn",
+	"sign-up-with-linkedin": "Sign up with LinkedIn"
 }
--- a/public/language/de/admin/extend/widgets.json
+++ b/public/language/de/admin/extend/widgets.json
@@ -30,6 +30,6 @@
 	"start-date": "Anfangsdatum",
 	"end-date": "Enddatum",
 	"hide-on-mobile": "Auf dem Handy verstecken",
-	"hide-drafts": "Hide drafts",
-	"show-drafts": "Show drafts"
+	"hide-drafts": "Entwürfe ausblenden",
+	"show-drafts": "Entwürfe anzeigen"
 }
--- a/public/language/de/admin/settings/chat.json
+++ b/public/language/de/admin/settings/chat.json
@@ -8,7 +8,6 @@
 	"max-chat-room-name-length": "Maximale Länge der Namen von Chaträumen",
 	"max-room-size": "Maximale Anzahl von Benutzern in Chatrooms",
 	"delay": "Zeit zwischen Chat-Nachrichten (ms)",
-	"newbieDelay": "... für neue Benutzer (ms)",
 	"notification-delay": "Benachrichtigungsverzögerung für Chat-Nachrichten",
 	"notification-delay-help": "Zusätzliche Nachrichten, die zwischen dieser Zeit gesendet werden, werden gesammelt, und der Benutzer wird einmal pro Verzögerungszeitraum benachrichtigt. Setze diesen Wert auf 0, um die Verzögerung zu deaktivieren.",
 	"restrictions.seconds-edit-after": "Anzahl der Sekunden, die eine Chat-Nachricht bearbeitbar bleibt.",
--- a/public/language/de/admin/settings/post.json
+++ b/public/language/de/admin/settings/post.json
@@ -10,7 +10,6 @@
 	"length": "Beitragslänge",
 	"post-queue": "Beitragswarteschlange",
 	"restrictions": "Posting beschränkungen",
-	"restrictions-new": "Beschränkungen für neue Benutzer",
 	"restrictions.post-queue": "Beitragswarteschlange verwenden",
 	"restrictions.post-queue-rep-threshold": "Benötigte Reputation um Beiträge ohne Warteschlange zu verfassen",
 	"restrictions.groups-exempt-from-post-queue": "Gruppen auswählen, die von der Beitragswarteschlange ausgenommen sind",
@@ -18,9 +17,6 @@
 	"restrictions.post-queue-help": "Aktivierte Beitragswarteschlange sorgt dafür, dass Posts von neuen Benutzern vor dem Veröffentlichen genehmigt werden müssen.",
 	"restrictions-new.post-queue-help": "Durch das Aktivieren von Einschränkungen für neue Benutzer werden Einschränkungen für Beiträge festgelegt, die von neuen Benutzern erstellt wurden",
 	"restrictions.seconds-between": "Anzahl der Sekunden zwischen Posts",
-	"restrictions.seconds-between-new": "Sekunden zwischen Beiträgen für neue Benutzer",
-	"restrictions.rep-threshold": "Mindesreputation bevor die Beschränkungen aufgehoben werden",
-	"restrictions.seconds-before-new": "Sekunden, bevor ein neuer Benutzer seinen ersten Beitrag schreiben kann",
 	"restrictions.seconds-edit-after": "Anzahl der Sekunden, die ein Beitrag bearbeitet werden kann (zum Deaktivieren auf 0 setzen)",
 	"restrictions.seconds-delete-after": "Anzahl der Sekunden, die ein Beitrag löschbar bleibt (zum Deaktivieren auf 0 setzen)",
 	"restrictions.replies-no-delete": "Anzahl der Antworten, nachdem Benutzern das Löschen ihrer eigenen Themen verweigert wurde (zum Deaktivieren auf 0 setzen)",
--- a/public/language/de/admin/settings/user.json
+++ b/public/language/de/admin/settings/user.json
@@ -79,7 +79,14 @@
 	"follow-replied-topics": "Themen folgen, auf die du antwortest",
 	"default-notification-settings": "Standardbenachrichtigungseinstellungen",
 	"categoryWatchState": "Standardmäßige Beobachtung",
-	"categoryWatchState.watching": "Beobachtet",
+	"categoryWatchState.tracking": "Verfolgung",
 	"categoryWatchState.notwatching": "Nicht beobachtet",
-	"categoryWatchState.ignoring": "Ignoriert"
+	"categoryWatchState.ignoring": "Ignoriert",
+	"restrictions-new": "Neue Benutzerbeschränkungen",
+	"restrictions.rep-threshold": "Mindestansehen bevor die Beschränkungen aufgehoben werden",
+	"restrictions.seconds-between-new": "Sekunden zwischen Beiträgen für neue Benutzer",
+	"restrictions.seconds-before-new": "Sekunden, bevor ein neuer Nutzer seinen ersten Beitrag verfassen kann",
+	"restrictions.seconds-edit-after-new": "Anzahl der Sekunden, die ein Beitrag für neue Benutzer bearbeitbar bleibt (zum Deaktivieren auf 0 setzen)",
+	"restrictions.milliseconds-between-messages": "Zeit zwischen Chat-Nachrichten für neue Benutzer (ms)",
+	"restrictions.groups-exempt-from-new-user-restrictions": "Gruppen auswählen, die von den neuen Benutzerbeschränkungen ausgenommen werden sollen"
 }
--- a/public/language/de/category.json
+++ b/public/language/de/category.json
@@ -10,12 +10,15 @@
    "watch": "Beobachten",
    "ignore": "Ignorieren",
    "watching": "Beobachte",
+    "tracking": "Verfolgung",
    "not-watching": "Nicht beobachtet",
    "ignoring": "Ignoriert",
-    "watching.description": "Zeige Themen in Ungelesen und Aktuell",
+    "watching.description": "Über neue Themen benachrichtigen.<br/>Themen in Ungelesen & Aktuell anzeigen",
+    "tracking.description": "Zeigt Themen in Ungelesen und Aktuell",
    "not-watching.description": "Zeige keine Themen in Ungelesen, zeige sie in Aktuell",
-    "ignoring.description": "Zeige keine Themen in Ungelesen und Aktuell",
+    "ignoring.description": "Zeige keine Themen in Ungelesen & Neu",
    "watching.message": "Du beobachtest jetzt Aktualisierungen aus dieser Kategorie und allen Unterkategorien",
+    "tracking.message": "Du verfolgst jetzt Aktualisierungen von dieser Kategorie und allen Unterkategorien",
    "notwatching.message": "Du beobachtest jetzt keine Aktualisierungen aus dieser Kategorie und allen Unterkategorien",
    "ignoring.message": "Du ignorierst jetzt Aktualisierungen aus dieser Kategorie und allen Unterkategorien",
    "watched-categories": "Beobachtete Kategorien",
--- a/public/language/de/error.json
+++ b/public/language/de/error.json
@@ -32,7 +32,7 @@
    "folder-exists": "Ordner existiert",
    "invalid-pagination-value": "Ungültige Seitennummerierung, muss mindestens %1 und maximal %2 sein",
    "username-taken": "Der Benutzername ist bereits vergeben",
-    "email-taken": "E-Mail-Adresse vergeben",
+    "email-taken": "Email address is already taken.",
    "email-nochange": "Die eingegebene E-Mail ist die gleiche wie die bereits hinterlegte E-Mail.",
    "email-invited": "E-Mail wurde bereits eingeladen",
    "email-not-confirmed": "Das Schreiben von Beiträgen in einigen Kategorien oder Themen ist erst möglich, wenn Ihre E-Mail bestätigt wurde. Bitte klicken Sie hier, um eine Bestätigungs-E-Mail zu senden.",
@@ -91,6 +91,7 @@
    "category-not-selected": "Kategorie nicht ausgewählt",
    "too-many-posts": "Du kannst nur einen Beitrag innerhalb von %1 Sekunden erstellen - Bitte warte bevor Du erneut einen Beitrag erstellst.",
    "too-many-posts-newbie": "Als neuer Benutzer kannst du nur einmal alle %1 Sekunde(n) posten, bis du %2 Reputation erworben hast - bitte warte, bevor du erneut postest",
+    "too-many-posts-newbie-minutes": "Als neuer Benutzer kannst du nur einmal alle %1 Minute(n) posten, bis du %2 Ansehen erworben hast - bitte warte, bevor du erneut postest",
    "already-posting": "Du bist bereits am Posten",
    "tag-too-short": "Bitte gebe ein längeres Schlagwort ein. Schlagworte sollten mindestens %1 Zeichen enthalten.",
    "tag-too-long": "Bitte gebe ein kürzeres Schlagwort ein. Schlagworte können nicht länger als %1 Zeichen sein.",
--- a/public/language/de/modules.json
+++ b/public/language/de/modules.json
@@ -68,6 +68,8 @@
    "chat.in-room": "In diesem Chat-Room",
    "chat.kick": "Rauswerfen",
    "chat.show-ip": "IP anzeigen",
+    "chat.copy-text": "Text kopieren",
+    "chat.copy-link": "Link kopieren",
    "chat.owner": "Raumbesitzer",
    "chat.grant-rescind-ownership": "Erteilung/Aufhebung des Eigentums",
    "chat.system.user-join": "%1 hat den Raum betreten <span class=\"timeago\" title=\"%2\"></span>",
--- a/public/language/de/notifications.json
+++ b/public/language/de/notifications.json
@@ -13,6 +13,7 @@
    "all": "Alle",
    "topics": "Themen",
    "tags": "Tags",
+    "categories": "Kategorien",
    "replies": "Antworten",
    "chat": "Chats",
    "group-chat": "Gruppenchats",
@@ -48,13 +49,14 @@
    "user-posted-to": "<strong>%1</strong> hat auf <strong>%2</strong> geantwortet.",
    "user-posted-to-dual": "<strong>%1</strong> und <strong>%2</strong> haben auf <strong>%3</strong> geantwortet.",
    "user-posted-to-triple": "<strong>%1</strong>, <strong>%2</strong> und <strong>%3</strong> haben geantwortet auf: <strong>%4</strong>",
-    "user-posted-to-multiple": "<strong>%1</strong>, <strong>%2</strong> und %3 andere haben geantwortet auf :<strong>%4</strong>",
+    "user-posted-to-multiple": "<strong>%1</strong>, <strong>%2</strong> und %3 andere haben geantwortet auf: <strong>%4</strong>",
    "user-posted-topic": "<strong>%1</strong> hat ein neues Thema erstellt: <strong>%2</strong>",
    "user-edited-post": "<strong>%1</strong> hat einen Post in <strong>%2</strong> bearbeitet",
    "user-posted-topic-with-tag": "<strong>%1</strong> hat ein neues Thema mit dem Tag <strong>%2</strong> erstellt",
    "user-posted-topic-with-tag-dual": "<strong>%1</strong> hat ein neues Thema mit den Tags <strong>%2</strong> and <strong>%3</strong> erstellt",
    "user-posted-topic-with-tag-triple": "<strong>%1</strong> hat ein neues Thema mit den Tags <strong>%2</strong>, <strong>%3</strong> und <strong>%4</strong> erstellt",
    "user-posted-topic-with-tag-multiple": "<strong>%1</strong> hat ein neues Thema mit den Tags <strong>%2</strong> erstellt",
+    "user-posted-topic-in-category": "<strong>%1</strong> hat ein neues Thema in <strong>%2</strong> erstellt",
    "user-started-following-you": "<strong>%1</strong> folgt dir jetzt.",
    "user-started-following-you-dual": "<strong>%1</strong> und <strong>%2</strong> folgen dir jetzt.",
    "user-started-following-you-triple": "<strong>%1</strong>, <strong>%2</strong> und <strong>%3</strong> folgen dir jetzt.",
@@ -81,6 +83,7 @@
    "notificationType-upvote": "Wenn jemand deinen beitrag positiv bewertet",
    "notificationType-new-topic": "Wenn jemand, dem du folgst, einen Beitrag erstellt",
    "notificationType-new-topic-with-tag": "Wenn ein Thema mit einem Tag gepostet wird, dem du folgst",
+    "notificationType-new-topic-in-category": "Wenn ein Thema in einer Kategorie veröffentlicht wird, die du beobachtest",
    "notificationType-new-reply": "Wenn es eine neue Antwort auf ein Thema das du beobachtest gibt",
    "notificationType-post-edit": "Wenn ein Post bearbeitet wurde, in einem Thema welches du beobachtest",
    "notificationType-follow": "Wenn dir jemand neues folgt",
--- a/public/language/de/post-queue.json
+++ b/public/language/de/post-queue.json
@@ -3,8 +3,10 @@
 	"post-queue": "Beitragswarteschlange",
 	"no-queued-posts": "Es sind keine Beiträge in der Beitragswarteschlange",
 	"no-single-post": "Dieses Thema oder dieser Beitrag ist nicht mehr in der Warteschlange. Er wurde wahrscheinlich angenommen oder gelöscht.",
-	"enabling-help": "Um diese Funktion zu aktivieren, gehe zu <a href=\"%1\">Einstellungen &rarr; Posts &rarr; Beitragswarteschlange</a> und aktiviere die <strong>Beitragswarteschlange</strong>.",
+	"enabling-help": "Die Beitragswarteschlange ist derzeit <strong>deaktiviert</strong>. Um diese Funktion zu aktivieren, gehe zu  <a href=\"%1\">Einstellungen &rarr; Post &rarr; Beitragswarteschlange</a> und aktiviere <strong>Beitragswarteschlange</strong>.",
 	"back-to-list": "Zurück zur Beitragswarteschlange",
+	"public-intro": "Wenn sich Beiträge in der Warteschlange befinden, werden sie hier angezeigt.",
+	"public-description": "Dieses Forum ist so konfiguriert, dass Beiträge von neuen Konten automatisch in die Warteschlange gestellt werden, bis sie von einem Moderator genehmigt werden. <br />Wenn du Beiträge in der Warteschlange hast, die auf die Genehmigung warten, kannst du sie hier sehen.",
 	"user": "Benutzer",
 	"when": "Wann",
 	"category": "Kategorie",
--- a/public/language/de/social.json
+++ b/public/language/de/social.json
@@ -6,5 +6,7 @@
 	"sign-in-with-google": "Mit Google anmelden",
 	"sign-up-with-google": "Mit Google registrieren",
 	"log-in-with-facebook": "Mit Facebook anmelden",
-	"continue-with-facebook": "Mit Facebook fortsetzen"
+	"continue-with-facebook": "Mit Facebook fortsetzen",
+	"sign-in-with-linkedin": "Mit LinkedIn anmelden",
+	"sign-up-with-linkedin": "Mit LinkedIn registrieren"
 }
--- a/public/language/el/admin/settings/chat.json
+++ b/public/language/el/admin/settings/chat.json
@@ -8,7 +8,6 @@
 	"max-chat-room-name-length": "Maximum length of chat room names",
 	"max-room-size": "Maximum number of users in chat rooms",
 	"delay": "Time between chat messages (ms)",
-	"newbieDelay": "... for new users (ms)",
 	"notification-delay": "Notification delay for chat messages",
 	"notification-delay-help": "Additional messages sent between this time are collated, and the user is notified once per delay period. Set this to 0 to disable the delay.",
 	"restrictions.seconds-edit-after": "Number of seconds a chat message will remain editable.",
--- a/public/language/el/admin/settings/post.json
+++ b/public/language/el/admin/settings/post.json
@@ -10,7 +10,6 @@
 	"length": "Post Length",
 	"post-queue": "Post Queue",
 	"restrictions": "Posting Restrictions",
-	"restrictions-new": "New User Restrictions",
 	"restrictions.post-queue": "Enable post queue",
 	"restrictions.post-queue-rep-threshold": "Reputation required to bypass post queue",
 	"restrictions.groups-exempt-from-post-queue": "Select groups that should be exempt from the post queue",
@@ -18,9 +17,6 @@
 	"restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval",
 	"restrictions-new.post-queue-help": "Enabling new user restrictions will set restrictions on posts created by new users",
 	"restrictions.seconds-between": "Number of seconds between posts",
-	"restrictions.seconds-between-new": "Seconds between posts for new users",
-	"restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted",
-	"restrictions.seconds-before-new": "Seconds before a new user can make their first post",
 	"restrictions.seconds-edit-after": "Number of seconds a post remains editable (set to 0 to disable)",
 	"restrictions.seconds-delete-after": "Number of seconds a post remains deletable (set to 0 to disable)",
 	"restrictions.replies-no-delete": "Number of replies after users are disallowed to delete their own topics (set to 0 to disable)",
--- a/public/language/el/admin/settings/user.json
+++ b/public/language/el/admin/settings/user.json
@@ -79,7 +79,14 @@
 	"follow-replied-topics": "Follow topics that you reply to",
 	"default-notification-settings": "Default notification settings",
 	"categoryWatchState": "Default category watch state",
-	"categoryWatchState.watching": "Watching",
+	"categoryWatchState.tracking": "Tracking",
 	"categoryWatchState.notwatching": "Not Watching",
-	"categoryWatchState.ignoring": "Ignoring"
+	"categoryWatchState.ignoring": "Ignoring",
+	"restrictions-new": "New User Restrictions",
+	"restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted",
+	"restrictions.seconds-between-new": "Seconds between posts for new users",
+	"restrictions.seconds-before-new": "Seconds before a new user can make their first post",
+	"restrictions.seconds-edit-after-new": "Number of seconds a post remains editable for new users (set to 0 to disable)",
+	"restrictions.milliseconds-between-messages": "Time between chat messages for new users (ms)",
+	"restrictions.groups-exempt-from-new-user-restrictions": "Select groups that should be exempt from the new user restrictions"
 }
--- a/public/language/el/category.json
+++ b/public/language/el/category.json
@@ -10,12 +10,15 @@
    "watch": "Παρακολουθήστε",
    "ignore": "Αγνόηση",
    "watching": "Παρακολουθώ",
+    "tracking": "Tracking",
    "not-watching": "Δεν παρακολουθώ",
    "ignoring": "Αγνόησε",
-    "watching.description": "Εμφάνιση θεμάτων σε μη αναγνωσμένα και πρόσφατα",
+    "watching.description": "Notify me of new topics.<br/>Show topics in unread & recent",
+    "tracking.description": "Shows topics in unread & recent",
    "not-watching.description": "Να μην εμφανίζονται θέματα σε μη αναγνωσμένα, να εμφανίζονται σε πρόσφατα",
-    "ignoring.description": "Να μην εμφανίζονται θέματα σε μη αναγνωσμένα και πρόσφατα",
+    "ignoring.description": "Do not show topics in unread & recent",
    "watching.message": "Παρακολουθείτε τώρα ενημερώσεις από αυτήν την κατηγορία και όλες τις υποκατηγορίες",
+    "tracking.message": "You are now tracking updates from this category and all subcategories",
    "notwatching.message": "Δεν παρακολουθείτε ενημερώσεις από αυτήν την κατηγορία και όλες τις υποκατηγορίες",
    "ignoring.message": "Τώρα αγνοείτε ενημερώσεις από αυτήν την κατηγορία και όλες τις υποκατηγορίες",
    "watched-categories": "Κατηγορίες υπό παρακολούθηση",
--- a/public/language/el/error.json
+++ b/public/language/el/error.json
@@ -32,7 +32,7 @@
    "folder-exists": "Folder exists",
    "invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",
    "username-taken": "Το όνομα χρήστη είναι πιασμένο",
-    "email-taken": "Το email είναι πιασμένο",
+    "email-taken": "Email address is already taken.",
    "email-nochange": "The email entered is the same as the email already on file.",
    "email-invited": "Email was already invited",
    "email-not-confirmed": "Posting in some categories or topics is enabled once your email is confirmed, please click here to send a confirmation email.",
@@ -91,6 +91,7 @@
    "category-not-selected": "Category not selected.",
    "too-many-posts": "You can only post once every %1 second(s) - please wait before posting again",
    "too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
+    "too-many-posts-newbie-minutes": "As a new user, you can only post once every %1 minute(s) until you have earned %2 reputation - please wait before posting again",
    "already-posting": "You are already posting",
    "tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",
    "tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
--- a/public/language/el/modules.json
+++ b/public/language/el/modules.json
@@ -68,6 +68,8 @@
    "chat.in-room": "In this room",
    "chat.kick": "Kick",
    "chat.show-ip": "Show IP",
+    "chat.copy-text": "Copy Text",
+    "chat.copy-link": "Copy Link",
    "chat.owner": "Room Owner",
    "chat.grant-rescind-ownership": "Grant/Rescind Ownership",
    "chat.system.user-join": "%1 has joined the room <span class=\"timeago\" title=\"%2\"></span>",
--- a/public/language/el/notifications.json
+++ b/public/language/el/notifications.json
@@ -13,6 +13,7 @@
    "all": "All",
    "topics": "Topics",
    "tags": "Tags",
+    "categories": "Categories",
    "replies": "Replies",
    "chat": "Chats",
    "group-chat": "Group Chats",
@@ -55,6 +56,7 @@
    "user-posted-topic-with-tag-dual": "<strong>%1</strong> has posted a new topic with tags <strong>%2</strong> and <strong>%3</strong>",
    "user-posted-topic-with-tag-triple": "<strong>%1</strong> has posted a new topic with tags <strong>%2</strong>, <strong>%3</strong> and <strong>%4</strong>",
    "user-posted-topic-with-tag-multiple": "<strong>%1</strong> has posted a new topic with tags <strong>%2</strong>",
+    "user-posted-topic-in-category": "<strong>%1</strong> has posted a new topic in <strong>%2</strong>",
    "user-started-following-you": "<strong>%1</strong> started following you.",
    "user-started-following-you-dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
    "user-started-following-you-triple": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> started following you.",
@@ -81,6 +83,7 @@
    "notificationType-upvote": "When someone upvotes your post",
    "notificationType-new-topic": "When someone you follow posts a topic",
    "notificationType-new-topic-with-tag": "When a topic is posted with a tag you follow",
+    "notificationType-new-topic-in-category": "When a topic is posted in a category you are watching",
    "notificationType-new-reply": "When a new reply is posted in a topic you are watching",
    "notificationType-post-edit": "When a post is edited in a topic you are watching",
    "notificationType-follow": "When someone starts following you",
--- a/public/language/el/post-queue.json
+++ b/public/language/el/post-queue.json
@@ -3,8 +3,10 @@
 	"post-queue": "Post Queue",
 	"no-queued-posts": "There are no posts in the post queue.",
 	"no-single-post": "The topic or post you are looking for is no longer in the queue. It has likely been approved or deleted already.",
-	"enabling-help": "To enable this feature, go to <a href=\"%1\">Settings &rarr; Post &rarr; Post Queue</a> and enable <strong>Post Queue</strong>.",
+	"enabling-help": "The post queue is currently <strong>disabled</strong>. To enable this feature, go to <a href=\"%1\">Settings &rarr; Post &rarr; Post Queue</a> and enable <strong>Post Queue</strong>.",
 	"back-to-list": "Back to Post Queue",
+	"public-intro": "If you have any queued posts, they will be shown here.",
+	"public-description": "This forum is configured to automatically queue posts from new accounts, pending moderator approval.<br />If you have queued posts awaiting approval, you will be able to see them here.",
 	"user": "User",
 	"when": "When",
 	"category": "Category",
--- a/public/language/el/social.json
+++ b/public/language/el/social.json
@@ -6,5 +6,7 @@
 	"sign-in-with-google": "Sign in with Google",
 	"sign-up-with-google": "Sign up with Google",
 	"log-in-with-facebook": "Log in with Facebook",
-	"continue-with-facebook": "Continue with Facebook"
+	"continue-with-facebook": "Continue with Facebook",
+	"sign-in-with-linkedin": "Sign in with LinkedIn",
+	"sign-up-with-linkedin": "Sign up with LinkedIn"
 }
--- a/public/language/en-GB/admin/settings/chat.json
+++ b/public/language/en-GB/admin/settings/chat.json
@@ -8,7 +8,6 @@
 	"max-chat-room-name-length": "Maximum length of chat room names",
 	"max-room-size": "Maximum number of users in chat rooms",
 	"delay": "Time between chat messages (ms)",
-	"newbieDelay": "... for new users (ms)",
 	"notification-delay": "Notification delay for chat messages",
 	"notification-delay-help": "Additional messages sent between this time are collated, and the user is notified once per delay period. Set this to 0 to disable the delay.",
 	"restrictions.seconds-edit-after": "Number of seconds a chat message will remain editable.",
--- a/public/language/en-GB/admin/settings/post.json
+++ b/public/language/en-GB/admin/settings/post.json
@@ -10,7 +10,6 @@
 	"length": "Post Length",
 	"post-queue": "Post Queue",
 	"restrictions": "Posting Restrictions",
-	"restrictions-new": "New User Restrictions",
 	"restrictions.post-queue": "Enable post queue",
 	"restrictions.post-queue-rep-threshold": "Reputation required to bypass post queue",
 	"restrictions.groups-exempt-from-post-queue": "Select groups that should be exempt from the post queue",
@@ -18,9 +17,6 @@
 	"restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval",
 	"restrictions-new.post-queue-help": "Enabling new user restrictions will set restrictions on posts created by new users",
 	"restrictions.seconds-between": "Number of seconds between posts",
-	"restrictions.seconds-between-new": "Seconds between posts for new users",
-	"restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted",
-	"restrictions.seconds-before-new": "Seconds before a new user can make their first post",
 	"restrictions.seconds-edit-after": "Number of seconds a post remains editable (set to 0 to disable)",
 	"restrictions.seconds-delete-after": "Number of seconds a post remains deletable (set to 0 to disable)",
 	"restrictions.replies-no-delete": "Number of replies after users are disallowed to delete their own topics (set to 0 to disable)",
--- a/public/language/en-GB/admin/settings/user.json
+++ b/public/language/en-GB/admin/settings/user.json
@@ -79,7 +79,14 @@
 	"follow-replied-topics": "Follow topics that you reply to",
 	"default-notification-settings": "Default notification settings",
 	"categoryWatchState": "Default category watch state",
-	"categoryWatchState.watching": "Watching",
+	"categoryWatchState.tracking": "Tracking",
 	"categoryWatchState.notwatching": "Not Watching",
-	"categoryWatchState.ignoring": "Ignoring"
+	"categoryWatchState.ignoring": "Ignoring",
+	"restrictions-new": "New User Restrictions",
+	"restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted",
+	"restrictions.seconds-between-new": "Seconds between posts for new users",
+	"restrictions.seconds-before-new": "Seconds before a new user can make their first post",
+	"restrictions.seconds-edit-after-new": "Number of seconds a post remains editable for new users (set to 0 to disable)",
+	"restrictions.milliseconds-between-messages": "Time between chat messages for new users (ms)",
+	"restrictions.groups-exempt-from-new-user-restrictions": "Select groups that should be exempt from the new user restrictions"
 }
--- a/public/language/en-GB/category.json
+++ b/public/language/en-GB/category.json
@@ -13,13 +13,16 @@
 	"watch": "Watch",
 	"ignore": "Ignore",
 	"watching": "Watching",
+	"tracking": "Tracking",
 	"not-watching": "Not Watching",
 	"ignoring": "Ignoring",
-	"watching.description": "Show topics in unread and recent",
+	"watching.description": "Notify me of new topics.<br/>Show topics in unread & recent",
+	"tracking.description": "Shows topics in unread & recent",
 	"not-watching.description": "Do not show topics in unread, show in recent",
-	"ignoring.description": "Do not show topics in unread and recent",
+	"ignoring.description": "Do not show topics in unread & recent",

 	"watching.message": "You are now watching updates from this category and all subcategories",
+	"tracking.message": "You are now tracking updates from this category and all subcategories",
 	"notwatching.message": "You are not watching updates from this category and all subcategories",
 	"ignoring.message": "You are now ignoring updates from this category and all subcategories",

--- a/public/language/en-GB/error.json
+++ b/public/language/en-GB/error.json
@@ -37,7 +37,7 @@
 	"invalid-pagination-value": "Invalid pagination value, must be at least %1 and at most %2",

 	"username-taken": "Username taken",
-	"email-taken": "Email taken",
+	"email-taken": "Email address is already taken.",
 	"email-nochange": "The email entered is the same as the email already on file.",
 	"email-invited": "Email was already invited",
 	"email-not-confirmed": "Posting in some categories or topics is enabled once your email is confirmed, please click here to send a confirmation email.",
@@ -104,6 +104,7 @@
 	"category-not-selected": "Category not selected.",
 	"too-many-posts": "You can only post once every %1 second(s) - please wait before posting again",
 	"too-many-posts-newbie": "As a new user, you can only post once every %1 second(s) until you have earned %2 reputation - please wait before posting again",
+	"too-many-posts-newbie-minutes": "As a new user, you can only post once every %1 minute(s) until you have earned %2 reputation - please wait before posting again",
 	"already-posting": "You are already posting",
 	"tag-too-short": "Please enter a longer tag. Tags should contain at least %1 character(s)",
 	"tag-too-long": "Please enter a shorter tag. Tags can't be longer than %1 character(s)",
--- a/public/language/en-GB/modules.json
+++ b/public/language/en-GB/modules.json
@@ -68,6 +68,8 @@
 	"chat.in-room": "In this room",
 	"chat.kick": "Kick",
 	"chat.show-ip": "Show IP",
+	"chat.copy-text": "Copy Text",
+	"chat.copy-link": "Copy Link",
 	"chat.owner": "Room Owner",
 	"chat.grant-rescind-ownership": "Grant/Rescind Ownership",

--- a/public/language/en-GB/notifications.json
+++ b/public/language/en-GB/notifications.json
@@ -15,6 +15,7 @@
 	"all": "All",
 	"topics": "Topics",
 	"tags": "Tags",
+	"categories": "Categories",
 	"replies": "Replies",
 	"chat": "Chats",
 	"group-chat": "Group Chats",
@@ -61,6 +62,8 @@
 	"user-posted-topic-with-tag-triple": "<strong>%1</strong> has posted a new topic with tags <strong>%2</strong>, <strong>%3</strong> and <strong>%4</strong>",
 	"user-posted-topic-with-tag-multiple": "<strong>%1</strong> has posted a new topic with tags <strong>%2</strong>",

+	"user-posted-topic-in-category": "<strong>%1</strong> has posted a new topic in <strong>%2</strong>",
+
 	"user-started-following-you": "<strong>%1</strong> started following you.",
 	"user-started-following-you-dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
 	"user-started-following-you-triple": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> started following you.",
@@ -89,6 +92,7 @@
 	"notificationType-upvote": "When someone upvotes your post",
 	"notificationType-new-topic": "When someone you follow posts a topic",
 	"notificationType-new-topic-with-tag": "When a topic is posted with a tag you follow",
+	"notificationType-new-topic-in-category": "When a topic is posted in a category you are watching",
 	"notificationType-new-reply": "When a new reply is posted in a topic you are watching",
 	"notificationType-post-edit": "When a post is edited in a topic you are watching",
 	"notificationType-follow": "When someone starts following you",
--- a/public/language/en-GB/post-queue.json
+++ b/public/language/en-GB/post-queue.json
@@ -3,8 +3,10 @@
 	"post-queue": "Post Queue",
 	"no-queued-posts": "There are no posts in the post queue.",
 	"no-single-post": "The topic or post you are looking for is no longer in the queue. It has likely been approved or deleted already.",
-	"enabling-help": "To enable this feature, go to <a href=\"%1\">Settings &rarr; Post &rarr; Post Queue</a> and enable <strong>Post Queue</strong>.",
+	"enabling-help": "The post queue is currently <strong>disabled</strong>. To enable this feature, go to <a href=\"%1\">Settings &rarr; Post &rarr; Post Queue</a> and enable <strong>Post Queue</strong>.",
 	"back-to-list": "Back to Post Queue",
+	"public-intro": "If you have any queued posts, they will be shown here.",
+	"public-description": "This forum is configured to automatically queue posts from new accounts, pending moderator approval.<br />If you have queued posts awaiting approval, you will be able to see them here.",
 	"user": "User",
 	"when": "When",
 	"category": "Category",
--- a/public/language/en-GB/social.json
+++ b/public/language/en-GB/social.json
@@ -6,5 +6,7 @@
 	"sign-in-with-google": "Sign in with Google",
 	"sign-up-with-google": "Sign up with Google",
 	"log-in-with-facebook": "Log in with Facebook",
-	"continue-with-facebook": "Continue with Facebook"
+	"continue-with-facebook": "Continue with Facebook",
+	"sign-in-with-linkedin": "Sign in with LinkedIn",
+	"sign-up-with-linkedin": "Sign up with LinkedIn"
 }
--- a/public/language/en-US/admin/settings/chat.json
+++ b/public/language/en-US/admin/settings/chat.json
@@ -8,7 +8,6 @@
 	"max-chat-room-name-length": "Maximum length of chat room names",
 	"max-room-size": "Maximum number of users in chat rooms",
 	"delay": "Time between chat messages (ms)",
-	"newbieDelay": "... for new users (ms)",
 	"notification-delay": "Notification delay for chat messages",
 	"notification-delay-help": "Additional messages sent between this time are collated, and the user is notified once per delay period. Set this to 0 to disable the delay.",
 	"restrictions.seconds-edit-after": "Number of seconds a chat message will remain editable.",
--- a/public/language/en-US/admin/settings/post.json
+++ b/public/language/en-US/admin/settings/post.json
@@ -10,7 +10,6 @@
 	"length": "Post Length",
 	"post-queue": "Post Queue",
 	"restrictions": "Posting Restrictions",
-	"restrictions-new": "New User Restrictions",
 	"restrictions.post-queue": "Enable post queue",
 	"restrictions.post-queue-rep-threshold": "Reputation required to bypass post queue",
 	"restrictions.groups-exempt-from-post-queue": "Select groups that should be exempt from the post queue",
@@ -18,9 +17,6 @@
 	"restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval",
 	"restrictions-new.post-queue-help": "Enabling new user restrictions will set restrictions on posts created by new users",
 	"restrictions.seconds-between": "Number of seconds between posts",
-	"restrictions.seconds-between-new": "Seconds between posts for new users",
-	"restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted",
-	"restrictions.seconds-before-new": "Seconds before a new user can make their first post",
 	"restrictions.seconds-edit-after": "Number of seconds a post remains editable (set to 0 to disable)",
 	"restrictions.seconds-delete-after": "Number of seconds a post remains deletable (set to 0 to disable)",
 	"restrictions.replies-no-delete": "Number of replies after users are disallowed to delete their own topics (set to 0 to disable)",
--- a/public/language/en-US/admin/settings/user.json
+++ b/public/language/en-US/admin/settings/user.json
@@ -79,7 +79,14 @@
 	"follow-replied-topics": "Follow topics that you reply to",
 	"default-notification-settings": "Default notification settings",
 	"categoryWatchState": "Default category watch state",
-	"categoryWatchState.watching": "Watching",
+	"categoryWatchState.tracking": "Tracking",
 	"categoryWatchState.notwatching": "Not Watching",
-	"categoryWatchState.ignoring": "Ignoring"
+	"categoryWatchState.ignoring": "Ignoring",
+	"restrictions-new": "New User Restrictions",
+	"restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted",
+	"restrictions.seconds-between-new": "Seconds between posts for new users",
+	"restrictions.seconds-before-new": "Seconds before a new user can make their first post",
+	"restrictions.seconds-edit-after-new": "Number of seconds a post remains editable for new users (set to 0 to disable)",
+	"restrictions.milliseconds-between-messages": "Time between chat messages for new users (ms)",
+	"restrictions.groups-exempt-from-new-user-restrictions": "Select groups that should be exempt from the new user restrictions"
 }
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`db.createUser( { user: 'nodebb', pwd: 'nodebb', roles: [ { role: 'readWrite', db: 'nodebb' }, { role: 'clusterMonitor', db: 'admin' } ] } )`