rename parseUrl to urlParse, closer to core url module, url.parse

.gitignore

@@ -1,4 +1,3 @@
-dist/
 yarn.lock
 npm-debug.log
 node_modules/

.mocharc.yml

@@ -1,4 +0,0 @@
-reporter: dot
-timeout: 25000
-exit: true
-bail: true

.travis.yml

@@ -14,7 +14,7 @@ before_script:
   - "mongo mydb_test --eval 'db.createUser({user:\"travis\", pwd: \"test\", roles: []});'"
   - sh -c "if [ '$DB' = 'mongodb' ]; then node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"mongo\\\",\\\"mongo:host\\\":\\\"127.0.0.1\\\",\\\"mongo:port\\\":27017,\\\"mongo:username\\\":\\\"\\\",\\\"mongo:password\\\":\\\"\\\",\\\"mongo:database\\\":0,\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"hAN3Eg8W\\\",\\\"admin:password:confirm\\\":\\\"hAN3Eg8W\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":27017,\\\"database\\\":\\\"travis_ci_test\\\"}\"; fi"
   - sh -c "if [ '$DB' = 'redis' ]; then node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567/forum\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"redis\\\",\\\"redis:host\\\":\\\"127.0.0.1\\\",\\\"redis:port\\\":6379,\\\"redis:password\\\":\\\"\\\",\\\"redis:database\\\":0,\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"hAN3Eg8W\\\",\\\"admin:password:confirm\\\":\\\"hAN3Eg8W\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":6379,\\\"database\\\":1}\"; fi"
-  - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database nodebb;' -U postgres; psql -c 'create database travis_ci_test;' -U postgres; node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"postgres\\\",\\\"postgres:host\\\":\\\"127.0.0.1\\\",\\\"postgres:port\\\":5433,\\\"postgres:password\\\":\\\"\\\",\\\"postgres:database\\\":\\\"nodebb\\\",\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"hAN3Eg8W\\\",\\\"admin:password:confirm\\\":\\\"hAN3Eg8W\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":5433,\\\"username\\\":\\\"postgres\\\",\\\"database\\\":\\\"travis_ci_test\\\"}\"; fi"
+  - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database nodebb;' -U postgres; psql -c 'create database travis_ci_test;' -U postgres; node app --setup=\"{\\\"url\\\":\\\"http://127.0.0.1:4567\\\",\\\"secret\\\":\\\"abcdef\\\",\\\"database\\\":\\\"postgres\\\",\\\"postgres:host\\\":\\\"127.0.0.1\\\",\\\"postgres:port\\\":5432,\\\"postgres:password\\\":\\\"\\\",\\\"postgres:database\\\":\\\"nodebb\\\",\\\"admin:username\\\":\\\"admin\\\",\\\"admin:email\\\":\\\"test@example.org\\\",\\\"admin:password\\\":\\\"hAN3Eg8W\\\",\\\"admin:password:confirm\\\":\\\"hAN3Eg8W\\\"}\" --ci=\"{\\\"host\\\":\\\"127.0.0.1\\\",\\\"port\\\":5432,\\\"username\\\":\\\"postgres\\\",\\\"database\\\":\\\"travis_ci_test\\\"}\"; fi"
 after_success:
   - "npm run coveralls"
 language: node_js
@@ -23,7 +23,7 @@ dist: xenial
 env:
   global:
     - PGUSER=postgres
-    - PGPORT=5433
+    - PGPORT=5432
     - CXX=g++-4.8
   jobs:
     - "DB=mongodb TEST_ENV=production"

CHANGELOG.md

@@ -1,170 +1,3 @@
-#### 1.13.2 (2020-02-05)
-
-##### Chores
-
-*  incrementing version number - v1.13.2 (71f4607d)
-*  bump themes (027f3f22)
-*  bump vanilla (236a1730)
-*  bump persona (82ace391)
-*  incrementing version number - v1.13.1 (cc6758a0)
-* **deps:**
-  *  update dependency eslint to v6.8.0 (#8062) (15783213)
-  *  update dependency nyc to v15 (#8094) (976e26a9)
-  *  update commitlint monorepo (#8100) (eb4a1a57)
-  *  update dependency lint-staged to v10.0.7 (#8132) (cdfbcbb9)
-  *  update dependency mocha to v7 (#8106) (b370333c)
-  *  update dependency husky to v4 (dd440ce9)
-  *  update dependency lint-staged to v10.0.1 (66992a55)
-  *  update dependency lint-staged to v10 (d74eecfb)
-
-##### Documentation Changes
-
-*  updated changelog (2edc6960)
-
-##### New Features
-
-*  add test for isOnline (66febb80)
-*  add test for change post owner (df2c7851)
-*  check flag values on save (assignee and state) (#8122) (8e5a2276)
-
-##### Bug Fixes
-
-*  admin relogin (a5ef6b53)
-*  #8135 (c35a21d7)
-*  handle mkdirp0.5->1.0x so it doesn't break upgrade (1e50616c)
-*  #8134, upgrade mkdirp to 1.0.x (87225a90)
-*  onSuccessfulLogin not working (111ed802)
-*  #8139, dont allow restore if not deleted by self (8c48f94b)
-*  use view_deleted when filtering, closes #8137 (9969dd63)
-*  escape invalid rules (d927b763)
-*  add missing await (3cca929a)
-*  missing await in SocketPosts.changeOwner (0ae1eb4f)
-*  #8133, check if user is in room before removing (23810cc6)
-*  add missing await (cd1fa27a)
-*  missing await (f799f017)
-*  dont return flag data to client (418c174d)
-*  check if user has read priv before flagging (51236df4)
-*  restrict getUsersInRoom to members (1f13ab8a)
-*  remove unused conditional, dont add dupe messages (3077eb94)
-*  tests for messaging (ecc579a2)
-*  #8127 user join system message duplicated (594cd7e1)
-*  background-size in taskbar images (106c141f)
-*  tests, was using hardcoded message id (1b08f376)
-*  typo in #8116 (8bb5e71e)
-*  build step defaults to series instead of parallel (3fac09b1)
-*  escape system message, don't allow editing system messages (6a63c1a1)
-*  escape register query param (c8fb7f92)
-*  delete upload (8c6a7954)
-*  check uploadName (153b1a0e)
-*  #8120, bubble errors from static hooks (01d1ae78)
-*  escape bootswatchSkin and homepageRoute (b0f3e48a)
-*  change owner missing await (3e525576)
-*  hsts always enabled (e3952674)
-*  escape topic.thumb (b7a57996)
-*  #8112, don't crash hook returns no data (4eb9652a)
-*  escape config.userLang/acpLang, don't allow invalid language codes (e06c1bfc)
-*  group create/join/update name validation (61da8c29)
-*  don't crash if groupData is missing (48f08627)
-*  #8105, fix export json on page load (5a8217de)
-*  #8103, fix advanced menu not displaying in ACP (52774531)
-*  meta description missing if url doesn't have post index (10989ccc)
-*  create user modal instantly closing (c1b1ee61)
-*  login with weak password (9d074731)
-*  dont check password strength on login (f6d7a24a)
-* **deps:**
-  *  update dependency connect-redis to v4.0.4 (#8143) (16ab641d)
-  *  update dependency rimraf to v3.0.1 (#8138) (726ba71c)
-  *  update dependency validator to v12.2.0 (#8136) (f07b4bfa)
-  *  update dependency nodebb-theme-persona to v10.1.34 (#8140) (6d7131fb)
-  *  update dependency nodebb-theme-persona to v10.1.31 (#8129) (c510a2c4)
-  *  update dependency mongodb to v3.5.2 (#8092) (0e49cfb9)
-  *  update dependency sharp to v0.24.0 (#8121) (16e8f496)
-  *  update dependency nodebb-plugin-composer-default to v6.3.21 (#8119) (ca10f8f0)
-  *  update dependency nodebb-widget-essentials to v4.0.18 (#8111) (df5e3a73)
-
-##### Other Changes
-
-* NodeBB/NodeBB (b959c24a)
-* //github.com/NodeBB/NodeBB (ee4304b4)
-* //github.com/NodeBB/NodeBB (bfaba895)
-*  save disableLeave (#8123) (09d55581)
-* //github.com/NodeBB/NodeBB (842916ea)
-
-##### Refactors
-
-*  messaging (30c50361)
-
-#### 1.13.1 (2019-12-19)
-
-##### Chores
-
-*  incrementing version number - v1.13.1 (d1e0672f)
-*  incrementing version number - v1.13.0 (c38b2d23)
-* **deps:**
-  *  update dependency husky to v3.1.0 (#8046) (c3418c26)
-  *  update dependency coveralls to v3.0.9 (#8067) (0aeee144)
-  *  update dependency eslint to v6.7.0 (32cfe96f)
-  *  update dependency coveralls to v3.0.8 (#8054) (8ba26104)
-
-##### Documentation Changes
-
-*  updated changelog (94499da3)
-
-##### New Features
-
-*  better output for cli plugins list, closes #8075 (4fc69443)
-*  #5272, allow changing user groups from manage users page (05c9fe27)
-*  merge social authentication into plugins menu in ACP (f9a8ebfc)
-*  convert middleware.isAdmin to async/await (efd1e88b)
-
-##### Bug Fixes
-
-*  #8085, fix cookie name (dec157d6)
-*  #8058, fix incorrect digest setting display in ACP (1b992d82)
-*  remove select version (6a17e32d)
-*  travis config (3ae98300)
-*  travis :dog: (3731dc4e)
-*  #8078, dont mark notifications read without a mergeId (a8df6d62)
-*  #8077, show continue chat on all profile pages (7af1c873)
-*  profile showing posts from deleted topics (2679f37d)
-*  #8073, configurable necroThreshold (4d669783)
-*  allow members to search as well (b323df2f)
-*  #8069, dont show hidden groups in search (c2cd7de8)
-*  missing await (33fd4a1c)
-*  #8064, break-word on post-queue (1bda92e3)
-*  #6711 (7ed002a1)
-*  #8061, don't crash if there is a network problem (de404102)
-*  #8059, properly mark topic unread when using mark unread for all (a688aaae)
-*  #8042, dont show errors after clearing form (3811e0a3)
-*  unhandled promise rejection error on reset error (51073772)
-*  #8050, fix redirect after registration (366ad5cd)
-*  make _csrf a secure cookie if the website is using https (#8045) (0efe27b1)
-*  #8034 (0a96c923)
-*  serialize (a2545204)
-*  show login fields if user has local password (1eca5b3d)
-*  use the correct attribute name for widgets (6c404b81)
-* **deps:**
-  *  update dependency semver to v7 (483d7535)
-  *  update dependency nodebb-theme-vanilla to v11.1.12 (610ecf35)
-  *  update dependency sharp to v0.23.4 (#8076) (eb18c182)
-  *  update dependency nodebb-theme-persona to v10.1.30 (0514383a)
-  *  update dependency nodebb-plugin-markdown to v8.11.0 (702ca164)
-  *  update dependency connect-mongo to v3.2.0 (2aef7a5b)
-  *  update dependency mongodb to v3.3.5 (#8065) (68118e43)
-  *  update dependency nodebb-theme-persona to v10.1.29 (#8057) (34933091)
-  *  update dependency sharp to v0.23.3 (#8044) (6fa88823)
-  *  update dependency validator to v12.1.0 (#8055) (488ea394)
-  *  update dependency nodebb-theme-slick to v1.2.28 (#8041) (b3511f71)
-  *  update dependency nodebb-theme-vanilla to v11.1.11 (#8040) (d567c4ae)
-  *  update dependency nodebb-theme-persona to v10.1.28 (#8039) (6c87bed5)
-  *  update dependency nodebb-plugin-dbsearch to v4.0.7 (#8038) (1e2e16b4)
-
-##### Refactors
-
-*  async/await middleware (a227cbe3)
-*  change to const/let (3454a24b)
-*  shorter returns (cec00795)
-
 ### 1.13.0 (2019-11-13)
 
 ##### Chores

Dockerfile

@@ -19,4 +19,5 @@ ENV NODE_ENV=production \
 
 EXPOSE 4567
 
-CMD node ./nodebb build ;  node ./nodebb start
+CMD ./nodebb start
+

install/data/defaults.json

@@ -109,7 +109,6 @@
     "email:sendmail:rateLimit": 2,
     "email:sendmail:rateDelta": 1000,
     "hideFullname": 0,
-    "hideEmail": 0,
     "allowGuestHandles": 0,
     "disableRecentCategoryFilter": 0,
     "maximumRelatedTopics": 0,

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "1.13.3",
+    "version": "1.13.0",
     "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -29,125 +29,123 @@
         ]
     },
     "dependencies": {
-        "ace-builds": "^1.4.9",
-        "archiver": "^4.0.0",
-        "async": "^3.2.0",
-        "autoprefixer": "^9.7.6",
+        "ace-builds": "^1.2.9",
+        "archiver": "^3.0.0",
+        "async": "^3.0.1",
+        "autoprefixer": "^9.4.6",
         "bcryptjs": "2.4.3",
-        "benchpressjs": "^2.0.2",
-        "body-parser": "^1.19.0",
-        "bootstrap": "^3.4.1",
+        "benchpressjs": "^2.0.0",
+        "body-parser": "^1.18.2",
+        "bootstrap": "^3.4.0",
         "bootswatch": "git://github.com/thomaspark/bootswatch.git#c41a8f066feb8950c6f9c6bcf5a3c37d1085404e",
-        "chart.js": "^2.9.3",
+        "chart.js": "^2.7.1",
         "cli-graph": "^3.2.2",
-        "clipboard": "^2.0.6",
-        "colors": "^1.4.0",
-        "commander": "^5.0.0",
-        "compression": "^1.7.4",
+        "clipboard": "^2.0.1",
+        "colors": "^1.1.2",
+        "commander": "^3.0.0",
+        "compression": "^1.7.1",
         "connect-ensure-login": "^0.1.1",
         "connect-flash": "^0.1.1",
         "connect-mongo": "3.2.0",
-        "connect-multiparty": "^2.2.0",
-        "connect-pg-simple": "^6.1.0",
-        "connect-redis": "4.0.4",
-        "cookie-parser": "^1.4.5",
-        "cron": "^1.8.2",
-        "cropperjs": "^1.5.6",
-        "csurf": "^1.11.0",
+        "connect-multiparty": "^2.1.0",
+        "connect-pg-simple": "^6.0.0",
+        "connect-redis": "4.0.3",
+        "cookie-parser": "^1.4.3",
+        "cron": "^1.3.0",
+        "cropperjs": "^1.2.2",
+        "csurf": "^1.9.0",
         "daemon": "^1.1.0",
-        "diff": "^4.0.2",
-        "express": "^4.17.1",
-        "express-session": "^1.17.0",
-        "express-useragent": "^1.0.13",
-        "graceful-fs": "^4.2.3",
-        "helmet": "^3.22.0",
-        "html-to-text": "^5.1.1",
-        "ipaddr.js": "^1.9.1",
-        "jquery": "3.5.1",
-        "jsesc": "3.0.1",
-        "json-2-csv": "^3.6.2",
-        "jsonwebtoken": "^8.5.1",
-        "less": "^3.11.1",
+        "diff": "^4.0.1",
+        "express": "^4.16.2",
+        "express-session": "^1.15.6",
+        "express-useragent": "^1.0.12",
+        "graceful-fs": "^4.1.11",
+        "helmet": "^3.11.0",
+        "html-to-text": "^5.0.0",
+        "ipaddr.js": "^1.5.4",
+        "jquery": "^3.2.1",
+        "jsesc": "2.5.2",
+        "json-2-csv": "^3.0.0",
+        "jsonwebtoken": "^8.4.0",
+        "less": "^3.10.3",
         "lodash": "^4.17.15",
-        "logrotate-stream": "^0.2.6",
+        "logrotate-stream": "^0.2.5",
         "lru-cache": "5.1.1",
         "material-design-lite": "^1.3.0",
-        "mime": "^2.4.4",
-        "mkdirp": "^1.0.4",
-        "mongodb": "3.5.7",
-        "morgan": "^1.10.0",
-        "mousetrap": "^1.6.5",
-        "@nodebb/mubsub": "^1.6.0",
+        "mime": "^2.2.0",
+        "mkdirp": "^0.5.1",
+        "mongodb": "3.4.0",
+        "morgan": "^1.9.1",
+        "mousetrap": "^1.6.1",
+        "mubsub-nbb": "^1.5.1",
         "nconf": "^0.10.0",
-        "nodebb-plugin-composer-default": "6.3.25",
+        "nodebb-plugin-composer-default": "6.3.20",
         "nodebb-plugin-dbsearch": "4.0.7",
-        "nodebb-plugin-emoji": "^3.3.0",
+        "nodebb-plugin-emoji": "^3.0.0",
         "nodebb-plugin-emoji-android": "2.0.0",
-        "nodebb-plugin-markdown": "8.11.2",
-        "nodebb-plugin-mentions": "2.7.4",
+        "nodebb-plugin-markdown": "8.11.0",
+        "nodebb-plugin-mentions": "2.7.3",
         "nodebb-plugin-soundpack-default": "1.0.0",
         "nodebb-plugin-spam-be-gone": "0.6.7",
-        "nodebb-rewards-essentials": "0.1.3",
+        "nodebb-rewards-essentials": "0.1.2",
         "nodebb-theme-lavender": "5.0.11",
-        "nodebb-theme-persona": "10.1.39",
-        "nodebb-theme-slick": "1.2.29",
-        "nodebb-theme-vanilla": "11.1.16",
-        "nodebb-widget-essentials": "4.1.0",
-        "nodemailer": "^6.4.6",
-        "passport": "^0.4.1",
+        "nodebb-theme-persona": "10.1.30",
+        "nodebb-theme-slick": "1.2.28",
+        "nodebb-theme-vanilla": "11.1.12",
+        "nodebb-widget-essentials": "4.0.17",
+        "nodemailer": "^6.0.0",
+        "passport": "^0.4.0",
         "passport-local": "1.0.0",
-        "pg": "^8.0.2",
-        "pg-cursor": "^2.1.9",
-        "postcss": "7.0.27",
+        "pg": "^7.4.0",
+        "pg-cursor": "^2.0.0",
+        "postcss": "7.0.21",
         "postcss-clean": "1.1.0",
-        "promise-polyfill": "^8.1.3",
+        "promise-polyfill": "^8.0.0",
         "prompt": "^1.0.0",
-        "redis": "3.0.2",
-        "request": "2.88.2",
-        "request-promise-native": "^1.0.8",
-        "rimraf": "3.0.2",
+        "redis": "2.8.0",
+        "request": "2.88.0",
+        "rimraf": "3.0.0",
         "rss": "^1.2.2",
-        "sanitize-html": "^1.23.0",
-        "semver": "^7.2.1",
-        "serve-favicon": "^2.5.0",
-        "sharp": "0.25.2",
-        "sitemap": "^6.1.0",
+        "sanitize-html": "^1.16.3",
+        "semver": "^7.0.0",
+        "serve-favicon": "^2.4.5",
+        "sharp": "0.23.4",
+        "sitemap": "^5.0.0",
         "socket.io": "2.3.0",
         "socket.io-adapter-cluster": "^1.0.1",
-        "socket.io-adapter-mongo": "^2.0.5",
+        "socket.io-adapter-mongo": "^2.0.4",
         "socket.io-adapter-postgres": "^1.2.1",
         "socket.io-client": "2.3.0",
         "socket.io-redis": "5.2.0",
         "socketio-wildcard": "2.0.0",
-        "spdx-license-list": "^6.1.0",
+        "spdx-license-list": "^6.0.0",
         "spider-detector": "2.0.0",
         "textcomplete": "^0.17.1",
         "textcomplete.contenteditable": "^0.1.1",
         "toobusy-js": "^0.5.1",
         "uglify-es": "^3.3.9",
-        "validator": "13.0.0",
+        "validator": "12.1.0",
         "winston": "3.2.1",
         "xml": "^1.0.1",
-        "xregexp": "^4.3.0",
+        "xregexp": "^4.1.1",
         "zxcvbn": "^4.4.2"
     },
     "devDependencies": {
-        "@apidevtools/swagger-parser": "9.0.1",
-        "@commitlint/cli": "8.3.5",
-        "@commitlint/config-angular": "8.3.4",
-        "coveralls": "3.1.0",
-        "eslint": "6.8.0",
-        "eslint-config-airbnb-base": "14.1.0",
-        "eslint-plugin-import": "2.20.2",
-        "grunt": "1.1.0",
+        "@commitlint/cli": "8.2.0",
+        "@commitlint/config-angular": "8.2.0",
+        "coveralls": "3.0.9",
+        "eslint": "6.7.0",
+        "eslint-config-airbnb-base": "14.0.0",
+        "eslint-plugin-import": "2.18.2",
+        "grunt": "1.0.4",
         "grunt-contrib-watch": "1.1.0",
-        "husky": "4.2.5",
-        "jsdom": "16.2.2",
-        "lint-staged": "10.2.0",
-        "mocha": "7.1.2",
+        "husky": "3.1.0",
+        "jsdom": "15.2.1",
+        "lint-staged": "9.4.2",
+        "mocha": "6.2.2",
         "mocha-lcov-reporter": "1.3.0",
-        "nyc": "15.0.1",
-        "smtp-server": "3.6.0"
+        "nyc": "14.1.1",
+        "smtp-server": "3.5.0"
     },
     "bugs": {
         "url": "https://github.com/NodeBB/NodeBB/issues"

loader.js

@@ -231,7 +231,7 @@ fs.open(pathToConfig, 'r', function (err) {
 			cwd: process.cwd(),
 		});
 
-		fs.writeFileSync(pidFilePath, String(process.pid));
+		fs.writeFileSync(pidFilePath, process.pid);
 	}
 
 	async.series([

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

@@ -1,6 +1,5 @@
 {
-	"you-are-on": "You are on <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</strong>",
+	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
 	"pid": "pid",

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

@@ -12,7 +12,8 @@
 	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
 	"name": "Tag Name",
 
-	"alerts.editing": "Editing tag(s)",
+	"alerts.editing-multiple": "Editing multiple tags",
+	"alerts.editing-x": "Editing \"%1\" tag",
 	"alerts.confirm-delete": "Do you want to delete the selected tags?",
 	"alerts.update-success": "Tag Updated!"
 }

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

@@ -15,7 +15,6 @@
 	"headers.acah": "Access-Control-Allow-Headers",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
-	"hsts.maxAge": "HSTS Max Age",
 	"hsts.subdomains": "Include subdomains in HSTS header",
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",

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

@@ -1,8 +1,6 @@
 {
 	"site-settings": "Site Settings",
 	"title": "Site Title",
-	"title.short": "Short Title",
-	"title.short-placeholder": "If no short title is specified, the site title will be used",
 	"title.url": "URL",
 	"title.url-placeholder": "The URL of the site title",
 	"title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.",
@@ -33,9 +31,5 @@
 	"outgoing-links": "Outgoing Links",
 	"outgoing-links.warning-page": "Use Outgoing Links Warning Page",
 	"search-default-sort-by": "Search default sort by",
-	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page",
-	"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"
-}
+	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page"
+}

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

@@ -3,7 +3,6 @@
 	"private-groups": "Private Groups",
 	"private-groups.help": "If enabled, joining of groups requires the approval of the group owner <em>(Default: enabled)</em>",
 	"private-groups.warning": "<strong>Beware!</strong> If this option is disabled and you have private groups, they automatically become public.",
-	"allow-multiple-badges": "Allow Multiple Badges",
 	"allow-multiple-badges-help": "This flag can be used to allow users to select multiple group badges, requires theme support.",
 	"max-name-length": "Maximum Group Name Length",
 	"max-title-length": "Maximum Group Title Length",

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

@@ -9,7 +9,7 @@
 	"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_help": "When enabled, all new registrants will be required to explicitly give consent for data collection and usage under the <a href=\"https://eugdpr.org/the-regulation/gdpr-faqs/\">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.",
 	"disable-username-changes": "عدم السماح بتغيير اسم المستخدم",
 	"disable-email-changes": "عدم السماح بتغيير البريد الالكتروني",
 	"disable-password-changes": "عدم السماح بتغيير كلمة المرور",
@@ -76,4 +76,4 @@
 	"categoryWatchState.watching": "Watching",
 	"categoryWatchState.notwatching": "Not Watching",
 	"categoryWatchState.ignoring": "Ignoring"
-}
+}

public/language/ar/modules.json

@@ -12,7 +12,6 @@
     "chat.recent-chats": "آخر الدردشات",
     "chat.contacts": "الأصدقاء",
     "chat.message-history": "تاريخ الرسائل",
-    "chat.message-deleted": "Message Deleted",
     "chat.options": "Chat options",
     "chat.pop-out": "افتح الدردشة في نافذة خاصة",
     "chat.minimize": "Minimize",

public/language/ar/topic.json

@@ -103,7 +103,7 @@
     "move_posts_instruction": "Click the posts you want to move",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "أدخل عنوان موضوعك هنا...",
-    "composer.handle_placeholder": "Enter your name/handle here",
+    "composer.handle_placeholder": "اﻹسم",
     "composer.discard": "نبذ التغييرات",
     "composer.submit": "حفظ",
     "composer.replying_to": "الرد على %1",

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

@@ -1,6 +1,5 @@
 {
-	"you-are-on": "Вие сте на <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</strong>",
+	"you-are-on": "Информация — Вие сте на <strong>%1:%2</strong>",
 	"nodes-responded": "%1 възела отговориха в рамките на %2мсек!",
 	"host": "сървър",
 	"pid": "ид. на процеса",

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

@@ -12,7 +12,8 @@
 	"settings": "Натиснете <a href=\"%1\">тук</a>, за да отворите страницата с настройки на етикета.",
 	"name": "Име на етикета",
 
-	"alerts.editing": "Редактиране на етикет(и)",
+	"alerts.editing-multiple": "Редактиране на множество етикети",
+	"alerts.editing-x": "Редактиране на етикета „%1“",
 	"alerts.confirm-delete": "Наистина ли искате да изтриете избраните етикети?",
 	"alerts.update-success": "Етикетът е променен!"
 }

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

@@ -15,7 +15,6 @@
 	"headers.acah": "Заглавки за разрешаване на управлението на достъпа",
 	"hsts": "Стриктна транспортна сигурност",
 	"hsts.enabled": "Включване на HSTS (препоръчително)",
-	"hsts.maxAge": "Максимална възраст на HSTS",
 	"hsts.subdomains": "Включване на поддомейните в заглавката на HSTS",
 	"hsts.preload": "Позволяване на предварителното зареждане на заглавката на HSTS",
 	"hsts.help": "Ако това е включено, за този уеб ще бъде настроена заглавка за HSTS. Можете да изберете дали да включите поддомейните и дали за заредите предварително флаговете в заглавката си. Ако не знаете какво да направите, най-добре не избирайте нищо. <a href=\"%1\">Още информация<i class=\"fa fa-external-link\"></i></a>",

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

@@ -1,8 +1,6 @@
 {
 	"site-settings": "Настройки на уеб сайта",
 	"title": "Заглавие на уеб сайта",
-	"title.short": "Кратко заглавие",
-	"title.short-placeholder": "Ако не е посочено кратко заглавие, ще бъде използвано заглавието на уеб сайта",
 	"title.url": "Адрес",
 	"title.url-placeholder": "Адресът на заглавието на уеб сайта",
 	"title.url-help": "При щракване върху заглавието, потребителите ще бъдат изпратени на този адрес. Ако бъде оставено празно, потребителите ще бъдат изпращани на началната страница на форума.",
@@ -33,9 +31,5 @@
 	"outgoing-links": "Изходящи връзки",
 	"outgoing-links.warning-page": "Показване на предупредителна страница при щракване върху външни връзки",
 	"search-default-sort-by": "Подредба по подразбиране при търсене",
-	"outgoing-links.whitelist": "Домейни, за които да не се показва предупредителната страница",
-	"site-colors": "Мета-данни за цвета на уеб сайта",
-	"theme-color": "Цвят на темата",
-	"background-color": "Фонов цвят",
-	"background-color-help": "Цвят, който да се използва като фон за началния екран, когато уеб сайтът е инсталиран като приложение"
-}
+	"outgoing-links.whitelist": "Домейни, за които да не се показва предупредителната страница"
+}

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

@@ -3,7 +3,6 @@
 	"private-groups": "Частни групи",
 	"private-groups.help": "Ако е включено, присъединяването към групи ще изисква одобрение от собственик на групата. <em>(По подразбиране: включено)</em>",
 	"private-groups.warning": "<strong>Внимание!</strong> Ако това е изключено и имате частни групи, те автоматично ще станат публични.",
-	"allow-multiple-badges": "Позволяване на множество значки",
 	"allow-multiple-badges-help": "Това може да се използва, за да позволи на потребителите да избират множество значки за групите. Изисква поддържа на теми.",
 	"max-name-length": "Минимална дължина на името на група",
 	"max-title-length": "Максимална дължина на заглавието на група",

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

@@ -9,7 +9,7 @@
 	"allow-login-with.email": "Само е-поща",
 	"account-settings": "Настройки на акаунта",
 	"gdpr_enabled": "Включване на искането за съгласие с ОРЗД",
-	"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\">Общия регламент относно защитата на данните (ОРЗД)</a>. <strong>Забележка</strong>: Включването на ОРЗД не задължава съществуващите потребители да дадат съгласието си. Ако искате това, ще трябва да инсталирате добавката за ОРЗД (GDPR).",
+	"gdpr_enabled_help": "Ако това е включено, всички новорегистрирани потребители ще бъдат задължени изрично да дадат съгласието си за събирането на данни и статистики за потреблението според <a href=\"https://eugdpr.org/the-regulation/gdpr-faqs/\">Общия регламент относно защитата на данните (ОРЗД)</a>. <strong>Забележка</strong>: Включването на ОРЗД не задължава съществуващите потребители да дадат съгласието си. Ако искате това, ще трябва да инсталирате добавката за ОРЗД (GDPR).",
 	"disable-username-changes": "Забраняване на промяната на потребителското име",
 	"disable-email-changes": "Забраняване на промяната на е-пощата",
 	"disable-password-changes": "Забраняване на промяната на паролата",
@@ -76,4 +76,4 @@
 	"categoryWatchState.watching": "Да се следят",
 	"categoryWatchState.notwatching": "Да не се следят",
 	"categoryWatchState.ignoring": "Да се пренебрегват"
-}
+}

public/language/bg/modules.json

@@ -12,7 +12,6 @@
     "chat.recent-chats": "Скорошни разговори",
     "chat.contacts": "Контакти",
     "chat.message-history": "История на съобщенията",
-    "chat.message-deleted": "Съобщението е изтрито",
     "chat.options": "Настройки на разговора",
     "chat.pop-out": "Отделяне на разговора в прозорец",
     "chat.minimize": "Намаляване",

public/language/bg/topic.json

@@ -103,7 +103,7 @@
     "move_posts_instruction": "Натиснете публикациите, които искате да преместите",
     "change_owner_instruction": "Натиснете публикациите, които искате да прехвърлите на друг потребител",
     "composer.title_placeholder": "Въведете заглавието на темата си тук...",
-    "composer.handle_placeholder": "Въведете името тук",
+    "composer.handle_placeholder": "Име",
     "composer.discard": "Отхвърляне",
     "composer.submit": "Публикуване",
     "composer.replying_to": "Отговор на %1",

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

@@ -1,6 +1,5 @@
 {
-	"you-are-on": "You are on <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</strong>",
+	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
 	"pid": "pid",

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

@@ -12,7 +12,8 @@
 	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
 	"name": "Tag Name",
 
-	"alerts.editing": "Editing tag(s)",
+	"alerts.editing-multiple": "Editing multiple tags",
+	"alerts.editing-x": "Editing \"%1\" tag",
 	"alerts.confirm-delete": "Do you want to delete the selected tags?",
 	"alerts.update-success": "Tag Updated!"
 }

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

@@ -15,7 +15,6 @@
 	"headers.acah": "Access-Control-Allow-Headers",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
-	"hsts.maxAge": "HSTS Max Age",
 	"hsts.subdomains": "Include subdomains in HSTS header",
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",

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

@@ -1,8 +1,6 @@
 {
 	"site-settings": "Site Settings",
 	"title": "Site Title",
-	"title.short": "Short Title",
-	"title.short-placeholder": "If no short title is specified, the site title will be used",
 	"title.url": "URL",
 	"title.url-placeholder": "The URL of the site title",
 	"title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.",
@@ -33,9 +31,5 @@
 	"outgoing-links": "Outgoing Links",
 	"outgoing-links.warning-page": "Use Outgoing Links Warning Page",
 	"search-default-sort-by": "Search default sort by",
-	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page",
-	"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"
-}
+	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page"
+}

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

@@ -3,7 +3,6 @@
 	"private-groups": "Private Groups",
 	"private-groups.help": "If enabled, joining of groups requires the approval of the group owner <em>(Default: enabled)</em>",
 	"private-groups.warning": "<strong>Beware!</strong> If this option is disabled and you have private groups, they automatically become public.",
-	"allow-multiple-badges": "Allow Multiple Badges",
 	"allow-multiple-badges-help": "This flag can be used to allow users to select multiple group badges, requires theme support.",
 	"max-name-length": "Maximum Group Name Length",
 	"max-title-length": "Maximum Group Title Length",

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

@@ -9,7 +9,7 @@
 	"allow-login-with.email": "Email Only",
 	"account-settings": "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_help": "When enabled, all new registrants will be required to explicitly give consent for data collection and usage under the <a href=\"https://eugdpr.org/the-regulation/gdpr-faqs/\">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.",
 	"disable-username-changes": "Disable username changes",
 	"disable-email-changes": "Disable email changes",
 	"disable-password-changes": "Disable password changes",
@@ -76,4 +76,4 @@
 	"categoryWatchState.watching": "Watching",
 	"categoryWatchState.notwatching": "Not Watching",
 	"categoryWatchState.ignoring": "Ignoring"
-}
+}

public/language/bn/modules.json

@@ -12,7 +12,6 @@
     "chat.recent-chats": "সাম্প্রতিক চ্যাটসমূহ",
     "chat.contacts": "কন্টাক্টস",
     "chat.message-history": "মেসেজ হিস্টোরী",
-    "chat.message-deleted": "Message Deleted",
     "chat.options": "Chat options",
     "chat.pop-out": "চ্যাট উইন্ডো আলাদা করুন",
     "chat.minimize": "Minimize",

public/language/bn/topic.json

@@ -103,7 +103,7 @@
     "move_posts_instruction": "Click the posts you want to move",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "আপনার টপিকের শিরোনাম দিন",
-    "composer.handle_placeholder": "Enter your name/handle here",
+    "composer.handle_placeholder": "Name",
     "composer.discard": "বাতিল",
     "composer.submit": "সাবমিট",
     "composer.replying_to": "%1 এর উত্তরে:",

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

@@ -1,6 +1,5 @@
 {
-	"you-are-on": "You are on <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</strong>",
+	"you-are-on": "Informace – jste na <strong>%1:%2</strong>",
 	"nodes-responded": "%1 vazeb odpovědělo během %2ms.",
 	"host": "host",
 	"pid": "pid",

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

@@ -12,7 +12,8 @@
 	"settings": "Pro přejití na stránku s nastavením značek, klikněte <a href=\"%1\">zde</a>.",
 	"name": "Název značky",
 
-	"alerts.editing": "Editing tag(s)",
+	"alerts.editing-multiple": "Upravení víceznaček",
+	"alerts.editing-x": "Upravení značky \"%1\"",
 	"alerts.confirm-delete": "Chcete odstranit vybranou značku?",
 	"alerts.update-success": "Značka aktualizována."
 }

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

@@ -15,7 +15,6 @@
 	"headers.acah": "Access-Control-Allow-Headers",
 	"hsts": "Přísné zabezpečení přenosu",
 	"hsts.enabled": "Povolit HSTS (doporučeno)",
-	"hsts.maxAge": "HSTS Max Age",
 	"hsts.subdomains": "Zahrnout poddomény v hlavičce HSTS",
 	"hsts.preload": "Povolit před-načtení hlavičky HSTS",
 	"hsts.help": "Je-li povoleno, bude nastavena pro tyto stránky hlavička HSTS . Můžete si v hlavičce zvolit zahrnutí i poddomén a přednastavených příznaků. Nejste-li si jist/a, ponechte nezaškrtnuté<a href=\"%1\">Více informací <i class=\"fa fa-external-link\"></i></a>",

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

@@ -1,8 +1,6 @@
 {
 	"site-settings": "Nastavení stránky",
 	"title": "Název stránky",
-	"title.short": "Short Title",
-	"title.short-placeholder": "If no short title is specified, the site title will be used",
 	"title.url": "URL",
 	"title.url-placeholder": "URL názvu stránky",
 	"title.url-help": "Bude-li kliknuto na název, uživatel bude přesměrován na tuto adresu. Zůstane-li prázdné, uživatel bude odeslán na index fóra",
@@ -33,9 +31,5 @@
 	"outgoing-links": "Odchozí odkazy",
 	"outgoing-links.warning-page": "Použít stránku s upozorněním při odchozích odkazech",
 	"search-default-sort-by": "Výchozí třídění při hledání",
-	"outgoing-links.whitelist": "Domény u kterých bude přeskočena upozorňovací stránka",
-	"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"
-}
+	"outgoing-links.whitelist": "Domény u kterých bude přeskočena upozorňovací stránka"
+}

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

@@ -3,7 +3,6 @@
 	"private-groups": "Soukromé skupiny",
 	"private-groups.help": "Je-li povoleno, připojení ke skupině vyžaduje schválení zakladatele skupiny <em>(výchozí: povoleno)</em>",
 	"private-groups.warning": "<strong>Ale pozor</strong>, je-li tato možnost zakázána a vy máte soukromé skupiny, stanou se automaticky veřejnými.",
-	"allow-multiple-badges": "Allow Multiple Badges",
 	"allow-multiple-badges-help": "Toto označení může být použito, aby uživatelé mohly vybrat několik skupinových symbolů, vyžaduje podporu motivu.",
 	"max-name-length": "Maximální délka názvu skupiny",
 	"max-title-length": "Maximální délka názvu skupiny",

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

@@ -9,7 +9,7 @@
 	"allow-login-with.email": "Pouze e-mail",
 	"account-settings": "Nastavení účtu",
 	"gdpr_enabled": "Povolit souhlas s GDPR",
-	"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_help": "Je-li povoleno, všichni nový uživatelé budou muset souhlasit se sběrem dat dle <a href=\"https://eugdpr.org/the-regulation/gdpr-faqs/\">General Data Protection Regulation (GDPR)</a>.<strong>Nezapomeňte, že: </strong>povolení GDPR nepřinutí již existující uživatele dát souhlas. Abyste tak učinili, bude muset nainstalovat zásuvný modul GDPR.",
 	"disable-username-changes": "Zakázat změnu uživatelského jména",
 	"disable-email-changes": "Zakázat změnu e-mailu",
 	"disable-password-changes": "Zakázat změnu hesla",
@@ -76,4 +76,4 @@
 	"categoryWatchState.watching": "Sledování",
 	"categoryWatchState.notwatching": "Nesleduji",
 	"categoryWatchState.ignoring": "Ignorace"
-}
+}

public/language/cs/modules.json

@@ -12,7 +12,6 @@
     "chat.recent-chats": "Aktuální konverzace",
     "chat.contacts": "Kontakty",
     "chat.message-history": "Historie zpráv",
-    "chat.message-deleted": "Message Deleted",
     "chat.options": "Možnosti konverzace",
     "chat.pop-out": "Skrýt konverzaci",
     "chat.minimize": "Minimalizovat",

public/language/cs/topic.json

@@ -103,7 +103,7 @@
     "move_posts_instruction": "Klikněte na příspěvek/y, který chcete přesunout",
     "change_owner_instruction": "Klikněte na příspěvek u kterého chcete změnit vlastníka",
     "composer.title_placeholder": "Zadejte název tématu…",
-    "composer.handle_placeholder": "Enter your name/handle here",
+    "composer.handle_placeholder": "Jméno",
     "composer.discard": "Zrušit",
     "composer.submit": "Odeslat",
     "composer.replying_to": "Odpovídání na %1",

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

@@ -1,6 +1,5 @@
 {
-	"you-are-on": "You are on <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</strong>",
+	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
 	"pid": "pid",

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

@@ -12,7 +12,8 @@
 	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
 	"name": "Tag Name",
 
-	"alerts.editing": "Editing tag(s)",
+	"alerts.editing-multiple": "Editing multiple tags",
+	"alerts.editing-x": "Editing \"%1\" tag",
 	"alerts.confirm-delete": "Do you want to delete the selected tags?",
 	"alerts.update-success": "Tag Updated!"
 }

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

@@ -15,7 +15,6 @@
 	"headers.acah": "Access-Control-Allow-Headers",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
-	"hsts.maxAge": "HSTS Max Age",
 	"hsts.subdomains": "Include subdomains in HSTS header",
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",

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

@@ -1,8 +1,6 @@
 {
 	"site-settings": "Site Settings",
 	"title": "Site Title",
-	"title.short": "Short Title",
-	"title.short-placeholder": "If no short title is specified, the site title will be used",
 	"title.url": "URL",
 	"title.url-placeholder": "The URL of the site title",
 	"title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.",
@@ -33,9 +31,5 @@
 	"outgoing-links": "Outgoing Links",
 	"outgoing-links.warning-page": "Use Outgoing Links Warning Page",
 	"search-default-sort-by": "Search default sort by",
-	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page",
-	"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"
-}
+	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page"
+}

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

@@ -3,7 +3,6 @@
 	"private-groups": "Private Groups",
 	"private-groups.help": "If enabled, joining of groups requires the approval of the group owner <em>(Default: enabled)</em>",
 	"private-groups.warning": "<strong>Beware!</strong> If this option is disabled and you have private groups, they automatically become public.",
-	"allow-multiple-badges": "Allow Multiple Badges",
 	"allow-multiple-badges-help": "This flag can be used to allow users to select multiple group badges, requires theme support.",
 	"max-name-length": "Maximum Group Name Length",
 	"max-title-length": "Maximum Group Title Length",

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

@@ -9,7 +9,7 @@
 	"allow-login-with.email": "Email Only",
 	"account-settings": "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_help": "When enabled, all new registrants will be required to explicitly give consent for data collection and usage under the <a href=\"https://eugdpr.org/the-regulation/gdpr-faqs/\">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.",
 	"disable-username-changes": "Disable username changes",
 	"disable-email-changes": "Disable email changes",
 	"disable-password-changes": "Disable password changes",
@@ -76,4 +76,4 @@
 	"categoryWatchState.watching": "Watching",
 	"categoryWatchState.notwatching": "Not Watching",
 	"categoryWatchState.ignoring": "Ignoring"
-}
+}

public/language/da/modules.json

@@ -12,7 +12,6 @@
     "chat.recent-chats": "Seneste chats",
     "chat.contacts": "Kontakter",
     "chat.message-history": "Beskedhistorik",
-    "chat.message-deleted": "Message Deleted",
     "chat.options": "Chat options",
     "chat.pop-out": "Pop ud chatten",
     "chat.minimize": "Minimize",

public/language/da/topic.json

@@ -103,7 +103,7 @@
     "move_posts_instruction": "Click the posts you want to move",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "Angiv din trådtittel her ...",
-    "composer.handle_placeholder": "Enter your name/handle here",
+    "composer.handle_placeholder": "Navn",
     "composer.discard": "Fortryd",
     "composer.submit": "Send",
     "composer.replying_to": "Svare til %1",

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

@@ -1,6 +1,5 @@
 {
-	"you-are-on": "You are on <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</strong>",
+	"you-are-on": "Info - Sie verwenden <strong>%1:%2</strong>",
 	"nodes-responded": "%1 Knoten antworteten innerhalb von %2ms",
 	"host": "Host",
 	"pid": "PID",

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

@@ -12,7 +12,8 @@
 	"settings": "Klicke <a href=\"%1\">hier</a>, um die Tag-Einstellungsseite zu öffnen.",
 	"name": "Tagname",
 
-	"alerts.editing": "Editing tag(s)",
+	"alerts.editing-multiple": "Bearbeite mehrere Tags",
+	"alerts.editing-x": "Bearbeite Tag \"%1\"",
 	"alerts.confirm-delete": "Wollen Sie die ausgewählten Tags löschen?",
 	"alerts.update-success": "Tag aktualisiert!"
 }

public/language/de/admin/menu.json

@@ -18,7 +18,7 @@
 	"manage/groups": "Gruppen",
 	"manage/ip-blacklist": "IP Blacklist",
 	"manage/uploads": "Uploads",
-	"manage/digest": "Zusammenfassungen",
+	"manage/digest": "Digests",
 
 	"section-settings": "Einstellungen",
 	"settings/general": "Allgemein",

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

@@ -15,7 +15,6 @@
 	"headers.acah": "Access-Control-Allow-Headers",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "HSTS Aktivieren (empfohlen)",
-	"hsts.maxAge": "HSTS Max Age",
 	"hsts.subdomains": "Subdomains in HSTS Header einbinden",
 	"hsts.preload": "Vorabladen von HSTS Header erlauben",
 	"hsts.help": "Wenn aktiviert, wird ein HSTS-Header für diese Seite gesetzt. Du kannst wählen, ob du Subdomains und Preloading-Flags in deinen Header aufnehmen möchtest. Im Zweifelsfall kannst du diese unmarkiert lassen.",

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

@@ -33,8 +33,8 @@
 	"testing.select": "Wählen Sie die E-Mail Vorlage",
 	"testing.send": "Test-E-Mail versenden",
 	"testing.send-help": "Die Test-E-Mail wird an die E-Mail Adresse des momentan eingeloggten Nutzers geschickt.",
-	"subscriptions": "Email Zusammenfassungen",
-	"subscriptions.disable": "Deaktivierung der Email Zusammenfassungen",
+	"subscriptions": "Email Digests",
+	"subscriptions.disable": "Disable email digests",
 	"subscriptions.hour": "Sende Zeit",
 	"subscriptions.hour-help": "Bitte geben Sie eine Nummer ein, welche die Stunde repräsentiert zu welcher geplante Emails versandt werden sollen (z.B. <code>0</code> für Mitternacht, <code>17</code> für 5 Uhr Nachmittags). Beachten Sie, dass die Zeit auf der Serverzeit basiert und daher nicht umbedingt mit ihrer Systemzeit übereinstimmen muss.<br>Die ungefähre Serverzeit ist: <span id=\"serverTime\"></span><br>Die nächste tägliche Sendung ist um <span id=\"nextDigestTime\"></span> geplant"
 }

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

@@ -1,8 +1,6 @@
 {
 	"site-settings": "Forum Einstellungen",
 	"title": "Forum Titel",
-	"title.short": "Short Title",
-	"title.short-placeholder": "If no short title is specified, the site title will be used",
 	"title.url": "URL",
 	"title.url-placeholder": "Die URL des Seitentitels",
 	"title.url-help": "Wenn der Titel angeklickt wird, werden Benutzer zu dieser Adresse geschickt, bei leerem Feld wird die Startseite verwendet.",
@@ -33,9 +31,5 @@
 	"outgoing-links": "Ausgehende Links",
 	"outgoing-links.warning-page": "Warnseite für ausgehende links verwenden",
 	"search-default-sort-by": "Standardmäßige Such-Sortierung",
-	"outgoing-links.whitelist": "Domains, für die keine Warnseite angezeigt werden soll",
-	"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"
-}
+	"outgoing-links.whitelist": "Domains, für die keine Warnseite angezeigt werden soll"
+}

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

@@ -3,7 +3,6 @@
 	"private-groups": "Private Gruppen",
 	"private-groups.help": "Wenn aktiviert, erfordert das Beitreten einer Gruppe die Bestätigung des jeweiligen Besitzers<em>(Standard: aktiviert)</em>",
 	"private-groups.warning": "<strong>Vorsicht!</strong> Wenn diese Option deaktiviert ist, und es private Gruppen gibt, werden diese automatisch öffentlich.",
-	"allow-multiple-badges": "Allow Multiple Badges",
 	"allow-multiple-badges-help": "Diese Eintellung kann verwendet werden um Benutzern zu erlauben mehrere Gruppen abzeichen auszuwählen, benötigt Theme unterstützung.",
 	"max-name-length": "Maximale Länge von Gruppennamen",
 	"max-title-length": "Maximale Gruppentitellänge",

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

@@ -9,7 +9,7 @@
 	"allow-login-with.email": "Nur E-Mail",
 	"account-settings": "Kontoeinstellungen",
 	"gdpr_enabled": "Aktivieren Sie die DSGVO-Zustimmungserfassung",
-	"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_help": "Wenn aktiviert, müssen alle Registranten explizit der Datensammlung und -nutzung unter der <a href=\"https://eugdpr.org/the-regulation/gdpr-faqs/\">Datenschutzgrundverordnung (DSGVO)</a> zustimmen. <strong>Hinweis</strong>: Die Aktivierung der DSGVO verpflichtet bereits registrierte Nutzer nicht der Zustimmung. Um dies zu tun, musst du das GDPR Plugin installieren.",
 	"disable-username-changes": "Deaktiviere Änderungen des Benutzernames",
 	"disable-email-changes": "Deaktiviere Änderungen der E-Mail Adresse",
 	"disable-password-changes": "Deaktiviere Änderungen des Passwortes",
@@ -76,4 +76,4 @@
 	"categoryWatchState.watching": "Beobachtet",
 	"categoryWatchState.notwatching": "Nicht beobachtet",
 	"categoryWatchState.ignoring": "Ignoriert"
-}
+}

public/language/de/email.json

@@ -27,9 +27,9 @@
     "digest.week": "der letzten Woche",
     "digest.month": "des letzen Monats",
     "digest.subject": "Zusammenfassung für %1",
-    "digest.title.day": "Deine tägliche Zusammenfassung",
-    "digest.title.week": "Deine wöchentliche Zusammenfassung",
-    "digest.title.month": "Deine monatliche Zusammenfassung",
+    "digest.title.day": "Your Daily Digest",
+    "digest.title.week": "Your Weekly Digest",
+    "digest.title.month": "Your Monthly Digest",
     "notif.chat.subject": "Neue Chatnachricht von %1 erhalten",
     "notif.chat.cta": "Klicke hier, um die Unterhaltung fortzusetzen",
     "notif.chat.unsub.info": "Diese Chat-Benachrichtigung wurde dir aufgrund deiner Abonnement-Einstellungen gesendet.",

public/language/de/modules.json

@@ -12,7 +12,6 @@
     "chat.recent-chats": "Aktuelle Chats",
     "chat.contacts": "Kontakte",
     "chat.message-history": "Nachrichtenverlauf",
-    "chat.message-deleted": "Message Deleted",
     "chat.options": "Chat-Optionen",
     "chat.pop-out": "Chat als Pop-out anzeigen",
     "chat.minimize": "Minimieren",

public/language/de/topic.json

@@ -103,7 +103,7 @@
     "move_posts_instruction": "Klicke auf die Beiträge, die du verschieben möchstest.",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "Hier den Titel des Themas eingeben...",
-    "composer.handle_placeholder": "Enter your name/handle here",
+    "composer.handle_placeholder": "Name",
     "composer.discard": "Verwerfen",
     "composer.submit": "Absenden",
     "composer.replying_to": "Antworte auf %1",
@@ -134,6 +134,6 @@
     "diffs.no-revisions-description": "Dieser Beitrag ha <strong>%1</strong> Revisionen.",
     "diffs.current-revision": "Aktuelle Revision",
     "diffs.original-revision": "Ursprüngliche Revision",
-    "timeago_later": "%1 später",
+    "timeago_later": "%1 later",
     "timeago_earlier": "%1 earlier"
 }

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

@@ -1,6 +1,5 @@
 {
-	"you-are-on": "You are on <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</strong>",
+	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
 	"pid": "pid",

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

@@ -12,7 +12,8 @@
 	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
 	"name": "Tag Name",
 
-	"alerts.editing": "Editing tag(s)",
+	"alerts.editing-multiple": "Editing multiple tags",
+	"alerts.editing-x": "Editing \"%1\" tag",
 	"alerts.confirm-delete": "Do you want to delete the selected tags?",
 	"alerts.update-success": "Tag Updated!"
 }

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

@@ -15,7 +15,6 @@
 	"headers.acah": "Access-Control-Allow-Headers",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
-	"hsts.maxAge": "HSTS Max Age",
 	"hsts.subdomains": "Include subdomains in HSTS header",
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",

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

@@ -1,8 +1,6 @@
 {
 	"site-settings": "Site Settings",
 	"title": "Site Title",
-	"title.short": "Short Title",
-	"title.short-placeholder": "If no short title is specified, the site title will be used",
 	"title.url": "URL",
 	"title.url-placeholder": "The URL of the site title",
 	"title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.",
@@ -33,9 +31,5 @@
 	"outgoing-links": "Outgoing Links",
 	"outgoing-links.warning-page": "Use Outgoing Links Warning Page",
 	"search-default-sort-by": "Search default sort by",
-	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page",
-	"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"
-}
+	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page"
+}

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

@@ -3,7 +3,6 @@
 	"private-groups": "Private Groups",
 	"private-groups.help": "If enabled, joining of groups requires the approval of the group owner <em>(Default: enabled)</em>",
 	"private-groups.warning": "<strong>Beware!</strong> If this option is disabled and you have private groups, they automatically become public.",
-	"allow-multiple-badges": "Allow Multiple Badges",
 	"allow-multiple-badges-help": "This flag can be used to allow users to select multiple group badges, requires theme support.",
 	"max-name-length": "Maximum Group Name Length",
 	"max-title-length": "Maximum Group Title Length",

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

@@ -9,7 +9,7 @@
 	"allow-login-with.email": "Email Only",
 	"account-settings": "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_help": "When enabled, all new registrants will be required to explicitly give consent for data collection and usage under the <a href=\"https://eugdpr.org/the-regulation/gdpr-faqs/\">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.",
 	"disable-username-changes": "Disable username changes",
 	"disable-email-changes": "Disable email changes",
 	"disable-password-changes": "Disable password changes",
@@ -76,4 +76,4 @@
 	"categoryWatchState.watching": "Watching",
 	"categoryWatchState.notwatching": "Not Watching",
 	"categoryWatchState.ignoring": "Ignoring"
-}
+}

public/language/el/modules.json

@@ -12,7 +12,6 @@
     "chat.recent-chats": "Recent Chats",
     "chat.contacts": "Contacts",
     "chat.message-history": "Message History",
-    "chat.message-deleted": "Message Deleted",
     "chat.options": "Chat options",
     "chat.pop-out": "Pop out chat",
     "chat.minimize": "Minimize",

public/language/el/topic.json

@@ -103,7 +103,7 @@
     "move_posts_instruction": "Click the posts you want to move",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "Εισαγωγή του τίτλου του θέματος εδώ...",
-    "composer.handle_placeholder": "Enter your name/handle here",
+    "composer.handle_placeholder": "Name",
     "composer.discard": "Πέταγμα",
     "composer.submit": "Υποβολή",
     "composer.replying_to": "Απάντηση στο %1",

public/language/en-GB/admin/development/info.json

@@ -1,6 +1,5 @@
 {
-	"you-are-on": "You are on <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</strong>",
+	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
 	"pid": "pid",

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

@@ -12,7 +12,8 @@
 	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
 	"name": "Tag Name",
 
-	"alerts.editing": "Editing tag(s)",
+	"alerts.editing-multiple": "Editing multiple tags",
+	"alerts.editing-x": "Editing \"%1\" tag",
 	"alerts.confirm-delete": "Do you want to delete the selected tags?",
 	"alerts.update-success": "Tag Updated!"
 }

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

@@ -15,7 +15,6 @@
 	"headers.acah": "Access-Control-Allow-Headers",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
-	"hsts.maxAge": "HSTS Max Age",
 	"hsts.subdomains": "Include subdomains in HSTS header",
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",

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

@@ -1,8 +1,6 @@
 {
 	"site-settings": "Site Settings",
 	"title": "Site Title",
-	"title.short": "Short Title",
-	"title.short-placeholder": "If no short title is specified, the site title will be used",
 	"title.url": "URL",
 	"title.url-placeholder": "The URL of the site title",
 	"title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.",
@@ -33,9 +31,5 @@
 	"outgoing-links": "Outgoing Links",
 	"outgoing-links.warning-page": "Use Outgoing Links Warning Page",
 	"search-default-sort-by": "Search default sort by",
-	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page",
-	"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"
-}
+	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page"
+}

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

@@ -3,7 +3,6 @@
 	"private-groups": "Private Groups",
 	"private-groups.help": "If enabled, joining of groups requires the approval of the group owner <em>(Default: enabled)</em>",
 	"private-groups.warning": "<strong>Beware!</strong> If this option is disabled and you have private groups, they automatically become public.",
-	"allow-multiple-badges": "Allow Multiple Badges",
 	"allow-multiple-badges-help": "This flag can be used to allow users to select multiple group badges, requires theme support.",
 	"max-name-length": "Maximum Group Name Length",
 	"max-title-length": "Maximum Group Title Length",

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

@@ -9,7 +9,7 @@
 	"allow-login-with.email": "Email Only",
 	"account-settings": "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_help": "When enabled, all new registrants will be required to explicitly give consent for data collection and usage under the <a href=\"https://eugdpr.org/the-regulation/gdpr-faqs/\">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.",
 	"disable-username-changes": "Disable username changes",
 	"disable-email-changes": "Disable email changes",
 	"disable-password-changes": "Disable password changes",
@@ -76,4 +76,4 @@
 	"categoryWatchState.watching": "Watching",
 	"categoryWatchState.notwatching": "Not Watching",
 	"categoryWatchState.ignoring": "Ignoring"
-}
+}

public/language/en-GB/modules.json

@@ -12,7 +12,6 @@
 	"chat.recent-chats": "Recent Chats",
 	"chat.contacts": "Contacts",
 	"chat.message-history": "Message History",
-	"chat.message-deleted": "Message Deleted",
 	"chat.options": "Chat options",
 	"chat.pop-out": "Pop out chat",
 	"chat.minimize": "Minimize",

public/language/en-GB/topic.json

@@ -120,7 +120,7 @@
 	"change_owner_instruction": "Click the posts you want to assign to another user",
 
 	"composer.title_placeholder": "Enter your topic title here...",
-	"composer.handle_placeholder": "Enter your name/handle here",
+	"composer.handle_placeholder": "Name",
 	"composer.discard": "Discard",
 	"composer.submit": "Submit",
 	"composer.replying_to": "Replying to %1",

public/language/en-US/admin/development/info.json

@@ -1,6 +1,5 @@
 {
-	"you-are-on": "You are on <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</strong>",
+	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
 	"pid": "pid",

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

@@ -12,7 +12,8 @@
 	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
 	"name": "Tag Name",
 
-	"alerts.editing": "Editing tag(s)",
+	"alerts.editing-multiple": "Editing multiple tags",
+	"alerts.editing-x": "Editing \"%1\" tag",
 	"alerts.confirm-delete": "Do you want to delete the selected tags?",
 	"alerts.update-success": "Tag Updated!"
 }

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

@@ -15,7 +15,6 @@
 	"headers.acah": "Access-Control-Allow-Headers",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
-	"hsts.maxAge": "HSTS Max Age",
 	"hsts.subdomains": "Include subdomains in HSTS header",
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",

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

@@ -1,8 +1,6 @@
 {
 	"site-settings": "Site Settings",
 	"title": "Site Title",
-	"title.short": "Short Title",
-	"title.short-placeholder": "If no short title is specified, the site title will be used",
 	"title.url": "URL",
 	"title.url-placeholder": "The URL of the site title",
 	"title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.",
@@ -33,9 +31,5 @@
 	"outgoing-links": "Outgoing Links",
 	"outgoing-links.warning-page": "Use Outgoing Links Warning Page",
 	"search-default-sort-by": "Search default sort by",
-	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page",
-	"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"
-}
+	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page"
+}

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

@@ -3,7 +3,6 @@
 	"private-groups": "Private Groups",
 	"private-groups.help": "If enabled, joining of groups requires the approval of the group owner <em>(Default: enabled)</em>",
 	"private-groups.warning": "<strong>Beware!</strong> If this option is disabled and you have private groups, they automatically become public.",
-	"allow-multiple-badges": "Allow Multiple Badges",
 	"allow-multiple-badges-help": "This flag can be used to allow users to select multiple group badges, requires theme support.",
 	"max-name-length": "Maximum Group Name Length",
 	"max-title-length": "Maximum Group Title Length",

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

@@ -9,7 +9,7 @@
 	"allow-login-with.email": "Email Only",
 	"account-settings": "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_help": "When enabled, all new registrants will be required to explicitly give consent for data collection and usage under the <a href=\"https://eugdpr.org/the-regulation/gdpr-faqs/\">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.",
 	"disable-username-changes": "Disable username changes",
 	"disable-email-changes": "Disable email changes",
 	"disable-password-changes": "Disable password changes",
@@ -76,4 +76,4 @@
 	"categoryWatchState.watching": "Watching",
 	"categoryWatchState.notwatching": "Not Watching",
 	"categoryWatchState.ignoring": "Ignoring"
-}
+}

public/language/en-US/modules.json

@@ -12,7 +12,6 @@
     "chat.recent-chats": "Recent Chats",
     "chat.contacts": "Contacts",
     "chat.message-history": "Message History",
-    "chat.message-deleted": "Message Deleted",
     "chat.options": "Chat options",
     "chat.pop-out": "Pop out chat",
     "chat.minimize": "Minimize",

public/language/en-US/topic.json

@@ -103,7 +103,7 @@
     "move_posts_instruction": "Click the posts you want to move",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "Enter your topic title here...",
-    "composer.handle_placeholder": "Enter your name/handle here",
+    "composer.handle_placeholder": "Name",
     "composer.discard": "Discard",
     "composer.submit": "Submit",
     "composer.replying_to": "Replying to %1",

public/language/en-x-pirate/admin/development/info.json

@@ -1,6 +1,5 @@
 {
-	"you-are-on": "You are on <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</strong>",
+	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
 	"pid": "pid",

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

@@ -12,7 +12,8 @@
 	"settings": "Click <a href=\"%1\">here</a> to visit the tag settings page.",
 	"name": "Tag Name",
 
-	"alerts.editing": "Editing tag(s)",
+	"alerts.editing-multiple": "Editing multiple tags",
+	"alerts.editing-x": "Editing \"%1\" tag",
 	"alerts.confirm-delete": "Do you want to delete the selected tags?",
 	"alerts.update-success": "Tag Updated!"
 }

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

@@ -15,7 +15,6 @@
 	"headers.acah": "Access-Control-Allow-Headers",
 	"hsts": "Strict Transport Security",
 	"hsts.enabled": "Enabled HSTS (recommended)",
-	"hsts.maxAge": "HSTS Max Age",
 	"hsts.subdomains": "Include subdomains in HSTS header",
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",

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

@@ -1,8 +1,6 @@
 {
 	"site-settings": "Site Settings",
 	"title": "Site Title",
-	"title.short": "Short Title",
-	"title.short-placeholder": "If no short title is specified, the site title will be used",
 	"title.url": "URL",
 	"title.url-placeholder": "The URL of the site title",
 	"title.url-help": "When the title is clicked, send users to this address. If left blank, user will be sent to the forum index.",
@@ -33,9 +31,5 @@
 	"outgoing-links": "Outgoing Links",
 	"outgoing-links.warning-page": "Use Outgoing Links Warning Page",
 	"search-default-sort-by": "Search default sort by",
-	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page",
-	"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"
-}
+	"outgoing-links.whitelist": "Domains to whitelist for bypassing the warning page"
+}

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

@@ -3,7 +3,6 @@
 	"private-groups": "Private Groups",
 	"private-groups.help": "If enabled, joining of groups requires the approval of the group owner <em>(Default: enabled)</em>",
 	"private-groups.warning": "<strong>Beware!</strong> If this option is disabled and you have private groups, they automatically become public.",
-	"allow-multiple-badges": "Allow Multiple Badges",
 	"allow-multiple-badges-help": "This flag can be used to allow users to select multiple group badges, requires theme support.",
 	"max-name-length": "Maximum Group Name Length",
 	"max-title-length": "Maximum Group Title Length",

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

@@ -9,7 +9,7 @@
 	"allow-login-with.email": "Email Only",
 	"account-settings": "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_help": "When enabled, all new registrants will be required to explicitly give consent for data collection and usage under the <a href=\"https://eugdpr.org/the-regulation/gdpr-faqs/\">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.",
 	"disable-username-changes": "Disable username changes",
 	"disable-email-changes": "Disable email changes",
 	"disable-password-changes": "Disable password changes",
@@ -76,4 +76,4 @@
 	"categoryWatchState.watching": "Watching",
 	"categoryWatchState.notwatching": "Not Watching",
 	"categoryWatchState.ignoring": "Ignoring"
-}
+}

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

@@ -12,7 +12,6 @@
     "chat.recent-chats": "Recent Chats",
     "chat.contacts": "Contacts",
     "chat.message-history": "Message History",
-    "chat.message-deleted": "Message Deleted",
     "chat.options": "Chat options",
     "chat.pop-out": "Pop out chat",
     "chat.minimize": "Minimize",

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

@@ -103,7 +103,7 @@
     "move_posts_instruction": "Click the posts you want to move",
     "change_owner_instruction": "Click the posts you want to assign to another user",
     "composer.title_placeholder": "Enter your topic title here...",
-    "composer.handle_placeholder": "Enter your name/handle here",
+    "composer.handle_placeholder": "Name",
     "composer.discard": "Discard",
     "composer.submit": "Submit",
     "composer.replying_to": "Replying to %1",

public/language/es/admin/advanced/database.json

@@ -18,8 +18,8 @@
 	"mongo.resident-memory": "Memoria Residente",
 	"mongo.virtual-memory": "Memoria Virtual",
 	"mongo.mapped-memory": "Memoria Mapeada",
-	"mongo.bytes-in": "Entradas de Bytes",
-	"mongo.bytes-out": "Salidas de Bytes",
+	"mongo.bytes-in": "Bytes In",
+	"mongo.bytes-out": "Bytes Out",
 	"mongo.num-requests": "Número de solicitudes",
 	"mongo.raw-info": "Fila de Información MongoDB",
 	"mongo.unauthorized": "NodeBB no pudo consultar las estadísticas relevantes en la base de datos MongoDB. Por favor verifique que el usuario usado por NodeBB contiene el roll "clusterMonitor" para la base de datos "admin".",
@@ -47,6 +47,6 @@
 	"redis.raw-info": "Fila de Información de Redis",
 
 	"postgres": "Postgres",
-	"postgres.version": "Versión PostgreSQL",
+	"postgres.version": "PostgreSQL Version",
 	"postgres.raw-info": "Postgres Raw Info"
 }

public/language/es/admin/appearance/customise.json

@@ -8,7 +8,7 @@
 	"custom-js.enable": "Activar Javascript personalizado",
 
 	"custom-header": "Cabezera personalizada",
-	"custom-header.description": "Ingrese HTML personalizado aquí (por ejemplo, Metaetiquetas, etc.), que se agregará al <code>&lt;head&gt;</code> sección del marcado de tu foro. Las etiquetas de script están permitidas, pero se desaconsejan, ya que <a href=\"#custom-js\" data-toggle=\"tab\">Custom Javascript2</a> pestaña está disponible.",
+	"custom-header.description": "Enter custom HTML here (ex. Meta Tags, etc.), which will be appended to the <code>&lt;head&gt;</code> section of your forum's markup. Script tags are allowed, but are discouraged, as the <a href=\"#custom-js\" data-toggle=\"tab\">Custom Javascript</a> tab is available.",
 	"custom-header.enable": "Activar cabecera personalizada",
 
 	"custom-css.livereload": "Activar Recargar en Vivo",

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

@@ -1,6 +1,5 @@
 {
-	"you-are-on": "Tú estas en <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</strong>",
+	"you-are-on": "Info - Tú estás en <strong>%1:%2</strong>",
 	"nodes-responded": "¡%1 nodos respondieron en %2ms!",
 	"host": "host",
 	"pid": "pid",

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

@@ -9,7 +9,7 @@
 
 	"plugin-search": "Buscar",
 	"plugin-search-placeholder": "Búscando Plug-in",
-	"submit-anonymous-usage": "Enviar datos anónimos de uso de complementos.",
+	"submit-anonymous-usage": "Submit anonymous plugin usage data.",
 	"reorder-plugins": "Re-ordenar Plug-ins",
 	"order-active": "Ordenar Plug-ins Activos",
 	"dev-interested": "¿Estas interesado en escribir plug-ins para NodeBB?",
@@ -30,8 +30,8 @@
 	"plugin-item.more-info": "Para mas información:",
 	"plugin-item.unknown": "Desconocido",
 	"plugin-item.unknown-explanation": "El estado de este plug-in no puede determinsarse, posiblemente es debido a un error de configuración.",
-	"plugin-item.compatible": "Este complemento funciona en NodeBB %1",
-	"plugin-item.not-compatible": "Este complemento no tiene datos de compatibilidad, asegúrese de que funcione antes de instalarlo en su entorno de producción.",
+	"plugin-item.compatible": "This plugin works on NodeBB %1",
+	"plugin-item.not-compatible": "This plugin has no compatibility data, make sure it works before installing on your production environment.",
 
 	"alert.enabled": "El plug-in esta Activo",
 	"alert.disabled": "Plug-in Des-habilitado",

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

@@ -12,7 +12,8 @@
 	"settings": "Haz click<a href=\"%1\">aquí</a> para visitar la página de configuración de etiquetas (tags).",
 	"name": "Nombre de Etiqueta (tag)",
 
-	"alerts.editing": "Editing tag(s)",
+	"alerts.editing-multiple": "Editando múltiples etiquetas (tags)",
+	"alerts.editing-x": "Editar \"%1\" etiqueta (tag)",
 	"alerts.confirm-delete": "¿Quieres borrar las etiquetas (tags) seleccionadas?",
 	"alerts.update-success": "¡Etiqueta (tag) Actualizada!"
 }

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

@@ -15,7 +15,6 @@
 	"headers.acah": "Access-Control-Allow-Headers",
 	"hsts": "Seguridad estricta del transporte",
 	"hsts.enabled": "Enabled HSTS (recommended)",
-	"hsts.maxAge": "HSTS Max Age",
 	"hsts.subdomains": "Include subdomains in HSTS header",
 	"hsts.preload": "Allow preloading of HSTS header",
 	"hsts.help": "If enabled, an HSTS header will be set for this site. You can elect to include subdomains and preloading flags in your header. If in doubt, you can leave these unchecked. <a href=\"%1\">More information <i class=\"fa fa-external-link\"></i></a>",

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

@@ -1,8 +1,6 @@
 {
 	"site-settings": "Ajustes del Sitio",
 	"title": "Título del Sitio",
-	"title.short": "Short Title",
-	"title.short-placeholder": "If no short title is specified, the site title will be used",
 	"title.url": "URL",
 	"title.url-placeholder": "La URL del título del sitio",
 	"title.url-help": "Cuando se hace click en el título, enviar a los usuarios a esta dirección. Si se deja en blanco, el usuario será enviado al índice del foro.",
@@ -33,9 +31,5 @@
 	"outgoing-links": "Enlaces a sitios externos",
 	"outgoing-links.warning-page": "Usar Página de Advertencia para Enlaces a Sitios Externos",
 	"search-default-sort-by": "Orden por defecto de la búsqueda",
-	"outgoing-links.whitelist": "Dominios permitidos que podrán evitar la página de advertencia",
-	"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"
-}
+	"outgoing-links.whitelist": "Dominios permitidos que podrán evitar la página de advertencia"
+}

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

@@ -3,7 +3,6 @@
 	"private-groups": "Grupos Privados",
 	"private-groups.help": "Si se habilita, unirse a grupos requiere la aprobación del dueño del grupo <em>(Por defecto: habilitado)</em>",
 	"private-groups.warning": "<strong>¡Cuidado!</strong> Si esta opción está deshabilitada y tienes grupos privados, se convertirán en grupos públicos automáticamente.",
-	"allow-multiple-badges": "Allow Multiple Badges",
 	"allow-multiple-badges-help": "Esta opción puede ser usadas para permitir a los usuarios seleccionar múltiples medallas de grupo, requiere de soporte del theme/plantilla.",
 	"max-name-length": "Longitud Máxima de Nombre de Grupo",
 	"max-title-length": "Longitud máxima del título del grupo",

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

@@ -9,7 +9,7 @@
 	"allow-login-with.email": "Solo Email",
 	"account-settings": "Configuración de la Cuenta",
 	"gdpr_enabled": "Habilitar la recolección del consentimiento GDPR",
-	"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_help": "When enabled, all new registrants will be required to explicitly give consent for data collection and usage under the <a href=\"https://eugdpr.org/the-regulation/gdpr-faqs/\">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.",
 	"disable-username-changes": "Desactivar cambios de nombre de usuario",
 	"disable-email-changes": "Desactivar cambios de email",
 	"disable-password-changes": "Desactivar cambios de contraseña",
@@ -76,4 +76,4 @@
 	"categoryWatchState.watching": "Vigilando ",
 	"categoryWatchState.notwatching": "Not Watching",
 	"categoryWatchState.ignoring": "Ignorando"
-}
+}