fix: lint

Co-authored-by: Brophy <paul.brophy@bastage.net>

.github/workflows/docker.yml

@@ -0,0 +1,52 @@
+name: Run Docker
+
+# Controls when the workflow will run
+on:
+  push:
+    branches:
+      - 'master'
+      - 'v*.x'
+    tags:
+      - 'v*'
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: nodebb/docker
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=raw,value=latest
+
+      - name: Build and push Docker images
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+

.github/workflows/test.yaml

@@ -186,7 +186,7 @@ jobs:
         run: npm run coverage
 
       - name: Test coverage
-        uses: coverallsapp/github-action@v1.1.2
+        uses: coverallsapp/github-action@1.1.3
         if: matrix.coverage
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -198,7 +198,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Coveralls Finished
-        uses: coverallsapp/github-action@v1.1.2
+        uses: coverallsapp/github-action@1.1.3
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel-finished: true

CHANGELOG.md

@@ -1,3 +1,119 @@
+#### v1.17.1 (2021-05-26)
+
+##### Chores
+
+* **deps:**
+  *  update dependency grunt to v1.4.1 (0e37bbfd)
+  *  update dependency jsdom to v16.6.0 (60170ad6)
+  *  update dependency eslint to v7.27.0 (298af98d)
+  *  update dependency eslint-plugin-import to v2.23.0 (1623ba4f)
+  *  update commitlint monorepo to v12.1.4 (4a01313d)
+  *  update commitlint monorepo to v12.1.3 (b82774c5)
+  *  update dependency eslint to v7.26.0 (d1418210)
+  *  update dependency lint-staged to v11 (1bf57d40)
+  *  update dependency mocha to v8.4.0 (461e187b)
+  *  update dependency eslint to v7.25.0 (32c20806)
+  *  update dependency grunt to v1.4.0 (a30deef3)
+*  incrementing version number - v1.17.0 (75f7972b)
+*  update changelog for v1.17.0 (4c441a1b)
+
+##### Documentation Changes
+
+*  update API docs to better outline authentication options (6ef0c8e9)
+*  update API authentication verbiage (d08d0c42)
+
+##### New Features
+
+*  keep query string when redirecting category (77dde41f)
+*  add req.query to flags.list/getCount (3d6bdeb3)
+*  add filter:flags.getFlagIdsWithFilters (d35c64b1)
+*  #9559, set order help text (f5847f4f)
+*  add filter:user.getWatchedCategories (4afca690)
+*  pass req.query to getUserDataByUserSlug (518157d9)
+*  #9508, add cluster support (94c12e37)
+*  #9551 (a3d6c56e)
+*  add template to hook (1f3e6601)
+*  add filter:account.getPostsFromUserSet (a2442ee9)
+*  automatically attempt reconnection on window focus (8cc61f11)
+*  #9533, allow redirect in build hooks (f6b583bb)
+*  add _hooks metadata object to all hooks that have object-type params (46899cca)
+*  add filter:categories.copySettingsFrom (d8e4fd4c)
+*  guard against multiple resolves (084c9851)
+*  #9511 send notifications on accept/reject (b40fc4b6)
+*  `hidden` class to FOUC (2bfa63ae)
+*  add filter:middleware.autoLocale (a478dc7e)
+*  remove sync hooks support (01956af4)
+
+##### Bug Fixes
+
+*  #9580, proper 404 when ajaxifying (9ebfdeb7)
+*  lint (09f51792)
+*  #9567 fix tests (951e71a0)
+*  #9567, use regular 404 (5215c30a)
+*  ioredis upgrade fix, maybe (1ce59508)
+*  bug where interstitial errors were not properly passed to the front-end via req.flash (1d9cfe1e)
+*  #9553, use same fields for user search results in acp (0551642a)
+*  lint (e8c5c18a)
+*  lint (ffa80163)
+*  tests (fad5988e)
+*  tests (074ee859)
+*  wrong error message checked (a9bb1088)
+*  #9507 session reroll causes socket.io to become confused (#9534) (ec6d1e23)
+*  isObjectField(s) empty field (2c22b06f)
+*  do not register SW for Safari until upstream fixes #9193 (ce5fea2a)
+*  infinite scroll with small number of items #9524 (#9525) (cb1dd0a3)
+*  #9519 unable to properly ajaxify to home on subfolder installs if anchor did not have a trailing slash (db48b952)
+*  #9512, fix chat icon if no privileges (6ed8890c)
+*  #9503, dont error in markUnread if room doesnt exist (308252f5)
+*  use socket.request.headers (9e07efc1)
+*  buildReqObject headers for socket.io calls (ed534f34)
+* **deps:**
+  *  update dependency sharp to v0.28.3 (963a9fe6)
+  *  update dependency ioredis to v4.27.3 (075dab27)
+  *  update dependency nodebb-theme-vanilla to v12.0.8 (#9574) (10290f54)
+  *  update dependency mongodb to v3.6.8 (#9573) (64935787)
+  *  update dependency postcss to v8.3.0 (ad4afd59)
+  *  update dependency nodebb-theme-persona to v11.0.20 (403bcfac)
+  *  update dependency nodebb-plugin-composer-default to v6.5.29 (8d7e4420)
+  *  update dependency mongodb to v3.6.7 (f29e4e87)
+  *  update dependency textcomplete to ^0.18.0 (9b7653cc)
+  *  update socket.io packages to v4.1.2 (#9563) (ca7c77bc)
+  *  update dependency nodebb-plugin-dbsearch to v5.0.2 (#9562) (2d0564cb)
+  *  update dependency nodebb-theme-slick to v1.4.7 (bf4aa50c)
+  *  update dependency nodebb-plugin-composer-default to v6.5.28 (4164b322)
+  *  update socket.io packages to v4.1.1 (155a7fb6)
+  *  update socket.io packages to v4.1.0 (53335677)
+  *  update dependency sharp to v0.28.2 (4bc07a08)
+  *  update dependency postcss to v8.2.15 (7770c2a1)
+  *  update dependency nodebb-theme-persona to v11.0.19 (3145c7d5)
+  *  update dependency nodebb-plugin-mentions to v2.13.11 (7e2ea4df)
+  *  update dependency nodebb-plugin-markdown to v8.12.10 (2ac5a085)
+  *  update dependency nodebb-plugin-markdown to v8.12.9 (ee3634cc)
+  *  update socket.io packages to v4.0.2 (ff98f854)
+  *  update dependency postcss to v8.2.14 (22ec1ea5)
+  *  update dependency sitemap to v7 (0389dd96)
+  *  update dependency nodebb-widget-essentials to v5.0.4 (19f1cbfc)
+  *  update dependency nodebb-theme-persona to v11.0.18 (33d91fde)
+  *  update dependency connect-redis to v5.2.0 (c0d54a06)
+  *  update dependency postcss to v8.2.13 (831e5c26)
+  *  update dependency postcss to v8.2.12 (38454df9)
+* **#9508:**  switch to ioredis (#9545) (dd81dd03)
+
+##### Refactors
+
+*  cli/upgrade async/await (#9558) (ac86937c)
+*  bubble other errors (0096cf17)
+
+##### Reverts
+
+*  sync hooks (5fe97b9c)
+
+##### Tests
+
+*  fix tests (1029a06a)
+*  fix redis tests (4e490f60)
+*  add test for undefined fields in getObjectsFields (92de49be)
+
 #### v1.17.0 (2021-04-22)
 
 ##### Breaking Changes

install/data/defaults.json

@@ -19,6 +19,7 @@
     "chatEditDuration": 0,
     "chatDeleteDuration": 0,
     "chatMessageDelay": 200,
+    "notificationSendDelay": 60,
     "newbiePostDelayThreshold": 3,
     "postQueue": 0,
     "postQueueReputationThreshold": 0,
@@ -30,6 +31,7 @@
     "maximumTagsPerTopic": 5,
     "minimumTagLength": 3,
     "maximumTagLength": 15,
+    "undoTimeout": 10000,
     "allowTopicsThumbnail": 1,
     "registrationType": "normal",
     "registrationApprovalType": "normal",

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "1.17.1",
+    "version": "1.17.2",
     "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -32,7 +32,7 @@
         "ace-builds": "^1.4.12",
         "archiver": "^5.2.0",
         "async": "^3.2.0",
-        "autoprefixer": "10.2.5",
+        "autoprefixer": "10.2.6",
         "bcryptjs": "2.4.3",
         "benchpressjs": "2.4.3",
         "body-parser": "^1.19.0",
@@ -49,7 +49,7 @@
         "connect-mongo": "4.4.1",
         "connect-multiparty": "^2.2.0",
         "connect-pg-simple": "^6.2.1",
-        "connect-redis": "5.2.0",
+        "connect-redis": "6.0.0",
         "cookie-parser": "^1.4.5",
         "cron": "^1.8.2",
         "cropperjs": "^1.5.11",
@@ -78,22 +78,22 @@
         "material-design-lite": "^1.3.0",
         "mime": "^2.5.2",
         "mkdirp": "^1.0.4",
-        "mongodb": "3.6.8",
+        "mongodb": "3.6.10",
         "morgan": "^1.10.0",
         "mousetrap": "^1.6.5",
         "multiparty": "4.2.2",
         "@nodebb/bootswatch": "3.4.2",
         "nconf": "^0.11.2",
-        "nodebb-plugin-composer-default": "6.5.29",
+        "nodebb-plugin-composer-default": "6.5.33",
         "nodebb-plugin-dbsearch": "5.0.2",
         "nodebb-plugin-emoji": "^3.5.0",
         "nodebb-plugin-emoji-android": "2.0.5",
-        "nodebb-plugin-markdown": "8.12.10",
+        "nodebb-plugin-markdown": "8.14.1",
         "nodebb-plugin-mentions": "2.13.11",
         "nodebb-plugin-spam-be-gone": "0.7.9",
-        "nodebb-rewards-essentials": "0.1.4",
+        "nodebb-rewards-essentials": "0.1.5",
         "nodebb-theme-lavender": "5.2.1",
-        "nodebb-theme-persona": "11.0.20",
+        "nodebb-theme-persona": "11.0.25",
         "nodebb-theme-slick": "1.4.7",
         "nodebb-theme-vanilla": "12.0.8",
         "nodebb-widget-essentials": "5.0.4",
@@ -104,10 +104,10 @@
         "passport-local": "1.0.0",
         "pg": "^8.5.1",
         "pg-cursor": "^2.5.2",
-        "postcss": "8.3.0",
+        "postcss": "8.3.5",
         "postcss-clean": "1.2.0",
         "prompt": "^1.1.0",
-        "ioredis": "4.27.3",
+        "ioredis": "4.27.6",
         "request": "2.88.2",
         "request-promise-native": "^1.0.9",
         "requirejs": "2.3.6",
@@ -123,7 +123,7 @@
         "socket.io-adapter-cluster": "^1.0.1",
         "socket.io-client": "4.1.2",
         "@socket.io/redis-adapter": "7.0.0",
-        "sortablejs": "1.13.0",
+        "sortablejs": "1.14.0",
         "spdx-license-list": "^6.4.0",
         "spider-detector": "2.0.0",
         "textcomplete": "^0.18.0",
@@ -144,10 +144,10 @@
         "@apidevtools/swagger-parser": "10.0.2",
         "@commitlint/cli": "12.1.4",
         "@commitlint/config-angular": "12.1.4",
-        "coveralls": "3.1.0",
-        "eslint": "7.27.0",
+        "coveralls": "3.1.1",
+        "eslint": "7.30.0",
         "eslint-config-airbnb-base": "14.2.1",
-        "eslint-plugin-import": "2.22.1",
+        "eslint-plugin-import": "2.23.4",
         "grunt": "1.4.1",
         "grunt-contrib-watch": "1.1.0",
         "husky": "6.0.0",
@@ -157,7 +157,7 @@
         "mocha-lcov-reporter": "1.3.0",
         "mockdate": "3.0.5",
         "nyc": "15.1.0",
-        "smtp-server": "3.8.0"
+        "smtp-server": "3.9.0"
     },
     "bugs": {
         "url": "https://github.com/NodeBB/NodeBB/issues"

install/web.js

@@ -127,7 +127,7 @@ function welcome(req, res) {
 		};
 	});
 
-	const defaults = require('./data/defaults');
+	const defaults = require('./data/defaults.json');
 
 	res.render('install/index', {
 		url: nconf.get('url') || (`${req.protocol}://${req.get('host')}`),

public/language/ar/admin/manage/users.json

@@ -1,6 +1,6 @@
 {
 	"users": "المستخدمين",
-	"edit": "تحرير",
+	"edit": "Actions",
 	"make-admin": "Make Admin",
 	"remove-admin": "Remove Admin",
 	"validate-email": "Validate Email",
@@ -47,6 +47,7 @@
 	"users.uid": "uid",
 	"users.username": "username",
 	"users.email": "email",
+	"users.ip": "IP",
 	"users.postcount": "postcount",
 	"users.reputation": "reputation",
 	"users.flags": "flags",

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

@@ -40,5 +40,8 @@
 	"site-colors": "Site Color Metadata",
 	"theme-color": "لون الثيم",
 	"background-color": "لون الخلفية",
-	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
+	"background-color-help": "Color used for splash screen background when website is installed as a PWA",
+	"undo-timeout": "Undo Timeout",
+	"undo-timeout-help": "Some operations such as moving topics will allow for the moderator to undo their action within a certain timeframe. Set to 0 to disable undo completely.",
+	"topic-tools": "Topic Tools"
 }

public/language/ar/error.json

@@ -85,6 +85,7 @@
     "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
     "too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)",
     "cant-use-system-tag": "You can not use this system tag.",
+    "cant-remove-system-tag": "You can not remove this system tag.",
     "still-uploading": "الرجاء الانتظار حتى يكتمل الرفع.",
     "file-too-big": "الحد الأقصى لرفع الملفات %1 كيلو بت. رجاءًا ارفع ملف أصغر",
     "guest-upload-disabled": "خاصية رفع الملفات غير مفعلة للزوار.",

public/language/ar/notifications.json

@@ -14,6 +14,7 @@
     "topics": "مواضيع",
     "replies": "ردود",
     "chat": "محادثات",
+    "group-chat": "Group Chats",
     "follows": "متابعون",
     "upvote": "الموافقين",
     "new-flags": "New Flags",

public/language/bg/admin/manage/users.json

@@ -1,6 +1,6 @@
 {
 	"users": "Потребители",
-	"edit": "Редактиране",
+	"edit": "Actions",
 	"make-admin": "Даване на администраторски права",
 	"remove-admin": "Отнемане на администраторски права",
 	"validate-email": "Проверка на е-пощата",
@@ -47,6 +47,7 @@
 	"users.uid": "потр. ид.",
 	"users.username": "потребителско име",
 	"users.email": "е-поща",
+	"users.ip": "IP адрес",
 	"users.postcount": "брой публикации",
 	"users.reputation": "репутация",
 	"users.flags": "доклади",

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

@@ -40,5 +40,8 @@
 	"site-colors": "Мета-данни за цвета на уеб сайта",
 	"theme-color": "Цвят на темата",
 	"background-color": "Фонов цвят",
-	"background-color-help": "Цвят, който да се използва като фон за началния екран, когато уеб сайтът е инсталиран като приложение"
+	"background-color-help": "Цвят, който да се използва като фон за началния екран, когато уеб сайтът е инсталиран като приложение",
+	"undo-timeout": "Време за отмяна",
+	"undo-timeout-help": "Някои действия, като например преместването на теми, могат да бъдат отменени от модератора в рамките на определено време. Задайте 0, за да забраните изцяло отменянето.",
+	"topic-tools": "Инструменти за темите"
 }

public/language/bg/error.json

@@ -85,6 +85,7 @@
     "not-enough-tags": "Недостатъчно етикети. Темите трябва да имат поне %1 етикет(а)",
     "too-many-tags": "Твърде много етикети. Темите не могат да имат повече от %1 етикет(а)",
     "cant-use-system-tag": "Не можете да използвате този системен етикет.",
+    "cant-remove-system-tag": "Не можете да премахнете този системен етикет.",
     "still-uploading": "Моля, изчакайте качването да приключи.",
     "file-too-big": "Максималният разрешен размер на файл е %1 КБ – моля, качете по-малък файл",
     "guest-upload-disabled": "Качването не е разрешено за гости",

public/language/bg/notifications.json

@@ -14,6 +14,7 @@
     "topics": "Теми",
     "replies": "Отговори",
     "chat": "Разговори",
+    "group-chat": "Групови разговори",
     "follows": "Следвания",
     "upvote": "Положителни гласове",
     "new-flags": "Нови докладвания",

public/language/bn/admin/manage/users.json

@@ -1,6 +1,6 @@
 {
 	"users": "Users",
-	"edit": "Edit",
+	"edit": "Actions",
 	"make-admin": "Make Admin",
 	"remove-admin": "Remove Admin",
 	"validate-email": "Validate Email",
@@ -47,6 +47,7 @@
 	"users.uid": "uid",
 	"users.username": "username",
 	"users.email": "email",
+	"users.ip": "IP",
 	"users.postcount": "postcount",
 	"users.reputation": "reputation",
 	"users.flags": "flags",

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

@@ -40,5 +40,8 @@
 	"site-colors": "Site Color Metadata",
 	"theme-color": "Theme Color",
 	"background-color": "Background Color",
-	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
+	"background-color-help": "Color used for splash screen background when website is installed as a PWA",
+	"undo-timeout": "Undo Timeout",
+	"undo-timeout-help": "Some operations such as moving topics will allow for the moderator to undo their action within a certain timeframe. Set to 0 to disable undo completely.",
+	"topic-tools": "Topic Tools"
 }

public/language/bn/category.json

@@ -9,10 +9,10 @@
     "no_new_posts": "নতুন কোন পোস্ট নাই",
     "watch": "নজর রাখুন",
     "ignore": "উপেক্ষা করুন",
-    "watching": "Watching",
-    "not-watching": "Not Watching",
-    "ignoring": "Ignoring",
-    "watching.description": "Show topics in unread and recent",
+    "watching": "দৃশ্যমান",
+    "not-watching": "দেখা হচ্ছে না",
+    "ignoring": "উপেক্ষারত",
+    "watching.description": "অপঠিত এবং সাম্প্রতিক বিষয়গুলো দেখাও",
     "not-watching.description": "Do not show topics in unread, show in recent",
     "ignoring.description": "Do not show topics in unread and recent",
     "watching.message": "You are now watching updates from this category and all subcategories",

public/language/bn/error.json

@@ -85,6 +85,7 @@
     "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
     "too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)",
     "cant-use-system-tag": "You can not use this system tag.",
+    "cant-remove-system-tag": "You can not remove this system tag.",
     "still-uploading": "আপলোড সম্পূর্ণ জন্য অনুগ্রহ করে অপেক্ষা করুন",
     "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
     "guest-upload-disabled": "Guest uploading has been disabled",

public/language/bn/notifications.json

@@ -14,6 +14,7 @@
     "topics": "Topics",
     "replies": "Replies",
     "chat": "Chats",
+    "group-chat": "Group Chats",
     "follows": "Follows",
     "upvote": "Upvotes",
     "new-flags": "New Flags",

public/language/cs/admin/manage/users.json

@@ -1,6 +1,6 @@
 {
 	"users": "Uživatelé",
-	"edit": "Upravit",
+	"edit": "Actions",
 	"make-admin": "Učinit správcem",
 	"remove-admin": "Odebrat správce",
 	"validate-email": "Ověřit e-mail",
@@ -47,6 +47,7 @@
 	"users.uid": "uid",
 	"users.username": "jméno",
 	"users.email": "e-mail",
+	"users.ip": "IP",
 	"users.postcount": "počet příspěvků",
 	"users.reputation": "reputace",
 	"users.flags": "označení",

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

@@ -40,5 +40,8 @@
 	"site-colors": "Site Color Metadata",
 	"theme-color": "Theme Color",
 	"background-color": "Background Color",
-	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
+	"background-color-help": "Color used for splash screen background when website is installed as a PWA",
+	"undo-timeout": "Undo Timeout",
+	"undo-timeout-help": "Some operations such as moving topics will allow for the moderator to undo their action within a certain timeframe. Set to 0 to disable undo completely.",
+	"topic-tools": "Topic Tools"
 }

public/language/cs/error.json

@@ -68,9 +68,9 @@
     "post-delete-duration-expired-minutes": "Je vám umožněno odstranit příspěvky jen po %1 minut/y od jeho vytvoření",
     "post-delete-duration-expired-minutes-seconds": "Je vám umožněno odstranit příspěvky jen po %1 minut/y %2 sekund/y od jeho vytvoření",
     "post-delete-duration-expired-hours": "Je vám umožněno odstranit příspěvky jen po %1 hodin/y od jeho vytvoření",
-    "post-delete-duration-expired-hours-minutes": "Je vám umožněno odstranit příspěvky jen po 1% hodin/y %2 minut/y od jeho vytvoření",
-    "post-delete-duration-expired-days": "Je vám umožněno odstranit příspěvky jen po 1% den/y/ů od jeho vytvoření",
-    "post-delete-duration-expired-days-hours": "Je vám umožněno odstranit příspěvky jen po 1% den/y/ů %2 hodin/y od jeho vytvoření",
+    "post-delete-duration-expired-hours-minutes": "Je vám umožněno odstranit příspěvky jen po %1 hodin/y %2 minut/y od jeho vytvoření",
+    "post-delete-duration-expired-days": "Je vám umožněno odstranit příspěvky jen po %1 den/y/ů od jeho vytvoření",
+    "post-delete-duration-expired-days-hours": "Je vám umožněno odstranit příspěvky jen po %1 den/y/ů %2 hodin/y od jeho vytvoření",
     "cant-delete-topic-has-reply": "Nemůžete odstranit vaše téma, po tom co obsahuje odpověď",
     "cant-delete-topic-has-replies": "Téma nelze odstranit poté, co obsahuje %1 odpovědí",
     "content-too-short": "Zadejte prosím delší příspěvek. Každý příspěvek musí obsahovat alespoň %1 znaků.",
@@ -85,6 +85,7 @@
     "not-enough-tags": "Málo značek. Téma musí obsahovat alespoň %1 značek",
     "too-many-tags": "Příliš mnoho značek. Téma nesmí mít více než %1 značek",
     "cant-use-system-tag": "You can not use this system tag.",
+    "cant-remove-system-tag": "You can not remove this system tag.",
     "still-uploading": "Vyčkejte, než se vše kompletně nahraje.",
     "file-too-big": "Maximální povolená velikost je %1 kB – nahrajte menší soubor",
     "guest-upload-disabled": "Nahrávání od hostů nebylo povoleno",

public/language/cs/notifications.json

@@ -14,6 +14,7 @@
     "topics": "Témata",
     "replies": "Odpovědi",
     "chat": "Konverzace",
+    "group-chat": "Group Chats",
     "follows": "Sledování",
     "upvote": "Souhlasy",
     "new-flags": "Nové označení",

public/language/da/admin/manage/users.json

@@ -1,6 +1,6 @@
 {
 	"users": "Users",
-	"edit": "Edit",
+	"edit": "Actions",
 	"make-admin": "Make Admin",
 	"remove-admin": "Remove Admin",
 	"validate-email": "Validate Email",
@@ -47,6 +47,7 @@
 	"users.uid": "uid",
 	"users.username": "username",
 	"users.email": "email",
+	"users.ip": "IP",
 	"users.postcount": "postcount",
 	"users.reputation": "reputation",
 	"users.flags": "flags",

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

@@ -40,5 +40,8 @@
 	"site-colors": "Site Color Metadata",
 	"theme-color": "Theme Color",
 	"background-color": "Background Color",
-	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
+	"background-color-help": "Color used for splash screen background when website is installed as a PWA",
+	"undo-timeout": "Undo Timeout",
+	"undo-timeout-help": "Some operations such as moving topics will allow for the moderator to undo their action within a certain timeframe. Set to 0 to disable undo completely.",
+	"topic-tools": "Topic Tools"
 }

public/language/da/error.json

@@ -85,6 +85,7 @@
     "not-enough-tags": "Ikke nok tags. Tråde skal have mindst %1 tag(s)",
     "too-many-tags": "For mange tags. Tråde kan ikke have mere end %1 tag(s)",
     "cant-use-system-tag": "You can not use this system tag.",
+    "cant-remove-system-tag": "You can not remove this system tag.",
     "still-uploading": "Venligst vent til overførslen er færdig",
     "file-too-big": "Maksimum filstørrelse er %1 kB - venligst overfør en mindre fil",
     "guest-upload-disabled": "Gæsteupload er deaktiveret",

public/language/da/modules.json

@@ -5,7 +5,7 @@
     "chat.send": "Send",
     "chat.no_active": "Du har ingen aktive chats.",
     "chat.user_typing": "%1 skriver ...",
-    "chat.user_has_messaged_you": "1% har skrevet til dig.",
+    "chat.user_has_messaged_you": "%1 har skrevet til dig.",
     "chat.see_all": "Se alle chats",
     "chat.mark_all_read": "Mark all chats read",
     "chat.no-messages": "Vælg en modtager for at se beskedhistorikken",
@@ -68,9 +68,9 @@
     "bootbox.ok": "OK",
     "bootbox.cancel": "Annuller",
     "bootbox.confirm": "Bekræft",
-    "cover.dragging_title": "Coverbillede positionering ",
+    "cover.dragging_title": "Coverbillede positionering",
     "cover.dragging_message": "Træk coverbilledet til den ønskede position og klik \"Gem\"",
-    "cover.saved": "Coverbillede og position gemt ",
+    "cover.saved": "Coverbillede og position gemt",
     "thumbs.modal.title": "Manage topic thumbnails",
     "thumbs.modal.no-thumbs": "No thumbnails found.",
     "thumbs.modal.resize-note": "<strong>Note</strong>: This forum is configured to resize topic thumbnails down to a maximum width of %1px",

public/language/da/notifications.json

@@ -14,6 +14,7 @@
     "topics": "Topics",
     "replies": "Replies",
     "chat": "Chats",
+    "group-chat": "Group Chats",
     "follows": "Follows",
     "upvote": "Upvotes",
     "new-flags": "New Flags",

public/language/de/admin/manage/users.json

@@ -1,6 +1,6 @@
 {
 	"users": "Benutzer",
-	"edit": "Bearbeiten",
+	"edit": "Actions",
 	"make-admin": "Zum Administrator befördern",
 	"remove-admin": "Adminstatus entfernen",
 	"validate-email": "E-Mail bestätigen",
@@ -47,6 +47,7 @@
 	"users.uid": "UID",
 	"users.username": "Nutzername",
 	"users.email": "E-Mail",
+	"users.ip": "IP",
 	"users.postcount": "Anzahl der Beiträge",
 	"users.reputation": "Ansehen",
 	"users.flags": "Meldungen",

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

@@ -40,5 +40,8 @@
 	"site-colors": "Site Color Metadata",
 	"theme-color": "Theme Color",
 	"background-color": "Background Color",
-	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
+	"background-color-help": "Color used for splash screen background when website is installed as a PWA",
+	"undo-timeout": "Undo Timeout",
+	"undo-timeout-help": "Some operations such as moving topics will allow for the moderator to undo their action within a certain timeframe. Set to 0 to disable undo completely.",
+	"topic-tools": "Topic Tools"
 }

public/language/de/error.json

@@ -85,6 +85,7 @@
     "not-enough-tags": "Nicht genügend Schlagworte. Themen müssen mindestens %1 Schlagwort(e) enthalten",
     "too-many-tags": "Zu viele Schlagworte. Themen dürfen nicht mehr als %1 Schlagwort(e) enthalten",
     "cant-use-system-tag": "You can not use this system tag.",
+    "cant-remove-system-tag": "You can not remove this system tag.",
     "still-uploading": "Bitte warte bis der Vorgang abgeschlossen ist.",
     "file-too-big": "Die maximale Dateigröße ist %1 kB, bitte lade eine kleinere Datei hoch.",
     "guest-upload-disabled": "Uploads für Gäste wurden deaktiviert.",

public/language/de/notifications.json

@@ -14,6 +14,7 @@
     "topics": "Themen",
     "replies": "Antworten",
     "chat": "Chats",
+    "group-chat": "Group Chats",
     "follows": "Folgt",
     "upvote": "Positive Bewertungen",
     "new-flags": "Neue Markierungen",

public/language/el/admin/manage/users.json

@@ -1,6 +1,6 @@
 {
 	"users": "Users",
-	"edit": "Edit",
+	"edit": "Actions",
 	"make-admin": "Make Admin",
 	"remove-admin": "Remove Admin",
 	"validate-email": "Validate Email",
@@ -47,6 +47,7 @@
 	"users.uid": "uid",
 	"users.username": "username",
 	"users.email": "email",
+	"users.ip": "IP",
 	"users.postcount": "postcount",
 	"users.reputation": "reputation",
 	"users.flags": "flags",

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

@@ -40,5 +40,8 @@
 	"site-colors": "Site Color Metadata",
 	"theme-color": "Theme Color",
 	"background-color": "Background Color",
-	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
+	"background-color-help": "Color used for splash screen background when website is installed as a PWA",
+	"undo-timeout": "Undo Timeout",
+	"undo-timeout-help": "Some operations such as moving topics will allow for the moderator to undo their action within a certain timeframe. Set to 0 to disable undo completely.",
+	"topic-tools": "Topic Tools"
 }

public/language/el/error.json

@@ -85,6 +85,7 @@
     "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
     "too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)",
     "cant-use-system-tag": "You can not use this system tag.",
+    "cant-remove-system-tag": "You can not remove this system tag.",
     "still-uploading": "Παρακαλώ περίμενε να τελειώσει το ανέβασμα των αρχείων.",
     "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
     "guest-upload-disabled": "Guest uploading has been disabled",

public/language/el/notifications.json

@@ -14,6 +14,7 @@
     "topics": "Topics",
     "replies": "Replies",
     "chat": "Chats",
+    "group-chat": "Group Chats",
     "follows": "Follows",
     "upvote": "Upvotes",
     "new-flags": "New Flags",

public/language/en-GB/admin/manage/users.json

@@ -1,6 +1,6 @@
 {
 	"users": "Users",
-	"edit": "Edit",
+	"edit": "Actions",
 	"make-admin": "Make Admin",
 	"remove-admin": "Remove Admin",
 	"validate-email": "Validate Email",
@@ -47,6 +47,7 @@
 	"users.uid": "uid",
 	"users.username": "username",
 	"users.email": "email",
+	"users.ip": "IP",
 	"users.postcount": "postcount",
 	"users.reputation": "reputation",
 	"users.flags": "flags",

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

@@ -40,5 +40,8 @@
 	"site-colors": "Site Color Metadata",
 	"theme-color": "Theme Color",
 	"background-color": "Background Color",
-	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
+	"background-color-help": "Color used for splash screen background when website is installed as a PWA",
+	"undo-timeout": "Undo Timeout",
+	"undo-timeout-help": "Some operations such as moving topics will allow for the moderator to undo their action within a certain timeframe. Set to 0 to disable undo completely.",
+	"topic-tools": "Topic Tools"
 }

public/language/en-GB/error.json

@@ -98,6 +98,7 @@
 	"not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
 	"too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)",
 	"cant-use-system-tag": "You can not use this system tag.",
+	"cant-remove-system-tag": "You can not remove this system tag.",
 
 	"still-uploading": "Please wait for uploads to complete.",
 	"file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",

public/language/en-GB/notifications.json

@@ -16,6 +16,7 @@
 	"topics": "Topics",
 	"replies": "Replies",
 	"chat": "Chats",
+	"group-chat": "Group Chats",
 	"follows": "Follows",
 	"upvote": "Upvotes",
 	"new-flags": "New Flags",

public/language/en-US/admin/manage/users.json

@@ -1,6 +1,6 @@
 {
 	"users": "Users",
-	"edit": "Edit",
+	"edit": "Actions",
 	"make-admin": "Make Admin",
 	"remove-admin": "Remove Admin",
 	"validate-email": "Validate Email",
@@ -47,6 +47,7 @@
 	"users.uid": "uid",
 	"users.username": "username",
 	"users.email": "email",
+	"users.ip": "IP",
 	"users.postcount": "postcount",
 	"users.reputation": "reputation",
 	"users.flags": "flags",

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

@@ -40,5 +40,8 @@
 	"site-colors": "Site Color Metadata",
 	"theme-color": "Theme Color",
 	"background-color": "Background Color",
-	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
+	"background-color-help": "Color used for splash screen background when website is installed as a PWA",
+	"undo-timeout": "Undo Timeout",
+	"undo-timeout-help": "Some operations such as moving topics will allow for the moderator to undo their action within a certain timeframe. Set to 0 to disable undo completely.",
+	"topic-tools": "Topic Tools"
 }

public/language/en-US/error.json

@@ -85,6 +85,7 @@
     "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
     "too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)",
     "cant-use-system-tag": "You can not use this system tag.",
+    "cant-remove-system-tag": "You can not remove this system tag.",
     "still-uploading": "Please wait for uploads to complete.",
     "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
     "guest-upload-disabled": "Guest uploading has been disabled",

public/language/en-US/notifications.json

@@ -14,6 +14,7 @@
     "topics": "Topics",
     "replies": "Replies",
     "chat": "Chats",
+    "group-chat": "Group Chats",
     "follows": "Follows",
     "upvote": "Upvotes",
     "new-flags": "New Flags",

public/language/en-x-pirate/admin/manage/users.json

@@ -1,6 +1,6 @@
 {
 	"users": "Users",
-	"edit": "Edit",
+	"edit": "Actions",
 	"make-admin": "Make Admin",
 	"remove-admin": "Remove Admin",
 	"validate-email": "Validate Email",
@@ -47,6 +47,7 @@
 	"users.uid": "uid",
 	"users.username": "username",
 	"users.email": "email",
+	"users.ip": "IP",
 	"users.postcount": "postcount",
 	"users.reputation": "reputation",
 	"users.flags": "flags",

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

@@ -40,5 +40,8 @@
 	"site-colors": "Site Color Metadata",
 	"theme-color": "Theme Color",
 	"background-color": "Background Color",
-	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
+	"background-color-help": "Color used for splash screen background when website is installed as a PWA",
+	"undo-timeout": "Undo Timeout",
+	"undo-timeout-help": "Some operations such as moving topics will allow for the moderator to undo their action within a certain timeframe. Set to 0 to disable undo completely.",
+	"topic-tools": "Topic Tools"
 }

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

@@ -85,6 +85,7 @@
     "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
     "too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)",
     "cant-use-system-tag": "You can not use this system tag.",
+    "cant-remove-system-tag": "You can not remove this system tag.",
     "still-uploading": "Please wait for uploads to complete.",
     "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
     "guest-upload-disabled": "Guest uploading has been disabled",

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

@@ -14,6 +14,7 @@
     "topics": "Topics",
     "replies": "Replies",
     "chat": "Chats",
+    "group-chat": "Group Chats",
     "follows": "Follows",
     "upvote": "Upvotes",
     "new-flags": "New Flags",

public/language/es/admin/manage/users.json

@@ -1,6 +1,6 @@
 {
 	"users": "Usuarios",
-	"edit": "Editar",
+	"edit": "Actions",
 	"make-admin": "Hacer Administrador",
 	"remove-admin": "Eliminar Administrador",
 	"validate-email": "Validar Email",
@@ -47,6 +47,7 @@
 	"users.uid": "uid",
 	"users.username": "nombre de usuario",
 	"users.email": "email",
+	"users.ip": "IP",
 	"users.postcount": "cantidad de posts",
 	"users.reputation": "reputación",
 	"users.flags": "reportes",

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

@@ -40,5 +40,8 @@
 	"site-colors": "Site Color Metadata",
 	"theme-color": "Theme Color",
 	"background-color": "Background Color",
-	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
+	"background-color-help": "Color used for splash screen background when website is installed as a PWA",
+	"undo-timeout": "Undo Timeout",
+	"undo-timeout-help": "Some operations such as moving topics will allow for the moderator to undo their action within a certain timeframe. Set to 0 to disable undo completely.",
+	"topic-tools": "Topic Tools"
 }

public/language/es/error.json

@@ -85,6 +85,7 @@
     "not-enough-tags": "Etiquetas insuficientes. El tema debe tener al menos %1 etiqueta(s).",
     "too-many-tags": "Demasiadas etiquetas. El tema no puede tener mas de %1 etiqueta(s)",
     "cant-use-system-tag": "You can not use this system tag.",
+    "cant-remove-system-tag": "You can not remove this system tag.",
     "still-uploading": "Por favor, espera a que terminen las subidas.",
     "file-too-big": "El tamaño de fichero máximo es de %1 kB - por favor, suba un fichero más pequeño",
     "guest-upload-disabled": "Las subidas están deshabilitadas para los invitados",

public/language/es/notifications.json

@@ -14,6 +14,7 @@
     "topics": "Temas",
     "replies": "Respuestas",
     "chat": "Chats",
+    "group-chat": "Group Chats",
     "follows": "Seguidores",
     "upvote": "Votos positivos",
     "new-flags": "Nuevos reportes",

public/language/et/admin/manage/users.json

@@ -1,6 +1,6 @@
 {
 	"users": "Kasutajad",
-	"edit": "Muuda",
+	"edit": "Actions",
 	"make-admin": "Ülenda administraatoriks",
 	"remove-admin": "Eemalda administraator",
 	"validate-email": "Kinnita email",
@@ -47,6 +47,7 @@
 	"users.uid": "uid",
 	"users.username": "Kasutajanimi",
 	"users.email": "email",
+	"users.ip": "IP",
 	"users.postcount": "Postituste arv",
 	"users.reputation": "Reputatsioon",
 	"users.flags": "Raporteerimised",

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

@@ -40,5 +40,8 @@
 	"site-colors": "Site Color Metadata",
 	"theme-color": "Theme Color",
 	"background-color": "Background Color",
-	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
+	"background-color-help": "Color used for splash screen background when website is installed as a PWA",
+	"undo-timeout": "Undo Timeout",
+	"undo-timeout-help": "Some operations such as moving topics will allow for the moderator to undo their action within a certain timeframe. Set to 0 to disable undo completely.",
+	"topic-tools": "Topic Tools"
 }

public/language/et/email.json

@@ -28,7 +28,7 @@
     "digest.day": "päev",
     "digest.week": "nädal",
     "digest.month": "kuu",
-    "digest.subject": "Ima 1% jaoks",
+    "digest.subject": "Ima %1 jaoks",
     "digest.title.day": "Your Daily Digest",
     "digest.title.week": "Your Weekly Digest",
     "digest.title.month": "Your Monthly Digest",

public/language/et/error.json

@@ -85,6 +85,7 @@
     "not-enough-tags": "Liiga vähe märksõnu. Teemadel peab olemalt vähemalt %1 märksõna",
     "too-many-tags": "Liiga palju märksõnu. Teemadel ei tohi olla rohkem kui %1 märksõna",
     "cant-use-system-tag": "You can not use this system tag.",
+    "cant-remove-system-tag": "You can not remove this system tag.",
     "still-uploading": "Palun oota, kuni üleslaadimised on laetud.",
     "file-too-big": "Maksimaalne üleslaetava faili suurus on %1 kB - valige väiksema mahuga fail.",
     "guest-upload-disabled": "Külaliste üleslaadimine on keelatud.",

public/language/et/notifications.json

@@ -14,6 +14,7 @@
     "topics": "Topics",
     "replies": "Replies",
     "chat": "Chats",
+    "group-chat": "Group Chats",
     "follows": "Follows",
     "upvote": "Upvotes",
     "new-flags": "New Flags",

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

@@ -1,5 +1,5 @@
 {
-	"alert.confirm-rebuild-and-restart": "آیا شما مطمئن هستید که شما می خواهید NodeBB را بازسازی و مجدداً راه اندازی کنید؟",
+	"alert.confirm-rebuild-and-restart": "آیا شما مطمئن هستید که می خواهید NodeBB را بازسازی و مجدداً راه اندازی کنید؟",
 	"alert.confirm-restart": "آیا از راه اندازی مجدد نود‌بی‌بی مطمئن هستید؟",
 
 	"acp-title": "%1 | کنترل پنل مدیر کل نود‌بی‌بی",

public/language/fa-IR/admin/manage/users.json

@@ -1,6 +1,6 @@
 {
 	"users": "Users",
-	"edit": "Edit",
+	"edit": "Actions",
 	"make-admin": "Make Admin",
 	"remove-admin": "Remove Admin",
 	"validate-email": "Validate Email",
@@ -47,6 +47,7 @@
 	"users.uid": "uid",
 	"users.username": "username",
 	"users.email": "email",
+	"users.ip": "IP",
 	"users.postcount": "postcount",
 	"users.reputation": "reputation",
 	"users.flags": "flags",

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

@@ -40,5 +40,8 @@
 	"site-colors": "Site Color Metadata",
 	"theme-color": "Theme Color",
 	"background-color": "Background Color",
-	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
+	"background-color-help": "Color used for splash screen background when website is installed as a PWA",
+	"undo-timeout": "Undo Timeout",
+	"undo-timeout-help": "Some operations such as moving topics will allow for the moderator to undo their action within a certain timeframe. Set to 0 to disable undo completely.",
+	"topic-tools": "Topic Tools"
 }

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

@@ -1,6 +1,6 @@
 {
-	"language-settings": "Language Settings",
-	"description": "The default language determines the language settings for all users who are visiting your forum. <br />Individual users can override the default language on their account settings page.",
-	"default-language": "Default Language",
-	"auto-detect": "Auto Detect Language Setting for Guests"
+	"language-settings": "تنظیمات زبان",
+	"description": "زبان پیشفرض، تنظیمات زبان همه کاربرانی که از انجمن شما بازدید میکنند را مشخص میکند. <br /> کاربران میتونانند زبان پیشفرض را در صفحه تنظیمات شناسه کاربری خود  تغییر دهند.",
+	"default-language": "زبان پیشفرض",
+	"auto-detect": "تشخیض خودکار تنظیمات زبان برای مهمانان"
 }

public/language/fa-IR/error.json

@@ -85,6 +85,7 @@
     "not-enough-tags": "تعداد برچسب ها کافی نیست. موضوع ها یابد حداقل %1 برچسب داشته باشند",
     "too-many-tags": "تعداد برچسب ها بیشتر  از حد مجاز است. موضوع ها نمی توانند بیشتر از %1 برچسب داشته باشند",
     "cant-use-system-tag": "You can not use this system tag.",
+    "cant-remove-system-tag": "You can not remove this system tag.",
     "still-uploading": "خواهشمندیم تا پایان بارگذاری‌ها شکیبا باشید.",
     "file-too-big": "حداکثر مجاز حجم فایل %1 کیلوبایت می باشد - لطفا فایلی با حجم کمتر بارگذاری کنید",
     "guest-upload-disabled": "بارگذاری برای مهمانان غیر فعال شده است",

public/language/fa-IR/notifications.json

@@ -14,6 +14,7 @@
     "topics": "موضوع ها",
     "replies": "پاسخ ها",
     "chat": "گفتگو ها",
+    "group-chat": "Group Chats",
     "follows": "دنبال کننده ها",
     "upvote": "رای های مثبت",
     "new-flags": "گزارش های جدید",

public/language/fa-IR/success.json

@@ -1,7 +1,7 @@
 {
     "success": "موفقیت‌آمیز",
     "topic-post": "پست شما باموفقیت فرستاده شد.",
-    "post-queued": "Your post is queued for approval. You will get a notification when it is accepted or rejected.",
+    "post-queued": "پست شما در صف تایید قرار گرفت. شما اعلانی بعد پذیرفته یا رد شدن آن دریافت خواهید کرد.",
     "authentication-successful": "اعتبارسنجی موفق",
     "settings-saved": "تنظیمات ذخیره شد."
 }

public/language/fi/admin/manage/users.json

@@ -1,6 +1,6 @@
 {
 	"users": "Users",
-	"edit": "Edit",
+	"edit": "Actions",
 	"make-admin": "Make Admin",
 	"remove-admin": "Remove Admin",
 	"validate-email": "Validate Email",
@@ -47,6 +47,7 @@
 	"users.uid": "uid",
 	"users.username": "username",
 	"users.email": "email",
+	"users.ip": "IP",
 	"users.postcount": "postcount",
 	"users.reputation": "reputation",
 	"users.flags": "flags",

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

@@ -40,5 +40,8 @@
 	"site-colors": "Site Color Metadata",
 	"theme-color": "Theme Color",
 	"background-color": "Background Color",
-	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
+	"background-color-help": "Color used for splash screen background when website is installed as a PWA",
+	"undo-timeout": "Undo Timeout",
+	"undo-timeout-help": "Some operations such as moving topics will allow for the moderator to undo their action within a certain timeframe. Set to 0 to disable undo completely.",
+	"topic-tools": "Topic Tools"
 }

public/language/fi/error.json

@@ -85,6 +85,7 @@
     "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)",
     "too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)",
     "cant-use-system-tag": "You can not use this system tag.",
+    "cant-remove-system-tag": "You can not remove this system tag.",
     "still-uploading": "Ole hyvä ja odota tiedostojen lähettämisen valmistumista.",
     "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file",
     "guest-upload-disabled": "Guest uploading has been disabled",

public/language/fi/notifications.json

@@ -14,6 +14,7 @@
     "topics": "Aiheet",
     "replies": "Vastaukset",
     "chat": "Keskustelut",
+    "group-chat": "Group Chats",
     "follows": "Seuratut",
     "upvote": "Tykkäykset",
     "new-flags": "New Flags",

public/language/fr/admin/manage/users.json

@@ -1,6 +1,6 @@
 {
 	"users": "Utilisateurs",
-	"edit": "Éditer ",
+	"edit": "Actions",
 	"make-admin": "Promouvoir Admin",
 	"remove-admin": "Retirer des Admins",
 	"validate-email": "Vérifier l'adresse e-mail",
@@ -47,6 +47,7 @@
 	"users.uid": "uid",
 	"users.username": "nom d'utilisateur",
 	"users.email": "e-mail",
+	"users.ip": "IP",
 	"users.postcount": "nombre de sujets",
 	"users.reputation": "réputation",
 	"users.flags": "signalements",

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

@@ -40,5 +40,8 @@
 	"site-colors": "Métadonnées des couleurs du site",
 	"theme-color": "Couleur du thème",
 	"background-color": "Couleur de l'arrière plan",
-	"background-color-help": "Couleur utilisée pour l'arrière-plan de l'écran de démarrage lorsque le site Web est installé en tant que PWA"
+	"background-color-help": "Couleur utilisée pour l'arrière-plan de l'écran de démarrage lorsque le site Web est installé en tant que PWA",
+	"undo-timeout": "Annuler le délai d'attente",
+	"undo-timeout-help": "Certaines opérations telles que le déplacement de sujets permettront au modérateur d'annuler son action dans un certain délai. Réglez sur 0 pour désactiver complètement l'annulation.",
+	"topic-tools": "Outils pour sujets"
 }

public/language/fr/error.json

@@ -85,6 +85,7 @@
     "not-enough-tags": "Pas assez de mots-clés. Les sujets doivent avoir au moins %1 mots-clé(s).",
     "too-many-tags": "Trop de mots-clés. Les sujets ne peuvent avoir au plus que %1 mots-clé(s).",
     "cant-use-system-tag": "Vous ne pouvez gérer les mots-clés.",
+    "cant-remove-system-tag": "Vous ne pouvez supprimer ces mots-clés.",
     "still-uploading": "Veuillez patienter pendant l'envoi des fichiers.",
     "file-too-big": "La taille maximale autorisée pour un fichier est de %1 ko. Veuillez envoyer un fichier plus petit.",
     "guest-upload-disabled": "L'envoi de fichiers a été désactivé pour les invités",

public/language/fr/notifications.json

@@ -14,6 +14,7 @@
     "topics": "Sujets",
     "replies": "Réponses",
     "chat": "Discussions",
+    "group-chat": "Groupe de discussions",
     "follows": "Suivis",
     "upvote": "Votes positifs",
     "new-flags": "Nouveaux drapeaux",

public/language/gl/admin/manage/users.json

@@ -1,6 +1,6 @@
 {
 	"users": "Users",
-	"edit": "Edit",
+	"edit": "Actions",
 	"make-admin": "Make Admin",
 	"remove-admin": "Remove Admin",
 	"validate-email": "Validate Email",
@@ -47,6 +47,7 @@
 	"users.uid": "uid",
 	"users.username": "username",
 	"users.email": "email",
+	"users.ip": "IP",
 	"users.postcount": "postcount",
 	"users.reputation": "reputation",
 	"users.flags": "flags",

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

@@ -40,5 +40,8 @@
 	"site-colors": "Site Color Metadata",
 	"theme-color": "Theme Color",
 	"background-color": "Background Color",
-	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
+	"background-color-help": "Color used for splash screen background when website is installed as a PWA",
+	"undo-timeout": "Undo Timeout",
+	"undo-timeout-help": "Some operations such as moving topics will allow for the moderator to undo their action within a certain timeframe. Set to 0 to disable undo completely.",
+	"topic-tools": "Topic Tools"
 }

public/language/gl/email.json

@@ -8,9 +8,9 @@
     "email.verify-your-email.subject": "Please verify your email",
     "email.verify.text1": "Your email address has changed!",
     "welcome.text1": "Grazas por rexistrarte %1!",
-    "welcome.text2": "Para activar a túa conta, precisamos que a verifiques co enderezo de correo electrónico co que te rexistraches.  ",
-    "welcome.text3": "Un administrador aceptou a túa solicitude de rexistro. Agora pódeste conectar co teu nome de usuario e contrasinal. ",
-    "welcome.cta": "Fai clic aquí para confirmar o teu enderezo de correo electrónico ",
+    "welcome.text2": "Para activar a túa conta, precisamos que a verifiques co enderezo de correo electrónico co que te rexistraches.",
+    "welcome.text3": "Un administrador aceptou a túa solicitude de rexistro. Agora pódeste conectar co teu nome de usuario e contrasinal.",
+    "welcome.cta": "Fai clic aquí para confirmar o teu enderezo de correo electrónico",
     "invitation.text1": "%1 convidoute a unirte %2",
     "invitation.text2": "Your invitation will expire in %1 days.",
     "invitation.cta": "Click here to create your account.",
@@ -28,7 +28,7 @@
     "digest.day": "día",
     "digest.week": "semana",
     "digest.month": "mes",
-    "digest.subject": "Resumo de 1%",
+    "digest.subject": "Resumo de %1",
     "digest.title.day": "Your Daily Digest",
     "digest.title.week": "Your Weekly Digest",
     "digest.title.month": "Your Monthly Digest",

public/language/gl/error.json

@@ -85,6 +85,7 @@
     "not-enough-tags": "Non hai etiquetas dabondas. Os temas deben ter %1 etiqueta(s) como mínimo.",
     "too-many-tags": "Moitas etiquetas. Os temas non poden ter máis de %1 etiqueta(s).",
     "cant-use-system-tag": "You can not use this system tag.",
+    "cant-remove-system-tag": "You can not remove this system tag.",
     "still-uploading": "Por favor, agarda a que remate a subida.",
     "file-too-big": "O tamaño máximo permitido é %1 kB - por favor, sube un arquivo máis pequeno",
     "guest-upload-disabled": "As subidas están deshabilitadas para os convidados",

public/language/gl/notifications.json

@@ -14,6 +14,7 @@
     "topics": "Topics",
     "replies": "Replies",
     "chat": "Chats",
+    "group-chat": "Group Chats",
     "follows": "Follows",
     "upvote": "Upvotes",
     "new-flags": "New Flags",

public/language/gl/user.json

@@ -26,7 +26,7 @@
     "website": "Páxina web",
     "location": "Localización",
     "age": "Idade",
-    "joined": "Unido ",
+    "joined": "Unido",
     "lastonline": "Última conexión:",
     "profile": "Perfil",
     "profile_views": "Visitas ao perfil:",
@@ -73,7 +73,7 @@
     "change_password_success": "O teu contrasinal foi actualizado!",
     "confirm_password": "Confirma o teu contrasinal",
     "password": "Contrasinal",
-    "username_taken_workaround": "Ese nome de usuario xa estaba collido, así que o modificamos lixeiramente. Agora o teu nome é <strong>%1</strong> ",
+    "username_taken_workaround": "Ese nome de usuario xa estaba collido, así que o modificamos lixeiramente. Agora o teu nome é <strong>%1</strong>",
     "password_same_as_username": "O teu contrasinal e o teu nome de usuario son os mesmos, por favor, escolle outro contrasinal.",
     "password_same_as_email": "O teu contrasinal é igual que o teu enderezo electrónico, por favor, escolle outro contrasinal.",
     "weak_password": "Weak password.",
@@ -147,7 +147,7 @@
     "info.no-flags": "Non se atopou ninguna mensaxe reportada",
     "info.ban-history": "Histórico recente de bans",
     "info.no-ban-history": "Este usuario nunca foi baneado",
-    "info.banned-until": "Baneado hasta 1%",
+    "info.banned-until": "Baneado hasta %1",
     "info.banned-expiry": "Expiry",
     "info.banned-permanently": "Baneado permanentemente",
     "info.banned-reason-label": "Motivo",

public/language/he/admin/development/info.json

@@ -1,7 +1,7 @@
 {
-	"you-are-on": "אתה נמצא ב",
+	"you-are-on": "אתה נמצא ב <strong>%1:%2</strong>",
 	"ip": "IP <strong>%1</strong>",
-	"nodes-responded": "%1 nodes responded within %2ms!",
+	"nodes-responded": "%1 צמתים הגיבו בתוך %2מילי שניות!",
 	"host": "מנחה",
 	"primary": "primary / run jobs",
 	"pid": "pid",

public/language/he/admin/development/logger.json

@@ -5,7 +5,7 @@
 	"enable-http": "הפעל רישום HTTP",
 	"enable-socket": "הפעל רישום אירועים ב-socket.io",
 	"file-path": "נתיב קובץ יומן רישום",
-	"file-path-placeholder": "/path/to/log/file.log ::: leave blank to log to your terminal",
+	"file-path-placeholder": "/path/to/log/file.log ::: השאר ריק כדי להיכנס לטרמינל שלך",
 
 	"control-panel": "לוח בקרת מנהל רישום",
 	"update-settings": "עדכן הגדרות מנהל רישום"

public/language/he/admin/extend/plugins.json

@@ -39,7 +39,7 @@
 	"alert.upgraded": "תוסף שודרג",
 	"alert.installed": "תוסף הותקן",
 	"alert.uninstalled": "תוסף הוסר",
-	"alert.activate-success": "Please rebuild and restart your NodeBB to fully activate this plugin",
+	"alert.activate-success": "בנה והפעל מחדש את NodeBB בכדי לשדרג תוסף זה במלואו.",
 	"alert.deactivate-success": "התוסף הושבת בהצלחה",
 	"alert.upgrade-success": "בנה והפעל מחדש את NodeBB בכדי לשדרג תוסף זה במלואו.",
 	"alert.install-success": "תוסף הותקן בהצלחה, אנא הפעל את התוסף.",

public/language/he/admin/extend/widgets.json

@@ -8,23 +8,23 @@
 	"containers.none": "אף אחד",
 	"container.well": "Well",
 	"container.jumbotron": "Jumbotron",
-	"container.panel": "Panel",
-	"container.panel-header": "Panel Header",
-	"container.panel-body": "Panel Body",
-	"container.alert": "Alert",
+	"container.panel": "פאנל",
+	"container.panel-header": "כותרת פאנל",
+	"container.panel-body": "גוף הפאנל",
+	"container.alert": "התרעה",
 
-	"alert.confirm-delete": "Are you sure you wish to delete this widget?",
-	"alert.updated": "Widgets Updated",
-	"alert.update-success": "Successfully updated widgets",
+	"alert.confirm-delete": "האם אתה בטוח שאתה רוצה למחוק את הווידג'ט?",
+	"alert.updated": "העלאת ווידג'טים",
+	"alert.update-success": "הווידג'טים הועלו בהצלחה",
 	"alert.clone-success": "Successfully cloned widgets",
 
 	"error.select-clone": "Please select a page to clone from",
 
-	"title": "Title",
+	"title": "כותרת",
 	"title.placeholder": "Title (only shown on some containers)",
 	"container": "Container",
 	"container.placeholder": "Drag and drop a container or enter HTML here.",
 	"show-to-groups": "Show to groups",
-	"hide-from-groups": "Hide from groups",
+	"hide-from-groups": "הסתר מקבוצות",
 	"hide-on-mobile": "Hide on mobile"
 }

public/language/he/admin/manage/users.json

@@ -1,6 +1,6 @@
 {
 	"users": "משתמשים",
-	"edit": "ערוך",
+	"edit": "Actions",
 	"make-admin": "הפוך למנהל",
 	"remove-admin": "הסר הרשאת מנהל",
 	"validate-email": "סמן את דוא\"ל המשתמש/ים כמאומת",
@@ -47,6 +47,7 @@
 	"users.uid": "מזהה משתמש (ID)",
 	"users.username": "שם משתמש",
 	"users.email": "דוא\"ל",
+	"users.ip": "IP",
 	"users.postcount": "מספר פוסטים",
 	"users.reputation": "מוניטין",
 	"users.flags": "דגלים",

public/language/he/admin/settings/general.json

@@ -40,5 +40,8 @@
 	"site-colors": "Site Color Metadata",
 	"theme-color": "Theme Color",
 	"background-color": "Background Color",
-	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
+	"background-color-help": "Color used for splash screen background when website is installed as a PWA",
+	"undo-timeout": "Undo Timeout",
+	"undo-timeout-help": "Some operations such as moving topics will allow for the moderator to undo their action within a certain timeframe. Set to 0 to disable undo completely.",
+	"topic-tools": "Topic Tools"
 }

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

@@ -4,19 +4,19 @@
 	"disable-down-voting": "השבת דיסלייק",
 	"votes-are-public": "כל ההצבעות פומביות",
 	"thresholds": "סף פעילות",
-	"min-rep-downvote": "מוניטין מינימלי כדי לפרסם הודעות",
+	"min-rep-downvote": "מוניטין מינימלי כדי להצביע נגד הודעות",
 	"downvotes-per-day": "הצבעות מטה ליום (מוגדרות ל -0 להצבעות למטה ללא הגבלה)",
 	"downvotes-per-user-per-day": "הצבעות למטה למשתמש ליום (מוגדרות ל -0 להצבעות למטה ללא הגבלה)",
-	"min-rep-flag": "מוניטין מינימלי כדי לפרסם הודעות",
+	"min-rep-flag": "מוניטין מינימלי כדי לדווח על הודעות",
 	"min-rep-website": "מוניטין מינימלי להוספת \"אתר\" לפרופיל המשתמש",
 	"min-rep-aboutme": "מוניטין מינימלי להוסיף \"אודותיי\" לפרופיל המשתמש",
 	"min-rep-signature": "מוניטין מינימלי להוספת \"חתימה\" לפרופיל המשתמש",
 	"min-rep-profile-picture": "מוניטין מינימלי להוסיף \"תמונת פרופיל\" לפרופיל המשתמש",
-	"min-rep-cover-picture": "מוניטין מינימלי להוסיף \"תמונת שער\" לפרופיל המשתמש",
+	"min-rep-cover-picture": "מוניטין מינימלי להוסיף \"תמונת נושא\" לפרופיל המשתמש",
 
-	"flags": "Flag Settings",
+	"flags": "הגדרות דיווח",
 	"flags.limit-per-target": "מספר הפעמים המרבי שניתן לסמן משהו",
-	"flags.limit-per-target-placeholder": "Default: 0",
-	"flags.limit-per-target-help": "When a post or user is flagged multiple times, each additional flag is considered a "report" and added to the original flag. Set this option to a number other than zero to limit the number of reports an item can receive.",
+	"flags.limit-per-target-placeholder": "ברירת מחדל: 0",
+	"flags.limit-per-target-help": "כשפוסט או משתמש מסומן כמה פעמים, כל דיווח נוסף נחשב ל "דיווח" ונוסף לדיווח הראשון. הגדר את האופציה הזאת לכל מספר שהוא לא 0 כדי להגביל את כמות הדיווחים שפוסט או משתמש יכול לקבל.",
 	"flags.auto-resolve-on-ban": "Automatically resolve all of a user's tickets when they are banned"
 }

public/language/he/admin/settings/sockets.json

@@ -1,6 +1,6 @@
 {
     "reconnection": "הגדרות חיבור מחדש",
     "max-attempts": "ניסיון חיבור מחדש מרבי",
-    "default-placeholder": "Default: %1",
+    "default-placeholder": "ברירת מחדל: %1",
     "delay": "עיכוב חיבור מחדש"
 }

public/language/he/admin/settings/tags.json

@@ -1,8 +1,8 @@
 {
     "tag": "הגדרות תגיות",
     "link-to-manage": "נהל תגיות",
-    "system-tags": "System Tags",
-    "system-tags-help": "Only privileged users will be able to use these tags.",
+    "system-tags": "תגיות מערכת",
+    "system-tags-help": "רק מנהלים יכולים להשתמש בתגית זו",
     "min-per-topic": "מינימום תגיות לנושא",
     "max-per-topic": "מקסימום תגיות לנושא",
     "min-length": "אורך תגית מינימלי",

public/language/he/admin/settings/uploads.json

@@ -3,40 +3,40 @@
 	"allow-files": "אפשר למשתמשים להעלות קבצים רגילים",
 	"private": "הפוך קבצים שהועלו לפרטיים",
 	"strip-exif-data": "הפשט נתוני EXIF",
-	"private-extensions": "File extensions to make private",
-	"private-uploads-extensions-help": "Enter comma-separated list of file extensions to make private here (e.g. <code>pdf,xls,doc</code>). An empty list means all files are private.",
-	"resize-image-width-threshold": "Resize images if they are wider than specified width",
-	"resize-image-width-threshold-help": "(in pixels, default: 1520 pixels, set to 0 to disable)",
-	"resize-image-width": "Resize images down to specified width",
-	"resize-image-width-help": "(in pixels, default: 760 pixels, set to 0 to disable)",
-	"resize-image-quality": "Quality to use when resizing images",
-	"resize-image-quality-help": "Use a lower quality setting to reduce the file size of resized images.",
-	"max-file-size": "Maximum File Size (in KiB)",
-	"max-file-size-help": "(in kibibytes, default: 2048 KiB)",
-	"reject-image-width": "Maximum Image Width (in pixels)",
-	"reject-image-width-help": "Images wider than this value will be rejected.",
-	"reject-image-height": "Maximum Image Height (in pixels)",
-	"reject-image-height-help": "Images taller than this value will be rejected.",
-	"allow-topic-thumbnails": "Allow users to upload topic thumbnails",
-	"topic-thumb-size": "Topic Thumb Size",
-	"allowed-file-extensions": "Allowed File Extensions",
-	"allowed-file-extensions-help": "Enter comma-separated list of file extensions here (e.g. <code>pdf,xls,doc</code>). An empty list means all extensions are allowed.",
-	"upload-limit-threshold": "Rate limit user uploads to:",
-	"upload-limit-threshold-per-minute": "Per %1 Minute",
-	"upload-limit-threshold-per-minutes": "Per %1 Minutes",
-	"profile-avatars": "Profile Avatars",
-	"allow-profile-image-uploads": "Allow users to upload profile images",
-	"convert-profile-image-png": "Convert profile image uploads to PNG",
-	"default-avatar": "Custom Default Avatar",
-	"upload": "Upload",
-	"profile-image-dimension": "Profile Image Dimension",
-	"profile-image-dimension-help": "(in pixels, default: 128 pixels)",
-	"max-profile-image-size": "Maximum Profile Image File Size",
-	"max-profile-image-size-help": "(in kibibytes, default: 256 KiB)",
-	"max-cover-image-size": "Maximum Cover Image File Size",
-	"max-cover-image-size-help": "(in kibibytes, default: 2,048 KiB)",
-	"keep-all-user-images": "Keep old versions of avatars and profile covers on the server",
-	"profile-covers": "Profile Covers",
-	"default-covers": "Default Cover Images",
-	"default-covers-help": "Add comma-separated default cover images for accounts that don't have an uploaded cover image"
+	"private-extensions": "סיומות קובצים להפוך לפרטיים",
+	"private-uploads-extensions-help": "הכנס כאן רשימה של פורמטי הקבצים, מופרדים בפסיק, כדי להפוך אותם לפרטיים  (לדוגמא <code>pdf,xls,doc</code>). שורה ריקה פירושו שכל הקבצים פרטיים.",
+	"resize-image-width-threshold": "שנה גודל תמונות אם הם רחבים יותר מהרוחב המוגדר",
+	"resize-image-width-threshold-help": "(בפיקסלים, ברירת מחדל: 1520 פיקסלים, הגדר 0 כדי להשבית)",
+	"resize-image-width": "שנה גודל תמונות לגודל המוגדר",
+	"resize-image-width-help": "(בפיקסלים, ברירת מחדל: 760 פיקסלים, הגדר 0 כדי להשבית)",
+	"resize-image-quality": "באיזה איכות להשתמש כאשר משנים תמונה",
+	"resize-image-quality-help": "השתמש ברזולוציה נמוכה כדי להקטין את גודל התמונה הממוזערת",
+	"max-file-size": "גודל קובץ מירבית (בKiB)",
+	"max-file-size-help": "(בקיביביטס, ברירת מחדל: 2048 KiB)",
+	"reject-image-width": "רוחב תמונה מקסימלי (בפיקסלים)",
+	"reject-image-width-help": "תמונות גבוהות יותר יידחו",
+	"reject-image-height": "גובה תמונה מקסימלי (בפיקסלים)",
+	"reject-image-height-help": "תמונות גבוהות יותר יידחו",
+	"allow-topic-thumbnails": "אפשר למשתמשים להעלות תמונה ממוזערת לנושא",
+	"topic-thumb-size": "גודל תמונה ממוזערת לנושא",
+	"allowed-file-extensions": "סיומות קבצים מאושרים",
+	"allowed-file-extensions-help": "הכנס כאן רשימת פורמטי קבצים מאושרים (לדוגמא. <code>pdf,xls,doc</code>). רשימה ריקה פירושו שכל הקבצים מאושרים.",
+	"upload-limit-threshold": "הגבל שיעור העלאות מהמשתמשים ל:",
+	"upload-limit-threshold-per-minute": "ל %1 דקה",
+	"upload-limit-threshold-per-minutes": "ל %1 דקות",
+	"profile-avatars": "סמל פרופיל",
+	"allow-profile-image-uploads": "אפשר למשתמשים להעלאות תמונות פרופיל",
+	"convert-profile-image-png": "המר העלאות תמונות פרופיל לPNG",
+	"default-avatar": "סמל אישי ברירת מחדל",
+	"upload": "העלה",
+	"profile-image-dimension": "מימדי תמונות פרופיל",
+	"profile-image-dimension-help": "(בפיקסלים, ברירת מחדל: 128 פיקסלים)",
+	"max-profile-image-size": "גודל קובץ מקסימלי של תמונות פרופיל",
+	"max-profile-image-size-help": "(בקיביביטס, ברירת מחדל: 256 KiB)",
+	"max-cover-image-size": "גודל תמונת נושא מקסימלי",
+	"max-cover-image-size-help": "(בקיביביטס, ברירת מחדל: 2048 KiB)",
+	"keep-all-user-images": "השאר גרסה קודמת של הסמל ותמונת הנושא על השרת",
+	"profile-covers": "תמונות נושא",
+	"default-covers": "תמונות נושא ברירת מחדל",
+	"default-covers-help": "הוסף תמונות נושא ברירת מחדל מופרדות בפסיקים עבור משתמשים שאין להם תמונת נושא שהועלתה"
 }

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

@@ -8,8 +8,8 @@
 	"allow-login-with.username": "שם משתמש בלבד",
 	"allow-login-with.email": "כתובת מייל בלבד",
 	"account-settings": "הגדרות חשבון",
-	"gdpr_enabled": "Enable GDPR consent collection",
-	"gdpr_enabled_help": "When enabled, all new registrants will be required to explicitly give consent for data collection and usage under the <a href=\"https://ec.europa.eu/info/priorities/justice-and-fundamental-rights/data-protection/2018-reform-eu-data-protection-rules/eu-data-protection-rules_en\">General Data Protection Regulation (GDPR)</a>. <strong>Note</strong>: Enabling GDPR does not force pre-existing users to provide consent. To do so, you will need to install the GDPR plugin.",
+	"gdpr_enabled": "אפשר הסכמת איסוף נתונים GDPR",
+	"gdpr_enabled_help": "כאשר תאפשר, כל המשתמשים החדשים יידרשו לתת הסכמה באופן מפורש לאיסוף ושימוש בנתונים תחת ה <a href=\"https://ec.europa.eu/info/priorities/justice-and-fundamental-rights/data-protection/2018-reform-eu-data-protection-rules/eu-data-protection-rules_en\">התקנה הכללית להגנת נתונים (GDPR)</a>. <strong>הערה</strong>: הפעלת GDPR לא יכריח משתמשים קיימים לאשר הסכמה. כדי לעשות זאת, תצטרכו להתקין את התוסף GDPR.",
 	"disable-username-changes": "בטל שינויי שם משתמש",
 	"disable-email-changes": "בטל שינויי כתובת מייל",
 	"disable-password-changes": "בטל שינויי סיסמא",
@@ -31,7 +31,7 @@
 	"session-time-days": "ימים",
 	"session-time-seconds": "שניות",
 	"session-time-help": "These values are used to govern how long a user stays logged in when they check &quot;Remember Me&quot; on login. Note that only one of these values will be used. If there is no <i>seconds</i> value we fall back to <i>days</i>. If there is no <i>days</i> value we default to <i>14 days</i>.",
-	"online-cutoff": "Minutes after user is considered inactive",
+	"online-cutoff": "דקות אחרי שהמשתמש נחשב לא פעיל",
 	"online-cutoff-help": "אם משתמש אינו מבצע פעולות במשך זמן זה, הוא נחשב כלא פעיל ואינו מקבל עדכונים בזמן אמת.",
 	"registration": "רישום משתמש",
 	"registration-type": "סוג הרשמה",
@@ -52,33 +52,33 @@
 	"max-invites-help": "0 בשביל לבטל הגבלה. מנהלים מקבלים אינסוף הזמנות<br>תקף רק ל-\"הזמנה בלבד\"",
 	"invite-expiration": "תוקף ההזמנה",
 	"invite-expiration-help": "הזמנות יפוגו ב-# ימים.",
-	"min-username-length": "Minimum Username Length",
-	"max-username-length": "Maximum Username Length",
-	"min-password-length": "Minimum Password Length",
-	"min-password-strength": "Minimum Password Strength",
-	"max-about-me-length": "Maximum About Me Length",
-	"terms-of-use": "Forum Terms of Use <small>(Leave blank to disable)</small>",
-	"user-search": "User Search",
-	"user-search-results-per-page": "Number of results to display",
-	"default-user-settings": "Default User Settings",
-	"show-email": "Show email",
-	"show-fullname": "Show fullname",
-	"restrict-chat": "Only allow chat messages from users I follow",
-	"outgoing-new-tab": "Open outgoing links in new tab",
-	"topic-search": "Enable In-Topic Searching",
+	"min-username-length": "אורך שם משתמש מינימלי",
+	"max-username-length": "אורך שם משתמש מקסימלי",
+	"min-password-length": "אורך סיסמה מינימלי",
+	"min-password-strength": "חוזק מינימלי של הסיסמה",
+	"max-about-me-length": "אורך מקסימום של התיבה 'עלי'",
+	"terms-of-use": "תנאי השימוש של הפורום <small>(השאר ריק כדי להשבית)</small>",
+	"user-search": "חיפוש משתמשים",
+	"user-search-results-per-page": "מספר התוצאות להצגה",
+	"default-user-settings": "הגדרות משתמש ברירת מחדל",
+	"show-email": "הצג כתובת אימייל",
+	"show-fullname": "הצג שם מלא",
+	"restrict-chat": "אשר הודעות צ'אט רק ממשתמשים שאני עוקב אחריהם",
+	"outgoing-new-tab": "פתח קישורים חיצוניים בכרטיסייה חדשה",
+	"topic-search": "הפעל חיפוש בתוך נושא",
 	"update-url-with-post-index": "Update url with post index while browsing topics",
-	"digest-freq": "Subscribe to Digest",
-	"digest-freq.off": "Off",
-	"digest-freq.daily": "Daily",
-	"digest-freq.weekly": "Weekly",
-	"digest-freq.monthly": "Monthly",
-	"email-chat-notifs": "Send an email if a new chat message arrives and I am not online",
-	"email-post-notif": "Send an email when replies are made to topics I am subscribed to",
-	"follow-created-topics": "Follow topics you create",
-	"follow-replied-topics": "Follow topics that you reply to",
-	"default-notification-settings": "Default notification settings",
-	"categoryWatchState": "Default category watch state",
-	"categoryWatchState.watching": "Watching",
-	"categoryWatchState.notwatching": "Not Watching",
-	"categoryWatchState.ignoring": "Ignoring"
+	"digest-freq": "הרשם לקבלת תקציר",
+	"digest-freq.off": "כבוי",
+	"digest-freq.daily": "יומי",
+	"digest-freq.weekly": "שבועי",
+	"digest-freq.monthly": "חודשי",
+	"email-chat-notifs": "שלח לי הודעה למייל כאשר הודעת צ'אט נשלחה אלי בזמן שאינני מחובר",
+	"email-post-notif": "שלח לי הודעה למייל כאשר תגובות חדשות פורסמו לנושאים שאני עוקב אחריהם",
+	"follow-created-topics": "עקוב אחר נושאים שייצרת",
+	"follow-replied-topics": "עקוב אחר נושאים שהגבת עליהם",
+	"default-notification-settings": "הגדרות התראות ברירת מחדל",
+	"categoryWatchState": "מצב מעקב על קטגוריה בברירת מחדל",
+	"categoryWatchState.watching": "עוקב",
+	"categoryWatchState.notwatching": "לא עוקב",
+	"categoryWatchState.ignoring": "מתעלם"
 }

public/language/he/category.json

@@ -19,5 +19,5 @@
     "notwatching.message": "בחרת לא לעקוב אחר עדכונים בקטגוריה זו וכל תת-הקטגוריות",
     "ignoring.message": "בחרת להתעלם מעדכונים בקטגוריה זו וכל תת-הקטגוריות",
     "watched-categories": "קטגוריות במעקב",
-    "x-more-categories": "%1 more categories"
+    "x-more-categories": "%1 קטגוריות נוספות"
 }

public/language/he/error.json

@@ -22,7 +22,7 @@
     "invalid-username-or-password": "אנא הגדר שם משתמש וסיסמה",
     "invalid-search-term": "מילת חיפוש לא תקינה",
     "invalid-url": "שגיאה בכתובת URL",
-    "invalid-event": "Invalid event: %1",
+    "invalid-event": "אירוע לא תקין: %1",
     "local-login-disabled": "מערכת הכניסה המקומית הושבתה עבור חשבונות שאינם מורשים.",
     "csrf-invalid": "אין באפשרותנו לחבר אותך למערכת, מכיוון שעבר זמן רב מידי. אנא נסה שנית.",
     "invalid-pagination-value": "ערך דף לא חוקי, חייב להיות לפחות %1 ולא מעל %2",
@@ -60,7 +60,7 @@
     "post-edit-duration-expired": "אתה רשאי לערוך פוסטים רק ל-%1 שניות לאחר הפרסום",
     "post-edit-duration-expired-minutes": "הנך רשאי לערוך תגובה עד %1 דקות מרגע פרסום התגובה.",
     "post-edit-duration-expired-minutes-seconds": "הנך רשאי לערוך תגובה עד %1 דקות %2 ושניות מרגע פרסום התגובה.",
-    "post-edit-duration-expired-hours": "אתה מורשה לערוך פוסטים רק %1 שעות אחרי הפרסום.",
+    "post-edit-duration-expired-hours": "אתה מורשה לערוך פוסט(ים) רק %1 שעות אחרי הפרסום.",
     "post-edit-duration-expired-hours-minutes": "הנך רשאי לערוך פוסט למשך %1 שעות %2 דקות מרגע פרסומו.",
     "post-edit-duration-expired-days": "אתה רשאי לערוך פוסט(ים) רק למשך %1 ימים מרגע פרסומו",
     "post-edit-duration-expired-days-hours": "אתה רשאי לערוך פוסט(ים) רק למשך %1 שעות %2 דקות מרגע פרסומו(ם)",
@@ -84,25 +84,26 @@
     "tag-too-long": "אנא הכנס תגית קצרה יותר. תגיות אינן יכולות להיות ארוכות יותר מ-%1 תווים",
     "not-enough-tags": "אין מספיק תגיות. לנושא חייב להיות לפחות %1 תגיות",
     "too-many-tags": "יותר מדי תגיות. לנושאים לא יכולים להיות יותר מ-%1 תגיות",
-    "cant-use-system-tag": "You can not use this system tag.",
+    "cant-use-system-tag": "אינך יכול להשתמש בתווית מערכת זו",
+    "cant-remove-system-tag": "אינך יכול להסיר תווית מערכת זו",
     "still-uploading": "אנא המתן לסיום ההעלאות",
     "file-too-big": "הגודל המקסימלי של הקובץ הוא %1 קילובייט - אנא העלה קובץ קטן יותר",
     "guest-upload-disabled": "העלאת אורחים אינה מאופשרת",
     "cors-error": "לא ניתן להעלות את התמונה עקב שגיאת CORS.",
-    "upload-ratelimit-reached": "You have uploaded too many files at one time. Please try again later.",
-    "scheduling-to-past": "Please select a date in the future.",
-    "invalid-schedule-date": "Please enter a valid date and time.",
+    "upload-ratelimit-reached": "העלת יותר מידי קבצים בפעם אחת. אנא נסה שוב במועד מאוחר יותר",
+    "scheduling-to-past": "אנא בחר תאריך בעתיד",
+    "invalid-schedule-date": "אנא הזן תאריך ושעה תקינים",
     "cant-pin-scheduled": "Scheduled topics cannot be (un)pinned.",
-    "cant-merge-scheduled": "Scheduled topics cannot be merged.",
-    "cant-move-posts-to-scheduled": "Can't move posts to a scheduled topic.",
-    "cant-move-from-scheduled-to-existing": "Can't move posts from a scheduled topic to an existing topic.",
+    "cant-merge-scheduled": "נושא מתוזמן אינו יכול להתמזג ",
+    "cant-move-posts-to-scheduled": "אינך יכול להעביר פוסטים לנושא מתוזמן",
+    "cant-move-from-scheduled-to-existing": "אינך יכול להעביר פוסטים מנושא מתוזמן לנושא קיים",
     "already-bookmarked": "כבר הוספת פוסט זה לרשימת המסומנים",
     "already-unbookmarked": "כבר הסרת פוסט זה מרשימת המסומנים",
     "cant-ban-other-admins": "אינך יכול לחסום מנהלים אחרים!",
     "cant-remove-last-admin": "אתה המנהל היחיד. הוסף משתמש אחר לניהול לפני שאתה מוריד את עצמך מניהול",
     "account-deletion-disabled": "מחיקת החשבון מושבתת",
     "cant-delete-admin": "משתמש זה מוגדר כמנהל. על מנת למחוק את המשתמש, עליך להסיר קודם את גישותיו.",
-    "already-deleting": "Already deleting",
+    "already-deleting": "כבר מחוק",
     "invalid-image": "תמונה לא תקינה",
     "invalid-image-type": "פורמט תמונה לא תקין. הפורמטים המורשים הם: %1",
     "invalid-image-extension": "פורמט תמונה לא תקין",
@@ -174,9 +175,9 @@
     "cant-kick-self": "אינך יכול להסיר את עצמך מהקבוצה",
     "no-users-selected": "לא נבחרו משתמשים",
     "invalid-home-page-route": "כתובת דף הבית הינה שגויה",
-    "invalid-session": "Invalid Session",
-    "invalid-session-text": "It looks like your login session is no longer active. Please refresh this page.",
-    "session-mismatch": "Session Mismatch",
+    "invalid-session": "סשן לא תקין",
+    "invalid-session-text": "נראה שסשן ההתחברות שלך כבר לא פעיל. אנא טען מחדש את העמוד.",
+    "session-mismatch": "מושב לא תואם",
     "session-mismatch-text": "It looks like your login session no longer matches with the server. Please refresh this page.",
     "no-topics-selected": "לא נבחרו נושאים!",
     "cant-move-to-same-topic": "אתה לא יכול להעביר פוסט לאותו נושא!",
@@ -190,6 +191,6 @@
     "socket-reconnect-failed": "לא ניתן להגיע לשרת בשלב זה. לחץ כאן כדי לנסות שוב, או נסה שוב מאוחר יותר",
     "plugin-not-whitelisted": "לא ניתן להתקין את התוסף – ניתן להתקין דרך הניהול רק תוספים שנמצאים ברשימה הלבנה של מנהל החבילות של NodeBB.",
     "topic-event-unrecognized": "Topic event '%1' unrecognized",
-    "cant-set-child-as-parent": "Can't set child as parent category",
+    "cant-set-child-as-parent": "לא ניתן להגדיר קטגוריה משנה לקטגוריית אב",
     "cant-set-self-as-parent": "Can't set self as parent category"
 }

public/language/he/flags.json

@@ -6,7 +6,7 @@
 	"assignee": "מוקצה",
 	"update": "עדכון",
 	"updated": "עודכן",
-	"resolved": "Resolved",
+	"resolved": "הושלם",
 	"target-purged": "התוכן שסומן נוקה ולא קיים יותר.",
 
 	"graph-label": "דיווחים יומיים",
@@ -82,7 +82,7 @@
 	"modal-submit-confirm-text-help": "שליחת דיווח מהיר תבטל כל סיבה קודמת שהוגדרה.",
 
 	"bulk-actions": "פעולות כלליות",
-	"bulk-resolve": "השלם דיווחים",
+	"bulk-resolve": "השלם דיווח(ים)",
 	"bulk-success": "%1 דיווחים עודכנו",
-	"flagged-timeago-readable": "Flagged <span class=\"timeago\" title=\"%1\"></span> (%2)"
+	"flagged-timeago-readable": "מדווחים <span class=\"timeago\" title=\"%1\"></span> (%2)"
 }

public/language/he/global.json

@@ -4,7 +4,7 @@
     "buttons.close": "סגור",
     "403.title": "גישה נדחתה",
     "403.message": "הגעתם לעמוד שאין לכם הרשאת צפייה בו",
-    "403.login": "נסו <a href='1%/login'>להתחבר</a>.",
+    "403.login": "נסו <a href='%1/login'>להתחבר</a>.",
     "404.title": "לא נמצא",
     "404.message": "הגעתם לעמוד שאינו קיים. חזרו <a href=\"%1/\">לעמוד הבית</a>",
     "500.title": "שגיאה פנימית.",

public/language/he/modules.json

@@ -60,21 +60,21 @@
     "composer.zen_mode": "מסך מלא",
     "composer.select_category": "בחר קטגוריה",
     "composer.textarea.placeholder": "כתוב את תוכן הפוסט כאן. ניתן גם לגרור לכאן תמונות.",
-    "composer.schedule-for": "Schedule topic for",
-    "composer.schedule-date": "Date",
-    "composer.schedule-time": "Time",
-    "composer.cancel-scheduling": "Cancel Scheduling",
-    "composer.set-schedule-date": "Set Date",
+    "composer.schedule-for": "תזמון נושא ל",
+    "composer.schedule-date": "תאריך",
+    "composer.schedule-time": "שעה",
+    "composer.cancel-scheduling": "בטל תיזמון",
+    "composer.set-schedule-date": "הגדר תאריך",
     "bootbox.ok": "אישור",
     "bootbox.cancel": "בטל",
     "bootbox.confirm": "אשר",
     "cover.dragging_title": "מיקום תמונת נושא",
     "cover.dragging_message": "גרור תמונת נושא למיקום הרצוי ולחץ על \"שמור\"",
     "cover.saved": "תמונת הנושא והמיקום נשמר",
-    "thumbs.modal.title": "Manage topic thumbnails",
-    "thumbs.modal.no-thumbs": "No thumbnails found.",
-    "thumbs.modal.resize-note": "<strong>Note</strong>: This forum is configured to resize topic thumbnails down to a maximum width of %1px",
-    "thumbs.modal.add": "Add thumbnail",
-    "thumbs.modal.remove": "Remove thumbnail",
-    "thumbs.modal.confirm-remove": "Are you sure you want to remove this thumbnail?"
+    "thumbs.modal.title": "נהל תמונה ממוזערת של הנושא",
+    "thumbs.modal.no-thumbs": "לא נמצעו תמונות ממוזערות",
+    "thumbs.modal.resize-note": "<strong>הערה</strong>: הפורום מוגדר לשנות את התמונה הממוזערת לגודל מקסימום של %1px",
+    "thumbs.modal.add": "הוסף תמונה ממוזערת",
+    "thumbs.modal.remove": "הסר תמונה ממוזערת",
+    "thumbs.modal.confirm-remove": "האם אתה בטוח שאתה רוצה להסיר את התמונה הממוזערת?"
 }

public/language/he/notifications.json

@@ -14,6 +14,7 @@
     "topics": "נושאים",
     "replies": "תגובות",
     "chat": "צ'אטים",
+    "group-chat": "צ'אט קבוצתי",
     "follows": "עוקבים",
     "upvote": "הצבעות בעד",
     "new-flags": "דיווחים חדשים",
@@ -47,8 +48,8 @@
     "posts-exported": "<strong>%1</strong> פוסטים יוצאו, לחץ כדי להוריד.",
     "uploads-exported": "<strong>%1</strong> העלאות יוצאו, לחץ כדי להוריד.",
     "users-csv-exported": "משתמשים יוצאו כ-csv, לחץ כאן להורדה.",
-    "post-queue-accepted": "Your queued post has been accepted. Click here to see your post.",
-    "post-queue-rejected": "Your queued post has been rejected.",
+    "post-queue-accepted": "הפוסט ששלחת התקבל. לחץ כאן כדי לראות את הפוסט",
+    "post-queue-rejected": "הפוסט ששלחת נדחה",
     "email-confirmed": "כתובת המייל אושרה",
     "email-confirmed-message": "תודה שאישרת את כתובת המייל שלך. החשבון שלך פעיל כעת.",
     "email-confirm-error-message": "אירעה שגיאה בעת אישור המייל שלך. ייתכן כי הקוד היה שגוי או פג תוקף.",

public/language/he/post-queue.json

@@ -8,11 +8,11 @@
 	"content": "תוכן",
 	"posted": "נשלח",
 	"reply-to": "תגובה ל %1",
-	"content-editable": "Click on content to edit",
-	"category-editable": "Click on category to edit",
-	"title-editable": "Click on title to edit",
-	"reply": "Reply",
-	"topic": "Topic",
-	"accept": "Accept",
-	"reject": "Reject"
+	"content-editable": "לחץ על התוכן כדי לערוך",
+	"category-editable": "לחץ על הקטגוריה כדי לערוך",
+	"title-editable": "לחץ על הכותרת כדי לערוך",
+	"reply": "תגובה",
+	"topic": "נושא",
+	"accept": "אשר",
+	"reject": "דחה"
 }

public/language/he/success.json

@@ -1,7 +1,7 @@
 {
     "success": "הצלחה",
     "topic-post": "העלת פוסט בהצלחה.",
-    "post-queued": "Your post is queued for approval. You will get a notification when it is accepted or rejected.",
+    "post-queued": "הפוסט שלך נשלח. תקבל התראה הוא יתקבל או ידחה.",
     "authentication-successful": "הנתונים אומתו בהצלחה",
     "settings-saved": "הנתונים נשמרו!"
 }

public/language/he/topic.json

@@ -1,6 +1,6 @@
 {
     "topic": "נושא",
-    "title": "Title",
+    "title": "כותרת",
     "no_topics_found": "לא נמצאו נושאים!",
     "no_posts_found": "לא נמצאו פוסטים!",
     "post_is_deleted": "פוסט זה נמחק!",
@@ -31,25 +31,25 @@
     "locked": "נעול",
     "pinned": "נעוץ",
     "pinned-with-expiry": "נעוץ עד %1",
-    "scheduled": "Scheduled",
+    "scheduled": "מתוזמן",
     "moved": "הועבר",
     "moved-from": "הועבר מ-%1",
     "copy-ip": "העתק IP",
     "ban-ip": "הרחק IP",
     "view-history": "ערוך היסטוריה",
     "locked-by": "נעול על ידי",
-    "unlocked-by": "Unlocked by",
-    "pinned-by": "Pinned by",
-    "unpinned-by": "Unpinned by",
-    "deleted-by": "Deleted by",
-    "restored-by": "Restored by",
-    "queued-by": "Post queued for approval →",
+    "unlocked-by": "נעילה הוסרה על ידי",
+    "pinned-by": "נעוץ על ידי",
+    "unpinned-by": "נעיצה הוסרה על ידי",
+    "deleted-by": "נמחק על ידי",
+    "restored-by": "שוחזר על ידי",
+    "queued-by": "הפוסט ממתין לאישור →",
     "bookmark_instructions": "לחץ כאן בכדי לחזור לפוסט האחרון שקראת בנושא הזה.",
     "flag-post": "דווח על פוסט זה",
     "flag-user": "דווח על משתמש זה",
     "already-flagged": "דווח כבר",
     "view-flag-report": "הצג דוח דיווחים",
-    "resolve-flag": "Resolve Flag",
+    "resolve-flag": "השלם דיווח",
     "merged_message": "נושא זה מוזג בתוך <a href=\"%1\">%2</a>",
     "deleted_message": "נושא זה נמחק. רק משתמשים עם הרשאות מתאימות יוכלו לצפות בו.",
     "following_topic.message": "מעתה, תקבל התראה כאשר מישהו יעלה פוסט לנושא זה.",
@@ -95,7 +95,7 @@
     "topic_move_multiple_success": "נושאים אלו יועברו מיד ל\"%1\" . לחץ כאן לביטול.",
     "topic_move_all_success": "כל הנושאים יועברו מיד ל\"%1\". לחץ כאן לביטול.",
     "topic_move_undone": "העברת הנושא בוטל",
-    "topic_move_posts_success": "הפוסטים יועברו מיד ל\"%1\" . לחץ כאן לביטול.",
+    "topic_move_posts_success": "הפוסטים יועברו בקרוב. לחץ כאן לביטול.",
     "topic_move_posts_undone": "העברת הפוסט בוטל",
     "post_delete_confirm": "האם אתה בטוח שאתה רוצה למחוק פוסט זה?",
     "post_restore_confirm": "האם אתה בטוח שאתה רוצה לשחזר פוסט זה?",
@@ -114,7 +114,7 @@
     "move_post": "הזז פוסט",
     "post_moved": "הפוסט הועבר!",
     "fork_topic": "פצל נושא",
-    "enter-new-topic-title": "Enter new topic title",
+    "enter-new-topic-title": "הכנס כותרת נושא חדשה",
     "fork_topic_instruction": "לחץ על הפוסטים שברצונך לפצל",
     "fork_no_pids": "לא נבחרו פוסטים!",
     "no-posts-selected": "לא נבחרו פוסטים!",
@@ -128,17 +128,17 @@
     "merge-options": "אפשרויות מיזוג",
     "merge-select-main-topic": "בחר את הכותרת המועדפת",
     "merge-new-title-for-topic": "כותרת חדשה לנושא",
-    "topic-id": "Topic ID",
-    "move_posts_instruction": "Click the posts you want to move then enter a topic ID or go to the target topic",
+    "topic-id": "מזהה נושא",
+    "move_posts_instruction": "לחץ על הפוסטים שברצונך להסיר ואז הכנס מזהה נושא או עבור לנושא היעד",
     "change_owner_instruction": "לחץ על הפוסטים עליהם תרצה לשנות את כותב ההודעה",
     "composer.title_placeholder": "הכנס את כותרת הנושא כאן...",
     "composer.handle_placeholder": "הזן את שמך / כינוי שלך כאן",
     "composer.discard": "ביטול",
     "composer.submit": "שלח",
-    "composer.schedule": "Schedule",
+    "composer.schedule": "תזמן",
     "composer.replying_to": "מגיב ל%1",
     "composer.new_topic": "נושא חדש",
-    "composer.editing": "Editing",
+    "composer.editing": "עורך",
     "composer.uploading": "מעלה...",
     "composer.thumb_url_label": "הדבק את כתובת ה-URL לתמונה מוקטנת עבור הנושא",
     "composer.thumb_title": "הוסף תמונה מוקטנת לנושא זה",
@@ -146,7 +146,7 @@
     "composer.thumb_file_label": "או העלה קובץ",
     "composer.thumb_remove": "נקה שדות",
     "composer.drag_and_drop_images": "גרור תמונות לכאן",
-    "more_users_and_guests": "%1 משתמשים נוספים ו-%2 אורחים",
+    "more_users_and_guests": "%1 משתמש(ים) נוספים ו-%2 אורח(ים)",
     "more_users": "%1 משתמשים נוספים",
     "more_guests": "%1 אורחים נוספים",
     "users_and_others": "%1 ו-%2 אחרים",
@@ -168,8 +168,8 @@
     "diffs.restore": "שחזר גרסה זו",
     "diffs.restore-description": "A new revision will be appended to this post's edit history after restoring.",
     "diffs.post-restored": "הפוסט שוחזר בהצלחה לגרסה קודמת",
-    "diffs.delete": "Delete this revision",
-    "diffs.deleted": "Revision deleted",
+    "diffs.delete": "מחק גרסה זו",
+    "diffs.deleted": "גרסה זו נמחקה",
     "timeago_later": "אחרי %1",
     "timeago_earlier": "לפני %1 ",
     "first-post": "פוסט ראשון",

public/language/hr/admin/manage/users.json

@@ -1,6 +1,6 @@
 {
 	"users": "Korisnici",
-	"edit": "Uredi",
+	"edit": "Actions",
 	"make-admin": "Dodaj administratora",
 	"remove-admin": "Makni administratora",
 	"validate-email": "Potvrdite email",
@@ -47,6 +47,7 @@
 	"users.uid": "uid",
 	"users.username": "korisničko ime",
 	"users.email": "email",
+	"users.ip": "IP",
 	"users.postcount": "postcount",
 	"users.reputation": "reputacija",
 	"users.flags": "flags",

public/language/hr/admin/settings/general.json

@@ -40,5 +40,8 @@
 	"site-colors": "Site Color Metadata",
 	"theme-color": "Theme Color",
 	"background-color": "Background Color",
-	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
+	"background-color-help": "Color used for splash screen background when website is installed as a PWA",
+	"undo-timeout": "Undo Timeout",
+	"undo-timeout-help": "Some operations such as moving topics will allow for the moderator to undo their action within a certain timeframe. Set to 0 to disable undo completely.",
+	"topic-tools": "Topic Tools"
 }