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,403 +1,3 @@
-#### 1.13.3 (2020-05-08)
-
-##### Chores
-
-*  incrementing version number - v1.13.3 (ee583e80)
-*  bump persona (d2bd746c)
-*  incrementing version number - v1.13.2 (beafd613)
-* **deps:**
-  *  update dependency coveralls to v3.1.0 (5ed4a108)
-  *  pin dependency @apidevtools/swagger-parser to 9.0.1 (51eccef5)
-  *  update dependency husky to v4.2.5 (30a25983)
-  *  update dependency husky to v4.2.4 (0a650118)
-  *  update dependency lint-staged to v10.1.3 (a9e68639)
-  *  update dependency nyc to v15.0.1 (#8231) (a3789e28)
-  *  update dependency lint-staged to v10.1.2 (#8235) (e1919c90)
-  *  update dependency lint-staged to v10.1.1 (944a6f58)
-  *  update dependency lint-staged to v10.1.0 (30bd233b)
-  *  update dependency eslint-config-airbnb-base to v14.1.0 (811c3aee)
-  *  update dependency jsdom to v16.2.2 (c5a7242d)
-  *  update dependency eslint-plugin-import to v2.20.2 (b92c1600)
-  *  update dependency lint-staged to v10.0.10 (0ad4b556)
-  *  update dependency coveralls to v3.0.11 (14458087)
-  *  update dependency smtp-server to v3.6.0 (22681945)
-  *  update dependency mocha to v7.1.1 (#8215) (c5356541)
-  *  update dependency grunt to v1.1.0 (#8214) (b0864e7c)
-  *  update dependency husky to v4.2.3 (#8162) (776fe9d2)
-  *  update dependency lint-staged to v10.0.8 (#8180) (13d8f6f1)
-  *  update dependency eslint-plugin-import to v2.20.1 (#8081) (4cdb3131)
-  *  update dependency jsdom to v16.2.1 (#8165) (fbd95a50)
-  *  update dependency husky to v4.2.2 (#8160) (f4ed35c9)
-  *  update dependency jsdom to v16 (#8114) (1037de02)
-
-##### Documentation Changes
-
-*  updated changelog (146388aa)
-
-##### New Features
-
-*  allow activating additional plugins for testing via config.json (a969c5ce)
-*  move plugin tests to separate file (3a23ddab)
-*  remove node14 for now (a72e4429)
-*  reduce infinite scroll area (3fcbd691)
-*  manifest.json improvements from #8126 (#8264) (6e5ebb61)
-*  show error if json is invalid (15345627)
-*  moved component specs into separate files (cd506557)
-*  added UserObject, UserObjectFull, Breadcrumb, Pagination component (64d79fe5)
-*  added some summary and descriptions (ae3e90d6)
-*  add some descriptions (442c018e)
-*  common schema (eade13f9)
-*  openapi component (1af5507a)
-*  add page query param to docs (9987813f)
-*  tag route doc (bbddaadf)
-*  local redoc view on development mode only (1136a369)
-*  added auto-generated, slimmed-down openapi 3.0 file for read api (7b155dab)
-*  add parent cids to body class (23571224)
-*  add 2 hooks for modifying privileges (d080c7b0)
-*  add user ip to admin/dev/info (5e91a67e)
-*  change option name (cba5b23e)
-*  add no-build to ./nodebb setup (476f6717)
-*  add awaitable socket.emit (4083a6e3)
-*  settings sorted list (#8170) (3c9689a5)
-*  guard against accidental ommision (79737c53)
-* **openapi:**
-  *  merging openapi-test branch into master (8387178b)
-  *  move all commonprops out for commonprops component (65c78de6)
-  *  added template to commonprops (2425f453)
-
-##### Bug Fixes
-
-*  #8302, send string to writeFileSync (d09bd2cf)
-*  winston showing json object (7d081843)
-*  sortable topics even if only 1 pinned topic (6765de3d)
-*  #8298, use class name added by jQueryUI instead (dd2bc189)
-*  topic search shortcut for macs (f2c725c6)
-*  #8297, uids.length is different than topics.length (0431d75f)
-*  #8297 guest handles shown in category.tpl (fcb81cb8)
-*  only add to set if numRecentReplies>0 (16a98eaf)
-*  #8293, don't show error if there are no self messages (be305410)
-*  failing tests @julianlam (ecd622fd)
-*  #3321, run plugin tests for installed plugins (a6bb9f43)
-*  remove deprecated mocha.opts (3d0db963)
-*  spec (84383d39)
-*  #8290, if there are no filters go to ?reset=1 (9839346e)
-*  #8283, update gdpr link again (2d076344)
-*  add missing await (4f1128fd)
-*  #8287, dont readd user after deletion (9d153fd3)
-*  missing await (4d6b2ec3)
-*  #8286, rescind notif when its resolved/rejected (0391856d)
-*  #8284, parse ToS on register (0ca84bd9)
-*  #8283, point to official site (17d664e0)
-*  jquery xhtml violations (275e837b)
-* #8274 Don't escape HTML in manage users (#8275) (4855f1de)
-*  crash in topic controller (0c7c70ed)
-*  crash when res.locals.linkTags is undefined (7cab2b0f)
-*  #8272 user link in digest email (e80b8101)
-*  tag of /api/unread/total (9ffdab02)
-*  response hook logic (5a1c6ee7)
-*  remove upload picture test (avatars) (6edf02d4)
-*  remove tests related to group covers, as route is gone (442fe65f)
-*  #8269, return array of topics from hook (4eafe0f0)
-*  remove dead picture upload code #8260 (ef52461f)
-*  path.resolve to logs file (5bcaf715)
-*  only trigger infinitescroll on scroll end (ba6d3fd3)
-*  wrong data returned in available.groups (c7ea84a2)
-*  no focus on find user modal (1b425ef1)
-*  accidental fp precision on flag and acp dash graphs (bcbf98aa)
-*  #8232, unresolvable session mismatch on register cancel (f2f6fbf1)
-*  pin jquery to 3.4.1, #8252 (e440d617)
-*  #8249, don't send move notifications for deleted posts/topics (d77036db)
-*  missing descriptions for common properties (7b31fb34)
-*  some definitions in read API spec (03739b6f)
-*  tagged all routes in read api spec (455d42bc)
-*  override ACAO header for read API spec file (240d9091)
-*  throw error if topic does not exist (59cf0e80)
-*  hookname (e93578b8)
-*  #8230, add hook getUserDataByUserSlug (0d1b5a7f)
-*  ignore case for group details route (15d6975e)
-*  lint (740e598a)
-*  lint (8e23dec8)
-*  #8221, fix parent selection (08031730)
-*  invite properly (071506eb)
-*  admins not seeing invite button (8f4b99a4)
-*  #8217, add missing lang key (0b5fac75)
-*  #8206 first message in chat has false `newSet` (93acd139)
-*  #8203, fix user invites refreshing page (2f9c7c62)
-*  #8202, filter non-existing users in search by uid (f07f4f8e)
-*  notification bodyShort truncated if there is a comma in topic title (266061c3)
-*  hsts max-age missing translation (b67af70d)
-*  call next (80f1bcad)
-*  try travis fix again (05bee629)
-*  try fixing psql on travis (bc9e92a1)
-*  dont let regular users see other users watched categories (cf6eadb9)
-*  also fix updating bookmark if sorting is newest_to_oldest (6e5de39b)
-*  #8188, fix bookmark if sorting is newest_to_oldest (32ada7c4)
-*  duplicate ID + label (ac241fb8)
-*  #8184 global mods unable to revoke other user sessions (f0db240a)
-*  return null if field does not exist (e72a29b3)
-*  #8179, limit length of location/website/fullname, check grouptitle (14e78667)
-*  tag key (32636755)
-*  #8175 (bc93b567)
-*  #8168 re-allowing slashes in homePageRoute (667608a0)
-*  tweak to session validation in addHeaders (eddbd868)
-*  only call clearCookie for logged in users (630f5d5b)
-*  #6422, update deleted/restored messages (06703408)
-*  #8163, prevent account deletion (4d0636f8)
-*  register (5a0c7c14)
-*  #8157, update recent tid when post is moved (e7495440)
-*  tests (b73aa84d)
-*  move start/stop every iteration (dd3893b1)
-*  #8154, move start/stop every iteration (300c04ce)
-*  #8154, respect stop (690bb69d)
-*  #8156 dont allow loading members from hidden groups (f23bc347)
-*  #8155, don't validate name on update if groupName didn't change (03a02e5d)
-*  return correct number of suggested topics (236e1e68)
-*  #8151, don't crash if taskbar doesn't have element (2e794801)
-*  logic for determining dailyStats hour vars (398f0120)
-*  fix daily analytics being one day off (9ecdb92f)
-*  remove debug line (0b9ad416)
-*  no decimal places for category analytics (14655f87)
-*  #8142, broken site if no server-side session (#8148) (d6e3f3f0)
-*  #8144 pluginHooks in maintenance mode middleware (0885ec68)
-* **deps:**
-  *  #8298 bump persona (158d9231)
-  *  update dependency nodebb-plugin-composer-default to v6.3.25 (89d17647)
-  *  update dependency jquery to v3.5.1 [security] (#8281) (a69f0b29)
-  *  update dependency nodebb-rewards-essentials to v0.1.3 (#8289) (919034a7)
-  *  update dependency mongodb to v3.5.7 (#8279) (25d509c4)
-  *  actually, swagger-parser is a dev dependency (d09c6ae0)
-  *  missing @apidevtools/swagger-parser (f1720735)
-  *  update dependency nodebb-theme-persona to v10.1.37 (#8258) (b0c30ceb)
-  *  update dependency archiver to v4 (28777f67)
-  *  update dependency mongodb to v3.5.6 (#8256) (49236067)
-  *  bump dependencies (#8239) (e68156e1)
-  *  update dependency jsesc to v3.0.1 (#8243) (92b55ef5)
-  *  update dependency jsesc to v3 (bb70cebb)
-  *  update dependency pg to v8 (#8227) (ac98775f)
-  *  update dependency validator to v13 (f497ee62)
-  *  update dependency sharp to v0.25.2 (#8220) (dd660c87)
-  *  bump markdown (ee6cb412)
-  *  update dependency mongodb to v3.5.5 (#8205) (5535c50c)
-  *  update dependency sitemap to v6 (#8198) (2052f14c)
-  *  update dependency nodebb-plugin-composer-default to v6.3.23 (6d98d5a1)
-  *  update dependency sharp to v0.25.1 (#8199) (21e91c91)
-  *  update dependency nodebb-plugin-composer-default to v6.3.22 (#8193) (e01f05e3)
-  *  update dependency nodebb-theme-slick to v1.2.29 (#8177) (9daa21ff)
-  *  update dependency nodebb-theme-vanilla to v11.1.16 (#8178) (7d6a983b)
-  *  update dependency nodebb-theme-persona to v10.1.35 (#8176) (3acc24b0)
-  *  update dependency sharp to v0.24.1 (#8164) (7cc63f7d)
-  *  update dependency mongodb to v3.5.3 (#8161) (4b907137)
-  *  update dependency nodebb-widget-essentials to v4.1.0 (#8159) (a5f3c2a2)
-  *  update dependency request to v2.88.2 (#8158) (7fde180a)
-  *  update dependency redis to v3 (#8152) (ef964b11)
-  *  update dependency rimraf to v3.0.2 (#8153) (d8efc6b6)
-* **openapi:**
-  *  v14 test fix (23a0b8c5)
-  *  remove account and group upload routes (d342a28c)
-  *  more fleshing out (058a15db)
-  *  fleshed out admin routes (bae88e08)
-  *  added some descriptions (ab4bd7e1)
-  *  added PostsObject component (2395d2be)
-  *  finished moving all category objects out (23dd2727)
-  *  changed some descriptions (c939f8c6)
-  *  added CategoryObject component (55d0a9ff)
-  *  removed repeated breadcrumb blocks in favour of $ref (646fac1e)
-  *  remove all repeated pagination blocks in favour of (ac579f9d)
-  *  removed warning for category mods route (1cf62095)
-  *  normalising the file for programmatic updates (3a5c6e07)
-
-##### Other Changes
-
-*  #8298 (2e57d8ac)
-* post.updatePostVoteCount (b25b51bd)
-* //github.com/NodeBB/NodeBB (5e140454)
-* categories.updateRecentTid (6c59683b)
-* categories.updateRecentTid (51933c1f)
-* router.page, dep. filter variant (0053e779)
-* flags as well (5ebcdb18)
-*  crash when res.locals.linkTags is undefined" (fe03effe)
-* //github.com/NodeBB/NodeBB (87a6ff0d)
-*  cnpm and pnpm (#8222) (e6a1741c)
-* //github.com/NodeBB/NodeBB (7ae76477)
-*  openapi component" (683e5851)
-*  override ACAO header for read API spec file" (c82a2637)
-* password.change (00e299e9)
-* topic.tools.load (5aa76cdf)
-*  #8154, move start/stop every iteration" (4abe5eb7)
-
-##### Refactors
-
-*  match core field name pinned (478ed6c1)
-*  getUsersCSV to use batch lib (1efb238a)
-*  reorganized socket.io admin modules (e1c6c3b2)
-
-#### 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

@@ -81,11 +81,9 @@
     "notificationType_upvote": "notification",
     "notificationType_new-topic": "notification",
     "notificationType_new-reply": "notification",
-    "notificationType_post-edit": "notification",
     "notificationType_follow": "notification",
     "notificationType_new-chat": "notification",
     "notificationType_group-invite": "notification",
-    "notificationType_group-request-membership": "notification",
     "notificationType_mention": "notification",
     "notificationType_new-register": "notification",
     "notificationType_post-queue": "notification",
@@ -111,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.4-0",
+    "version": "1.13.0",
     "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -29,125 +29,123 @@
         ]
     },
     "dependencies": {
-        "ace-builds": "^1.4.9",
+        "ace-builds": "^1.2.9",
-        "archiver": "^4.0.0",
+        "archiver": "^3.0.0",
-        "async": "^3.2.0",
+        "async": "^3.0.1",
-        "autoprefixer": "^9.7.6",
+        "autoprefixer": "^9.4.6",
         "bcryptjs": "2.4.3",
-        "benchpressjs": "^2.0.2",
+        "benchpressjs": "^2.0.0",
-        "body-parser": "^1.19.0",
+        "body-parser": "^1.18.2",
-        "bootstrap": "^3.4.1",
+        "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",
+        "clipboard": "^2.0.1",
-        "colors": "^1.4.0",
+        "colors": "^1.1.2",
-        "commander": "^5.0.0",
+        "commander": "^3.0.0",
-        "compression": "^1.7.4",
+        "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-multiparty": "^2.1.0",
-        "connect-pg-simple": "^6.1.0",
+        "connect-pg-simple": "^6.0.0",
-        "connect-redis": "4.0.4",
+        "connect-redis": "4.0.3",
-        "cookie-parser": "^1.4.5",
+        "cookie-parser": "^1.4.3",
-        "cron": "^1.8.2",
+        "cron": "^1.3.0",
-        "cropperjs": "^1.5.6",
+        "cropperjs": "^1.2.2",
-        "csurf": "^1.11.0",
+        "csurf": "^1.9.0",
         "daemon": "^1.1.0",
-        "diff": "^4.0.2",
+        "diff": "^4.0.1",
-        "express": "^4.17.1",
+        "express": "^4.16.2",
-        "express-session": "^1.17.0",
+        "express-session": "^1.15.6",
-        "express-useragent": "^1.0.13",
+        "express-useragent": "^1.0.12",
-        "graceful-fs": "^4.2.3",
+        "graceful-fs": "^4.1.11",
-        "helmet": "^3.22.0",
+        "helmet": "^3.11.0",
-        "html-to-text": "^5.1.1",
+        "html-to-text": "^5.0.0",
-        "ipaddr.js": "^1.9.1",
+        "ipaddr.js": "^1.5.4",
-        "jquery": "3.5.1",
+        "jquery": "^3.2.1",
-        "jsesc": "3.0.1",
+        "jsesc": "2.5.2",
-        "json-2-csv": "^3.6.2",
+        "json-2-csv": "^3.0.0",
-        "jsonwebtoken": "^8.5.1",
+        "jsonwebtoken": "^8.4.0",
-        "less": "^3.11.1",
+        "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",
+        "mime": "^2.2.0",
-        "mkdirp": "^1.0.4",
+        "mkdirp": "^0.5.1",
-        "mongodb": "3.5.7",
+        "mongodb": "3.4.0",
-        "morgan": "^1.10.0",
+        "morgan": "^1.9.1",
-        "mousetrap": "^1.6.5",
+        "mousetrap": "^1.6.1",
-        "@nodebb/mubsub": "^1.6.0",
+        "mubsub-nbb": "^1.5.1",
         "nconf": "^0.10.0",
-        "nodebb-plugin-composer-default": "6.3.28",
+        "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-markdown": "8.11.0",
-        "nodebb-plugin-mentions": "2.7.4",
+        "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-persona": "10.1.30",
-        "nodebb-theme-slick": "1.2.29",
+        "nodebb-theme-slick": "1.2.28",
-        "nodebb-theme-vanilla": "11.1.16",
+        "nodebb-theme-vanilla": "11.1.12",
-        "nodebb-widget-essentials": "4.1.0",
+        "nodebb-widget-essentials": "4.0.17",
-        "nodemailer": "^6.4.6",
+        "nodemailer": "^6.0.0",
-        "passport": "^0.4.1",
+        "passport": "^0.4.0",
         "passport-local": "1.0.0",
-        "pg": "^8.0.2",
+        "pg": "^7.4.0",
-        "pg-cursor": "^2.1.9",
+        "pg-cursor": "^2.0.0",
-        "postcss": "7.0.27",
+        "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",
+        "redis": "2.8.0",
-        "request": "2.88.2",
+        "request": "2.88.0",
-        "request-promise-native": "^1.0.8",
+        "rimraf": "3.0.0",
-        "rimraf": "3.0.2",
         "rss": "^1.2.2",
-        "sanitize-html": "^1.23.0",
+        "sanitize-html": "^1.16.3",
-        "semver": "^7.2.1",
+        "semver": "^7.0.0",
-        "serve-favicon": "^2.5.0",
+        "serve-favicon": "^2.4.5",
-        "sharp": "0.25.2",
+        "sharp": "0.23.4",
-        "sitemap": "^6.1.0",
+        "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.2.0",
-        "@commitlint/cli": "8.3.5",
+        "@commitlint/config-angular": "8.2.0",
-        "@commitlint/config-angular": "8.3.4",
+        "coveralls": "3.0.9",
-        "coveralls": "3.1.0",
+        "eslint": "6.7.0",
-        "eslint": "7.0.0",
+        "eslint-config-airbnb-base": "14.0.0",
-        "eslint-config-airbnb-base": "14.1.0",
+        "eslint-plugin-import": "2.18.2",
-        "eslint-plugin-import": "2.20.2",
+        "grunt": "1.0.4",
-        "grunt": "1.1.0",
         "grunt-contrib-watch": "1.1.0",
-        "husky": "4.2.5",
+        "husky": "3.1.0",
-        "jsdom": "16.2.2",
+        "jsdom": "15.2.1",
-        "lint-staged": "10.2.0",
+        "lint-staged": "9.4.2",
-        "mocha": "7.1.2",
+        "mocha": "6.2.2",
         "mocha-lcov-reporter": "1.3.0",
-        "nyc": "15.0.1",
+        "nyc": "14.1.1",
-        "smtp-server": "3.6.0"
+        "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>",
+	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</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",
+	"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"
-}

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/notifications.json

@@ -35,7 +35,6 @@
     "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> أنشأ موضوعًا جديدًا: <strong>%2</strong>",
-    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> صار يتابعك.",
     "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
     "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
@@ -54,7 +53,6 @@
     "notificationType_upvote": "عندما يوافقك احدهم على منشورك",
     "notificationType_new-topic": "When someone you follow posts a topic",
     "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
-    "notificationType_post-edit": "When a post is edited in a topic you are watching",
     "notificationType_follow": "When someone starts following you",
     "notificationType_new-chat": "When you receive a chat message",
     "notificationType_group-invite": "When you receive a group invite",

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>",
+	"you-are-on": "Информация — Вие сте на <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</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": "Домейни, за които да не се показва предупредителната страница",
+	"outgoing-links.whitelist": "Домейни, за които да не се показва предупредителната страница"
-	"site-colors": "Мета-данни за цвета на уеб сайта",
+}
-	"theme-color": "Цвят на темата",
-	"background-color": "Фонов цвят",
-	"background-color-help": "Цвят, който да се използва като фон за началния екран, когато уеб сайтът е инсталиран като приложение"
-}

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/notifications.json

@@ -35,7 +35,6 @@
     "user_posted_to_dual": "<strong>%1</strong> и <strong>%2</strong> публикуваха отговори на: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> и %2 други публикуваха отговори на: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> публикува нова тема: <strong>%2</strong>",
-    "user_edited_post": "<strong>%1</strong> редактира публикация в <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> започна да Ви следва.",
     "user_started_following_you_dual": "<strong>%1</strong> и <strong>%2</strong> започнаха да Ви следват.",
     "user_started_following_you_multiple": "<strong>%1</strong> и %2 започнаха да Ви следват.",
@@ -54,7 +53,6 @@
     "notificationType_upvote": "Когато някой гласува положително за Ваша публикация",
     "notificationType_new-topic": "Когато някой, когото следвате, публикува тема",
     "notificationType_new-reply": "Когато бъде публикуван нов отговор в тема, която следвате",
-    "notificationType_post-edit": "Когато бъде редактирана публикация в тема, която следите",
     "notificationType_follow": "Когато някой започне да Ви следва",
     "notificationType_new-chat": "Когато получите съобщение в разговор",
     "notificationType_group-invite": "Когато получите покана за група",

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>",
+	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</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",
+	"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"
-}

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/notifications.json

@@ -35,7 +35,6 @@
     "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
-    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> আপনাকে অনুসরন করা শুরু করেছেন।",
     "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
     "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
@@ -54,7 +53,6 @@
     "notificationType_upvote": "When someone upvotes your post",
     "notificationType_new-topic": "When someone you follow posts a topic",
     "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
-    "notificationType_post-edit": "When a post is edited in a topic you are watching",
     "notificationType_follow": "When someone starts following you",
     "notificationType_new-chat": "When you receive a chat message",
     "notificationType_group-invite": "When you receive a group invite",

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>",
+	"you-are-on": "Informace – jste na <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</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",
+	"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"
-}

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/notifications.json

@@ -35,7 +35,6 @@
     "user_posted_to_dual": "<strong>%1</strong> a <strong>%2</strong> odpověděli na: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> a %2 další/ch odpověděli na <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> založil nové téma: <strong>%2</strong>",
-    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> vás začal sledovat.",
     "user_started_following_you_dual": "<strong>%1</strong> a <strong>%2</strong> vás začali sledovat.",
     "user_started_following_you_multiple": "<strong>%1</strong> a %2 další/ch vás začali sledovat.",
@@ -54,7 +53,6 @@
     "notificationType_upvote": "Vyjádří-li někdo souhlas s vaším příspěvkem",
     "notificationType_new-topic": "Začne-li někdo sledovat příspěvky a téma",
     "notificationType_new-reply": "Bude-li přidán nový příspěvek v tématu, které sledujete",
-    "notificationType_post-edit": "When a post is edited in a topic you are watching",
     "notificationType_follow": "Začne-li vás někdo sledovat",
     "notificationType_new-chat": "Obdržíte-li novou konverzační zprávu",
     "notificationType_group-invite": "Obdržíte-li pozvání ke skupině",

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>",
+	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</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",
+	"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"
-}

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/notifications.json

@@ -35,7 +35,6 @@
     "user_posted_to_dual": "<strong>%1</strong> og <strong>%2</strong> har skrevet svar til: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> og %2 andre har skrevet svar til: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> har oprettet en ny tråd: <strong>%2</strong>",
-    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> har valgt at følge dig.",
     "user_started_following_you_dual": "<strong>%1</strong> og <strong>%2</strong> har valgt at følge dig.",
     "user_started_following_you_multiple": "<strong>%1</strong> og %2 har valgt at følge dig.",
@@ -54,7 +53,6 @@
     "notificationType_upvote": "When someone upvotes your post",
     "notificationType_new-topic": "When someone you follow posts a topic",
     "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
-    "notificationType_post-edit": "When a post is edited in a topic you are watching",
     "notificationType_follow": "When someone starts following you",
     "notificationType_new-chat": "When you receive a chat message",
     "notificationType_group-invite": "When you receive a group invite",

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>",
+	"you-are-on": "Info - Sie verwenden <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</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": "Email Digests",
-	"subscriptions.disable": "Deaktivierung der Email Zusammenfassungen",
+	"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",
+	"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"
-}

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.day": "Your Daily Digest",
-    "digest.title.week": "Deine wöchentliche Zusammenfassung",
+    "digest.title.week": "Your Weekly Digest",
-    "digest.title.month": "Deine monatliche Zusammenfassung",
+    "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/notifications.json

@@ -35,7 +35,6 @@
     "user_posted_to_dual": "<strong>%1</strong> und <strong>%2</strong> haben auf <strong>%3</strong> geantwortet.",
     "user_posted_to_multiple": "<strong>%1</strong> und %2 andere Nutzer haben auf <strong>%3</strong> geantwortet.",
     "user_posted_topic": "<strong>%1</strong> hat ein neues Thema erstellt: <strong>%2</strong>",
-    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> folgt dir jetzt.",
     "user_started_following_you_dual": "<strong>%1</strong> und <strong>%2</strong> folgen dir jetzt.",
     "user_started_following_you_multiple": "<strong>%1</strong> und %2 andere Nutzer folgen dir jetzt.",
@@ -54,7 +53,6 @@
     "notificationType_upvote": "Wenn jemand deinen beitrag positiv bewertet",
     "notificationType_new-topic": "Wenn jemand dem du folgst einen Beitrag erstellt",
     "notificationType_new-reply": "Wenn es eine neue Antwort auf ein Thema das du beobachtest gibt",
-    "notificationType_post-edit": "When a post is edited in a topic you are watching",
     "notificationType_follow": "Wenn dir jemand neues folgt",
     "notificationType_new-chat": "Wenn du eine Chat Nachricht erhältst",
     "notificationType_group-invite": "Wenn du eine Gruppeneinladung erhältst",

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>",
+	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</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",
+	"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"
-}

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/notifications.json

@@ -35,7 +35,6 @@
     "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
-    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> started following you.",
     "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
     "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
@@ -54,7 +53,6 @@
     "notificationType_upvote": "When someone upvotes your post",
     "notificationType_new-topic": "When someone you follow posts a topic",
     "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
-    "notificationType_post-edit": "When a post is edited in a topic you are watching",
     "notificationType_follow": "When someone starts following you",
     "notificationType_new-chat": "When you receive a chat message",
     "notificationType_group-invite": "When you receive a group invite",

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>",
+	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</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",
+	"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"
-}

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/notifications.json

@@ -39,7 +39,6 @@
 	"user_posted_to_dual" : "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
 	"user_posted_to_multiple" : "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
 	"user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
-	"user_edited_post" : "<strong>%1</strong> has edited a post in <strong>%2</strong>",
 	"user_started_following_you": "<strong>%1</strong> started following you.",
 	"user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
 	"user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
@@ -60,7 +59,6 @@
 	"notificationType_upvote": "When someone upvotes your post",
 	"notificationType_new-topic": "When someone you follow posts a topic",
 	"notificationType_new-reply": "When a new reply is posted in a topic you are watching",
-	"notificationType_post-edit": "When a post is edited in a topic you are watching",
 	"notificationType_follow": "When someone starts following you",
 	"notificationType_new-chat": "When you receive a chat message",
 	"notificationType_group-invite": "When you receive a group invite",

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>",
+	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</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",
+	"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"
-}

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/notifications.json

@@ -35,7 +35,6 @@
     "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
-    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> started following you.",
     "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
     "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
@@ -54,7 +53,6 @@
     "notificationType_upvote": "When someone upvotes your post",
     "notificationType_new-topic": "When someone you follow posts a topic",
     "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
-    "notificationType_post-edit": "When a post is edited in a topic you are watching",
     "notificationType_follow": "When someone starts following you",
     "notificationType_new-chat": "When you receive a chat message",
     "notificationType_group-invite": "When you receive a group invite",

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>",
+	"you-are-on": "Info - You are on <strong>%1:%2</strong>",
-	"ip": "IP <strong>%1</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",
+	"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"
-}

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/notifications.json

@@ -35,7 +35,6 @@
     "user_posted_to_dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> and %2 others have posted replies to: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> has posted a new topic: <strong>%2</strong>",
-    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
     "user_started_following_you": "<strong>%1</strong> started following you.",
     "user_started_following_you_dual": "<strong>%1</strong> and <strong>%2</strong> started following you.",
     "user_started_following_you_multiple": "<strong>%1</strong> and %2 others started following you.",
@@ -54,7 +53,6 @@
     "notificationType_upvote": "When someone upvotes your post",
     "notificationType_new-topic": "When someone you follow posts a topic",
     "notificationType_new-reply": "When a new reply is posted in a topic you are watching",
-    "notificationType_post-edit": "When a post is edited in a topic you are watching",
     "notificationType_follow": "When someone starts following you",
     "notificationType_new-chat": "When you receive a chat message",
     "notificationType_group-invite": "When you receive a group invite",