fix: inability for admins with setting privilege to save plugin settings

As it is not fired during middleware.processRender

.github/ISSUE_TEMPLATE.md

@@ -9,6 +9,7 @@
 
 - **NodeBB version:** 
 - **NodeBB git hash:** 
+- **NodeJS version:**
 <!-- (to find your git hash, execute `git rev-parse HEAD` from the main NodeBB directory) -->
 - **Installed NodeBB Plugins:** 
 <!-- (to find installed plugins run ./nodebb plugins) -->

CHANGELOG.md

@@ -1,3 +1,80 @@
+#### v1.15.2 (2020-11-18)
+
+##### Chores
+
+*  incrementing version number - v1.15.2-beta.1 (20c05e80)
+*  remove debug log (0a0b4661)
+*  incrementing version number - v1.15.2-beta.0 (996174a1)
+* **deps:**  update dependency smtp-server to v3.8.0 (5f5f0edb)
+
+##### Documentation Changes
+
+*  openapi schema for user/group exist check, session deletion (bcccb331)
+
+##### New Features
+
+*  #5274 (4e9b10ab)
+*  #4456 (fb567a7a)
+*  #8475, allow flagging self posts (a6afcfd5)
+*  #7550, show message if post is queued when js is disabled (120999bf)
+*  #8171, add oldCategory if topic is moved (35f932cd)
+*  #8204, separate notification type for group chats (b44ddecd)
+*  add test for custom translations (7928036a)
+*  https://github.com/NodeBB/NodeBB/issues/8147 (1d6bcbeb)
+*  invites regardless of registration type, invite privilege, groups to join on acceptance (#8786) (3ccebf11)
+*  add nodejs version to issue template (29c2ca94)
+*  allow groups to specify which cids to show member posts from (#8875) (8518404e)
+* **api:**  account deletion routes for the Write API (#8881) (a0b7a823)
+* **deps:**  benchpressjs@2.2.1 (#8887) (d30ea256)
+
+##### Bug Fixes
+
+*  #6407, fix feeds (fa4177c3)
+*  navigation highlight (62b62821)
+*  benchpress warnings (a87ccccc)
+*  benchpress warnings (dfdc0c42)
+*  internal helper method hasGlobalPrivilege, DRY (e1d7c4d8)
+*  spec (2f4653a3)
+*  #8884, remove header/footer cache (e4d2764d)
+*  check tid in event handlers client side (9dac9630)
+*  #8883 (f14e42d8)
+*  #8872 missing admin/menu language key+fallback (fdab76f8)
+*  run every hour, dont show message if average_time is 0 (51b7eca1)
+*  add back test timeout for exports (b3e00489)
+*  pass length to messaging checkContent hook (dc9668e4)
+* **deps:**
+  *  update dependency nodebb-theme-persona to v10.2.74 (#8905) (5f6137f0)
+  *  update dependency nodebb-theme-persona to v10.2.73 (#8904) (c2019b7b)
+  *  update dependency nodebb-plugin-composer-default to v6.4.7 (#8902) (b7b1f203)
+  *  update dependency nodebb-theme-persona to v10.2.72 (#8903) (bee8cfe4)
+  *  update dependency nodebb-theme-vanilla to v11.3.3 (422aa7f0)
+  *  update dependency nodebb-theme-persona to v10.2.71 (3b6e71d5)
+  *  update dependency nodebb-theme-persona to v10.2.70 (d6dd1cb6)
+  *  update dependency nodebb-theme-slick to v1.3.2 (2ce1fcd3)
+  *  update dependency nodebb-theme-vanilla to v11.3.2 (9f2d0d42)
+  *  update dependency nodebb-theme-persona to v10.2.69 (15810643)
+  *  update dependency sharp to v0.26.3 (84d54577)
+  *  update dependency nodebb-plugin-mentions to v2.13.5 (dde9f189)
+  *  update dependency json2csv to v5.0.5 (b63b7ae5)
+  *  update dependency benchpressjs to v2.2.2 (d1e804aa)
+  *  update dependency nodebb-theme-vanilla to v11.3.1 (#8878) (85aaeded)
+  *  update dependency nodebb-theme-slick to v1.3.1 (bbfb276a)
+  *  update dependency nodebb-theme-persona to v10.2.68 (ec70329a)
+  *  update dependency nodebb-plugin-spam-be-gone to v0.7.6 (#8877) (45922fae)
+  *  update dependency nodebb-plugin-spam-be-gone to v0.7.5 (#8876) (48e82520)
+  *  update dependency nodebb-plugin-spam-be-gone to v0.7.4 (#8874) (eab27f23)
+
+##### Refactors
+
+*  client-side handlers for user invitations (d83eb7f8)
+*  async/await controllers/index.js (5598130a)
+*  less dupe code (8fbe8324)
+
+##### Tests
+
+*  new api test to ensure each path's parameters are defined in context (97842c43)
+*  updated test name to be more specific (319cfeaa)
+
 #### v1.15.1 (2020-11-11)
 
 ##### Chores

Gruntfile.js

@@ -143,8 +143,17 @@ module.exports = function (grunt) {
 		if (worker) {
 			worker.kill();
 		}
+
+		const execArgv = [];
+		const inspect = process.argv.find(a => a.startsWith('--inspect'));
+
+		if (inspect) {
+			execArgv.push(inspect);
+		}
+
 		worker = fork('app.js', args, {
-			env: env,
+			env,
+			execArgv,
 		});
 	}
 

install/data/defaults.json

@@ -86,6 +86,7 @@
     "notificationType_post-edit": "notification",
     "notificationType_follow": "notification",
     "notificationType_new-chat": "notification",
+    "notificationType_new-group-chat": "notification",
     "notificationType_group-invite": "notification",
     "notificationType_group-request-membership": "notification",
     "notificationType_mention": "notification",
@@ -113,14 +114,17 @@
     "email:smtpTransport:pool": false,
     "hideFullname": 0,
     "hideEmail": 0,
+    "showFullnameAsDisplayName": 0,
     "allowGuestHandles": 0,
     "guestsIncrementTopicViews": 1,
+    "allowGuestReplyNotifications": 1,
     "incrementTopicViewsInterval": 60,
     "recentMaxTopics": 200,
     "disableRecentCategoryFilter": 0,
     "maximumRelatedTopics": 0,
     "disableEmailSubscriptions": 0,
     "emailConfirmInterval": 10,
+    "removeEmailNotificationImages": 0,
     "inviteExpiration": 7,
     "digestHour": 17,
     "passwordExpiryDays": 0,
@@ -136,6 +140,9 @@
     "necroThreshold": 7,
     "categoryWatchState": "watching",
     "submitPluginUsage": 1,
+    "showAverageApprovalTime": true,
+    "autoApproveTime": 0,
     "maxUserSessions": 10,
-    "useCompression": 0
+    "useCompression": 0,
+    "updateUrlWithPostIndex": 1
 }

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "1.15.1",
+    "version": "1.15.3-beta.0",
     "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -41,7 +41,7 @@
         "async": "^3.2.0",
         "autoprefixer": "^10.0.0",
         "bcryptjs": "2.4.3",
-        "benchpressjs": "2.1.0",
+        "benchpressjs": "2.2.2",
         "body-parser": "^1.19.0",
         "bootbox": "4.4.0",
         "bootstrap": "^3.4.1",
@@ -77,7 +77,7 @@
         "jquery-serializeobject": "1.0.0",
         "jquery-ui": "1.12.1",
         "jsesc": "3.0.2",
-        "json2csv": "5.0.4",
+        "json2csv": "5.0.5",
         "jsonwebtoken": "^8.5.1",
         "less": "^3.11.1",
         "lodash": "^4.17.15",
@@ -93,19 +93,19 @@
         "@nodebb/mubsub": "1.7.1",
         "@nodebb/socket.io-adapter-mongo": "3.1.1",
         "nconf": "^0.10.0",
-        "nodebb-plugin-composer-default": "6.4.6",
+        "nodebb-plugin-composer-default": "6.4.7",
         "nodebb-plugin-dbsearch": "4.1.2",
         "nodebb-plugin-emoji": "^3.3.0",
         "nodebb-plugin-emoji-android": "2.0.0",
         "nodebb-plugin-markdown": "8.12.1",
-        "nodebb-plugin-mentions": "2.13.4",
+        "nodebb-plugin-mentions": "2.13.5",
         "nodebb-plugin-soundpack-default": "1.0.0",
-        "nodebb-plugin-spam-be-gone": "0.7.3",
+        "nodebb-plugin-spam-be-gone": "0.7.6",
         "nodebb-rewards-essentials": "0.1.4",
         "nodebb-theme-lavender": "5.0.14",
-        "nodebb-theme-persona": "10.2.67",
-        "nodebb-theme-slick": "1.2.40",
-        "nodebb-theme-vanilla": "11.3.0",
+        "nodebb-theme-persona": "10.2.81",
+        "nodebb-theme-slick": "1.3.3",
+        "nodebb-theme-vanilla": "11.3.4",
         "nodebb-widget-essentials": "4.1.2",
         "nodemailer": "^6.4.6",
         "nprogress": "0.2.0",
@@ -127,7 +127,7 @@
         "sanitize-html": "^2.0.0",
         "semver": "^7.2.1",
         "serve-favicon": "^2.5.0",
-        "sharp": "0.26.2",
+        "sharp": "0.26.3",
         "sitemap": "^6.1.0",
         "slideout": "1.0.1",
         "socket.io": "2.3.0",
@@ -168,7 +168,7 @@
         "mocha": "8.2.1",
         "mocha-lcov-reporter": "1.3.0",
         "nyc": "15.1.0",
-        "smtp-server": "3.7.0"
+        "smtp-server": "3.8.0"
     },
     "bugs": {
         "url": "https://github.com/NodeBB/NodeBB/issues"

install/web.js

@@ -240,7 +240,7 @@ async function compileTemplate() {
 	const source = await fs.promises.readFile(sourceFile, 'utf8');
 
 	const [compiled] = await Promise.all([
-		Benchpress.precompile(source),
+		Benchpress.precompile(source, { filename: 'install/index.tpl' }),
 		mkdirp(path.dirname(destJs)),
 	]);
 

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

@@ -9,6 +9,7 @@
 	"upload-files": "Upload Files",
 	"signature": "Signature",
 	"ban": "Ban",
+	"invite": "Invite",
 	"search-content": "Search Content",
 	"search-users": "Search Users",
 	"search-tags": "Search Tags",

public/language/ar/admin/menu.json

@@ -31,6 +31,7 @@
 	"settings/pagination": "ترقيم الصفحات",
 	"settings/tags": "الكلمات المفتاحية",
 	"settings/notifications": "التنبيهات",
+	"settings/api": "API Access",
 	"settings/sounds": "Sounds",
 	"settings/social": "Social",
 	"settings/cookies": "Cookies",

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

@@ -4,7 +4,7 @@
 	"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
-	
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Use an external email server to send emails",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
 	"subscriptions": "Email Digests",
 	"subscriptions.disable": "Disable email digests",
 	"subscriptions.hour": "Digest Hour",
-	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>"
+	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>",
+	"notifications.settings": "Email notification settings",
+	"notifications.remove-images": "Remove images from email notifications"
 }

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

@@ -1,7 +1,7 @@
 {
-	"handles": "Guest Handles",
+	"settings": "Settings",
 	"handles.enabled": "Allow guest handles",
 	"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
-	"topic-views": "Topic views",
-	"topic-views.enabled": "Allow guests to increase topic view counts"
+	"topic-views.enabled": "Allow guests to increase topic view counts",
+	"reply-notifications.enabled": "Allow guests to generate reply notifications"
 }

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

@@ -16,6 +16,7 @@
 	"allow-account-deletion": "السماح بحذف الحساب",
 	"hide-fullname": "إخفاء الإسم الكامل عن المستخدمين",
 	"hide-email": "إخفاء البريد الإلكتروني عن المستخدمين",
+	"show-fullname-as-displayname": "Show user's full name as their display name if available",
 	"themes": "القوالب",
 	"disable-user-skins": "منع المستخدمين من اختيار سمة مخصص",
 	"account-protection": "حماية الحساب",
@@ -43,6 +44,9 @@
 	"registration-type.disabled": "لا يوجد تسجيل",
 	"registration-type.help": "Normal - Users can register from the /register page.<br/>\nInvite Only - Users can invite others from the <a href=\"%1/users\" target=\"_blank\">users</a> page.<br/>\nAdmin Invite Only - Only administrators can invite others from <a href=\"%1/users\" target=\"_blank\">users</a> and <a href=\"%1/admin/manage/users\">admin/manage/users</a> pages.<br/>\nNo registration - No user registration.<br/>",
 	"registration-approval-type.help": "Normal - Users are registered immediately.<br/>\nAdmin Approval - User registrations are placed in an <a href=\"%1/admin/manage/registration\">approval queue</a> for administrators.<br/>\nAdmin Approval for IPs - Normal for new users, Admin Approval for IP addresses that already have an account.<br/>",
+	"registration-queue-auto-approve-time": "Automatic Approval Time",
+	"registration-queue-auto-approve-time-help": "Hours before user is approved automatically. 0 to disable.",
+	"registration-queue-show-average-time": "Show users average time it takes to approve a new user",
 	"registration.max-invites": "الحد الأقصى للدعوات لكل عضو",
 	"max-invites": "الحد الأقصى للدعوات لكل عضو",
 	"max-invites-help": "0  لعدم تحديد قيود، الإدارة تحصل على دعوات لامحدودة <br> هذا الخيار يعمل فقط عند تحديد خيار \"بالدعوات فقط\"",
@@ -62,6 +66,7 @@
 	"restrict-chat": "السماح فقط برسائل الدردشة من المستخدمين الذين أتبعهم",
 	"outgoing-new-tab": "Open outgoing links in new tab",
 	"topic-search": "Enable In-Topic Searching",
+	"update-url-with-post-index": "Update url with post index while browsing topics",
 	"digest-freq": "Subscribe to Digest",
 	"digest-freq.off": "Off",
 	"digest-freq.daily": "Daily",

public/language/ar/flags.json

@@ -67,7 +67,7 @@
 	"sort-upvotes": "Most upvotes",
 	"sort-replies": "Most replies",
 
-	"modal-title": "Report Inappropriate Content",
+	"modal-title": "Report Content",
 	"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
 	"modal-reason-spam": "Spam",
 	"modal-reason-offensive": "Offensive",

public/language/ar/groups.json

@@ -35,6 +35,8 @@
     "details.member_count": "عدد اﻷعضاء",
     "details.creation_date": "تاريخ الإنشاء",
     "details.description": "الوصف",
+    "details.member-post-cids": "Categories to display posts from",
+    "details.member-post-cids-help": "<strong>Note</strong>: Selecting no categories will assume all categories are included. Use <code>ctrl</code> and <code>shift</code> to select multiple options.",
     "details.badge_preview": "معاينة الوسام",
     "details.change_icon": "تغيير الأيقونة",
     "details.change_label_colour": "Change Label Colour",

public/language/ar/notifications.json

@@ -60,6 +60,7 @@
     "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_new-group-chat": "When you receive a group chat message",
     "notificationType_group-invite": "When you receive a group invite",
     "notificationType_group-request-membership": "When someone requests to join a group you own",
     "notificationType_new-register": "When someone gets added to registration queue",

public/language/ar/register.json

@@ -18,6 +18,8 @@
     "agree_to_terms_of_use": "أوافق على شروط الاستخدام",
     "terms_of_use_error": "يجب عليك الموافقة على شروط الاستخدام",
     "registration-added-to-queue": "تمت إضافتك في قائمة الإنتضار. ستتلقى رسالة إلكترونية عند الموافقة على تسجيلك من قبل الإدارة.",
+    "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.",
+    "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.",
     "interstitial.intro": "نحتاج إلى بعض المعلومات الإضافية قبل أن نتمكن من إنشاء حسابك.",
     "interstitial.errors-found": "تعذر علينا إتمام عملية التسجيل:",
     "gdpr_agree_data": "I consent to the collection and processing of my personal information on this website.",

public/language/ar/topic.json

@@ -30,6 +30,7 @@
     "locked": "مقفل",
     "pinned": "مثبت",
     "moved": "منقول",
+    "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",
     "ban-ip": "Ban IP",
     "view-history": "Edit History",

public/language/ar/user.json

@@ -123,6 +123,7 @@
     "open_links_in_new_tab": "فتح الروابط الخارجية في نافدة جديدة",
     "enable_topic_searching": "تفعيل خاصية البحث داخل المواضيع",
     "topic_search_help": "إذا قمت بتفعيل ميزة البحث في-الموضوع،  سيتم تجاوز الخيار الافتراضي للمتصفح مما يؤدي للبحث بكامل الموضوع بدلا عن البحث في الجزء الظاهر في الشاشة.",
+    "update_url_with_post_index": "Update url with post index while browsing topics",
     "scroll_to_my_post": "بعد اضافة رد على المشاركة, قم بإظهار المشاركة",
     "follow_topics_you_reply_to": "متابعة المواضيع التي تقوم بالرد عليها",
     "follow_topics_you_create": "متابعة المواضيع التي تقوم بإنشائها",

public/language/ar/users.json

@@ -11,6 +11,7 @@
     "online-only": "المتصلون فقط",
     "invite": "دعوة",
     "prompt-email": "Emails:",
+    "groups-to-join": "Groups to be joined when invite is accepted:",
     "invitation-email-sent": "تم إرسال دعوة بالبريد الإلكتروني إلى %1",
     "user_list": "قائمة اﻷعضاء",
     "recent_topics": "أحدث المواضيع",

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

@@ -9,6 +9,7 @@
 	"upload-files": "Качване на файлове",
 	"signature": "Подпис",
 	"ban": "Блокиране",
+	"invite": "Пращане на покана",
 	"search-content": "Търсене на съдържание",
 	"search-users": "Търсене на потребители",
 	"search-tags": "Търсене на етикети",

public/language/bg/admin/menu.json

@@ -31,6 +31,7 @@
 	"settings/pagination": "Странициране",
 	"settings/tags": "Етикети",
 	"settings/notifications": "Известия",
+	"settings/api": "Достъп чрез ППИ",
 	"settings/sounds": "Звуци",
 	"settings/social": "Обществени",
 	"settings/cookies": "Бисквитки",

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

@@ -4,7 +4,7 @@
 	"address-help": "Следният адрес на е-поща е този, който получателят ще види в полетата „От“ и “Отговор до“.",
 	"from": "Име за полето „От“",
 	"from-help": "Името на изпращача, което да бъде показано в е-писмото.",
-	
+
 	"smtp-transport": "Транспорт чрез SMTP",
 	"smtp-transport.enabled": "Използване на външен сървър за е-поща за изпращане на е-писма",
 	"smtp-transport-help": "Можете да изберете от списък от познати услуги, или да въведете такава ръчно.",
@@ -35,5 +35,7 @@
 	"subscriptions": "Резюмета по е-поща",
 	"subscriptions.disable": "Изключване на резюметата по е-пощата",
 	"subscriptions.hour": "Време за разпращане",
-	"subscriptions.hour-help": "Моля, въведете число, представляващо часа, в който да се разпращат е-писма с подготвеното резюме (напр.. <code>0</code> за полунощ, <code>17</code> за 5 следобед). Имайте предвид, че този час е според часовата зона на сървъра и може да не съвпада с часовника на системата Ви.<br /> Приблизителното време на сървъра е: <span id=\"serverTime\"></span><br /> Изпращането на следващия ежедневен бюлетин е планирано за   <span id=\"nextDigestTime\"></span>"
+	"subscriptions.hour-help": "Моля, въведете число, представляващо часа, в който да се разпращат е-писма с подготвеното резюме (напр.. <code>0</code> за полунощ, <code>17</code> за 5 следобед). Имайте предвид, че този час е според часовата зона на сървъра и може да не съвпада с часовника на системата Ви.<br /> Приблизителното време на сървъра е: <span id=\"serverTime\"></span><br /> Изпращането на следващия ежедневен бюлетин е планирано за   <span id=\"nextDigestTime\"></span>",
+	"notifications.settings": "Настройки за известията по е-поща",
+	"notifications.remove-images": "Премахване на изображенията от известията по е-поща"
 }

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

@@ -1,7 +1,7 @@
 {
-	"handles": "Имена за гостите",
+	"settings": "Настройки",
 	"handles.enabled": "Позволяване на имената за гостите",
 	"handles.enabled-help": "Тази възможност предоставя ново поле, което позволява на гостите да си изберат име, което да се използва за всяка публикация, която правят. Ако е изключено, всички те просто ще имат името „Гост“.",
-	"topic-views": "Преглеждания на темите",
-	"topic-views.enabled": "Гостите да допринасят за броя на преглеждания на темите"
+	"topic-views.enabled": "Гостите да допринасят за броя на преглеждания на темите",
+	"reply-notifications.enabled": "Гостите да могат да предизвикват изпращането на известия за отговорите си"
 }

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

@@ -16,6 +16,7 @@
 	"allow-account-deletion": "Позволяване на изтриването на профила",
 	"hide-fullname": "Скриване на пълното име от потребителите",
 	"hide-email": "Скриване на е-пощата от потребителите",
+	"show-fullname-as-displayname": "Показване на цялото име на потребителя, ако е налично",
 	"themes": "Теми",
 	"disable-user-skins": "Потребителите да не могат да избират собствен облик",
 	"account-protection": "Защита на акаунта",
@@ -43,6 +44,9 @@
 	"registration-type.disabled": "Без регистриране",
 	"registration-type.help": "Обикновена — Потребителите могат да се регистрират от страницата /register.<br/>\nСамо с покана — Потребителите могат да поканят други от страницата с <a href=\"%1/users\" target=\"_blank\">потребителите</a>.<br/>\nСамо с покана от администратор — Само администратори могат да канят други от страницата с <a href=\"%1/users\" target=\"_blank\">потребителите</a> и от страниците за <a href=\"%1/admin/manage/users\">управление на потребителите</a>.<br/>\nБез регистриране — Потребителите не се регистрират.<br/>",
 	"registration-approval-type.help": "Обикновена — Потребителите се регистрират на момента.<br/>\nОдобрена от администратор — Потребителските регистрации се поставят в <a href=\"%1/admin/manage/registration\">опашка за одобрение</a>, която администраторите преглеждат.<br/>\nОдобрена от администратор по IP адрес — Новите потребители се регистрират по обикновения начин, а онези, от чиито IP адрес вече са се регистрирали други акаунти, се нуждаят от одобрението на администратор.<br/>",
+	"registration-queue-auto-approve-time": "Време за автоматично одобрение",
+	"registration-queue-auto-approve-time-help": "Брой часове преди потребител да бъде одобрен автоматично. 0 = изключено.",
+	"registration-queue-show-average-time": "Средното време за одобрение на нов потребител да се показва на потребителите",
 	"registration.max-invites": "Максимален брой покани на потребител",
 	"max-invites": "Максимален брой покани на потребител",
 	"max-invites-help": "0 = няма ограничение. Администраторите могат да разпращат неограничен брой покани.<br>Тази стойност се използва, само ако е избран режимът „Само с покана“.",
@@ -62,6 +66,7 @@
 	"restrict-chat": "Разрешаване на съобщенията само от потребители, които следвам",
 	"outgoing-new-tab": "Отваряне на външните връзки в нов подпрозорец",
 	"topic-search": "Включване на търсенето в темите",
+	"update-url-with-post-index": "Обновяване на адресната лента с номера на публикацията по време на разглеждане на темите",
 	"digest-freq": "Абониране за резюмета",
 	"digest-freq.off": "Изключено",
 	"digest-freq.daily": "Ежедневно",

public/language/bg/flags.json

@@ -67,7 +67,7 @@
 	"sort-upvotes": "Най-много положителни гласове",
 	"sort-replies": "Най-много отговори",
 
-	"modal-title": "Докладване на неуместно съдържание",
+	"modal-title": "Докладване на съдържанието",
 	"modal-body": "Моля, посочете причината за докладването на %1 %2 за преглед. Или използвайте някой от бутоните за бързо докладване, ако са приложими.",
 	"modal-reason-spam": "Спам",
 	"modal-reason-offensive": "Обидно",

public/language/bg/groups.json

@@ -35,6 +35,8 @@
     "details.member_count": "Брой на членовете",
     "details.creation_date": "Дата на създаване",
     "details.description": "Описание",
+    "details.member-post-cids": "Категории, от които да се показват публикации",
+    "details.member-post-cids-help": "<strong>Забележка</strong>: Ако не изберете нито една категория, ще се смята, че са включени всички категории. Използвайте <code>CTRL</code> и <code>SHIFT</code>, за да изберете няколко възможности.",
     "details.badge_preview": "Преглед на емблемата",
     "details.change_icon": "Промяна на иконката",
     "details.change_label_colour": "Промяна на цвета на етикета",

public/language/bg/notifications.json

@@ -60,6 +60,7 @@
     "notificationType_post-edit": "Когато бъде редактирана публикация в тема, която следите",
     "notificationType_follow": "Когато някой започне да Ви следва",
     "notificationType_new-chat": "Когато получите съобщение в разговор",
+    "notificationType_new-group-chat": "Когато получите съобщение в групов разговор",
     "notificationType_group-invite": "Когато получите покана за група",
     "notificationType_group-request-membership": "Когато някой поиска да се включи в група, на която Вие сте собственик",
     "notificationType_new-register": "Когато някой бъде добавен в опашката за регистрация",

public/language/bg/register.json

@@ -18,6 +18,8 @@
     "agree_to_terms_of_use": "Съгласен съм с условията за ползване",
     "terms_of_use_error": "Трябва да се съгласите с условията за ползване",
     "registration-added-to-queue": "Вашата регистрация беше добавена в опашката за одобрение. Ще получите е-писмо, когато тя бъде одобрена от администратор.",
+    "registration-queue-average-time": "Средното време за одобрение на нови членове е %1 часа и %2 минути.",
+    "registration-queue-auto-approve-time": "Членството Ви в този форум ще бъде напълно активирано след около %1 часа.",
     "interstitial.intro": "Нуждаем се от малко допълнителна информация, преди да можем да създадем акаунта Ви.",
     "interstitial.errors-found": "Не можем да завършим Вашата регистрация:",
     "gdpr_agree_data": "Съгласявам се това личната ми информация да се съхранява и обработва от този уеб сайт.",

public/language/bg/topic.json

@@ -30,6 +30,7 @@
     "locked": "Заключена",
     "pinned": "Закачена",
     "moved": "Преместена",
+    "moved-from": "Преместена от %1",
     "copy-ip": "Копиране на IP адреса",
     "ban-ip": "Блокиране на IP адреса",
     "view-history": "История на редакциите",

public/language/bg/user.json

@@ -123,6 +123,7 @@
     "open_links_in_new_tab": "Отваряне на външните връзки в нов подпрозорец",
     "enable_topic_searching": "Включване на търсенето в темите",
     "topic_search_help": "Ако е включено, търсенето в темата ще замени стандартното поведение на браузъра при търсене в страницата и ще Ви позволи да претърсвате цялата тема, а не само това, което се вижда на екрана",
+    "update_url_with_post_index": "Обновяване на адресната лента с номера на публикацията по време на разглеждане на темите",
     "scroll_to_my_post": "След публикуване на отговор, да се показва новата публикация",
     "follow_topics_you_reply_to": "Следене на темите, в които отговаряте",
     "follow_topics_you_create": "Следене на темите, които създавате",

public/language/bg/users.json

@@ -11,6 +11,7 @@
     "online-only": "Само тези на линия",
     "invite": "Канене",
     "prompt-email": "Е-пощи:",
+    "groups-to-join": "Групи, в които да се присъедини след приемане на поканата:",
     "invitation-email-sent": "Беше изпратено е-писмо за потвърждение до %1",
     "user_list": "Списък от потребители",
     "recent_topics": "Скорошни теми",

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

@@ -9,6 +9,7 @@
 	"upload-files": "Upload Files",
 	"signature": "Signature",
 	"ban": "Ban",
+	"invite": "Invite",
 	"search-content": "Search Content",
 	"search-users": "Search Users",
 	"search-tags": "Search Tags",

public/language/bn/admin/menu.json

@@ -31,6 +31,7 @@
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
+	"settings/api": "API Access",
 	"settings/sounds": "Sounds",
 	"settings/social": "Social",
 	"settings/cookies": "Cookies",

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

@@ -4,7 +4,7 @@
 	"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
-	
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Use an external email server to send emails",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
 	"subscriptions": "ইমেইল ডাইজেস্ট",
 	"subscriptions.disable": "ইমেইল ডাইজেস্ট নিষ্ক্রিয়",
 	"subscriptions.hour": "Digest Hour",
-	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>"
+	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>",
+	"notifications.settings": "Email notification settings",
+	"notifications.remove-images": "Remove images from email notifications"
 }

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

@@ -1,7 +1,7 @@
 {
-	"handles": "Guest Handles",
+	"settings": "Settings",
 	"handles.enabled": "Allow guest handles",
 	"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
-	"topic-views": "Topic views",
-	"topic-views.enabled": "Allow guests to increase topic view counts"
+	"topic-views.enabled": "Allow guests to increase topic view counts",
+	"reply-notifications.enabled": "Allow guests to generate reply notifications"
 }

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

@@ -16,6 +16,7 @@
 	"allow-account-deletion": "Allow account deletion",
 	"hide-fullname": "Hide fullname from users",
 	"hide-email": "Hide email from users",
+	"show-fullname-as-displayname": "Show user's full name as their display name if available",
 	"themes": "Themes",
 	"disable-user-skins": "Prevent users from choosing a custom skin",
 	"account-protection": "Account Protection",
@@ -43,6 +44,9 @@
 	"registration-type.disabled": "No registration",
 	"registration-type.help": "Normal - Users can register from the /register page.<br/>\nInvite Only - Users can invite others from the <a href=\"%1/users\" target=\"_blank\">users</a> page.<br/>\nAdmin Invite Only - Only administrators can invite others from <a href=\"%1/users\" target=\"_blank\">users</a> and <a href=\"%1/admin/manage/users\">admin/manage/users</a> pages.<br/>\nNo registration - No user registration.<br/>",
 	"registration-approval-type.help": "Normal - Users are registered immediately.<br/>\nAdmin Approval - User registrations are placed in an <a href=\"%1/admin/manage/registration\">approval queue</a> for administrators.<br/>\nAdmin Approval for IPs - Normal for new users, Admin Approval for IP addresses that already have an account.<br/>",
+	"registration-queue-auto-approve-time": "Automatic Approval Time",
+	"registration-queue-auto-approve-time-help": "Hours before user is approved automatically. 0 to disable.",
+	"registration-queue-show-average-time": "Show users average time it takes to approve a new user",
 	"registration.max-invites": "Maximum Invitations per User",
 	"max-invites": "Maximum Invitations per User",
 	"max-invites-help": "0 for no restriction. Admins get infinite invitations<br>Only applicable for \"Invite Only\"",
@@ -62,6 +66,7 @@
 	"restrict-chat": "Only allow chat messages from users I follow",
 	"outgoing-new-tab": "Open outgoing links in new tab",
 	"topic-search": "Enable In-Topic Searching",
+	"update-url-with-post-index": "Update url with post index while browsing topics",
 	"digest-freq": "Subscribe to Digest",
 	"digest-freq.off": "Off",
 	"digest-freq.daily": "Daily",

public/language/bn/flags.json

@@ -67,7 +67,7 @@
 	"sort-upvotes": "Most upvotes",
 	"sort-replies": "Most replies",
 
-	"modal-title": "Report Inappropriate Content",
+	"modal-title": "Report Content",
 	"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
 	"modal-reason-spam": "Spam",
 	"modal-reason-offensive": "Offensive",

public/language/bn/groups.json

@@ -35,6 +35,8 @@
     "details.member_count": "Member Count",
     "details.creation_date": "Creation Date",
     "details.description": "Description",
+    "details.member-post-cids": "Categories to display posts from",
+    "details.member-post-cids-help": "<strong>Note</strong>: Selecting no categories will assume all categories are included. Use <code>ctrl</code> and <code>shift</code> to select multiple options.",
     "details.badge_preview": "Badge Preview",
     "details.change_icon": "Change Icon",
     "details.change_label_colour": "Change Label Colour",

public/language/bn/notifications.json

@@ -60,6 +60,7 @@
     "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_new-group-chat": "When you receive a group chat message",
     "notificationType_group-invite": "When you receive a group invite",
     "notificationType_group-request-membership": "When someone requests to join a group you own",
     "notificationType_new-register": "When someone gets added to registration queue",

public/language/bn/register.json

@@ -18,6 +18,8 @@
     "agree_to_terms_of_use": "আমি নিয়মাবলী মেনে চলতে সম্মতি জানালাম",
     "terms_of_use_error": "আপনাকে অবশ্যই ব্যাবহার নীতিমালায় সম্মত হতে হবে।",
     "registration-added-to-queue": "আপনার নিবন্ধনটি এ্যাপ্লুভাল তালিকায় যুক্ত হয়েছে। একজন এডমিনিস্ট্রেটর কর্তৃক নিবন্ধন গৃহীত হলে আপনি একটি মেইল পাবেন। ",
+    "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.",
+    "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.",
     "interstitial.intro": "আপনার একাউন্ট তৈরীর পূর্বে আমাদের আরো কিছু বাড়তি তথ্য জানা প্রয়োজন।",
     "interstitial.errors-found": "আপনার নিবন্ধনটি সম্পূর্ণ করা সম্ভব হয় নি।",
     "gdpr_agree_data": "I consent to the collection and processing of my personal information on this website.",

public/language/bn/topic.json

@@ -30,6 +30,7 @@
     "locked": "বন্ধ",
     "pinned": "Pinned",
     "moved": "Moved",
+    "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",
     "ban-ip": "Ban IP",
     "view-history": "Edit History",

public/language/bn/user.json

@@ -123,6 +123,7 @@
     "open_links_in_new_tab": "আউটগোয়িং লিংকগুলো নতুন ট্যাবে খুলুন",
     "enable_topic_searching": "In-Topic সার্চ সক্রীয় করো",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "update_url_with_post_index": "Update url with post index while browsing topics",
     "scroll_to_my_post": "After posting a reply, show the new post",
     "follow_topics_you_reply_to": "Watch topics that you reply to",
     "follow_topics_you_create": "Watch topics you create",

public/language/bn/users.json

@@ -11,6 +11,7 @@
     "online-only": "শুধুমাত্র অনলাইন",
     "invite": "ইনভাইট",
     "prompt-email": "ইমেইল",
+    "groups-to-join": "Groups to be joined when invite is accepted:",
     "invitation-email-sent": "%1 কে একটি ইনভাইটেশন ইমেইল পাঠানো হয়েছে",
     "user_list": "সদস্য তালিকা",
     "recent_topics": "সাম্প্রতিক টপিক",

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

@@ -9,6 +9,7 @@
 	"upload-files": "Náhrát soubory",
 	"signature": "Podpis",
 	"ban": "Blokovat",
+	"invite": "Invite",
 	"search-content": "Hledat obsah",
 	"search-users": "Hledat uživatele",
 	"search-tags": "Hledat označení",

public/language/cs/admin/menu.json

@@ -31,6 +31,7 @@
 	"settings/pagination": "Stránkování",
 	"settings/tags": "Značky",
 	"settings/notifications": "Oznámení",
+	"settings/api": "API Access",
 	"settings/sounds": "Sounds",
 	"settings/social": "Social",
 	"settings/cookies": "Cookies",

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

@@ -4,7 +4,7 @@
 	"address-help": "Následující e-mailové adresy budou zobrazeny  příjemci v políčkách „Od” a „Odpovědět”.",
 	"from": "Jméno – od",
 	"from-help": "Zobrazené jméno v e-mailu v – Od",
-	
+
 	"smtp-transport": "Přenos SMTP",
 	"smtp-transport.enabled": "Pro odesílání e-mailů použít externí e-mailový server ",
 	"smtp-transport-help": "Ze seznamu můžete vybrat známé služby nebo zadat vlastní.",
@@ -35,5 +35,7 @@
 	"subscriptions": "E-mailové odběry",
 	"subscriptions.disable": "Zakázat e-mailové odběry",
 	"subscriptions.hour": "Hodina přehledu",
-	"subscriptions.hour-help": "Zadejte číslo odpovídající hodině, kdy mají být odeslány přehledové e-maily (tj. <code>0</code> pro půlnoc, <code>17</code> pro 5:00pm).  Mějte na paměti, že tato hodina závisí na hodinách samotného serveru a nemusí tak souhlasit se systémovými hodinami. <br />Přibližný čas serveru je: <span id=\"serverTime\"></span>.<br />Další odeslání přehledů je plánováno na <span id=\"nextDigestTime\"></span>."
+	"subscriptions.hour-help": "Zadejte číslo odpovídající hodině, kdy mají být odeslány přehledové e-maily (tj. <code>0</code> pro půlnoc, <code>17</code> pro 5:00pm).  Mějte na paměti, že tato hodina závisí na hodinách samotného serveru a nemusí tak souhlasit se systémovými hodinami. <br />Přibližný čas serveru je: <span id=\"serverTime\"></span>.<br />Další odeslání přehledů je plánováno na <span id=\"nextDigestTime\"></span>.",
+	"notifications.settings": "Email notification settings",
+	"notifications.remove-images": "Remove images from email notifications"
 }

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

@@ -1,7 +1,7 @@
 {
-	"handles": "Zacházení s hosty",
+	"settings": "Settings",
 	"handles.enabled": "Povolit upravení zacházení s hosty",
 	"handles.enabled-help": "Tato možnost odkryje nové pole, které umožňuje hostům vybrat jméno, které se připojí ke každému příspěvku, který vytvoří. Bude-li zakázáno, budou jednoduše nazýváni „Host”",
-	"topic-views": "Topic views",
-	"topic-views.enabled": "Allow guests to increase topic view counts"
+	"topic-views.enabled": "Allow guests to increase topic view counts",
+	"reply-notifications.enabled": "Allow guests to generate reply notifications"
 }

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

@@ -16,6 +16,7 @@
 	"allow-account-deletion": "Povolit smazání účtu",
 	"hide-fullname": "Skrýt jméno před uživateli",
 	"hide-email": "Skrýt e-mail před uživateli",
+	"show-fullname-as-displayname": "Show user's full name as their display name if available",
 	"themes": "Motivy",
 	"disable-user-skins": "Zabránit uživateli ve výběru vlastního vzhledu",
 	"account-protection": "Ochrana účtu",
@@ -43,6 +44,9 @@
 	"registration-type.disabled": "Bez registrace",
 	"registration-type.help": "Normální - uživatel se může registrovat ze stránky Registrace<br/>\nJen pro pozvané - uživatel může pozvat jiné ze stránky<a href=\"%1/users\" target=\"_blank\">Uživatelé</a>.<br/>♥\nJen pro pozvané správcem - jen správci mohou pozvat jiné  ze stránky <a href=\"%1/users\" target=\"_blank\">Uživatelé</a>a ze stránky <a href=\"%1/admin/manage/users\">admin/manage/users</a>.<br/>\nBez registrace - žádná registrace uživatelů.<br/>•",
 	"registration-approval-type.help": "Normální - uživatel se může hned registrovat.<br/>\nSchválení správcem - uživatelská registrace je zařazena do <a href=\"%1/admin/manage/registration\">fronty pro schválení</a> správcem.<br/>\nSchválení správcem dle IP - pro nové uživatele stav Normální, Schválení správcem pro adresy IP, které již mají účet.<br/>",
+	"registration-queue-auto-approve-time": "Automatic Approval Time",
+	"registration-queue-auto-approve-time-help": "Hours before user is approved automatically. 0 to disable.",
+	"registration-queue-show-average-time": "Show users average time it takes to approve a new user",
 	"registration.max-invites": "Maximální počet pozvání na uživatele",
 	"max-invites": "Maximální počet pozvání na uživatele",
 	"max-invites-help": "0 pro neomezené. Správci mají neomezeně pozvánek<br> Použitelné jen pro „Jen pozvané\"",
@@ -62,6 +66,7 @@
 	"restrict-chat": "Povolit chatové zprávy jen od uživatelů, které sleduji",
 	"outgoing-new-tab": "Otevřít odchozí odkazy v nové záložce",
 	"topic-search": "Povolit hledání v tématu",
+	"update-url-with-post-index": "Update url with post index while browsing topics",
 	"digest-freq": "Přihlásit k přehledu",
 	"digest-freq.off": "Vypnuto",
 	"digest-freq.daily": "Denně",

public/language/cs/flags.json

@@ -67,7 +67,7 @@
 	"sort-upvotes": "Most upvotes",
 	"sort-replies": "Most replies",
 
-	"modal-title": "Nahlásit nevhodný obsah",
+	"modal-title": "Report Content",
 	"modal-body": "Zadejte váš důvod k označení %1 %2 pro kontrolu. Nebo použijte tlačítko je-li dostupné.",
 	"modal-reason-spam": "Spam",
 	"modal-reason-offensive": "Urážlivé",

public/language/cs/groups.json

@@ -35,6 +35,8 @@
     "details.member_count": "Počet členů",
     "details.creation_date": "Datum vytvoření",
     "details.description": "Popis",
+    "details.member-post-cids": "Categories to display posts from",
+    "details.member-post-cids-help": "<strong>Note</strong>: Selecting no categories will assume all categories are included. Use <code>ctrl</code> and <code>shift</code> to select multiple options.",
     "details.badge_preview": "Náhled symbolu",
     "details.change_icon": "Změnit ikonu",
     "details.change_label_colour": "Změnit barvu popisu",

public/language/cs/notifications.json

@@ -60,6 +60,7 @@
     "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_new-group-chat": "When you receive a group chat message",
     "notificationType_group-invite": "Obdržíte-li pozvání ke skupině",
     "notificationType_group-request-membership": "Pokud někdo požaduje připojení se do vaší skupiny",
     "notificationType_new-register": "Bude-li někdo přidán do registrační fronty",

public/language/cs/register.json

@@ -18,6 +18,8 @@
     "agree_to_terms_of_use": "Souhlasím s Podmínkami",
     "terms_of_use_error": "Musíte souhlasit s podmínkami.",
     "registration-added-to-queue": "Vaše registrace byla přidána do fronty. Obdržíte e-mail až ji správce schválí.",
+    "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.",
+    "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.",
     "interstitial.intro": "Před vytvořením účtu vyžadujeme některé dodatečné informace.",
     "interstitial.errors-found": "Nebylo možné dokončit vaší registraci:",
     "gdpr_agree_data": "Dávám souhlas se sběrem a zpracováním mých osobních údajů na této webové stránce.",

public/language/cs/topic.json

@@ -30,6 +30,7 @@
     "locked": "Uzamknuto",
     "pinned": "Připnuto",
     "moved": "Přesunuto",
+    "moved-from": "Moved from %1",
     "copy-ip": "Kopírovat IP",
     "ban-ip": "Zakázat IP",
     "view-history": "Upravit historii",

public/language/cs/user.json

@@ -123,6 +123,7 @@
     "open_links_in_new_tab": "Otevřít odchozí odkaz v nové záložce",
     "enable_topic_searching": "Povolit vyhledávání v tématu",
     "topic_search_help": "Je-li povoleno, hledání v tématu přepíše výchozí chování vyhledávání v prohlížeči a umožní vám prohledávat celé téma, namísto pouze toho, co je zobrazeno na obrazovce",
+    "update_url_with_post_index": "Update url with post index while browsing topics",
     "scroll_to_my_post": "Po odeslání odpovědi, zobrazit nový příspěvek",
     "follow_topics_you_reply_to": "Sledovat témata, do kterých přispějete",
     "follow_topics_you_create": "Sledovat témata, která vytvoříte",

public/language/cs/users.json

@@ -11,6 +11,7 @@
     "online-only": "Pouze připojené",
     "invite": "Pozvat",
     "prompt-email": "E-maily:",
+    "groups-to-join": "Groups to be joined when invite is accepted:",
     "invitation-email-sent": "E-mailová pozvánka byla odeslána na adresu %1",
     "user_list": "Seznam uživatelů",
     "recent_topics": "Poslední témata",

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

@@ -9,6 +9,7 @@
 	"upload-files": "Upload Files",
 	"signature": "Signature",
 	"ban": "Ban",
+	"invite": "Invite",
 	"search-content": "Search Content",
 	"search-users": "Search Users",
 	"search-tags": "Search Tags",

public/language/da/admin/menu.json

@@ -31,6 +31,7 @@
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
+	"settings/api": "API Access",
 	"settings/sounds": "Sounds",
 	"settings/social": "Social",
 	"settings/cookies": "Cookies",

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

@@ -4,7 +4,7 @@
 	"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
-	
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Use an external email server to send emails",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
 	"subscriptions": "Email Digests",
 	"subscriptions.disable": "Disable email digests",
 	"subscriptions.hour": "Digest Hour",
-	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>"
+	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>",
+	"notifications.settings": "Email notification settings",
+	"notifications.remove-images": "Remove images from email notifications"
 }

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

@@ -1,7 +1,7 @@
 {
-	"handles": "Guest Handles",
+	"settings": "Settings",
 	"handles.enabled": "Allow guest handles",
 	"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
-	"topic-views": "Topic views",
-	"topic-views.enabled": "Allow guests to increase topic view counts"
+	"topic-views.enabled": "Allow guests to increase topic view counts",
+	"reply-notifications.enabled": "Allow guests to generate reply notifications"
 }

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

@@ -16,6 +16,7 @@
 	"allow-account-deletion": "Allow account deletion",
 	"hide-fullname": "Hide fullname from users",
 	"hide-email": "Hide email from users",
+	"show-fullname-as-displayname": "Show user's full name as their display name if available",
 	"themes": "Themes",
 	"disable-user-skins": "Prevent users from choosing a custom skin",
 	"account-protection": "Account Protection",
@@ -43,6 +44,9 @@
 	"registration-type.disabled": "No registration",
 	"registration-type.help": "Normal - Users can register from the /register page.<br/>\nInvite Only - Users can invite others from the <a href=\"%1/users\" target=\"_blank\">users</a> page.<br/>\nAdmin Invite Only - Only administrators can invite others from <a href=\"%1/users\" target=\"_blank\">users</a> and <a href=\"%1/admin/manage/users\">admin/manage/users</a> pages.<br/>\nNo registration - No user registration.<br/>",
 	"registration-approval-type.help": "Normal - Users are registered immediately.<br/>\nAdmin Approval - User registrations are placed in an <a href=\"%1/admin/manage/registration\">approval queue</a> for administrators.<br/>\nAdmin Approval for IPs - Normal for new users, Admin Approval for IP addresses that already have an account.<br/>",
+	"registration-queue-auto-approve-time": "Automatic Approval Time",
+	"registration-queue-auto-approve-time-help": "Hours before user is approved automatically. 0 to disable.",
+	"registration-queue-show-average-time": "Show users average time it takes to approve a new user",
 	"registration.max-invites": "Maximum Invitations per User",
 	"max-invites": "Maximum Invitations per User",
 	"max-invites-help": "0 for no restriction. Admins get infinite invitations<br>Only applicable for \"Invite Only\"",
@@ -62,6 +66,7 @@
 	"restrict-chat": "Only allow chat messages from users I follow",
 	"outgoing-new-tab": "Open outgoing links in new tab",
 	"topic-search": "Enable In-Topic Searching",
+	"update-url-with-post-index": "Update url with post index while browsing topics",
 	"digest-freq": "Subscribe to Digest",
 	"digest-freq.off": "Off",
 	"digest-freq.daily": "Daily",

public/language/da/flags.json

@@ -67,7 +67,7 @@
 	"sort-upvotes": "Most upvotes",
 	"sort-replies": "Most replies",
 
-	"modal-title": "Report Inappropriate Content",
+	"modal-title": "Report Content",
 	"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
 	"modal-reason-spam": "Spam",
 	"modal-reason-offensive": "Offensive",

public/language/da/groups.json

@@ -35,6 +35,8 @@
     "details.member_count": "Medlemsantal",
     "details.creation_date": "Oprettelsesdato",
     "details.description": "Beskrivelse",
+    "details.member-post-cids": "Categories to display posts from",
+    "details.member-post-cids-help": "<strong>Note</strong>: Selecting no categories will assume all categories are included. Use <code>ctrl</code> and <code>shift</code> to select multiple options.",
     "details.badge_preview": "Mærke forhåndsvisning",
     "details.change_icon": "Skift ikon",
     "details.change_label_colour": "Change Label Colour",

public/language/da/notifications.json

@@ -60,6 +60,7 @@
     "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_new-group-chat": "When you receive a group chat message",
     "notificationType_group-invite": "When you receive a group invite",
     "notificationType_group-request-membership": "When someone requests to join a group you own",
     "notificationType_new-register": "When someone gets added to registration queue",

public/language/da/register.json

@@ -18,6 +18,8 @@
     "agree_to_terms_of_use": "Jeg acceptere betingelserne for brug",
     "terms_of_use_error": "You must agree to the Terms of Use",
     "registration-added-to-queue": "Din registrering er blevet tilføjet til godkendelses køen. Du vil mostage en email når du er blevet accepteret af en administrator.",
+    "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.",
+    "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.",
     "interstitial.intro": "We require some additional information before we can create your account.",
     "interstitial.errors-found": "We could not complete your registration:",
     "gdpr_agree_data": "I consent to the collection and processing of my personal information on this website.",

public/language/da/topic.json

@@ -30,6 +30,7 @@
     "locked": "Låst",
     "pinned": "Pinned",
     "moved": "Flyttet",
+    "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",
     "ban-ip": "Ban IP",
     "view-history": "Edit History",

public/language/da/user.json

@@ -123,6 +123,7 @@
     "open_links_in_new_tab": "Åben udgående link i en ny tab",
     "enable_topic_searching": "Slå In-Topic søgning til",
     "topic_search_help": "Hvis slået til, så vil in-topic søgning overskrive browserens almindelige søge function og tillade dig at søge hele emnet, istedet for kun det der er vist på skærmen",
+    "update_url_with_post_index": "Update url with post index while browsing topics",
     "scroll_to_my_post": "After posting a reply, show the new post",
     "follow_topics_you_reply_to": "Watch topics that you reply to",
     "follow_topics_you_create": "Vis emner du har oprettet",

public/language/da/users.json

@@ -11,6 +11,7 @@
     "online-only": "Kun online",
     "invite": "Invitér",
     "prompt-email": "Emails:",
+    "groups-to-join": "Groups to be joined when invite is accepted:",
     "invitation-email-sent": "En invitations email er blevet sendt til %1",
     "user_list": "Bruger Liste",
     "recent_topics": "Seneste Tråde",

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

@@ -9,6 +9,7 @@
 	"upload-files": "Dateien hochladen",
 	"signature": "Signatur",
 	"ban": "Bannen",
+	"invite": "Invite",
 	"search-content": "Inhalt durchsuchen",
 	"search-users": "Benutzersuche",
 	"search-tags": "Tags suchen",

public/language/de/admin/menu.json

@@ -31,6 +31,7 @@
 	"settings/pagination": "Seitennummerierung",
 	"settings/tags": "Tags",
 	"settings/notifications": "Benachrichtigungen",
+	"settings/api": "API Access",
 	"settings/sounds": "Sounds",
 	"settings/social": "Social",
 	"settings/cookies": "Cookies",

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

@@ -4,7 +4,7 @@
 	"address-help": "Die folgende E-Mail Adresse ist die E-Mail Adresse, welche dem Empfänger im \"Von\" und \"Antworten\" Bereich sehen wird.",
 	"from": "Name des Absenders",
 	"from-help": "Der Name des Absenders, welcher in der E-Mail angezeigt werden soll.",
-	
+
 	"smtp-transport": "SMTP Konfiguration",
 	"smtp-transport.enabled": "Benutze einen externen Email-Server",
 	"smtp-transport-help": "Du kannst aus einer Liste bekannter Email-Provider auswählen, oder einen benutzerdefinierten eingeben.",
@@ -35,5 +35,7 @@
 	"subscriptions": "Email Zusammenfassungen",
 	"subscriptions.disable": "Deaktivierung der Email Zusammenfassungen",
 	"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"
+	"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",
+	"notifications.settings": "Email notification settings",
+	"notifications.remove-images": "Remove images from email notifications"
 }

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

@@ -1,7 +1,7 @@
 {
-	"handles": "Gastzugang",
+	"settings": "Settings",
 	"handles.enabled": "Gastzugänge erlauben",
 	"handles.enabled-help": "Diese Option offenbart ein neues Feld, welches Gästen erlaubt einen Nutzernamen zu wählen, welcher sie mit jedem Beitrag assoziiert den sie erstellen. Wenn diese Option deaktiviert ist, werden sie einfach \"Gast\" genannt",
-	"topic-views": "Topic views",
-	"topic-views.enabled": "Allow guests to increase topic view counts"
+	"topic-views.enabled": "Allow guests to increase topic view counts",
+	"reply-notifications.enabled": "Allow guests to generate reply notifications"
 }

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

@@ -16,6 +16,7 @@
 	"allow-account-deletion": "Erlaube löschen des Kontos",
 	"hide-fullname": "Den 'Kompletten Namen' von Benutzern verstecken",
 	"hide-email": "Die Email-Adresse von Benutzern verstecken",
+	"show-fullname-as-displayname": "Show user's full name as their display name if available",
 	"themes": "Themes",
 	"disable-user-skins": "Verhindere das Benutzer eigene Skins verwenden",
 	"account-protection": "Kontosicherheit",
@@ -43,6 +44,9 @@
 	"registration-type.disabled": "Keine Registrierung",
 	"registration-type.help": "Normal - Users can register from the /register page.<br/>\nInvite Only - Users can invite others from the <a href=\"%1/users\" target=\"_blank\">users</a> page.<br/>\nAdmin Invite Only - Only administrators can invite others from <a href=\"%1/users\" target=\"_blank\">users</a> and <a href=\"%1/admin/manage/users\">admin/manage/users</a> pages.<br/>\nNo registration - No user registration.<br/>",
 	"registration-approval-type.help": "Normal - Users are registered immediately.<br/>\nAdmin Approval - User registrations are placed in an <a href=\"%1/admin/manage/registration\">approval queue</a> for administrators.<br/>\nAdmin Approval for IPs - Normal for new users, Admin Approval for IP addresses that already have an account.<br/>",
+	"registration-queue-auto-approve-time": "Automatic Approval Time",
+	"registration-queue-auto-approve-time-help": "Hours before user is approved automatically. 0 to disable.",
+	"registration-queue-show-average-time": "Show users average time it takes to approve a new user",
 	"registration.max-invites": "Maximale Einladungen pro Benutzer",
 	"max-invites": "Maximale Einladungen pro Benutzer",
 	"max-invites-help": "0 für keine Beschränkung. Admins haben keine beschränkung.<br>Nur praktikabel für \"Nur Einladungen\".",
@@ -62,6 +66,7 @@
 	"restrict-chat": "Erlaube nur Chatnachrichten von Benutzern denen ich folge",
 	"outgoing-new-tab": "Öffne externe Links in einem neuen Tab",
 	"topic-search": "Suchen innerhalb von Themen aktivieren",
+	"update-url-with-post-index": "Update url with post index while browsing topics",
 	"digest-freq": "Zusammenfassung abonnieren",
 	"digest-freq.off": "Aus",
 	"digest-freq.daily": "Täglich",

public/language/de/flags.json

@@ -67,7 +67,7 @@
 	"sort-upvotes": "Most upvotes",
 	"sort-replies": "Most replies",
 
-	"modal-title": "Anstößige Inhalte Melden",
+	"modal-title": "Report Content",
 	"modal-body": "Bitte geben Sie den Grund an, weshalb Sie %1 %2 melden wollen. Alternativ können Sie einen der Schnell-Meldungs-Knöpfe verwenden, wenn anwendbar.",
 	"modal-reason-spam": "Spam",
 	"modal-reason-offensive": "Beleidigend",

public/language/de/groups.json

@@ -35,6 +35,8 @@
     "details.member_count": "Mitgliederanzahl",
     "details.creation_date": "Erstelldatum",
     "details.description": "Beschreibung",
+    "details.member-post-cids": "Categories to display posts from",
+    "details.member-post-cids-help": "<strong>Note</strong>: Selecting no categories will assume all categories are included. Use <code>ctrl</code> and <code>shift</code> to select multiple options.",
     "details.badge_preview": "Abzeichenvorschau",
     "details.change_icon": "Symbol ändern",
     "details.change_label_colour": "Label-Farbe ändern",

public/language/de/notifications.json

@@ -60,6 +60,7 @@
     "notificationType_post-edit": "Wenn ein Post bearbeitet wurde, in einem Thema welches du beobachtest",
     "notificationType_follow": "Wenn dir jemand neues folgt",
     "notificationType_new-chat": "Wenn du eine Chat Nachricht erhältst",
+    "notificationType_new-group-chat": "When you receive a group chat message",
     "notificationType_group-invite": "Wenn du eine Gruppeneinladung erhältst",
     "notificationType_group-request-membership": "Wenn jemand einer Gruppe beitreten möchte, die dir gehört",
     "notificationType_new-register": "Wenn jemand der Registrierungswarteschlange hinzugefügt wird",

public/language/de/register.json

@@ -18,6 +18,8 @@
     "agree_to_terms_of_use": "Ich stimme den Nutzungsbedingungen zu",
     "terms_of_use_error": "Du musst den Nutzungsbedingungen zustimmen",
     "registration-added-to-queue": "Deine Registration wurde abgeschickt. Du wirst eine E-Mail erhalten, sobald sie von einem Administrator akzeptiert wird.",
+    "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.",
+    "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.",
     "interstitial.intro": "Wir benötigen ein wenig mehr Informationen bevor wir dein Konto erstellen können.",
     "interstitial.errors-found": "Wir konnten deinen Registrierungsvorgang nicht abschließen:",
     "gdpr_agree_data": "Ich stimme der Sammlung und Verarbeitung meiner Persönlichen Daten auf dieser Website zu.",

public/language/de/topic.json

@@ -30,6 +30,7 @@
     "locked": "Gesperrt",
     "pinned": "Angeheftet",
     "moved": "Verschoben",
+    "moved-from": "Moved from %1",
     "copy-ip": "IP-Adresse Kopieren",
     "ban-ip": "IP-Adresse bannen",
     "view-history": "Verlauf bearbeiten",

public/language/de/user.json

@@ -123,6 +123,7 @@
     "open_links_in_new_tab": "Ausgehende Links in neuem Tab öffnen",
     "enable_topic_searching": "Suchen innerhalb von Themen aktivieren",
     "topic_search_help": "Wenn aktiviert, ersetzt die im-Thema-Suche die Standardsuche des Browsers. Dadurch kannst du im ganzen Thema suchen, nicht nur im sichtbaren Abschnitt.",
+    "update_url_with_post_index": "Update url with post index while browsing topics",
     "scroll_to_my_post": "Zeige eigene Antwort nach dem Erstellen im Thema an",
     "follow_topics_you_reply_to": "Themen folgen, in denen du geantwortet hast",
     "follow_topics_you_create": "Themen folgen, die du erstellst",

public/language/de/users.json

@@ -11,6 +11,7 @@
     "online-only": "Nur Online",
     "invite": "Einladen",
     "prompt-email": "E-Mails:",
+    "groups-to-join": "Groups to be joined when invite is accepted:",
     "invitation-email-sent": "Eine Einladungsemail wurde an %1 verschickt",
     "user_list": "Nutzerliste",
     "recent_topics": "Neueste Themen",

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

@@ -9,6 +9,7 @@
 	"upload-files": "Upload Files",
 	"signature": "Signature",
 	"ban": "Ban",
+	"invite": "Invite",
 	"search-content": "Search Content",
 	"search-users": "Search Users",
 	"search-tags": "Search Tags",

public/language/el/admin/menu.json

@@ -31,6 +31,7 @@
 	"settings/pagination": "Pagination",
 	"settings/tags": "Tags",
 	"settings/notifications": "Notifications",
+	"settings/api": "API Access",
 	"settings/sounds": "Sounds",
 	"settings/social": "Social",
 	"settings/cookies": "Cookies",

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

@@ -4,7 +4,7 @@
 	"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
-	
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Use an external email server to send emails",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
 	"subscriptions": "Email Digests",
 	"subscriptions.disable": "Disable email digests",
 	"subscriptions.hour": "Digest Hour",
-	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>"
+	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>",
+	"notifications.settings": "Email notification settings",
+	"notifications.remove-images": "Remove images from email notifications"
 }

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

@@ -1,7 +1,7 @@
 {
-	"handles": "Guest Handles",
+	"settings": "Settings",
 	"handles.enabled": "Allow guest handles",
 	"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
-	"topic-views": "Topic views",
-	"topic-views.enabled": "Allow guests to increase topic view counts"
+	"topic-views.enabled": "Allow guests to increase topic view counts",
+	"reply-notifications.enabled": "Allow guests to generate reply notifications"
 }

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

@@ -16,6 +16,7 @@
 	"allow-account-deletion": "Allow account deletion",
 	"hide-fullname": "Hide fullname from users",
 	"hide-email": "Hide email from users",
+	"show-fullname-as-displayname": "Show user's full name as their display name if available",
 	"themes": "Themes",
 	"disable-user-skins": "Prevent users from choosing a custom skin",
 	"account-protection": "Account Protection",
@@ -43,6 +44,9 @@
 	"registration-type.disabled": "No registration",
 	"registration-type.help": "Normal - Users can register from the /register page.<br/>\nInvite Only - Users can invite others from the <a href=\"%1/users\" target=\"_blank\">users</a> page.<br/>\nAdmin Invite Only - Only administrators can invite others from <a href=\"%1/users\" target=\"_blank\">users</a> and <a href=\"%1/admin/manage/users\">admin/manage/users</a> pages.<br/>\nNo registration - No user registration.<br/>",
 	"registration-approval-type.help": "Normal - Users are registered immediately.<br/>\nAdmin Approval - User registrations are placed in an <a href=\"%1/admin/manage/registration\">approval queue</a> for administrators.<br/>\nAdmin Approval for IPs - Normal for new users, Admin Approval for IP addresses that already have an account.<br/>",
+	"registration-queue-auto-approve-time": "Automatic Approval Time",
+	"registration-queue-auto-approve-time-help": "Hours before user is approved automatically. 0 to disable.",
+	"registration-queue-show-average-time": "Show users average time it takes to approve a new user",
 	"registration.max-invites": "Maximum Invitations per User",
 	"max-invites": "Maximum Invitations per User",
 	"max-invites-help": "0 for no restriction. Admins get infinite invitations<br>Only applicable for \"Invite Only\"",
@@ -62,6 +66,7 @@
 	"restrict-chat": "Only allow chat messages from users I follow",
 	"outgoing-new-tab": "Open outgoing links in new tab",
 	"topic-search": "Enable In-Topic Searching",
+	"update-url-with-post-index": "Update url with post index while browsing topics",
 	"digest-freq": "Subscribe to Digest",
 	"digest-freq.off": "Off",
 	"digest-freq.daily": "Daily",

public/language/el/flags.json

@@ -67,7 +67,7 @@
 	"sort-upvotes": "Most upvotes",
 	"sort-replies": "Most replies",
 
-	"modal-title": "Report Inappropriate Content",
+	"modal-title": "Report Content",
 	"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
 	"modal-reason-spam": "Spam",
 	"modal-reason-offensive": "Offensive",

public/language/el/groups.json

@@ -35,6 +35,8 @@
     "details.member_count": "Member Count",
     "details.creation_date": "Ημερομηνία Δημιουργίας",
     "details.description": "Περιγραφή",
+    "details.member-post-cids": "Categories to display posts from",
+    "details.member-post-cids-help": "<strong>Note</strong>: Selecting no categories will assume all categories are included. Use <code>ctrl</code> and <code>shift</code> to select multiple options.",
     "details.badge_preview": "Badge Preview",
     "details.change_icon": "Change Icon",
     "details.change_label_colour": "Change Label Colour",

public/language/el/notifications.json

@@ -60,6 +60,7 @@
     "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_new-group-chat": "When you receive a group chat message",
     "notificationType_group-invite": "When you receive a group invite",
     "notificationType_group-request-membership": "When someone requests to join a group you own",
     "notificationType_new-register": "When someone gets added to registration queue",

public/language/el/register.json

@@ -18,6 +18,8 @@
     "agree_to_terms_of_use": "Συμφωνώ με τους Όρους Χρήσης",
     "terms_of_use_error": "You must agree to the Terms of Use",
     "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator.",
+    "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.",
+    "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.",
     "interstitial.intro": "We require some additional information before we can create your account.",
     "interstitial.errors-found": "We could not complete your registration:",
     "gdpr_agree_data": "I consent to the collection and processing of my personal information on this website.",

public/language/el/topic.json

@@ -30,6 +30,7 @@
     "locked": "Κλειδωμένο",
     "pinned": "Pinned",
     "moved": "Moved",
+    "moved-from": "Moved from %1",
     "copy-ip": "Copy IP",
     "ban-ip": "Ban IP",
     "view-history": "Edit History",

public/language/el/user.json

@@ -123,6 +123,7 @@
     "open_links_in_new_tab": "Open outgoing links in new tab",
     "enable_topic_searching": "Enable In-Topic Searching",
     "topic_search_help": "If enabled, in-topic searching will override the browser's default page search behaviour and allow you to search through the entire topic, instead of what is only shown on screen",
+    "update_url_with_post_index": "Update url with post index while browsing topics",
     "scroll_to_my_post": "After posting a reply, show the new post",
     "follow_topics_you_reply_to": "Watch topics that you reply to",
     "follow_topics_you_create": "Watch topics you create",

public/language/el/users.json

@@ -11,6 +11,7 @@
     "online-only": "Μόνο Συνδεδεμένοι",
     "invite": "Πρόσκληση",
     "prompt-email": "Emails:",
+    "groups-to-join": "Groups to be joined when invite is accepted:",
     "invitation-email-sent": "An invitation email has been sent to %1",
     "user_list": "Λίστα Χρηστών",
     "recent_topics": "Πρόσφατα Θέματα",

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

@@ -9,6 +9,7 @@
 	"upload-files": "Upload Files",
 	"signature": "Signature",
 	"ban": "Ban",
+	"invite": "Invite",
 	"search-content": "Search Content",
 	"search-users": "Search Users",
 	"search-tags": "Search Tags",

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

@@ -4,7 +4,7 @@
 	"address-help": "The following email address refers to the email that the recipient will see in the \"From\" and \"Reply To\" fields.",
 	"from": "From Name",
 	"from-help": "The from name to display in the email.",
-	
+
 	"smtp-transport": "SMTP Transport",
 	"smtp-transport.enabled": "Use an external email server to send emails",
 	"smtp-transport-help": "You can select from a list of well-known services or enter a custom one.",
@@ -35,5 +35,7 @@
 	"subscriptions": "Email Digests",
 	"subscriptions.disable": "Disable email digests",
 	"subscriptions.hour": "Digest Hour",
-	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>"
+	"subscriptions.hour-help": "Please enter a number representing the hour to send scheduled email digests (e.g. <code>0</code> for midnight, <code>17</code> for 5:00pm). Keep in mind that this is the hour according to the server itself, and may not exactly match your system clock.<br /> The approximate server time is: <span id=\"serverTime\"></span><br /> The next daily digest is scheduled to be sent  <span id=\"nextDigestTime\"></span>",
+	"notifications.settings": "Email notification settings",
+	"notifications.remove-images": "Remove images from email notifications"
 }

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

@@ -1,7 +1,7 @@
 {
-	"handles": "Guest Handles",
+	"settings": "Settings",
 	"handles.enabled": "Allow guest handles",
 	"handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"",
-	"topic-views": "Topic views",
-	"topic-views.enabled": "Allow guests to increase topic view counts"
+	"topic-views.enabled": "Allow guests to increase topic view counts",
+	"reply-notifications.enabled": "Allow guests to generate reply notifications"
 }

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

@@ -16,6 +16,7 @@
 	"allow-account-deletion": "Allow account deletion",
 	"hide-fullname": "Hide fullname from users",
 	"hide-email": "Hide email from users",
+	"show-fullname-as-displayname": "Show user's full name as their display name if available",
 	"themes": "Themes",
 	"disable-user-skins": "Prevent users from choosing a custom skin",
 	"account-protection": "Account Protection",
@@ -43,6 +44,9 @@
 	"registration-type.disabled": "No registration",
 	"registration-type.help": "Normal - Users can register from the /register page.<br/>\nInvite Only - Users can invite others from the <a href=\"%1/users\" target=\"_blank\">users</a> page.<br/>\nAdmin Invite Only - Only administrators can invite others from <a href=\"%1/users\" target=\"_blank\">users</a> and <a href=\"%1/admin/manage/users\">admin/manage/users</a> pages.<br/>\nNo registration - No user registration.<br/>",
 	"registration-approval-type.help": "Normal - Users are registered immediately.<br/>\nAdmin Approval - User registrations are placed in an <a href=\"%1/admin/manage/registration\">approval queue</a> for administrators.<br/>\nAdmin Approval for IPs - Normal for new users, Admin Approval for IP addresses that already have an account.<br/>",
+	"registration-queue-auto-approve-time": "Automatic Approval Time",
+	"registration-queue-auto-approve-time-help": "Hours before user is approved automatically. 0 to disable.",
+	"registration-queue-show-average-time": "Show users average time it takes to approve a new user",
 	"registration.max-invites": "Maximum Invitations per User",
 	"max-invites": "Maximum Invitations per User",
 	"max-invites-help": "0 for no restriction. Admins get infinite invitations<br>Only applicable for \"Invite Only\"",
@@ -62,6 +66,7 @@
 	"restrict-chat": "Only allow chat messages from users I follow",
 	"outgoing-new-tab": "Open outgoing links in new tab",
 	"topic-search": "Enable In-Topic Searching",
+	"update-url-with-post-index": "Update url with post index while browsing topics",
 	"digest-freq": "Subscribe to Digest",
 	"digest-freq.off": "Off",
 	"digest-freq.daily": "Daily",

public/language/en-GB/flags.json

@@ -67,7 +67,7 @@
 	"sort-upvotes": "Most upvotes",
 	"sort-replies": "Most replies",
 
-	"modal-title": "Report Inappropriate Content",
+	"modal-title": "Report Content",
 	"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",
 	"modal-reason-spam": "Spam",
 	"modal-reason-offensive": "Offensive",

public/language/en-GB/groups.json

@@ -40,6 +40,8 @@
 	"details.member_count": "Member Count",
 	"details.creation_date": "Creation Date",
 	"details.description": "Description",
+	"details.member-post-cids": "Categories to display posts from",
+	"details.member-post-cids-help": "<strong>Note</strong>: Selecting no categories will assume all categories are included. Use <code>ctrl</code> and <code>shift</code> to select multiple options.",
 	"details.badge_preview": "Badge Preview",
 	"details.change_icon": "Change Icon",
 	"details.change_label_colour": "Change Label Colour",

public/language/en-GB/notifications.json

@@ -66,6 +66,7 @@
 	"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_new-group-chat": "When you receive a group chat message",
 	"notificationType_group-invite": "When you receive a group invite",
 	"notificationType_group-request-membership": "When someone requests to join a group you own",
 	"notificationType_new-register": "When someone gets added to registration queue",

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

@@ -8,5 +8,11 @@
 	"content": "Content",
 	"posted": "Posted",
 	"reply-to": "Reply to \"%1\"",
-	"content-editable": "You can click on individual content to edit before posting."
-}
+	"content-editable": "You can click on individual content to edit before posting.",
+	"category-editable": "Click on category to edit",
+	"title-editable": "Click on title to edit",
+	"reply": "Reply",
+	"topic": "Topic",
+	"accept": "Accept",
+	"reject": "Reject"
+}

public/language/en-GB/register.json

@@ -1,27 +1,28 @@
 {
-	"register": "Register",
-	"cancel_registration": "Cancel Registration",
-	"help.email": "By default, your email will be hidden from the public.",
-	"help.username_restrictions": "A unique username between %1 and %2 characters. Others can mention you with @<span id='yourUsername'>username</span>.",
-	"help.minimum_password_length": "Your password's length must be at least %1 characters.",
-	"email_address": "Email Address",
-	"email_address_placeholder": "Enter Email Address",
-	"username": "Username",
-	"username_placeholder": "Enter Username",
-	"password": "Password",
-	"password_placeholder": "Enter Password",
-	"confirm_password": "Confirm Password",
-	"confirm_password_placeholder": "Confirm Password",
-	"register_now_button": "Register Now",
-	"alternative_registration": "Alternative Registration",
-	"terms_of_use": "Terms of Use",
-	"agree_to_terms_of_use": "I agree to the Terms of Use",
-	"terms_of_use_error": "You must agree to the Terms of Use",
-	"registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator.",
-	"interstitial.intro": "We require some additional information before we can create your account.",
-	"interstitial.errors-found": "We could not complete your registration:",
-
-	"gdpr_agree_data": "I consent to the collection and processing of my personal information on this website.",
-	"gdpr_agree_email": "I consent to receive digest and notification emails from this website.",
-	"gdpr_consent_denied": "You must give consent to this site to collect/process your information, and to send you emails."
-}
+    "register": "Register",
+    "cancel_registration": "Cancel Registration",
+    "help.email": "By default, your email will be hidden from the public.",
+    "help.username_restrictions": "A unique username between %1 and %2 characters. Others can mention you with @<span id='yourUsername'>username</span>.",
+    "help.minimum_password_length": "Your password's length must be at least %1 characters.",
+    "email_address": "Email Address",
+    "email_address_placeholder": "Enter Email Address",
+    "username": "Username",
+    "username_placeholder": "Enter Username",
+    "password": "Password",
+    "password_placeholder": "Enter Password",
+    "confirm_password": "Confirm Password",
+    "confirm_password_placeholder": "Confirm Password",
+    "register_now_button": "Register Now",
+    "alternative_registration": "Alternative Registration",
+    "terms_of_use": "Terms of Use",
+    "agree_to_terms_of_use": "I agree to the Terms of Use",
+    "terms_of_use_error": "You must agree to the Terms of Use",
+    "registration-added-to-queue": "Your registration has been added to the approval queue. You will receive an email when it is accepted by an administrator.",
+    "registration-queue-average-time": "Our average time for approving memberships is %1 hours %2 minutes.",
+    "registration-queue-auto-approve-time": "Your membership to this forum will be fully activated in up to %1 hours.",
+    "interstitial.intro": "We require some additional information before we can create your account.",
+    "interstitial.errors-found": "We could not complete your registration:",
+    "gdpr_agree_data": "I consent to the collection and processing of my personal information on this website.",
+    "gdpr_agree_email": "I consent to receive digest and notification emails from this website.",
+    "gdpr_consent_denied": "You must give consent to this site to collect/process your information, and to send you emails."
+}

public/language/en-GB/topic.json

@@ -33,6 +33,7 @@
 	"locked": "Locked",
 	"pinned": "Pinned",
 	"moved": "Moved",
+	"moved-from": "Moved from %1",
 	"copy-ip": "Copy IP",
 	"ban-ip": "Ban IP",
 	"view-history": "Edit History",