chore: incrementing version number - v1.14.3-beta.9

fix privilege shortcuts in group page after search

.gitignore

@@ -67,4 +67,5 @@ test/files/normalise.jpg.png
 test/files/normalise-resized.jpg
 package-lock.json
 /package.json
-*.mongodb
+*.mongodb
+link-plugins.sh

.travis.yml

@@ -39,6 +39,7 @@ addons:
       - g++-4.8
       - mongodb-org-server
 node_js:
+  - "14"
   - "12"
   - "10"
 branches:

CHANGELOG.md

@@ -1,3 +1,51 @@
+#### 1.14.2 (2020-07-15)
+
+##### Chores
+
+*  incrementing version number - v1.14.2 (1e4d683f)
+*  update changelog for v1.14.2 (488e69fd)
+*  up theme (63fb2ad7)
+*  incrementing version number - v1.14.2-beta.1 (9d1465d0)
+*  up theme (15aabfd3)
+*  up theme (599c5015)
+*  incrementing version number - v1.14.2-beta.0 (fca4ee31)
+*  incrementing version number - v1.14.1 (31203b16)
+*  update changelog for v1.14.1 (d4c16086)
+* **deps:**  update commitlint monorepo to v9.1.1 (0ca7e28a)
+
+##### New Features
+
+*  logic for flag note editing, #8499 (14417209)
+*  logic for flag note deletion, #8499 (f85a45c7)
+*  #8460, export groups members as csv (00d39fb3)
+*  pass connection options to socket.io-adapter-mongo (393f19b4)
+*  #8023, allow wildcard search for uid/email (3dcf5387)
+*  up composer (6235b31c)
+*  #8427, daily downvote limits (c513b88d)
+*  warn user if whitelisted tags are less than minTags (4adbf87c)
+
+##### Bug Fixes
+
+* **deps:**
+  *  update dependency nodebb-plugin-mentions to v2.9.1 (c54287fe)
+  *  update dependency nodebb-plugin-mentions to v2.9.0 (7730e7da)
+  *  update dependency nodebb-theme-persona to v10.1.62 (#8485) (4e9743ab)
+  *  update dependency nodebb-plugin-composer-default to v6.3.49 (#8479) (ab244ca6)
+*  #8499 (65240a17)
+*  #8500 (5e984d10)
+*  invalid session error modal during logout (2286ee2a)
+*  #8488 (b3a88331)
+*  category search in selector (46a66863)
+*  groups.updateCover (73ddf1cb)
+* **docs:**  bad changelog (60bf488f)
+
+##### Other Changes
+
+*  update changelog for v1.14.2" (e085c846)
+* flag.showModal on flag modal appearance (3379d65f)
+* NodeBB/NodeBB (2fba0a14)
+*  update changelog for v1.14.1" (26c74409)
+
 #### 1.14.1 (2020-07-08)
 
 ##### Chores

README.md

@@ -48,7 +48,7 @@ Our minimalist "Persona" theme gets you going right away, no coding experience r
 
 NodeBB requires the following software to be installed:
 
-* A version of Node.js at least 8 or greater ([installation/upgrade instructions](https://github.com/nodesource/distributions))
+* A version of Node.js at least 10 or greater ([installation/upgrade instructions](https://github.com/nodesource/distributions))
 * Redis, version 2.8.9 or greater **or** MongoDB, version 2.6 or greater
 * nginx, version 1.3.13 or greater (**only if** intending to use nginx to proxy requests to a NodeBB)
 

install/data/defaults.json

@@ -79,6 +79,7 @@
     "min:rep:website": 0,
     "min:rep:aboutme": 0,
     "min:rep:signature": 0,
+    "flags:limitPerTarget": 0,
     "notificationType_upvote": "notification",
     "notificationType_new-topic": "notification",
     "notificationType_new-reply": "notification",

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "1.14.3",
+    "version": "1.14.3-beta.9",
     "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -18,8 +18,8 @@
     },
     "husky": {
         "hooks": {
-            "pre-commit": "lint-staged",
-            "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
+            "pre-commit": "npx lint-staged",
+            "commit-msg": "npx commitlint -E HUSKY_GIT_PARAMS"
         }
     },
     "lint-staged": {
@@ -30,26 +30,26 @@
     },
     "dependencies": {
         "ace-builds": "^1.4.9",
-        "archiver": "^4.0.0",
+        "archiver": "^5.0.0",
         "async": "^3.2.0",
         "autoprefixer": "^9.7.6",
         "bcryptjs": "2.4.3",
         "benchpressjs": "^2.0.2",
         "body-parser": "^1.19.0",
         "bootstrap": "^3.4.1",
-        "bootswatch": "git://github.com/thomaspark/bootswatch.git#c41a8f066feb8950c6f9c6bcf5a3c37d1085404e",
+        "bootswatch": "thomaspark/bootswatch#v3.4.1+1",
         "chart.js": "^2.9.3",
         "cli-graph": "^3.2.2",
         "clipboard": "^2.0.6",
         "colors": "^1.4.0",
-        "commander": "^5.0.0",
+        "commander": "^6.0.0",
         "compression": "^1.7.4",
         "connect-ensure-login": "^0.1.1",
         "connect-flash": "^0.1.1",
         "connect-mongo": "3.2.0",
         "connect-multiparty": "^2.2.0",
         "connect-pg-simple": "^6.1.0",
-        "connect-redis": "4.0.4",
+        "connect-redis": "5.0.0",
         "cookie-parser": "^1.4.5",
         "cron": "^1.8.2",
         "cropperjs": "^1.5.6",
@@ -70,7 +70,7 @@
         "less": "^3.11.1",
         "lodash": "^4.17.15",
         "logrotate-stream": "^0.2.6",
-        "lru-cache": "5.1.1",
+        "lru-cache": "6.0.0",
         "material-design-lite": "^1.3.0",
         "mime": "^2.4.4",
         "mkdirp": "^1.0.4",
@@ -80,19 +80,19 @@
         "@nodebb/mubsub": "^1.6.0",
         "@nodebb/socket.io-adapter-mongo": "3.0.1",
         "nconf": "^0.10.0",
-        "nodebb-plugin-composer-default": "6.3.50",
-        "nodebb-plugin-dbsearch": "4.1.1",
+        "nodebb-plugin-composer-default": "6.3.53",
+        "nodebb-plugin-dbsearch": "4.1.2",
         "nodebb-plugin-emoji": "^3.3.0",
         "nodebb-plugin-emoji-android": "2.0.0",
         "nodebb-plugin-markdown": "8.11.2",
-        "nodebb-plugin-mentions": "2.9.1",
+        "nodebb-plugin-mentions": "2.9.3",
         "nodebb-plugin-soundpack-default": "1.0.0",
         "nodebb-plugin-spam-be-gone": "0.7.2",
         "nodebb-rewards-essentials": "0.1.3",
-        "nodebb-theme-lavender": "5.1.0",
-        "nodebb-theme-persona": "10.1.65",
+        "nodebb-theme-lavender": "5.0.11",
+        "nodebb-theme-persona": "10.2.3",
         "nodebb-theme-slick": "1.2.29",
-        "nodebb-theme-vanilla": "11.1.33",
+        "nodebb-theme-vanilla": "11.2.2",
         "nodebb-widget-essentials": "4.1.1",
         "nodemailer": "^6.4.6",
         "passport": "^0.4.1",
@@ -132,28 +132,28 @@
         "zxcvbn": "^4.4.2"
     },
     "devDependencies": {
-        "@apidevtools/swagger-parser": "9.0.1",
+        "@apidevtools/swagger-parser": "10.0.1",
         "@commitlint/cli": "9.1.1",
         "@commitlint/config-angular": "9.1.1",
         "coveralls": "3.1.0",
-        "eslint": "7.3.1",
+        "eslint": "7.5.0",
         "eslint-config-airbnb-base": "14.1.0",
         "eslint-plugin-import": "2.21.1",
-        "grunt": "1.1.0",
+        "grunt": "1.2.1",
         "grunt-contrib-watch": "1.1.0",
         "husky": "4.2.5",
-        "jsdom": "16.2.2",
+        "jsdom": "16.3.0",
         "lint-staged": "10.2.11",
         "mocha": "8.0.1",
         "mocha-lcov-reporter": "1.3.0",
-        "nyc": "15.0.1",
+        "nyc": "15.1.0",
         "smtp-server": "3.7.0"
     },
     "bugs": {
         "url": "https://github.com/NodeBB/NodeBB/issues"
     },
     "engines": {
-        "node": ">=8"
+        "node": ">=10"
     },
     "maintainers": [
         {
@@ -172,4 +172,4 @@
             "url": "https://github.com/barisusakli"
         }
     ]
-}
+}

public/js-enabled.css

@@ -1,3 +0,0 @@
-/*
-    The following stylesheet is only included on pages that can execute javascript
-*/

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

@@ -3,6 +3,7 @@
 	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
+	"primary": "primary / run jobs",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "online",

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

@@ -27,6 +27,8 @@
 	"enable": "Enable",
 	"disable": "Disable",
 	"edit": "Edit",
+	"analytics": "Analytics",
+	"view-category": "View category",
 
 	"select-category": "Select Category",
 	"set-parent-category": "Set Parent Category",
@@ -76,7 +78,9 @@
 	"alert.user-search": "Search for a user here...",
 	"alert.find-group": "Find a Group",
 	"alert.group-search": "Search for a group here...",
+	"alert.not-enough-whitelisted-tags": "Whitelisted tags are less than minimum tags, you need to create more whitelisted tags!",
 	"collapse-all": "Collapse All",
 	"expand-all": "Expand All",
-	"disable-on-create": "Disable on create"
+	"disable-on-create": "Disable on create",
+	"no-matches": "No matches"
 }

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

@@ -8,6 +8,8 @@
 	"hidden": "Hidden",
 	"private": "Private",
 	"edit": "Edit",
+	"delete": "Delete",
+	"download-csv": "Download CSV",
 	"search-placeholder": "Search",
 	"create": "Create Group",
 	"description-placeholder": "A short description about your group",

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

@@ -4,6 +4,7 @@
 	"admin": "Admin",
 	"group-privileges": "Group Privileges",
 	"user-privileges": "User Privileges",
+	"edit-privileges": "Edit Privileges",
 	"chat": "Chat",
 	"upload-images": "Upload Images",
 	"upload-files": "Upload Files",
@@ -33,7 +34,6 @@
 	"delete-topics": "Delete Topics",
 	"purge": "Purge",
 	"moderate": "Moderate",
-
 	"admin-dashboard": "Dashboard",
 	"admin-categories": "Categories",
 	"admin-privileges": "Privileges",

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

@@ -108,5 +108,5 @@
 
 	"alerts.prompt-email": "Emails: ",
 	"alerts.email-sent-to": "An invitation email has been sent to %1",
-	"alerts.x-users-found": "%1 user(s) found! Search took %2 ms."
+	"alerts.x-users-found": "%1 user(s) found, (%2 seconds)"
 }

public/language/ar/admin/menu.json

@@ -19,7 +19,7 @@
 	"settings/general": "عامة",
 	"settings/homepage": "Home Page",
 	"settings/navigation": "Navigation",
-	"settings/reputation": "السمعة",
+	"settings/reputation": "Reputation & Flags",
 	"settings/email": "البريد الإلكتروني",
 	"settings/user": "Users",
 	"settings/group": "Groups",

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

@@ -2,6 +2,5 @@
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
 	"welcome-notification-link": "Welcome Notification Link",
-	"welcome-notification-uid": "Welcome Notification User (UID)",
-	"notification-alert-timeout": "Notification Alert Timeout"
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

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

@@ -5,10 +5,16 @@
 	"votes-are-public": "All Votes Are Public",
 	"thresholds": "Activity Thresholds",
 	"min-rep-downvote": "Minimum reputation to downvote posts",
+	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
+	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",
 	"min-rep-signature": "Minimum reputation to add \"Signature\" to user profile",
 	"min-rep-profile-picture": "Minimum reputation to add \"Profile Picture\" to user profile",
-	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile"
+	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile",
+
+	"flags": "Flag Settings",
+	"flags.limit-per-target": "Maximum number of times something can be flagged",
+	"flags.limit-per-target-placeholder": "Default: 0"
 }

public/language/ar/error.json

@@ -138,8 +138,13 @@
     "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature",
     "not-enough-reputation-min-rep-profile-picture": "You do not have enough reputation to add a profile picture",
     "not-enough-reputation-min-rep-cover-picture": "You do not have enough reputation to add a cover picture",
-    "already-flagged": "لقد بلغت عن هذه المشاركة من قبل.",
+    "post-already-flagged": "You have already flagged this post",
+    "user-already-flagged": "You have already flagged this user",
+    "post-flagged-too-many-times": "This post has been flagged by others already",
+    "user-flagged-too-many-times": "This user has been flagged by others already",
     "self-vote": "You cannot vote on your own post",
+    "too-many-downvotes-today": "You can only downvote %1 times a day",
+    "too-many-downvotes-today-user": "You can only downvote a user %1 times a day",
     "reload-failed": "المنتدى واجه مشكلة أثناء إعادة التحميل: \"%1\".  سيواصل المنتدى خدمة العملاء السابقين لكن يجب عليك إلغاء أي تغيير قمت به قبل إعادة التحميل.",
     "registration-error": "حدث خطأ أثناء التسجيل",
     "parse-error": "حدث خطأ ما أثناء تحليل استجابة الخادم",

public/language/ar/flags.json

@@ -1,8 +1,7 @@
 {
 	"state": "الحالة",
-	"reporter": "المُبلغ",
-	"reported-at": "وقت التبليغ",
-	"description": "الوصف",
+	"reports": "Reports",
+	"first-reported": "First Reported",
 	"no-flags": "Hooray! No flags found.",
 	"assignee": "المحال إليه",
 	"update": "تحديث",
@@ -26,6 +25,7 @@
 	"filter-quick-mine": "Assigned to me",
 	"filter-cid-all": "All categories",
 	"apply-filters": "Apply Filters",
+	"more-filters": "More Filters",
 
 	"quick-actions": "اجراءات سريعه",
 	"flagged-user": "Flagged User",
@@ -43,6 +43,9 @@
 	"notes": "Flag Notes",
 	"add-note": "اضافة ملاحظة",
 	"no-notes": "No shared notes.",
+	"delete-note-confirm": "Are you sure you want to delete this flag note?",
+	"note-added": "Note Added",
+	"note-deleted": "Note Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "No flag history.",
@@ -53,7 +56,6 @@
 	"state-resolved": "تم حلها",
 	"state-rejected": "تم رفضها",
 	"no-assignee": "Not Assigned",
-	"note-added": "Note Added",
 
 	"modal-title": "Report Inappropriate Content",
 	"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",

public/language/ar/modules.json

@@ -1,6 +1,7 @@
 {
     "chat.chatting_with": "Chat with",
     "chat.placeholder": "أكتب رسالة دردشة هنا، اضغط ENTER للإرسال",
+    "chat.scroll-up-alert": "You are looking at older messages, click here to go to most recent message.",
     "chat.send": "أرسل",
     "chat.no_active": "لا يوجد لديك دردشات نشطة.",
     "chat.user_typing": "%1 يكتب رسالة...",
@@ -58,6 +59,7 @@
     "composer.upload-file": "Upload File",
     "composer.zen_mode": "Zen Mode",
     "composer.select_category": "Select a category",
+    "composer.textarea.placeholder": "Enter your post content here, drag and drop images",
     "bootbox.ok": "OK",
     "bootbox.cancel": "إلغاء",
     "bootbox.confirm": "تأكيد",

public/language/ar/topic.json

@@ -36,9 +36,11 @@
     "ban-ip": "Ban IP",
     "view-history": "Edit History",
     "bookmark_instructions": "اضغط هنا للعودة لأخر مشاركة مقروءة في الموضوع",
-    "flag_post": "Flag this post",
-    "flag_user": "Flag this user",
-    "merged_message": "This topic has been merged into <a href=\"/topic/%1\">%2</a>",
+    "flag-post": "Flag this post",
+    "flag-user": "Flag this user",
+    "already-flagged": "Already Flagged",
+    "view-flag-report": "View Flag Report",
+    "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "هذه المشاركة محذوفة. فقط من لهم صلاحية الإشراف على ا لمشاركات يمكنهم معاينتها.",
     "following_topic.message": "ستستلم تنبيها عند كل مشاركة جديدة في هذا الموضوع.",
     "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",

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

@@ -3,6 +3,7 @@
 	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 възела отговориха в рамките на %2мсек!",
 	"host": "сървър",
+	"primary": "основен / изпълнение на задачите",
 	"pid": "ид. на процеса",
 	"nodejs": "nodejs",
 	"online": "на линия",

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

@@ -27,6 +27,8 @@
 	"enable": "Включване",
 	"disable": "Изключване",
 	"edit": "Редактиране",
+	"analytics": "Анализи",
+	"view-category": "Преглед на категорията",
 
 	"select-category": "Изберете категория",
 	"set-parent-category": "Задайте базова категория",
@@ -76,7 +78,9 @@
 	"alert.user-search": "Потърсете потребител тук…",
 	"alert.find-group": "Търсене на група",
 	"alert.group-search": "Потърсете група тук…",
+	"alert.not-enough-whitelisted-tags": "Разрешените етикети са по-малко от минимума. Трябва да създадете още разрешени етикети!",
 	"collapse-all": "Свиване на всички",
 	"expand-all": "Разгъване на всички",
-	"disable-on-create": "Изключване при създаване"
+	"disable-on-create": "Изключване при създаване",
+	"no-matches": "Няма съвпадения"
 }

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

@@ -8,6 +8,8 @@
 	"hidden": "Скрита",
 	"private": "Частна",
 	"edit": "Редактиране",
+	"delete": "Изтриване",
+	"download-csv": "Сваляне във формат „CSV“",
 	"search-placeholder": "Търсене",
 	"create": "Създаване на група",
 	"description-placeholder": "Кратко описание на групата",

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

@@ -4,6 +4,7 @@
 	"admin": "Администратор",
 	"group-privileges": "Правомощия за групите",
 	"user-privileges": "Правомощия за потребителите",
+	"edit-privileges": "Редактиране на правомощията",
 	"chat": "Разговор",
 	"upload-images": "Качване на изображения",
 	"upload-files": "Качване на файлове",
@@ -33,7 +34,6 @@
 	"delete-topics": "Изтриване на теми",
 	"purge": "Изчистване",
 	"moderate": "Модериране",
-
 	"admin-dashboard": "Табло",
 	"admin-categories": "Категории",
 	"admin-privileges": "Правомощия",

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

@@ -108,5 +108,5 @@
 
 	"alerts.prompt-email": "Е-пощи: ",
 	"alerts.email-sent-to": "Беше изпратено е-писмо за потвърждение до %1",
-	"alerts.x-users-found": "Намерени потребители: %1! Търсенето отне %2 милисекунди."
+	"alerts.x-users-found": "Намерени потребители: %1 (%2 секунди)"
 }

public/language/bg/admin/menu.json

@@ -19,7 +19,7 @@
 	"settings/general": "Общи",
 	"settings/homepage": "Начална страница",
 	"settings/navigation": "Навигация",
-	"settings/reputation": "Репутация",
+	"settings/reputation": "Репутация и доклади",
 	"settings/email": "Е-поща",
 	"settings/user": "Потребители",
 	"settings/group": "Групи",

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

@@ -2,6 +2,5 @@
 	"notifications": "Известия",
 	"welcome-notification": "Приветствено известие",
 	"welcome-notification-link": "Връзка за приветственото известие",
-	"welcome-notification-uid": "Потр. ид. за приветственото известие",
-	"notification-alert-timeout": "Време за изчакване преди премахване на уведомяването за известие"
+	"welcome-notification-uid": "Потр. ид. за приветственото известие"
 }

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

@@ -5,10 +5,16 @@
 	"votes-are-public": "Всички гласувания са публични",
 	"thresholds": "Ограничения на дейността",
 	"min-rep-downvote": "Минимална репутация, необходима за отрицателно гласуване за публикации",
+	"downvotes-per-day": "Отрицателни гласувания за ден (задайте 0 за неограничен брой)",
+	"downvotes-per-user-per-day": "Отрицателни гласувания за потребител за ден (задайте 0 за неограничен брой)",
 	"min-rep-flag": "Минимална репутация, необходима за докладване на публикации",
 	"min-rep-website": "Минимална репутация, необходима за добавяне на полето „Уебсайт“ към профила на потребителя",
 	"min-rep-aboutme": "Минимална репутация, необходима за добавяне на полето „За мен“ към профила на потребителя",
 	"min-rep-signature": "Минимална репутация, необходима за добавяне на полето „Подпис“ към профила на потребителя",
 	"min-rep-profile-picture": "Минимална репутация, необходима за добавяне на профилна снимка към профила на потребителя",
-	"min-rep-cover-picture": "Минимална репутация, необходима за добавяне на снимка на корицата към профила на потребителя"
+	"min-rep-cover-picture": "Минимална репутация, необходима за добавяне на снимка на корицата към профила на потребителя",
+
+	"flags": "Настройки за докладите",
+	"flags.limit-per-target": "Максимален брой докладвания на едно и също нещо",
+	"flags.limit-per-target-placeholder": "По подразбиране: 0"
 }

public/language/bg/error.json

@@ -138,8 +138,13 @@
     "not-enough-reputation-min-rep-signature": "Нямате достатъчно репутация, за да добавите подпис",
     "not-enough-reputation-min-rep-profile-picture": "Нямате достатъчно репутация, за да добавите снимка на профила си",
     "not-enough-reputation-min-rep-cover-picture": "Нямате достатъчно репутация, за да добавите снимка на корицата",
-    "already-flagged": "Вече сте докладвали тази публикация",
+    "post-already-flagged": "Вече сте докладвали тази публикация",
+    "user-already-flagged": "Вече сте докладвали този потребител",
+    "post-flagged-too-many-times": "Тази публикация вече е докладвана от други хора",
+    "user-flagged-too-many-times": "Този потребител вече е докладван от други хора",
     "self-vote": "Не можете да гласувате за собствената си публикация",
+    "too-many-downvotes-today": "Можете да гласувате отрицателно не повече от %1 пъти на ден",
+    "too-many-downvotes-today-user": "Можете да гласувате отрицателно за потребител не повече от %1 пъти на ден",
     "reload-failed": "NodeBB срещна проблем при презареждането: „%1“. NodeBB ще продължи да поддържа съществуващите клиентски ресурси, но Вие трябва да отмените последните си действия преди презареждането.",
     "registration-error": "Грешка при регистрацията",
     "parse-error": "Нещо се обърка при прочитането на отговора на сървъра",

public/language/bg/flags.json

@@ -1,8 +1,7 @@
 {
 	"state": "Състояние",
-	"reporter": "Докладвал",
-	"reported-at": "Докладвано на",
-	"description": "Описание",
+	"reports": "Доклади",
+	"first-reported": "Първо докладване",
 	"no-flags": "Ура! Няма намерени доклади.",
 	"assignee": "Назначен",
 	"update": "Обновяване",
@@ -26,6 +25,7 @@
 	"filter-quick-mine": "Назначени на мен",
 	"filter-cid-all": "Всички категории",
 	"apply-filters": "Прилагане на филтрите",
+	"more-filters": "Още филтри",
 
 	"quick-actions": "Бързи действия",
 	"flagged-user": "Докладван потребител",
@@ -43,6 +43,9 @@
 	"notes": "Бележки към доклада",
 	"add-note": "Добавяне на бележка",
 	"no-notes": "Няма споделени бележки.",
+	"delete-note-confirm": "Наистина ли искате да изтриете тази бележка към доклада?",
+	"note-added": "Бележката е добавена",
+	"note-deleted": "Бележката е изтрита",
 
 	"history": "Акаунт и история на докладванията",
 	"no-history": "Няма история на доклада.",
@@ -53,7 +56,6 @@
 	"state-resolved": "Разрешен",
 	"state-rejected": "Отхвърлен",
 	"no-assignee": "Без назначение",
-	"note-added": "Бележката е добавена",
 
 	"modal-title": "Докладване на неуместно съдържание",
 	"modal-body": "Моля, посочете причината за докладването на %1 %2 за преглед. Или използвайте някой от бутоните за бързо докладване, ако са приложими.",

public/language/bg/modules.json

@@ -1,6 +1,7 @@
 {
     "chat.chatting_with": "Разговор с",
     "chat.placeholder": "Въведете съобщението тук и натиснете Ентер за изпращане",
+    "chat.scroll-up-alert": "В момента разглеждате по-стари съобщения. Щракнете тук, за да се прехвърлите към най-новото съобщение.",
     "chat.send": "Изпращане",
     "chat.no_active": "Нямате текущи разговори.",
     "chat.user_typing": "%1 пише...",
@@ -58,6 +59,7 @@
     "composer.upload-file": "Качване на файл",
     "composer.zen_mode": "Режим Дзен",
     "composer.select_category": "Изберете категория",
+    "composer.textarea.placeholder": "Въведете съдържанието на публикацията си тук. Можете също да влачите и пускате снимки.",
     "bootbox.ok": "Добре",
     "bootbox.cancel": "Отказ",
     "bootbox.confirm": "Потвърждаване",

public/language/bg/topic.json

@@ -36,9 +36,11 @@
     "ban-ip": "Блокиране на IP адреса",
     "view-history": "История на редакциите",
     "bookmark_instructions": "Щракнете тук, за да се върнете към последно прочетената публикация в тази тема.",
-    "flag_post": "Докладване на тази публикация",
-    "flag_user": "Докладване на този потребител",
-    "merged_message": "Тази тема беше слята в <a href=\"/topic/%1\">%2</a>",
+    "flag-post": "Докладване на тази публикация",
+    "flag-user": "Докладване на този потребител",
+    "already-flagged": "Вече е докладвано",
+    "view-flag-report": "Преглед на доклада",
+    "merged_message": "Тази тема беше слята в <a href=\"%1\">%2</a>",
     "deleted_message": "Темата е изтрита. Само потребители с права за управление на темите могат да я видят.",
     "following_topic.message": "Вече ще получавате известия когато някой публикува коментар в тази тема.",
     "not_following_topic.message": "Ще виждате тази тема в списъка с непрочетени теми, но няма да получавате известия, когато хората публикуват нещо в нея.",

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

@@ -3,6 +3,7 @@
 	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
+	"primary": "primary / run jobs",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "online",

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

@@ -27,6 +27,8 @@
 	"enable": "Enable",
 	"disable": "Disable",
 	"edit": "Edit",
+	"analytics": "Analytics",
+	"view-category": "View category",
 
 	"select-category": "Select Category",
 	"set-parent-category": "Set Parent Category",
@@ -76,7 +78,9 @@
 	"alert.user-search": "Search for a user here...",
 	"alert.find-group": "Find a Group",
 	"alert.group-search": "Search for a group here...",
+	"alert.not-enough-whitelisted-tags": "Whitelisted tags are less than minimum tags, you need to create more whitelisted tags!",
 	"collapse-all": "Collapse All",
 	"expand-all": "Expand All",
-	"disable-on-create": "Disable on create"
+	"disable-on-create": "Disable on create",
+	"no-matches": "No matches"
 }

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

@@ -8,6 +8,8 @@
 	"hidden": "Hidden",
 	"private": "Private",
 	"edit": "Edit",
+	"delete": "Delete",
+	"download-csv": "Download CSV",
 	"search-placeholder": "Search",
 	"create": "Create Group",
 	"description-placeholder": "A short description about your group",

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

@@ -4,6 +4,7 @@
 	"admin": "Admin",
 	"group-privileges": "Group Privileges",
 	"user-privileges": "User Privileges",
+	"edit-privileges": "Edit Privileges",
 	"chat": "Chat",
 	"upload-images": "Upload Images",
 	"upload-files": "Upload Files",
@@ -33,7 +34,6 @@
 	"delete-topics": "Delete Topics",
 	"purge": "Purge",
 	"moderate": "Moderate",
-
 	"admin-dashboard": "Dashboard",
 	"admin-categories": "Categories",
 	"admin-privileges": "Privileges",

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

@@ -108,5 +108,5 @@
 
 	"alerts.prompt-email": "Emails: ",
 	"alerts.email-sent-to": "An invitation email has been sent to %1",
-	"alerts.x-users-found": "%1 user(s) found! Search took %2 ms."
+	"alerts.x-users-found": "%1 user(s) found, (%2 seconds)"
 }

public/language/bn/admin/menu.json

@@ -19,7 +19,7 @@
 	"settings/general": "General",
 	"settings/homepage": "Home Page",
 	"settings/navigation": "Navigation",
-	"settings/reputation": "Reputation",
+	"settings/reputation": "Reputation & Flags",
 	"settings/email": "Email",
 	"settings/user": "Users",
 	"settings/group": "Groups",

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

@@ -2,6 +2,5 @@
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
 	"welcome-notification-link": "Welcome Notification Link",
-	"welcome-notification-uid": "Welcome Notification User (UID)",
-	"notification-alert-timeout": "Notification Alert Timeout"
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

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

@@ -5,10 +5,16 @@
 	"votes-are-public": "All Votes Are Public",
 	"thresholds": "Activity Thresholds",
 	"min-rep-downvote": "Minimum reputation to downvote posts",
+	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
+	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",
 	"min-rep-signature": "Minimum reputation to add \"Signature\" to user profile",
 	"min-rep-profile-picture": "Minimum reputation to add \"Profile Picture\" to user profile",
-	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile"
+	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile",
+
+	"flags": "Flag Settings",
+	"flags.limit-per-target": "Maximum number of times something can be flagged",
+	"flags.limit-per-target-placeholder": "Default: 0"
 }

public/language/bn/error.json

@@ -138,8 +138,13 @@
     "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature",
     "not-enough-reputation-min-rep-profile-picture": "You do not have enough reputation to add a profile picture",
     "not-enough-reputation-min-rep-cover-picture": "You do not have enough reputation to add a cover picture",
-    "already-flagged": "You have already flagged this post",
+    "post-already-flagged": "You have already flagged this post",
+    "user-already-flagged": "You have already flagged this user",
+    "post-flagged-too-many-times": "This post has been flagged by others already",
+    "user-flagged-too-many-times": "This user has been flagged by others already",
     "self-vote": "You cannot vote on your own post",
+    "too-many-downvotes-today": "You can only downvote %1 times a day",
+    "too-many-downvotes-today-user": "You can only downvote a user %1 times a day",
     "reload-failed": "\"%1\" রিলোড করতে সমস্যা হয়েছে। রিলোডের পূর্বে যা করা হয়েছিল সেটি আনডু করা সমীচীন। ",
     "registration-error": "নিবন্ধন এরর!",
     "parse-error": "Something went wrong while parsing server response",

public/language/bn/flags.json

@@ -1,8 +1,7 @@
 {
 	"state": "State",
-	"reporter": "Reporter",
-	"reported-at": "Reported At",
-	"description": "Description",
+	"reports": "Reports",
+	"first-reported": "First Reported",
 	"no-flags": "Hooray! No flags found.",
 	"assignee": "Assignee",
 	"update": "Update",
@@ -26,6 +25,7 @@
 	"filter-quick-mine": "Assigned to me",
 	"filter-cid-all": "All categories",
 	"apply-filters": "Apply Filters",
+	"more-filters": "More Filters",
 
 	"quick-actions": "Quick Actions",
 	"flagged-user": "Flagged User",
@@ -43,6 +43,9 @@
 	"notes": "Flag Notes",
 	"add-note": "Add Note",
 	"no-notes": "No shared notes.",
+	"delete-note-confirm": "Are you sure you want to delete this flag note?",
+	"note-added": "Note Added",
+	"note-deleted": "Note Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "No flag history.",
@@ -53,7 +56,6 @@
 	"state-resolved": "Resolved",
 	"state-rejected": "Rejected",
 	"no-assignee": "Not Assigned",
-	"note-added": "Note Added",
 
 	"modal-title": "Report Inappropriate Content",
 	"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",

public/language/bn/modules.json

@@ -1,6 +1,7 @@
 {
     "chat.chatting_with": "Chat with",
     "chat.placeholder": "এখানে আপনার বার্তা লিখুন। পাঠানোর জন্য Enter চাপুন",
+    "chat.scroll-up-alert": "You are looking at older messages, click here to go to most recent message.",
     "chat.send": "প্রেরন করুন",
     "chat.no_active": "আপনার কোন সচল কথোপকথন নেই",
     "chat.user_typing": "%1 লিখছেন",
@@ -58,6 +59,7 @@
     "composer.upload-file": "Upload File",
     "composer.zen_mode": "Zen Mode",
     "composer.select_category": "Select a category",
+    "composer.textarea.placeholder": "Enter your post content here, drag and drop images",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",

public/language/bn/topic.json

@@ -36,9 +36,11 @@
     "ban-ip": "Ban IP",
     "view-history": "Edit History",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
-    "flag_post": "Flag this post",
-    "flag_user": "Flag this user",
-    "merged_message": "This topic has been merged into <a href=\"/topic/%1\">%2</a>",
+    "flag-post": "Flag this post",
+    "flag-user": "Flag this user",
+    "already-flagged": "Already Flagged",
+    "view-flag-report": "View Flag Report",
+    "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "এই টপিকটি মুছে ফেলা হয়েছে। শুধুমাত্র টপিক ব্যবস্থাপনার ক্ষমতাপ্রাপ্ত সদস্যগণ এটি দেখতে পারবেন।",
     "following_topic.message": "এখন থেকে এই টপিকে অন্যকেউ পোস্ট করলে আপনি নোটিফিকেশন পাবেন।",
     "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",

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

@@ -3,6 +3,7 @@
 	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 vazeb odpovědělo během %2ms.",
 	"host": "host",
+	"primary": "primary / run jobs",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "připojen",

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

@@ -27,6 +27,8 @@
 	"enable": "Povolit",
 	"disable": "Zakázat",
 	"edit": "Upravit",
+	"analytics": "Analytics",
+	"view-category": "View category",
 
 	"select-category": "Vyberte kategorii",
 	"set-parent-category": "Nastavit nadřazenou kategorii",
@@ -76,7 +78,9 @@
 	"alert.user-search": "Najít uživatele…",
 	"alert.find-group": "Najít skupinu",
 	"alert.group-search": "Hledat skupinu…",
+	"alert.not-enough-whitelisted-tags": "Whitelisted tags are less than minimum tags, you need to create more whitelisted tags!",
 	"collapse-all": "Sbalit vše",
 	"expand-all": "Rozbalit vše",
-	"disable-on-create": "Zakázat při vytvoření"
+	"disable-on-create": "Zakázat při vytvoření",
+	"no-matches": "No matches"
 }

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

@@ -8,6 +8,8 @@
 	"hidden": "Skrytý",
 	"private": "Soukromí",
 	"edit": "Upravit",
+	"delete": "Delete",
+	"download-csv": "Download CSV",
 	"search-placeholder": "Hledat",
 	"create": "Vytvořit skupinu",
 	"description-placeholder": "Krátký popis skupiny",

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

@@ -4,6 +4,7 @@
 	"admin": "Admin",
 	"group-privileges": "Oprávnění skupiny",
 	"user-privileges": "Oprávnění uživatele",
+	"edit-privileges": "Edit Privileges",
 	"chat": "Konverzace",
 	"upload-images": "Nahrát obrázky",
 	"upload-files": "Náhrát soubory",
@@ -33,7 +34,6 @@
 	"delete-topics": "Odstranit témata",
 	"purge": "Vyčistit",
 	"moderate": "Moderace",
-
 	"admin-dashboard": "Dashboard",
 	"admin-categories": "Categories",
 	"admin-privileges": "Privileges",

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

@@ -108,5 +108,5 @@
 
 	"alerts.prompt-email": "E-maily:",
 	"alerts.email-sent-to": "E-mail s pozvánkou byl odeslán na %1",
-	"alerts.x-users-found": "Počet nalezených uživatelů: %1 (hledání trvalo %2 ms)"
+	"alerts.x-users-found": "%1 user(s) found, (%2 seconds)"
 }

public/language/cs/admin/menu.json

@@ -19,7 +19,7 @@
 	"settings/general": "Všeobecné",
 	"settings/homepage": "Home Page",
 	"settings/navigation": "Navigation",
-	"settings/reputation": "Reputace",
+	"settings/reputation": "Reputation & Flags",
 	"settings/email": "E-mail",
 	"settings/user": "Users",
 	"settings/group": "Groups",

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

@@ -2,6 +2,5 @@
 	"notifications": "Oznámení",
 	"welcome-notification": "Uvítání",
 	"welcome-notification-link": "Odkaz na uvítání",
-	"welcome-notification-uid": "Uvítání uživatele (UID)",
-	"notification-alert-timeout": "Čas pro zobrazení oznámení"
+	"welcome-notification-uid": "Uvítání uživatele (UID)"
 }

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

@@ -5,10 +5,16 @@
 	"votes-are-public": "Všechna hlasování jsou veřejná",
 	"thresholds": "Omezení aktivity",
 	"min-rep-downvote": "Minimální reputace pro vyjádření nesouhlasu s příspěvkem",
+	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
+	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
 	"min-rep-flag": "Minimální reputace pro označení příspěvků",
 	"min-rep-website": "Minimální reputace pro přidání „Webové stránky” do uživatelského profilu",
 	"min-rep-aboutme": "Minimální reputace pro přidání „O mně” do uživatelského profilu",
 	"min-rep-signature": "Minimální reputace pro přidání „Podpisu” do uživatelského profilu",
 	"min-rep-profile-picture": "Minimální reputace pro přidání „Profilového obrázku” do uživatelského profilu",
-	"min-rep-cover-picture": "Minimální reputace pro přidání „Obrázku uživatele” do uživatelského profilu"
+	"min-rep-cover-picture": "Minimální reputace pro přidání „Obrázku uživatele” do uživatelského profilu",
+
+	"flags": "Flag Settings",
+	"flags.limit-per-target": "Maximum number of times something can be flagged",
+	"flags.limit-per-target-placeholder": "Default: 0"
 }

public/language/cs/error.json

@@ -138,8 +138,13 @@
     "not-enough-reputation-min-rep-signature": "Pro přidání podpisu nemáte dostatek reputace",
     "not-enough-reputation-min-rep-profile-picture": "Pro přidání profilového obrázku nemáte dostatek reputace",
     "not-enough-reputation-min-rep-cover-picture": "Pro přidání obrázku nemáte dostatek reputace",
-    "already-flagged": "Tento příspěvek jste již označil",
+    "post-already-flagged": "You have already flagged this post",
+    "user-already-flagged": "You have already flagged this user",
+    "post-flagged-too-many-times": "This post has been flagged by others already",
+    "user-flagged-too-many-times": "This user has been flagged by others already",
     "self-vote": "U svého vlastního příspěvku nemůžete hlasovat",
+    "too-many-downvotes-today": "You can only downvote %1 times a day",
+    "too-many-downvotes-today-user": "You can only downvote a user %1 times a day",
     "reload-failed": "Vyskytla se chyba v NodeBB při znovu načtení: \"%1\". NodeBB bude pokračovat v běhu na straně klienta,  nicméně byste měl/a přenastavit zpět to, co jste udělal/a před opětovným načtením.",
     "registration-error": "Chyba při registraci",
     "parse-error": "Při analýze odpovědi serveru nastala chyba",

public/language/cs/flags.json

@@ -1,8 +1,7 @@
 {
 	"state": "Stav",
-	"reporter": "Nahlásil",
-	"reported-at": "Nahlásil v",
-	"description": "Popis",
+	"reports": "Reports",
+	"first-reported": "First Reported",
 	"no-flags": "Hurá, žádné označení.",
 	"assignee": "Nabyvatel",
 	"update": "Aktualizovat",
@@ -26,6 +25,7 @@
 	"filter-quick-mine": "Přiřazeno mě",
 	"filter-cid-all": "Všechny kategorie",
 	"apply-filters": "Použít filtry",
+	"more-filters": "More Filters",
 
 	"quick-actions": "Quick Actions",
 	"flagged-user": "Označený uživatel",
@@ -43,6 +43,9 @@
 	"notes": "Poznámky označení",
 	"add-note": "Přidat poznámku",
 	"no-notes": "Žádné sdílené poznámky.",
+	"delete-note-confirm": "Are you sure you want to delete this flag note?",
+	"note-added": "Poznámka přidána",
+	"note-deleted": "Note Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "Žádná historie označení.",
@@ -53,7 +56,6 @@
 	"state-resolved": "Vyřešeno",
 	"state-rejected": "Zamítnuto",
 	"no-assignee": "Nepřiřazeno",
-	"note-added": "Poznámka přidána",
 
 	"modal-title": "Nahlásit nevhodný obsah",
 	"modal-body": "Zadejte váš důvod k označení %1 %2 pro kontrolu. Nebo použijte tlačítko je-li dostupné.",

public/language/cs/modules.json

@@ -1,6 +1,7 @@
 {
     "chat.chatting_with": "Konverzace s",
     "chat.placeholder": "Konverzační zprávu napište zde, pro odeslání stiskněte klávesu Enter",
+    "chat.scroll-up-alert": "You are looking at older messages, click here to go to most recent message.",
     "chat.send": "Odeslat",
     "chat.no_active": "Nemáte žádné aktivní konverzace.",
     "chat.user_typing": "%1 píše…",
@@ -58,6 +59,7 @@
     "composer.upload-file": "Nahrát soubor",
     "composer.zen_mode": "Režim Zem",
     "composer.select_category": "Vyberte kategorii",
+    "composer.textarea.placeholder": "Enter your post content here, drag and drop images",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Zrušit",
     "bootbox.confirm": "Potvrdit",

public/language/cs/topic.json

@@ -36,9 +36,11 @@
     "ban-ip": "Zakázat IP",
     "view-history": "Upravit historii",
     "bookmark_instructions": "Pro návrat k poslednímu čtenému příspěvku v tématu, klikněte zde.",
-    "flag_post": "Flag this post",
-    "flag_user": "Flag this user",
-    "merged_message": "Toto téma bylo sloučeno do <a href=\"/topic/%1\">%2</a>",
+    "flag-post": "Flag this post",
+    "flag-user": "Flag this user",
+    "already-flagged": "Already Flagged",
+    "view-flag-report": "View Flag Report",
+    "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Toto téma bylo odstraněno. Jen uživatelé s oprávněním správy témat ho mohou vidět.",
     "following_topic.message": "Nyní budete dostávat upozornění, jakmile někdo přidá příspěvek do tohoto tématu.",
     "not_following_topic.message": " Toto téma uvidíte v seznamu nepřečtených témat, ale neobdržíte upozornění, přidá-li někdo nový příspěvek.",

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

@@ -3,6 +3,7 @@
 	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
+	"primary": "primary / run jobs",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "online",

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

@@ -27,6 +27,8 @@
 	"enable": "Enable",
 	"disable": "Disable",
 	"edit": "Edit",
+	"analytics": "Analytics",
+	"view-category": "View category",
 
 	"select-category": "Select Category",
 	"set-parent-category": "Set Parent Category",
@@ -76,7 +78,9 @@
 	"alert.user-search": "Search for a user here...",
 	"alert.find-group": "Find a Group",
 	"alert.group-search": "Search for a group here...",
+	"alert.not-enough-whitelisted-tags": "Whitelisted tags are less than minimum tags, you need to create more whitelisted tags!",
 	"collapse-all": "Collapse All",
 	"expand-all": "Expand All",
-	"disable-on-create": "Disable on create"
+	"disable-on-create": "Disable on create",
+	"no-matches": "No matches"
 }

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

@@ -8,6 +8,8 @@
 	"hidden": "Hidden",
 	"private": "Private",
 	"edit": "Edit",
+	"delete": "Delete",
+	"download-csv": "Download CSV",
 	"search-placeholder": "Search",
 	"create": "Create Group",
 	"description-placeholder": "A short description about your group",

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

@@ -4,6 +4,7 @@
 	"admin": "Admin",
 	"group-privileges": "Group Privileges",
 	"user-privileges": "User Privileges",
+	"edit-privileges": "Edit Privileges",
 	"chat": "Chat",
 	"upload-images": "Upload Images",
 	"upload-files": "Upload Files",
@@ -33,7 +34,6 @@
 	"delete-topics": "Delete Topics",
 	"purge": "Purge",
 	"moderate": "Moderate",
-
 	"admin-dashboard": "Dashboard",
 	"admin-categories": "Categories",
 	"admin-privileges": "Privileges",

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

@@ -108,5 +108,5 @@
 
 	"alerts.prompt-email": "Emails: ",
 	"alerts.email-sent-to": "An invitation email has been sent to %1",
-	"alerts.x-users-found": "%1 user(s) found! Search took %2 ms."
+	"alerts.x-users-found": "%1 user(s) found, (%2 seconds)"
 }

public/language/da/admin/menu.json

@@ -19,7 +19,7 @@
 	"settings/general": "General",
 	"settings/homepage": "Home Page",
 	"settings/navigation": "Navigation",
-	"settings/reputation": "Reputation",
+	"settings/reputation": "Reputation & Flags",
 	"settings/email": "Email",
 	"settings/user": "Users",
 	"settings/group": "Groups",

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

@@ -2,6 +2,5 @@
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
 	"welcome-notification-link": "Welcome Notification Link",
-	"welcome-notification-uid": "Welcome Notification User (UID)",
-	"notification-alert-timeout": "Notification Alert Timeout"
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

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

@@ -5,10 +5,16 @@
 	"votes-are-public": "All Votes Are Public",
 	"thresholds": "Activity Thresholds",
 	"min-rep-downvote": "Minimum reputation to downvote posts",
+	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
+	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",
 	"min-rep-signature": "Minimum reputation to add \"Signature\" to user profile",
 	"min-rep-profile-picture": "Minimum reputation to add \"Profile Picture\" to user profile",
-	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile"
+	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile",
+
+	"flags": "Flag Settings",
+	"flags.limit-per-target": "Maximum number of times something can be flagged",
+	"flags.limit-per-target-placeholder": "Default: 0"
 }

public/language/da/error.json

@@ -138,8 +138,13 @@
     "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature",
     "not-enough-reputation-min-rep-profile-picture": "You do not have enough reputation to add a profile picture",
     "not-enough-reputation-min-rep-cover-picture": "You do not have enough reputation to add a cover picture",
-    "already-flagged": "Du har allerede vurderet dette indlæg",
+    "post-already-flagged": "You have already flagged this post",
+    "user-already-flagged": "You have already flagged this user",
+    "post-flagged-too-many-times": "This post has been flagged by others already",
+    "user-flagged-too-many-times": "This user has been flagged by others already",
     "self-vote": "You cannot vote on your own post",
+    "too-many-downvotes-today": "You can only downvote %1 times a day",
+    "too-many-downvotes-today-user": "You can only downvote a user %1 times a day",
     "reload-failed": "NodeBB stødte på et problem under genindlæsningen : \"%1\". NodeBB vil fortsætte med en ældre version, og det er nok god ide at genoptage fra lige før du genindlæste siden.",
     "registration-error": "Registeringsfejl",
     "parse-error": "Noget gik galt under fortolknings er serverens respons",

public/language/da/flags.json

@@ -1,8 +1,7 @@
 {
 	"state": "State",
-	"reporter": "Reporter",
-	"reported-at": "Reported At",
-	"description": "Description",
+	"reports": "Reports",
+	"first-reported": "First Reported",
 	"no-flags": "Hooray! No flags found.",
 	"assignee": "Assignee",
 	"update": "Update",
@@ -26,6 +25,7 @@
 	"filter-quick-mine": "Assigned to me",
 	"filter-cid-all": "All categories",
 	"apply-filters": "Apply Filters",
+	"more-filters": "More Filters",
 
 	"quick-actions": "Quick Actions",
 	"flagged-user": "Flagged User",
@@ -43,6 +43,9 @@
 	"notes": "Flag Notes",
 	"add-note": "Add Note",
 	"no-notes": "No shared notes.",
+	"delete-note-confirm": "Are you sure you want to delete this flag note?",
+	"note-added": "Note Added",
+	"note-deleted": "Note Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "No flag history.",
@@ -53,7 +56,6 @@
 	"state-resolved": "Resolved",
 	"state-rejected": "Rejected",
 	"no-assignee": "Not Assigned",
-	"note-added": "Note Added",
 
 	"modal-title": "Report Inappropriate Content",
 	"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",

public/language/da/modules.json

@@ -1,6 +1,7 @@
 {
     "chat.chatting_with": "Chat with",
     "chat.placeholder": "Skriv din chatbesked her, tryk enter for at sende",
+    "chat.scroll-up-alert": "You are looking at older messages, click here to go to most recent message.",
     "chat.send": "Send",
     "chat.no_active": "Du har ingen aktive chats.",
     "chat.user_typing": "%1 skriver ...",
@@ -58,6 +59,7 @@
     "composer.upload-file": "Upload File",
     "composer.zen_mode": "Zen Mode",
     "composer.select_category": "Select a category",
+    "composer.textarea.placeholder": "Enter your post content here, drag and drop images",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Annuller",
     "bootbox.confirm": "Bekræft",

public/language/da/topic.json

@@ -36,9 +36,11 @@
     "ban-ip": "Ban IP",
     "view-history": "Edit History",
     "bookmark_instructions": "Klik her for at vende tilbage til den sidst læste indlæg i denne tråd.",
-    "flag_post": "Flag this post",
-    "flag_user": "Flag this user",
-    "merged_message": "This topic has been merged into <a href=\"/topic/%1\">%2</a>",
+    "flag-post": "Flag this post",
+    "flag-user": "Flag this user",
+    "already-flagged": "Already Flagged",
+    "view-flag-report": "View Flag Report",
+    "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Denne tråd er blevet slettet. Kun brugere med emne behandlings privilegier kan se den.",
     "following_topic.message": "Du vil nu modtage notifikationer når nogle skriver et indlæg i dette emne.",
     "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",

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

@@ -3,6 +3,7 @@
 	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 Knoten antworteten innerhalb von %2ms",
 	"host": "Host",
+	"primary": "primary / run jobs",
 	"pid": "PID",
 	"nodejs": "Node.js Version",
 	"online": "Online",

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

@@ -27,6 +27,8 @@
 	"enable": "Aktivieren",
 	"disable": "Deaktivieren",
 	"edit": "Bearbeiten",
+	"analytics": "Analytics",
+	"view-category": "View category",
 
 	"select-category": "Kategorie auswählen",
 	"set-parent-category": "Übergeordnete Kategorie festlegen",
@@ -76,7 +78,9 @@
 	"alert.user-search": "Hier nach einem Benutzer suchen...",
 	"alert.find-group": "Gruppe finden",
 	"alert.group-search": "Hier nach einer Gruppe suchen...",
+	"alert.not-enough-whitelisted-tags": "Whitelisted tags are less than minimum tags, you need to create more whitelisted tags!",
 	"collapse-all": "Alle einklappen",
 	"expand-all": "Alle ausklappen",
-	"disable-on-create": "Deaktiviere beim erstellen"
+	"disable-on-create": "Deaktiviere beim erstellen",
+	"no-matches": "No matches"
 }

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

@@ -8,6 +8,8 @@
 	"hidden": "Hidden",
 	"private": "Private",
 	"edit": "Ändern",
+	"delete": "Delete",
+	"download-csv": "Download CSV",
 	"search-placeholder": "Suchen",
 	"create": "Gruppe erstellen",
 	"description-placeholder": "Eine kurze Beschreibung deiner Gruppe",

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

@@ -4,6 +4,7 @@
 	"admin": "Admin",
 	"group-privileges": "Group Privileges",
 	"user-privileges": "User Privileges",
+	"edit-privileges": "Edit Privileges",
 	"chat": "Chat",
 	"upload-images": "Bilder hochladen",
 	"upload-files": "Dateien hochladen",
@@ -33,7 +34,6 @@
 	"delete-topics": "Themen entfernen",
 	"purge": "Endgültig löschen",
 	"moderate": "Moderieren",
-
 	"admin-dashboard": "Dashboard",
 	"admin-categories": "Categories",
 	"admin-privileges": "Privileges",

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

@@ -108,5 +108,5 @@
 
 	"alerts.prompt-email": "E-Mails:",
 	"alerts.email-sent-to": "Eine Einladungsemail wurde an %1 gesendet",
-	"alerts.x-users-found": "%1 Nutzer gefunden! Die Suche dauerte %2ms."
+	"alerts.x-users-found": "%1 user(s) found, (%2 seconds)"
 }

public/language/de/admin/menu.json

@@ -19,7 +19,7 @@
 	"settings/general": "Allgemein",
 	"settings/homepage": "Home Page",
 	"settings/navigation": "Navigation",
-	"settings/reputation": "Reputation",
+	"settings/reputation": "Reputation & Flags",
 	"settings/email": "E-Mail",
 	"settings/user": "Users",
 	"settings/group": "Groups",

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

@@ -2,6 +2,5 @@
 	"notifications": "Benachrichtigungen",
 	"welcome-notification": "Wilkommensnachricht",
 	"welcome-notification-link": "Wilkommensnachricht-Link",
-	"welcome-notification-uid": "Wilkommensbenachrichtigung Benutzer (UID)",
-	"notification-alert-timeout": "Benachrichtigungs Timeout"
+	"welcome-notification-uid": "Wilkommensbenachrichtigung Benutzer (UID)"
 }

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

@@ -5,10 +5,16 @@
 	"votes-are-public": "Alle Bewertungen sind öffentlich",
 	"thresholds": "Aktivitätsschwelle",
 	"min-rep-downvote": "Minimales Ansehen um Beiträge negativ zu bewerten",
+	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
+	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
 	"min-rep-flag": "Minimales Ansehen und Beiträge zu melden",
 	"min-rep-website": "Erforderliche Reputation um eine \"Website\" zum Benutzerprofil hinzuzufügen",
 	"min-rep-aboutme": "Erforderliche Reputation um eine \"Über mich\"-Sektion zum Benutzerprofil hinzuzufügen",
 	"min-rep-signature": "Erforderliche Reputation um eine \"Signatur\" zum Benutzerprofil hinzuzufügen",
 	"min-rep-profile-picture": "Minimale Reputation um ein Profilbild hinzuzufügen",
-	"min-rep-cover-picture": "Minimale Reputation um ein Deckbild hinzuzufügen"
+	"min-rep-cover-picture": "Minimale Reputation um ein Deckbild hinzuzufügen",
+
+	"flags": "Flag Settings",
+	"flags.limit-per-target": "Maximum number of times something can be flagged",
+	"flags.limit-per-target-placeholder": "Default: 0"
 }

public/language/de/error.json

@@ -138,8 +138,13 @@
     "not-enough-reputation-min-rep-signature": "Deine Reputation um eine \"Signatur\" zum Benutzerprofil hinzuzufügen ist zu niedrig",
     "not-enough-reputation-min-rep-profile-picture": "Deine Reputation ist zu niedrig um ein Profilbild hinzuzufügen.",
     "not-enough-reputation-min-rep-cover-picture": "Deine Reputation ist zu niedrig um ein Deckbild hinzuzufügen.",
-    "already-flagged": "Du hast diesen Beitrag bereits gemeldet",
+    "post-already-flagged": "You have already flagged this post",
+    "user-already-flagged": "You have already flagged this user",
+    "post-flagged-too-many-times": "This post has been flagged by others already",
+    "user-flagged-too-many-times": "This user has been flagged by others already",
     "self-vote": "Du kannst deine eigenen Beiträge nicht bewerten",
+    "too-many-downvotes-today": "You can only downvote %1 times a day",
+    "too-many-downvotes-today-user": "You can only downvote a user %1 times a day",
     "reload-failed": "Es ist ein Problem während des Reloads von NodeBB aufgetreten: \"%1\". NodeBB wird weiterhin clientseitige Assets bereitstellen, allerdings solltest du das, was du vor dem Reload gemacht hast, rückgängig machen.",
     "registration-error": "Registrierungsfehler",
     "parse-error": "Beim auswerten der Serverantwort ist etwas schiefgegangen",

public/language/de/flags.json

@@ -1,8 +1,7 @@
 {
 	"state": "Zustand",
-	"reporter": "Meldender",
-	"reported-at": "Gemeldet am",
-	"description": "Beschreibung",
+	"reports": "Reports",
+	"first-reported": "First Reported",
 	"no-flags": "Hurra! Keine Meldungen gefunden.",
 	"assignee": "Zugeordneter Benutzer",
 	"update": "Aktualisieren",
@@ -26,6 +25,7 @@
 	"filter-quick-mine": "Mir zugewiesen",
 	"filter-cid-all": "Alle Kategorien",
 	"apply-filters": "Filter anwenden",
+	"more-filters": "More Filters",
 
 	"quick-actions": "Quick Actions",
 	"flagged-user": "Gemeldeter Benutzer",
@@ -43,6 +43,9 @@
 	"notes": "Meldungsnotizen",
 	"add-note": "Notiz hinzufügen",
 	"no-notes": "Keine geteilten Notizen",
+	"delete-note-confirm": "Are you sure you want to delete this flag note?",
+	"note-added": "Notiz hinzugefügt",
+	"note-deleted": "Note Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "Kein Meldungsverlauf",
@@ -53,7 +56,6 @@
 	"state-resolved": "Gelöst",
 	"state-rejected": "Abgelehnt",
 	"no-assignee": "Nicht zugewiesen",
-	"note-added": "Notiz hinzugefügt",
 
 	"modal-title": "Anstößige Inhalte Melden",
 	"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.",

public/language/de/modules.json

@@ -1,6 +1,7 @@
 {
     "chat.chatting_with": "Chat mit",
     "chat.placeholder": "Schreibe hier etwas, und drücke Enter zum Absenden.",
+    "chat.scroll-up-alert": "You are looking at older messages, click here to go to most recent message.",
     "chat.send": "Senden",
     "chat.no_active": "Du hast keine aktiven Chats.",
     "chat.user_typing": "%1 tippt gerade ...",
@@ -58,6 +59,7 @@
     "composer.upload-file": "Datei hochladen",
     "composer.zen_mode": "Zen Modus",
     "composer.select_category": "Wähle eine Kategorie",
+    "composer.textarea.placeholder": "Enter your post content here, drag and drop images",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Abbrechen",
     "bootbox.confirm": "Bestätigen",

public/language/de/topic.json

@@ -36,9 +36,11 @@
     "ban-ip": "IP-Adresse bannen",
     "view-history": "Verlauf bearbeiten",
     "bookmark_instructions": "Klicke hier, um zum letzten gelesenen Beitrag des Themas zurückzukehren.",
-    "flag_post": "Flag this post",
-    "flag_user": "Flag this user",
-    "merged_message": "Dieses Thema wurde mit <a href=\"/topic/%1\">%2</a> zusammengeführt",
+    "flag-post": "Flag this post",
+    "flag-user": "Flag this user",
+    "already-flagged": "Already Flagged",
+    "view-flag-report": "View Flag Report",
+    "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Dieses Thema wurde gelöscht. Nur Nutzer mit entsprechenden Rechten können es sehen.",
     "following_topic.message": "Du erhältst nun eine Benachrichtigung, wenn jemand einen Beitrag zu diesem Thema verfasst.",
     "not_following_topic.message": "Ungelesene Beiträge in diesem Thema werden angezeigt, aber du erhältst keine Benachrichtigung wenn jemand einen Beitrag zu diesem Thema verfasst.",

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

@@ -3,6 +3,7 @@
 	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
+	"primary": "primary / run jobs",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "online",

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

@@ -27,6 +27,8 @@
 	"enable": "Enable",
 	"disable": "Disable",
 	"edit": "Edit",
+	"analytics": "Analytics",
+	"view-category": "View category",
 
 	"select-category": "Select Category",
 	"set-parent-category": "Set Parent Category",
@@ -76,7 +78,9 @@
 	"alert.user-search": "Search for a user here...",
 	"alert.find-group": "Find a Group",
 	"alert.group-search": "Search for a group here...",
+	"alert.not-enough-whitelisted-tags": "Whitelisted tags are less than minimum tags, you need to create more whitelisted tags!",
 	"collapse-all": "Collapse All",
 	"expand-all": "Expand All",
-	"disable-on-create": "Disable on create"
+	"disable-on-create": "Disable on create",
+	"no-matches": "No matches"
 }

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

@@ -8,6 +8,8 @@
 	"hidden": "Hidden",
 	"private": "Private",
 	"edit": "Edit",
+	"delete": "Delete",
+	"download-csv": "Download CSV",
 	"search-placeholder": "Search",
 	"create": "Create Group",
 	"description-placeholder": "A short description about your group",

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

@@ -4,6 +4,7 @@
 	"admin": "Admin",
 	"group-privileges": "Group Privileges",
 	"user-privileges": "User Privileges",
+	"edit-privileges": "Edit Privileges",
 	"chat": "Chat",
 	"upload-images": "Upload Images",
 	"upload-files": "Upload Files",
@@ -33,7 +34,6 @@
 	"delete-topics": "Delete Topics",
 	"purge": "Purge",
 	"moderate": "Moderate",
-
 	"admin-dashboard": "Dashboard",
 	"admin-categories": "Categories",
 	"admin-privileges": "Privileges",

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

@@ -108,5 +108,5 @@
 
 	"alerts.prompt-email": "Emails: ",
 	"alerts.email-sent-to": "An invitation email has been sent to %1",
-	"alerts.x-users-found": "%1 user(s) found! Search took %2 ms."
+	"alerts.x-users-found": "%1 user(s) found, (%2 seconds)"
 }

public/language/el/admin/menu.json

@@ -19,7 +19,7 @@
 	"settings/general": "General",
 	"settings/homepage": "Home Page",
 	"settings/navigation": "Navigation",
-	"settings/reputation": "Reputation",
+	"settings/reputation": "Reputation & Flags",
 	"settings/email": "Email",
 	"settings/user": "Users",
 	"settings/group": "Groups",

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

@@ -2,6 +2,5 @@
 	"notifications": "Ειδοποιήσεις",
 	"welcome-notification": "Ειδοποίηση καλωσορίσματος",
 	"welcome-notification-link": "Welcome Notification Link",
-	"welcome-notification-uid": "Welcome Notification User (UID)",
-	"notification-alert-timeout": "Notification Alert Timeout"
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

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

@@ -5,10 +5,16 @@
 	"votes-are-public": "All Votes Are Public",
 	"thresholds": "Activity Thresholds",
 	"min-rep-downvote": "Minimum reputation to downvote posts",
+	"downvotes-per-day": "Downvotes per day (set to 0 for unlimited downvotes)",
+	"downvotes-per-user-per-day": "Downvotes per user per day (set to 0 for unlimited downvotes)",
 	"min-rep-flag": "Minimum reputation to flag posts",
 	"min-rep-website": "Minimum reputation to add \"Website\" to user profile",
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",
 	"min-rep-signature": "Minimum reputation to add \"Signature\" to user profile",
 	"min-rep-profile-picture": "Minimum reputation to add \"Profile Picture\" to user profile",
-	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile"
+	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile",
+
+	"flags": "Flag Settings",
+	"flags.limit-per-target": "Maximum number of times something can be flagged",
+	"flags.limit-per-target-placeholder": "Default: 0"
 }

public/language/el/error.json

@@ -138,8 +138,13 @@
     "not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature",
     "not-enough-reputation-min-rep-profile-picture": "You do not have enough reputation to add a profile picture",
     "not-enough-reputation-min-rep-cover-picture": "You do not have enough reputation to add a cover picture",
-    "already-flagged": "You have already flagged this post",
+    "post-already-flagged": "You have already flagged this post",
+    "user-already-flagged": "You have already flagged this user",
+    "post-flagged-too-many-times": "This post has been flagged by others already",
+    "user-flagged-too-many-times": "This user has been flagged by others already",
     "self-vote": "You cannot vote on your own post",
+    "too-many-downvotes-today": "You can only downvote %1 times a day",
+    "too-many-downvotes-today-user": "You can only downvote a user %1 times a day",
     "reload-failed": "Το NodeBB συνάντησε ένα πρόβλημα καθώς γινόταν η ανανέωση: \"%1\". Το NodeBB θα συνεχίσει να προσφέρει τα στοιχεία του χρήστη, αν και θα ήταν καλή ιδέα να επαναφέρεις ότι έκανες πριν την ανανέωση.",
     "registration-error": "Registration Error",
     "parse-error": "Something went wrong while parsing server response",

public/language/el/flags.json

@@ -1,8 +1,7 @@
 {
 	"state": "State",
-	"reporter": "Reporter",
-	"reported-at": "Reported At",
-	"description": "Description",
+	"reports": "Reports",
+	"first-reported": "First Reported",
 	"no-flags": "Hooray! No flags found.",
 	"assignee": "Assignee",
 	"update": "Update",
@@ -26,6 +25,7 @@
 	"filter-quick-mine": "Assigned to me",
 	"filter-cid-all": "All categories",
 	"apply-filters": "Apply Filters",
+	"more-filters": "More Filters",
 
 	"quick-actions": "Quick Actions",
 	"flagged-user": "Flagged User",
@@ -43,6 +43,9 @@
 	"notes": "Flag Notes",
 	"add-note": "Add Note",
 	"no-notes": "No shared notes.",
+	"delete-note-confirm": "Are you sure you want to delete this flag note?",
+	"note-added": "Note Added",
+	"note-deleted": "Note Deleted",
 
 	"history": "Account & Flag History",
 	"no-history": "No flag history.",
@@ -53,7 +56,6 @@
 	"state-resolved": "Resolved",
 	"state-rejected": "Rejected",
 	"no-assignee": "Not Assigned",
-	"note-added": "Note Added",
 
 	"modal-title": "Report Inappropriate Content",
 	"modal-body": "Please specify your reason for flagging %1 %2 for review. Alternatively, use one of the quick report buttons if applicable.",

public/language/el/modules.json

@@ -1,6 +1,7 @@
 {
     "chat.chatting_with": "Chat with",
     "chat.placeholder": "Type chat message here, press enter to send",
+    "chat.scroll-up-alert": "You are looking at older messages, click here to go to most recent message.",
     "chat.send": "Send",
     "chat.no_active": "You have no active chats.",
     "chat.user_typing": "%1 is typing ...",
@@ -58,6 +59,7 @@
     "composer.upload-file": "Upload File",
     "composer.zen_mode": "Zen Mode",
     "composer.select_category": "Select a category",
+    "composer.textarea.placeholder": "Enter your post content here, drag and drop images",
     "bootbox.ok": "OK",
     "bootbox.cancel": "Cancel",
     "bootbox.confirm": "Confirm",

public/language/el/topic.json

@@ -36,9 +36,11 @@
     "ban-ip": "Ban IP",
     "view-history": "Edit History",
     "bookmark_instructions": "Click here to return to the last read post in this thread.",
-    "flag_post": "Flag this post",
-    "flag_user": "Flag this user",
-    "merged_message": "This topic has been merged into <a href=\"/topic/%1\">%2</a>",
+    "flag-post": "Flag this post",
+    "flag-user": "Flag this user",
+    "already-flagged": "Already Flagged",
+    "view-flag-report": "View Flag Report",
+    "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
     "deleted_message": "Το θέμα αυτό έχει διαγραφεί. Μόνο οι χρήστες με δικαιώματα διαχειριστή θεμάτων μπορούν να το δουν.",
     "following_topic.message": "Θα λαμβάνεις ειδοποιήσεις όποτε κάποιος δημοσιεύει κάτι σε αυτό το θέμα.",
     "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",

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

@@ -3,6 +3,7 @@
 	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
+	"primary": "primary / run jobs",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "online",

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

@@ -27,6 +27,8 @@
 	"enable": "Enable",
 	"disable": "Disable",
 	"edit": "Edit",
+	"analytics": "Analytics",
+	"view-category": "View category",
 
 	"select-category": "Select Category",
 	"set-parent-category": "Set Parent Category",
@@ -79,5 +81,6 @@
 	"alert.not-enough-whitelisted-tags": "Whitelisted tags are less than minimum tags, you need to create more whitelisted tags!",
 	"collapse-all": "Collapse All",
 	"expand-all": "Expand All",
-	"disable-on-create": "Disable on create"
+	"disable-on-create": "Disable on create",
+	"no-matches": "No matches"
 }

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

@@ -9,7 +9,8 @@
 	"private": "Private",
 	"edit": "Edit",
 	"delete": "Delete",
-	"download-csv": "Download CSV",
+	"privileges": "Privileges",
+	"download-csv": "CSV",
 	"search-placeholder": "Search",
 	"create": "Create Group",
 	"description-placeholder": "A short description about your group",

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

@@ -4,6 +4,7 @@
 	"admin": "Admin",
 	"group-privileges": "Group Privileges",
 	"user-privileges": "User Privileges",
+	"edit-privileges": "Edit Privileges",
 	"chat": "Chat",
 	"upload-images": "Upload Images",
 	"upload-files": "Upload Files",
@@ -33,7 +34,6 @@
 	"delete-topics": "Delete Topics",
 	"purge": "Purge",
 	"moderate": "Moderate",
-
 	"admin-dashboard": "Dashboard",
 	"admin-categories": "Categories",
 	"admin-privileges": "Privileges",

public/language/en-GB/admin/menu.json

@@ -19,7 +19,7 @@
 	"settings/general": "General",
 	"settings/homepage": "Home Page",
 	"settings/navigation": "Navigation",
-	"settings/reputation": "Reputation",
+	"settings/reputation": "Reputation & Flags",
 	"settings/email": "Email",
 	"settings/user": "Users",
 	"settings/group": "Groups",

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

@@ -2,6 +2,5 @@
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
 	"welcome-notification-link": "Welcome Notification Link",
-	"welcome-notification-uid": "Welcome Notification User (UID)",
-	"notification-alert-timeout": "Notification Alert Timeout"
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }

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

@@ -12,5 +12,9 @@
 	"min-rep-aboutme": "Minimum reputation to add \"About me\" to user profile",
 	"min-rep-signature": "Minimum reputation to add \"Signature\" to user profile",
 	"min-rep-profile-picture": "Minimum reputation to add \"Profile Picture\" to user profile",
-	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile"
+	"min-rep-cover-picture": "Minimum reputation to add \"Cover Picture\" to user profile",
+
+	"flags": "Flag Settings",
+	"flags.limit-per-target": "Maximum number of times something can be flagged",
+	"flags.limit-per-target-placeholder": "Default: 0"
 }

public/language/en-GB/error.json

@@ -163,7 +163,10 @@
 	"not-enough-reputation-min-rep-signature": "You do not have enough reputation to add a signature",
 	"not-enough-reputation-min-rep-profile-picture": "You do not have enough reputation to add a profile picture",
 	"not-enough-reputation-min-rep-cover-picture": "You do not have enough reputation to add a cover picture",
-	"already-flagged": "You have already flagged this post",
+	"post-already-flagged": "You have already flagged this post",
+	"user-already-flagged": "You have already flagged this user",
+	"post-flagged-too-many-times": "This post has been flagged by others already",
+	"user-flagged-too-many-times": "This user has been flagged by others already",
 	"self-vote": "You cannot vote on your own post",
 	"too-many-downvotes-today": "You can only downvote %1 times a day",
 	"too-many-downvotes-today-user": "You can only downvote a user %1 times a day",

public/language/en-GB/flags.json

@@ -1,8 +1,7 @@
 {
 	"state": "State",
-	"reporter": "Reporter",
-	"reported-at": "Reported At",
-	"description": "Description",
+	"reports": "Reports",
+	"first-reported": "First Reported",
 	"no-flags": "Hooray! No flags found.",
 	"assignee": "Assignee",
 	"update": "Update",
@@ -26,6 +25,7 @@
 	"filter-quick-mine": "Assigned to me",
 	"filter-cid-all": "All categories",
 	"apply-filters": "Apply Filters",
+	"more-filters": "More Filters",
 
 	"quick-actions": "Quick Actions",
 	"flagged-user": "Flagged User",