chore: incrementing version number - v3.5.2

refactor session get/destroy

.dockerignore

@@ -1,10 +0,0 @@
-.*
-logs
-test
-node_modules
-commitlint.config.js
-nodebb.bat
-renovate.json
-*.yml
-*.md
-Dockerfile

.eslintignore

@@ -18,4 +18,3 @@ logs/
 .eslintrc
 test/files
 *.min.js
-install/docker/

.github/workflows/docker.yml

@@ -52,10 +52,10 @@ jobs:
       - name: Build and push Docker images
         uses: docker/build-push-action@v5
         with:
-          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 }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/test.yaml

@@ -63,7 +63,7 @@ jobs:
           - 5432:5432
 
       redis:
-        image: 'redis:7.2.3'
+        image: 'redis:7.2.2'
         # Set health checks to wait until redis has started
         options: >-
           --health-cmd "redis-cli ping"

.gitignore

@@ -70,5 +70,3 @@ package-lock.json
 *.mongodb
 link-plugins.sh
 test.sh
-
-.docker/

Dockerfile

@@ -13,39 +13,29 @@ USER node
 
 RUN npm install --omit=dev
 
-FROM node:lts as rebuild
 
-ARG BUILDPLATFORM
-ARG TARGETPLATFORM
-
-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 \
-    daemon=false \
-    silent=false
+FROM node:lts
 
 RUN mkdir -p /usr/src/app && \
     chown -R node:node /usr/src/app
-
-COPY --chown=node:node --from=rebuild /usr/src/build /usr/src/app
-
-
 WORKDIR /usr/src/app
 
+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 \
+    daemon=false \
+    silent=false
+
 EXPOSE 4567
-VOLUME ["/usr/src/app/node_modules", "/usr/src/app/build", "/usr/src/app/public/uploads", "/opt/config"]
-ENTRYPOINT ["./install/docker/entrypoint.sh"]
+
+CMD test -n "${SETUP}" && ./nodebb setup || node ./nodebb build; node ./nodebb start

README.md

@@ -46,8 +46,7 @@ NodeBB requires the following software to be installed:
 
 ## Installation
 
-[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/).
+[Please refer to platform-specific installation documentation](https://docs.nodebb.org/installing/os)
 
 ## Securing NodeBB
 
@@ -60,7 +59,6 @@ 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/)

docker-compose.yml

@@ -1,55 +1,24 @@
-version: '3.8'
+version: '3.5'
 
 services:
-  nodebb:
+  node:
     build: .
     restart: unless-stopped
-    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
+    depends_on:
+      - db
+    expose:
+      - 4567 # use a reverse proxy like Traefik
+
+  db:
+    image: mongo:bionic
+    restart: unless-stopped
+    expose:
+      - 27017
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: root
     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:/data/db
+
+volumes:
   mongo:
-    image: "mongo:7-jammy"
-    restart: unless-stopped
-    expose:
-      - "27017"
-    environment:
-      MONGO_INITDB_ROOT_USERNAME: nodebb
-      MONGO_INITDB_ROOT_PASSWORD: nodebb
-      MONGO_INITDB_DATABASE: nodebb
-    volumes:
-      - ./.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

install/data/defaults.json

@@ -23,11 +23,10 @@
     "chatMessageDelay": 2000,
     "newbieChatMessageDelay": 120000,
     "notificationSendDelay": 60,
-    "newbieReputationThreshold": 3,
+    "newbiePostDelayThreshold": 3,
     "postQueue": 0,
     "postQueueReputationThreshold": 0,
     "groupsExemptFromPostQueue": ["administrators", "Global Moderators"],
-    "groupsExemptFromNewUserRestrictions": ["administrators", "Global Moderators"],
     "groupsExemptFromMaintenanceMode": ["administrators", "Global Moderators"],
     "minimumPostLength": 8,
     "maximumPostLength": 32767,

install/docker/entrypoint.sh

@@ -1,46 +0,0 @@
-#!/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

install/docker/mongodb-user-init.js

@@ -1 +0,0 @@
-db.createUser( { user: 'nodebb', pwd: 'nodebb', roles: [ { role: 'readWrite', db: 'nodebb' }, { role: 'clusterMonitor', db: 'admin' } ] } )

install/docker/setup.json

@@ -1,21 +0,0 @@
-{
-    "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"
-    }
-}

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "3.5.1",
+    "version": "3.5.2",
     "homepage": "https://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -34,9 +34,9 @@
         "@fortawesome/fontawesome-free": "6.4.2",
         "@isaacs/ttlcache": "1.4.1",
         "@popperjs/core": "2.11.8",
-        "ace-builds": "1.31.2",
+        "ace-builds": "1.31.0",
         "archiver": "6.0.1",
-        "async": "3.2.5",
+        "async": "3.2.4",
         "autoprefixer": "10.4.16",
         "bcryptjs": "2.4.3",
         "benchpressjs": "2.5.1",
@@ -55,10 +55,10 @@
         "connect-flash": "0.1.1",
         "connect-mongo": "5.1.0",
         "connect-multiparty": "2.2.0",
-        "connect-pg-simple": "9.0.1",
+        "connect-pg-simple": "9.0.0",
         "connect-redis": "7.1.0",
         "cookie-parser": "1.4.6",
-        "cron": "3.1.6",
+        "cron": "3.1.4",
         "cropperjs": "1.6.1",
         "csrf-sync": "4.0.1",
         "daemon": "1.1.0",
@@ -70,7 +70,7 @@
         "file-loader": "6.2.0",
         "fs-extra": "11.1.1",
         "graceful-fs": "4.2.11",
-        "helmet": "7.1.0",
+        "helmet": "7.0.0",
         "html-to-text": "9.0.5",
         "imagesloaded": "5.0.0",
         "ipaddr.js": "2.1.0",
@@ -84,17 +84,17 @@
         "jsonwebtoken": "9.0.2",
         "lodash": "4.17.21",
         "logrotate-stream": "0.2.9",
-        "lru-cache": "10.0.2",
+        "lru-cache": "10.0.1",
         "mime": "3.0.0",
         "mkdirp": "3.0.1",
-        "mongodb": "6.3.0",
+        "mongodb": "6.2.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.27",
-        "nodebb-plugin-dbsearch": "6.2.3",
+        "nodebb-plugin-dbsearch": "6.2.2",
         "nodebb-plugin-emoji": "5.1.13",
         "nodebb-plugin-emoji-android": "4.0.0",
         "nodebb-plugin-markdown": "12.2.5",
@@ -102,10 +102,10 @@
         "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.99",
+        "nodebb-theme-harmony": "1.1.91",
         "nodebb-theme-lavender": "7.1.5",
-        "nodebb-theme-peace": "2.1.25",
-        "nodebb-theme-persona": "13.2.47",
+        "nodebb-theme-peace": "2.1.23",
+        "nodebb-theme-persona": "13.2.42",
         "nodebb-widget-essentials": "7.0.14",
         "nodemailer": "6.9.7",
         "nprogress": "0.2.0",
@@ -125,7 +125,7 @@
         "rss": "1.2.2",
         "rtlcss": "4.1.1",
         "sanitize-html": "2.11.0",
-        "sass": "1.69.5",
+        "sass": "1.69.4",
         "semver": "7.5.4",
         "serve-favicon": "2.5.0",
         "sharp": "0.32.6",
@@ -134,7 +134,7 @@
         "socket.io-client": "4.7.2",
         "@socket.io/redis-adapter": "8.2.1",
         "sortablejs": "1.15.0",
-        "spdx-license-list": "6.8.0",
+        "spdx-license-list": "6.7.0",
         "spider-detector": "2.0.1",
         "terser-webpack-plugin": "5.3.9",
         "textcomplete": "0.18.2",
@@ -146,7 +146,7 @@
         "webpack": "5.89.0",
         "webpack-merge": "5.10.0",
         "winston": "3.11.0",
-        "workerpool": "8.0.0",
+        "workerpool": "6.5.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": "18.4.2",
-        "@commitlint/config-angular": "18.4.2",
+        "@commitlint/cli": "17.8.1",
+        "@commitlint/config-angular": "17.8.1",
         "coveralls": "3.1.1",
-        "eslint": "8.54.0",
+        "eslint": "8.52.0",
         "eslint-config-nodebb": "0.2.1",
         "eslint-plugin-import": "2.29.0",
         "grunt": "1.6.1",
         "grunt-contrib-watch": "1.1.0",
         "husky": "8.0.3",
         "jsdom": "22.1.0",
-        "lint-staged": "15.1.0",
+        "lint-staged": "15.0.2",
         "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.5"
+        "sass-embedded": "1.69.4"
     },
     "resolutions": {
         "*/jquery": "3.7.1"

install/web.js

@@ -174,8 +174,6 @@ 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'],

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

@@ -8,6 +8,7 @@
 	"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.",

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

@@ -10,6 +10,7 @@
 	"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",
@@ -17,6 +18,9 @@
 	"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)",

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

@@ -79,14 +79,7 @@
 	"follow-replied-topics": "Follow topics that you reply to",
 	"default-notification-settings": "Default notification settings",
 	"categoryWatchState": "Default category watch state",
-	"categoryWatchState.tracking": "Tracking",
+	"categoryWatchState.watching": "Watching",
 	"categoryWatchState.notwatching": "Not Watching",
-	"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"
+	"categoryWatchState.ignoring": "Ignoring"
 }

public/language/ar/category.json

@@ -10,15 +10,12 @@
     "watch": "تابع",
     "ignore": "تجاهل",
     "watching": "متابع",
-    "tracking": "Tracking",
     "not-watching": "لست متابع",
     "ignoring": "متجاهل",
-    "watching.description": "Notify me of new topics.<br/>Show topics in unread & recent",
-    "tracking.description": "Shows topics in unread & recent",
+    "watching.description": "أظهر المواضيع في الغير مقروء و الحديث",
     "not-watching.description": "Do not show topics in unread, show in recent",
-    "ignoring.description": "Do not show topics in unread & recent",
+    "ignoring.description": "Do not show topics in unread and 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": "الأقسام المُتابعة",

public/language/ar/error.json

@@ -91,7 +91,6 @@
     "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)",

public/language/ar/modules.json

@@ -68,8 +68,6 @@
     "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>",

public/language/ar/notifications.json

@@ -13,7 +13,6 @@
     "all": "الكل",
     "topics": "مواضيع",
     "tags": "Tags",
-    "categories": "Categories",
     "replies": "ردود",
     "chat": "محادثات",
     "group-chat": "Group Chats",
@@ -56,7 +55,6 @@
     "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.",
@@ -83,7 +81,6 @@
     "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",

public/language/ar/post-queue.json

@@ -3,10 +3,8 @@
 	"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": "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>.",
+	"enabling-help": "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",

public/language/ar/social.json

@@ -6,7 +6,5 @@
 	"sign-in-with-google": "تسجيل الدخول باستخدام قوقل",
 	"sign-up-with-google": "التسجيل باستخدام قوقل",
 	"log-in-with-facebook": "تسجيل الدخول باستخدام فيسبوك",
-	"continue-with-facebook": "التسجيل باستخدام فيسبوك",
-	"sign-in-with-linkedin": "Sign in with LinkedIn",
-	"sign-up-with-linkedin": "Sign up with LinkedIn"
+	"continue-with-facebook": "التسجيل باستخدام فيسبوك"
 }

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

@@ -8,6 +8,7 @@
 	"max-chat-room-name-length": "Максимална дължина на имената на стаи за разговори",
 	"max-room-size": "Максимален брой потребители в стая за разговор",
 	"delay": "Време между съобщенията в разговорите (мсек)",
+	"newbieDelay": "…за нови потребители (мсек)",
 	"notification-delay": "Забавяне преди известяване за съобщения в разговорите",
 	"notification-delay-help": "Допълнителните съобщения, изпратени в рамките на това време, се комбинират, и потребителят получава по едно известие за всеки такъв период на забавяне. Задайте стойност 0, за да изключите забавянето.",
 	"restrictions.seconds-edit-after": "Брой секунди, през които съобщенията в разговор могат да бъдат редактирани.",

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

@@ -10,6 +10,7 @@
 	"length": "Дължина на публикациите",
 	"post-queue": "Опашка за публикации",
 	"restrictions": "Ограничения за публикуването",
+	"restrictions-new": "Ограничения за новите потребители",
 	"restrictions.post-queue": "Включване на опашката за публикации",
 	"restrictions.post-queue-rep-threshold": "Нужна репутация за пропускане на опашката за публикации",
 	"restrictions.groups-exempt-from-post-queue": "Избиране на групи, които да пропускат опашката за публикации",
@@ -17,6 +18,9 @@
 	"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 = изключено)",

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

@@ -78,15 +78,8 @@
 	"follow-created-topics": "Следване на темите, които създавате",
 	"follow-replied-topics": "Следване на темите, на които отговаряте",
 	"default-notification-settings": "Настройки по подразбиране за известията",
-	"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": "Избиране на групи, за които да не важат ограниченията за нови потребители"
+	"categoryWatchState": "Състояние по подразбиране за следенето на категории",
+	"categoryWatchState.watching": "Да се следят",
+	"categoryWatchState.notwatching": "Да не се следят",
+	"categoryWatchState.ignoring": "Да се пренебрегват"
 }

public/language/bg/category.json

@@ -7,20 +7,17 @@
     "browsing": "разглежда",
     "no-replies": "Няма отговори",
     "no-new-posts": "Няма нови публикации.",
-    "watch": "Наблюдаване",
+    "watch": "Следене",
     "ignore": "Пренебрегване",
-    "watching": "Наблюдавате",
-    "tracking": "Следите",
-    "not-watching": "Не наблюдавате",
+    "watching": "Следите",
+    "not-watching": "Не следите",
     "ignoring": "Пренебрегвате",
-    "watching.description": "Искам да получавам известия за новите теми.<br/>Искам темите да се показват в списъците с непрочетени и скорошни.",
-    "tracking.description": "Темите да се показват в непрочетените и скорошните",
+    "watching.description": "Темите да се показват в непрочетените и скорошните",
     "not-watching.description": "Темите да не се показват в непрочетените, а само в скорошните",
     "ignoring.description": "Темите да не се показват нито в непрочетените, нито в скорошните",
-    "watching.message": "Вече наблюдавате новите неща в категорията и подкатегориите ѝ",
-    "tracking.message": "Вече следите новите неща в категорията и подкатегориите ѝ",
-    "notwatching.message": "Вече не наблюдавате новите неща в категорията и подкатегориите ѝ",
+    "watching.message": "Вече следите новите неща в категорията и подкатегориите ѝ",
+    "notwatching.message": "Вече не следите новите неща в категорията и подкатегориите ѝ",
     "ignoring.message": "Вече пренебрегвате новите неща в тази категория и всички нейни подкатегории",
-    "watched-categories": "Наблюдавани категории",
+    "watched-categories": "Следени категории",
     "x-more-categories": "Още %1 категории"
 }

public/language/bg/error.json

@@ -91,7 +91,6 @@
     "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 символ(а)",

public/language/bg/modules.json

@@ -68,8 +68,6 @@
     "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>",

public/language/bg/notifications.json

@@ -13,7 +13,6 @@
     "all": "Всички",
     "topics": "Теми",
     "tags": "Етикети",
-    "categories": "Категории",
     "replies": "Отговори",
     "chat": "Разговори",
     "group-chat": "Групови разговори",
@@ -56,7 +55,6 @@
     "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> започнаха да Ви следват.",
@@ -83,9 +81,8 @@
     "notificationType-upvote": "Когато някой гласува положително за Ваша публикация",
     "notificationType-new-topic": "Когато някой, когото следвате, публикува тема",
     "notificationType-new-topic-with-tag": "Когато бъде публикувана нова тема с етикет, който следвате",
-    "notificationType-new-topic-in-category": "Когато бъде публикувана нова тема в категория, която наблюдавате",
-    "notificationType-new-reply": "Когато бъде публикуван нов отговор в тема, която наблюдавате",
-    "notificationType-post-edit": "Когато бъде редактирана публикация в тема, която наблюдавате",
+    "notificationType-new-reply": "Когато бъде публикуван нов отговор в тема, която следвате",
+    "notificationType-post-edit": "Когато бъде редактирана публикация в тема, която следите",
     "notificationType-follow": "Когато някой започне да Ви следва",
     "notificationType-new-chat": "Когато получите съобщение в разговор",
     "notificationType-new-group-chat": "Когато получите съобщение в групов разговор",

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",

public/language/bg/post-queue.json

@@ -3,10 +3,8 @@
 	"post-queue": "Опашка за публикации",
 	"no-queued-posts": "В опашката за публикации няма нищо.",
 	"no-single-post": "Темата или публикацията, която търсите, вече не се намира в опашката. Вероятно или е била одобрена, или изтрита.",
-	"enabling-help": "В момента опашката за публикации е <strong>изключена</strong>. За да включите тази функционалност, идете в <a href=\"%1\">Настройки &rarr; Публикации &rarr; Опашка за публикации</a> и включете <strong>Опашката за публикации</strong>.",
+	"enabling-help": "За да включите тази функционалност, идете в <a href=\"%1\">Настройки &rarr; Публикуване &rarr; Опашка за публикации</a> и включете <strong>Опашката за публикации</strong>.",
 	"back-to-list": "Назад към Опашката за публикации",
-	"public-intro": "Ако имате публикации, които чакат в опашката, те ще бъдат показани тук.",
-	"public-description": "Този форум е настроен автоматично да добавя публикациите от нови потребители, така че да чакат одобрението на модератор.<br />Ако имате публикации, които чакат в опашката за одобрение, ще можете да ги видите тук.",
 	"user": "Потребител",
 	"when": "Кога",
 	"category": "Категория",

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",

public/language/bg/social.json

@@ -6,7 +6,5 @@
 	"sign-in-with-google": "Вписване с Google",
 	"sign-up-with-google": "Регистриране с Google",
 	"log-in-with-facebook": "Вписване с Facebook",
-	"continue-with-facebook": "Продължаване с Facebook",
-	"sign-in-with-linkedin": "Вписване с LinkedIn",
-	"sign-up-with-linkedin": "Регистриране с LinkedIn"
+	"continue-with-facebook": "Продължаване с Facebook"
 }

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": "Вече ще получавате известия, когато някой публикува тема с този етикет.",

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/>Темата да се показва в списъка с непрочетени, само ако категорията не се пренебрегва.",

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": "Избрани са няколко"
 }

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": "Няма заглавие на група",

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

@@ -8,6 +8,7 @@
 	"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.",

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

@@ -10,6 +10,7 @@
 	"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",
@@ -17,6 +18,9 @@
 	"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)",

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

@@ -79,14 +79,7 @@
 	"follow-replied-topics": "Follow topics that you reply to",
 	"default-notification-settings": "Default notification settings",
 	"categoryWatchState": "Default category watch state",
-	"categoryWatchState.tracking": "Tracking",
+	"categoryWatchState.watching": "Watching",
 	"categoryWatchState.notwatching": "Not Watching",
-	"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"
+	"categoryWatchState.ignoring": "Ignoring"
 }

public/language/bn/category.json

@@ -10,15 +10,12 @@
     "watch": "নজর রাখুন",
     "ignore": "উপেক্ষা করুন",
     "watching": "দৃশ্যমান",
-    "tracking": "Tracking",
     "not-watching": "দেখা হচ্ছে না",
     "ignoring": "উপেক্ষারত",
-    "watching.description": "Notify me of new topics.<br/>Show topics in unread & recent",
-    "tracking.description": "Shows topics in unread & recent",
+    "watching.description": "অপঠিত এবং সাম্প্রতিক বিষয়গুলো দেখাও",
     "not-watching.description": "Do not show topics in unread, show in recent",
-    "ignoring.description": "Do not show topics in unread & recent",
+    "ignoring.description": "Do not show topics in unread and 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": "প্রেক্ষিত বিভাগসমূহ",

public/language/bn/error.json

@@ -91,7 +91,6 @@
     "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)",

public/language/bn/modules.json

@@ -68,8 +68,6 @@
     "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>",

public/language/bn/notifications.json

@@ -13,7 +13,6 @@
     "all": "All",
     "topics": "Topics",
     "tags": "Tags",
-    "categories": "Categories",
     "replies": "Replies",
     "chat": "Chats",
     "group-chat": "Group Chats",
@@ -56,7 +55,6 @@
     "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.",
@@ -83,7 +81,6 @@
     "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",

public/language/bn/post-queue.json

@@ -3,10 +3,8 @@
 	"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": "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>.",
+	"enabling-help": "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",

public/language/bn/social.json

@@ -6,7 +6,5 @@
 	"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",
-	"sign-in-with-linkedin": "Sign in with LinkedIn",
-	"sign-up-with-linkedin": "Sign up with LinkedIn"
+	"continue-with-facebook": "Continue with Facebook"
 }

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

@@ -8,6 +8,7 @@
 	"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.",

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

@@ -10,6 +10,7 @@
 	"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ů",
@@ -17,6 +18,9 @@
 	"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)",

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

@@ -79,14 +79,7 @@
 	"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.tracking": "Tracking",
+	"categoryWatchState.watching": "Sledování",
 	"categoryWatchState.notwatching": "Nesleduji",
-	"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"
+	"categoryWatchState.ignoring": "Ignorace"
 }

public/language/cs/category.json

@@ -10,15 +10,12 @@
     "watch": "Sledovat",
     "ignore": "Ignorovat",
     "watching": "Sledováno",
-    "tracking": "Tracking",
     "not-watching": "Nesledováno",
     "ignoring": "Ignorováno",
-    "watching.description": "Notify me of new topics.<br/>Show topics in unread & recent",
-    "tracking.description": "Shows topics in unread & recent",
+    "watching.description": "Zobrazit témata v nepřečtených a posledních",
     "not-watching.description": "Nezobrazovat témata v nepřečtených, zobrazit poslední",
-    "ignoring.description": "Do not show topics in unread & recent",
+    "ignoring.description": "Nezobrazovat témata v nepřečtených a posledních",
     "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",

public/language/cs/error.json

@@ -91,7 +91,6 @@
     "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ů",

public/language/cs/modules.json

@@ -68,8 +68,6 @@
     "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>",

public/language/cs/notifications.json

@@ -13,7 +13,6 @@
     "all": "Vše",
     "topics": "Témata",
     "tags": "Tags",
-    "categories": "Categories",
     "replies": "Odpovědi",
     "chat": "Konverzace",
     "group-chat": "Skupinová konverzace",
@@ -56,7 +55,6 @@
     "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.",
@@ -83,7 +81,6 @@
     "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",

public/language/cs/post-queue.json

@@ -3,10 +3,8 @@
 	"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": "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>.",
+	"enabling-help": "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",

public/language/cs/social.json

@@ -6,7 +6,5 @@
 	"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",
-	"sign-in-with-linkedin": "Sign in with LinkedIn",
-	"sign-up-with-linkedin": "Sign up with LinkedIn"
+	"continue-with-facebook": "Continue with Facebook"
 }

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

@@ -8,6 +8,7 @@
 	"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.",

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

@@ -10,6 +10,7 @@
 	"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",
@@ -17,6 +18,9 @@
 	"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)",

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

@@ -79,14 +79,7 @@
 	"follow-replied-topics": "Follow topics that you reply to",
 	"default-notification-settings": "Default notification settings",
 	"categoryWatchState": "Default category watch state",
-	"categoryWatchState.tracking": "Tracking",
+	"categoryWatchState.watching": "Watching",
 	"categoryWatchState.notwatching": "Not Watching",
-	"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"
+	"categoryWatchState.ignoring": "Ignoring"
 }

public/language/da/category.json

@@ -10,15 +10,12 @@
     "watch": "Overvåg",
     "ignore": "Ignorer",
     "watching": "Watching",
-    "tracking": "Tracking",
     "not-watching": "Not Watching",
     "ignoring": "Ignoring",
-    "watching.description": "Notify me of new topics.<br/>Show topics in unread & recent",
-    "tracking.description": "Shows topics in unread & recent",
+    "watching.description": "Show topics in unread and recent",
     "not-watching.description": "Do not show topics in unread, show in recent",
-    "ignoring.description": "Do not show topics in unread & recent",
+    "ignoring.description": "Do not show topics in unread and 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",

public/language/da/error.json

@@ -91,7 +91,6 @@
     "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).",

public/language/da/modules.json

@@ -68,8 +68,6 @@
     "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>",

public/language/da/notifications.json

@@ -13,7 +13,6 @@
     "all": "All",
     "topics": "Topics",
     "tags": "Tags",
-    "categories": "Categories",
     "replies": "Replies",
     "chat": "Chats",
     "group-chat": "Group Chats",
@@ -56,7 +55,6 @@
     "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.",
@@ -83,7 +81,6 @@
     "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",

public/language/da/post-queue.json

@@ -3,10 +3,8 @@
 	"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": "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>.",
+	"enabling-help": "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",

public/language/da/social.json

@@ -6,7 +6,5 @@
 	"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",
-	"sign-in-with-linkedin": "Sign in with LinkedIn",
-	"sign-up-with-linkedin": "Sign up with LinkedIn"
+	"continue-with-facebook": "Continue with Facebook"
 }

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": "Entwürfe ausblenden",
-	"show-drafts": "Entwürfe anzeigen"
+	"hide-drafts": "Hide drafts",
+	"show-drafts": "Show drafts"
 }

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

@@ -8,6 +8,7 @@
 	"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.",

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

@@ -10,6 +10,7 @@
 	"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",
@@ -17,6 +18,9 @@
 	"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)",

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

@@ -79,14 +79,7 @@
 	"follow-replied-topics": "Themen folgen, auf die du antwortest",
 	"default-notification-settings": "Standardbenachrichtigungseinstellungen",
 	"categoryWatchState": "Standardmäßige Beobachtung",
-	"categoryWatchState.tracking": "Verfolgung",
+	"categoryWatchState.watching": "Beobachtet",
 	"categoryWatchState.notwatching": "Nicht beobachtet",
-	"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"
+	"categoryWatchState.ignoring": "Ignoriert"
 }

public/language/de/category.json

@@ -10,15 +10,12 @@
     "watch": "Beobachten",
     "ignore": "Ignorieren",
     "watching": "Beobachte",
-    "tracking": "Verfolgung",
     "not-watching": "Nicht beobachtet",
     "ignoring": "Ignoriert",
-    "watching.description": "Über neue Themen benachrichtigen.<br/>Themen in Ungelesen & Aktuell anzeigen",
-    "tracking.description": "Zeigt Themen in Ungelesen und Aktuell",
+    "watching.description": "Zeige Themen in Ungelesen und Aktuell",
     "not-watching.description": "Zeige keine Themen in Ungelesen, zeige sie in Aktuell",
-    "ignoring.description": "Zeige keine Themen in Ungelesen & Neu",
+    "ignoring.description": "Zeige keine Themen in Ungelesen und Aktuell",
     "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",

public/language/de/error.json

@@ -91,7 +91,6 @@
     "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.",

public/language/de/modules.json

@@ -68,8 +68,6 @@
     "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>",

public/language/de/notifications.json

@@ -13,7 +13,6 @@
     "all": "Alle",
     "topics": "Themen",
     "tags": "Tags",
-    "categories": "Kategorien",
     "replies": "Antworten",
     "chat": "Chats",
     "group-chat": "Gruppenchats",
@@ -49,14 +48,13 @@
     "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.",
@@ -83,7 +81,6 @@
     "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",

public/language/de/post-queue.json

@@ -3,10 +3,8 @@
 	"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": "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>.",
+	"enabling-help": "Um diese Funktion zu aktivieren, gehe zu <a href=\"%1\">Einstellungen &rarr; Posts &rarr; Beitragswarteschlange</a> und aktiviere die <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",

public/language/de/social.json

@@ -6,7 +6,5 @@
 	"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",
-	"sign-in-with-linkedin": "Mit LinkedIn anmelden",
-	"sign-up-with-linkedin": "Mit LinkedIn registrieren"
+	"continue-with-facebook": "Mit Facebook fortsetzen"
 }

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

@@ -8,6 +8,7 @@
 	"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.",

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

@@ -10,6 +10,7 @@
 	"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",
@@ -17,6 +18,9 @@
 	"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)",

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

@@ -79,14 +79,7 @@
 	"follow-replied-topics": "Follow topics that you reply to",
 	"default-notification-settings": "Default notification settings",
 	"categoryWatchState": "Default category watch state",
-	"categoryWatchState.tracking": "Tracking",
+	"categoryWatchState.watching": "Watching",
 	"categoryWatchState.notwatching": "Not Watching",
-	"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"
+	"categoryWatchState.ignoring": "Ignoring"
 }

public/language/el/category.json

@@ -10,15 +10,12 @@
     "watch": "Παρακολουθήστε",
     "ignore": "Αγνόηση",
     "watching": "Παρακολουθώ",
-    "tracking": "Tracking",
     "not-watching": "Δεν παρακολουθώ",
     "ignoring": "Αγνόησε",
-    "watching.description": "Notify me of new topics.<br/>Show topics in unread & recent",
-    "tracking.description": "Shows topics in unread & recent",
+    "watching.description": "Εμφάνιση θεμάτων σε μη αναγνωσμένα και πρόσφατα",
     "not-watching.description": "Να μην εμφανίζονται θέματα σε μη αναγνωσμένα, να εμφανίζονται σε πρόσφατα",
-    "ignoring.description": "Do not show topics in unread & recent",
+    "ignoring.description": "Να μην εμφανίζονται θέματα σε μη αναγνωσμένα και πρόσφατα",
     "watching.message": "Παρακολουθείτε τώρα ενημερώσεις από αυτήν την κατηγορία και όλες τις υποκατηγορίες",
-    "tracking.message": "You are now tracking updates from this category and all subcategories",
     "notwatching.message": "Δεν παρακολουθείτε ενημερώσεις από αυτήν την κατηγορία και όλες τις υποκατηγορίες",
     "ignoring.message": "Τώρα αγνοείτε ενημερώσεις από αυτήν την κατηγορία και όλες τις υποκατηγορίες",
     "watched-categories": "Κατηγορίες υπό παρακολούθηση",

public/language/el/error.json

@@ -91,7 +91,6 @@
     "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)",

public/language/el/modules.json

@@ -68,8 +68,6 @@
     "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>",

public/language/el/notifications.json

@@ -13,7 +13,6 @@
     "all": "All",
     "topics": "Topics",
     "tags": "Tags",
-    "categories": "Categories",
     "replies": "Replies",
     "chat": "Chats",
     "group-chat": "Group Chats",
@@ -56,7 +55,6 @@
     "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.",
@@ -83,7 +81,6 @@
     "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",

public/language/el/post-queue.json

@@ -3,10 +3,8 @@
 	"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": "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>.",
+	"enabling-help": "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",

public/language/el/social.json

@@ -6,7 +6,5 @@
 	"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",
-	"sign-in-with-linkedin": "Sign in with LinkedIn",
-	"sign-up-with-linkedin": "Sign up with LinkedIn"
+	"continue-with-facebook": "Continue with Facebook"
 }

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

@@ -8,6 +8,7 @@
 	"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.",

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

@@ -10,6 +10,7 @@
 	"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",
@@ -17,6 +18,9 @@
 	"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)",

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

@@ -79,14 +79,7 @@
 	"follow-replied-topics": "Follow topics that you reply to",
 	"default-notification-settings": "Default notification settings",
 	"categoryWatchState": "Default category watch state",
-	"categoryWatchState.tracking": "Tracking",
+	"categoryWatchState.watching": "Watching",
 	"categoryWatchState.notwatching": "Not Watching",
-	"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"
+	"categoryWatchState.ignoring": "Ignoring"
 }

public/language/en-GB/category.json

@@ -13,16 +13,13 @@
 	"watch": "Watch",
 	"ignore": "Ignore",
 	"watching": "Watching",
-	"tracking": "Tracking",
 	"not-watching": "Not Watching",
 	"ignoring": "Ignoring",
-	"watching.description": "Notify me of new topics.<br/>Show topics in unread & recent",
-	"tracking.description": "Shows topics in unread & recent",
+	"watching.description": "Show topics in unread and recent",
 	"not-watching.description": "Do not show topics in unread, show in recent",
-	"ignoring.description": "Do not show topics in unread & recent",
+	"ignoring.description": "Do not show topics in unread and 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",
 

public/language/en-GB/error.json

@@ -104,7 +104,6 @@
 	"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)",

public/language/en-GB/modules.json

@@ -68,8 +68,6 @@
 	"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",
 

public/language/en-GB/notifications.json

@@ -15,7 +15,6 @@
 	"all": "All",
 	"topics": "Topics",
 	"tags": "Tags",
-	"categories": "Categories",
 	"replies": "Replies",
 	"chat": "Chats",
 	"group-chat": "Group Chats",
@@ -62,8 +61,6 @@
 	"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.",
@@ -92,7 +89,6 @@
 	"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",

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

@@ -3,10 +3,8 @@
 	"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": "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>.",
+	"enabling-help": "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",

public/language/en-GB/social.json

@@ -6,7 +6,5 @@
 	"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",
-	"sign-in-with-linkedin": "Sign in with LinkedIn",
-	"sign-up-with-linkedin": "Sign up with LinkedIn"
+	"continue-with-facebook": "Continue with Facebook"
 }

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

@@ -8,6 +8,7 @@
 	"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.",

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

@@ -10,6 +10,7 @@
 	"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",
@@ -17,6 +18,9 @@
 	"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)",

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

@@ -79,14 +79,7 @@
 	"follow-replied-topics": "Follow topics that you reply to",
 	"default-notification-settings": "Default notification settings",
 	"categoryWatchState": "Default category watch state",
-	"categoryWatchState.tracking": "Tracking",
+	"categoryWatchState.watching": "Watching",
 	"categoryWatchState.notwatching": "Not Watching",
-	"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"
+	"categoryWatchState.ignoring": "Ignoring"
 }

public/language/en-US/category.json

@@ -10,15 +10,12 @@
     "watch": "Watch",
     "ignore": "Ignore",
     "watching": "Watching",
-    "tracking": "Tracking",
     "not-watching": "Not Watching",
     "ignoring": "Ignoring",
-    "watching.description": "Notify me of new topics.<br/>Show topics in unread & recent",
-    "tracking.description": "Shows topics in unread & recent",
+    "watching.description": "Show topics in unread and recent",
     "not-watching.description": "Do not show topics in unread, show in recent",
-    "ignoring.description": "Do not show topics in unread & recent",
+    "ignoring.description": "Do not show topics in unread and 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": "Watched categories",

public/language/en-US/error.json

@@ -91,7 +91,6 @@
     "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)",

public/language/en-US/modules.json

@@ -68,8 +68,6 @@
     "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>",

public/language/en-US/notifications.json

@@ -13,7 +13,6 @@
     "all": "All",
     "topics": "Topics",
     "tags": "Tags",
-    "categories": "Categories",
     "replies": "Replies",
     "chat": "Chats",
     "group-chat": "Group Chats",
@@ -56,7 +55,6 @@
     "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.",
@@ -83,7 +81,6 @@
     "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",